7449 files changed, 72396 insertions, 101201 deletions

diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
index 1a871d82ec03..ea2dba3fcc63 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.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.18.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
index f0af8132a3a7..ab61bf9f2144 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.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/caribou/Manifest b/app-accessibility/caribou/Manifest
index 9ed26fa7a527..969fc082b6da 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,2 +1,2 @@
-DIST caribou-0.4.18.1.tar.xz 410548 SHA256 aefadf125a647fc68696f4134e99ee43dca121da5de8e1edf6eab5664a9f3150 SHA512 226ca64fafb4e7c5e38ba714059e9e6ef7bbfce04160b98884fb299dc465e4f7d278033477f2539ba64fe9c39c62448903a8273dee0315bff81dbbe107d665d5 WHIRLPOOL 1310f79944ee547535a04563dd7910dfff2db400faf6c28685deecc062432759a24f0587f875d88cc87ddcdcd4c249a83abde0222ffcab4a24afe91dc9a55cdb
 DIST caribou-0.4.19.tar.xz 412328 SHA256 2f0bd0c14c5f94cf5ac3a7627018919addf7a054ac84aaa8e62356957c175a44 SHA512 ae8fd278612778eae35810eee199dc9c64b45340de1459cc71eb5806ebc14ddd05e7e0e5464e2976d0160a50c6d76656a7ed0362bfd79eecdc09de1fc78b6de1 WHIRLPOOL db26dbc91e231558712bd33f57f857de660cc17f5c7c6c8c8fd2687807b75d5784df8654e0328c35a4e06902ec5a628609b8c9dd2d568a2afcb59c2f12c081a8
+DIST caribou-0.4.20.tar.xz 415148 SHA256 3a6664d5698c2b62a6c1c115743630d339ac237a7324bb354f2e5d55b4bb50d9 SHA512 e72a18462268278e0c07f178085eeff0e65ece6a9bf2f667c4ca66a66d173b39c68843c537ba6e8bd056c21575be592cece5f4f752f324c7f0db44fe28c45504 WHIRLPOOL e718ab799dcb8474c813e22fae1445d5a299d6c14dfa880cbe3da55793db867a8e5b5ef442a99e184a75a5b6fbf4d5719821a901d75ba69dba74db1d3473c437
diff --git a/app-accessibility/caribou/caribou-0.4.18.1.ebuild b/app-accessibility/caribou/caribou-0.4.18.1.ebuild
deleted file mode 100644
index 77a349079ddd..000000000000
--- a/app-accessibility/caribou/caribou-0.4.18.1.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"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7:=
-	dev-libs/libgee:0.8
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/glib[dbus]
-	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	# + caribou is python2 only so fix the shell scripts
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-		-i bin/{antler-keyboard,caribou-preferences}.in ||
-		die "sed failed"
-
-	gnome2_src_prepare
-
-	prepare_caribou() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_caribou
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--disable-docs \
-			--disable-static \
-			--enable-gtk3-module \
-			--enable-gtk2-module \
-			VALAC=$(type -P true)
-	# vala is not needed for tarball builds, but configure checks for it...
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
-}
diff --git a/app-accessibility/caribou/caribou-0.4.20.ebuild b/app-accessibility/caribou/caribou-0.4.20.ebuild
new file mode 100644
index 000000000000..4804eb814073
--- /dev/null
+++ b/app-accessibility/caribou/caribou-0.4.20.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"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Input assistive technology intended for switch and pointer users"
+HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core
+	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3:3[introspection]
+	x11-libs/gtk+:2
+	>=dev-libs/gobject-introspection-0.10.7:=
+	dev-libs/libgee:0.8
+	dev-libs/libxml2
+	>=media-libs/clutter-1.5.11:1.0[introspection]
+	x11-libs/libX11
+	x11-libs/libxklavier
+	x11-libs/libXtst
+"
+# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
+# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
+# librsvg needed to load svg images in css styles
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/glib[dbus]
+	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
+	>=gnome-base/gsettings-desktop-schemas-3
+	gnome-base/librsvg:2
+	sys-apps/dbus
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
+	# + caribou is python2 only so fix the shell scripts
+	sed -e '/export PYTHONPATH=.*python/ d' \
+		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
+		-i bin/{antler-keyboard,caribou-preferences}.in ||
+		die "sed failed"
+
+	gnome2_src_prepare
+
+	prepare_caribou() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_caribou
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--disable-docs \
+			--disable-static \
+			--enable-gtk3-module \
+			--enable-gtk2-module \
+			VALAC=$(type -P true)
+	# vala is not needed for tarball builds, but configure checks for it...
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
+}
diff --git a/app-accessibility/orca/orca-3.18.2.ebuild b/app-accessibility/orca/orca-3.18.2.ebuild
index 090e21a8f091..7d2b6adcbe24 100644
--- a/app-accessibility/orca/orca-3.18.2.ebuild
+++ b/app-accessibility/orca/orca-3.18.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-accessibility/speakup/Manifest b/app-accessibility/speakup/Manifest
deleted file mode 100644
index e62a838af6bd..000000000000
--- a/app-accessibility/speakup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST speakup-3.1.6_p201011120508.tar.bz2 128355 SHA256 29a75654d18a6b5d3067142acd6e33e6ba91453cff3101d86f4ba7af7f3e1e1b SHA512 b15245635d42dc1798734031401c644a55484c299fcc7368a80e2b1ef4c4cdea962e0d1c15bee3ef0f1dab1212bb60a0cd6124d656bf9ad46875ec1d95d8cf88 WHIRLPOOL 7e0c4a9674ac46cf432a0e3c65c291610268dc9b5345edc008ba0c4f15ad6a38c3acb0be04ce3f29e6038de56c8e8fccbe1c92b3615f9ccf572f5adb9d4062fd
diff --git a/app-accessibility/speakup/metadata.xml b/app-accessibility/speakup/metadata.xml
deleted file mode 100644
index 8fb4aba1043e..000000000000
--- a/app-accessibility/speakup/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 type="person">
-  <email>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>accessibility@gentoo.org</email>
-  <name>Gentoo Accessibility Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-accessibility/speakup/speakup-3.1.6_p201011120508.ebuild b/app-accessibility/speakup/speakup-3.1.6_p201011120508.ebuild
deleted file mode 100644
index 4f5e7693e502..000000000000
--- a/app-accessibility/speakup/speakup-3.1.6_p201011120508.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://linux-speakup.org/speakup.git"
-	vcs=git-2
-else
-	SRC_URI="ftp://linux-speakup.org/pub/speakup/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-inherit $vcs linux-mod
-
-DESCRIPTION="The speakup linux kernel based screen reader"
-HOMEPAGE="http://linux-speakup.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="modules"
-
-S="${WORKDIR}/${PN}-3.1.6"
-MODULE_NAMES="speakup(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntsa(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_apollo(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_audptr(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_bns(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decext(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dectlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dtlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dummy(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_keypc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_ltlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_soft(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_spkout(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_txprt(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)"
-BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
-BUILD_TARGETS="clean all"
-
-src_prepare() {
-	use modules && cmd=die || cmd=ewarn
-	if ! kernel_is 2 6 36; then
-		$cmd "This version of speakup requires kernel version 2.6.36"
-	fi
-}
-
-src_compile() {
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	use modules && linux-mod_src_install
-	dodoc Bugs.txt README To-Do
-	dodoc drivers/staging/speakup/DefaultKeyAssignments
-	dodoc drivers/staging/speakup/spkguide.txt
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	elog "You must set up the speech synthesizer driver to be loaded"
-	elog "automatically in order for your system to start speaking"
-	elog "when it is booted."
-	if has_version "<sys-apps/baselayout-2"; then
-		elog "this is done via /etc/modules.autoload.d/kernel-2.6"
-	else
-		elog "This is done via /etc/conf.d/modules."
-	fi
-}
diff --git a/app-accessibility/speakup/speakup-9999.ebuild b/app-accessibility/speakup/speakup-9999.ebuild
deleted file mode 100644
index 11d7a80a69ac..000000000000
--- a/app-accessibility/speakup/speakup-9999.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="2"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://linux-speakup.org/speakup.git"
-	vcs=git-2
-else
-	SRC_URI="ftp://linux-speakup.org/pub/speakup/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit $vcs linux-mod
-
-DESCRIPTION="The speakup linux kernel based screen reader"
-HOMEPAGE="http://linux-speakup.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="modules"
-
-MODULE_NAMES="speakup(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_acntsa(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_apollo(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_audptr(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_bns(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decext(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_decpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dectlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dtlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_dummy(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_keypc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_ltlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_soft(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_spkout(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
-	speakup_txprt(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)"
-BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
-BUILD_TARGETS="clean all"
-
-src_prepare() {
-	use modules && cmd=die || cmd=ewarn
-	if kernel_is lt 2 6 36; then
-		$cmd "Speakup requires at least kernel version 2.6.36"
-	fi
-}
-
-src_compile() {
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	use modules && linux-mod_src_install
-	dodoc Bugs.txt README To-Do
-	dodoc drivers/staging/speakup/DefaultKeyAssignments
-	dodoc drivers/staging/speakup/spkguide.txt
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	elog "You must set up the speech synthesizer driver to be loaded"
-	elog "automatically in order for your system to start speaking"
-	elog "when it is booted."
-	if has_version "<sys-apps/baselayout-2"; then
-		elog "this is done via /etc/modules.autoload.d/kernel-2.6"
-	else
-		elog "This is done via /etc/conf.d/modules."
-	fi
-}
diff --git a/app-accessibility/speechd-up/Manifest b/app-accessibility/speechd-up/Manifest
deleted file mode 100644
index 9c72956a6277..000000000000
--- a/app-accessibility/speechd-up/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST speechd-up-0.4.tar.gz 395659 SHA256 03ebc5c05eedebbeb86c561a4708b90deecacfeb7aecd4a8b93ea3b3419d202a SHA512 17f67049e9dbd6986b1e068b6ebb9baf250990d6b3d41e7f5c5f887051e876d48972fe7881d309696c8ed57093297a9a1479046ae97da2428615d566ce51d383 WHIRLPOOL cd42a0b6c2eb9c2746c47f7a8564ccf55e033857886528bbc67d7e40fa1dc5031cf1323b791fc2fc7defea092dd2a36e15c7bb05f0c083573b7ba85769f8c0b9
diff --git a/app-accessibility/speechd-up/files/speechd-up.confd b/app-accessibility/speechd-up/files/speechd-up.confd
deleted file mode 100644
index 2808a6c1b80a..000000000000
--- a/app-accessibility/speechd-up/files/speechd-up.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/speechd-up: config file for /etc/init.d/speechd-up
-
-# Niceness level at which to run speechd-up
-
-NICELEVEL=-5
-
diff --git a/app-accessibility/speechd-up/files/speechd-up.rc b/app-accessibility/speechd-up/files/speechd-up.rc
deleted file mode 100644
index 76a58506e1da..000000000000
--- a/app-accessibility/speechd-up/files/speechd-up.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SPEAKUPDEV=/dev/softsynth
-SPEAKUPDIR=/sys/module/speakup/parameters
-
-depend() {
-	use eflite festival
-	need speech-dispatcher
-}
-
-check_speakup() {
-	if [ ! -d ${SPEAKUPDIR} ]; then
-		eerror "Speakup is not currently running."
-		eerror "Please correct this before using speechd-up."
-		return 1
-	fi
-
-	if [ ! -c ${SPEAKUPDEV} ]; then
-		mknod ${SPEAKUPDEV} c 10 26
-	fi
-	echo soft > ${SPEAKUPDIR}/synth
-	sleep 1
-}
-
-start() {
-	check_speakup || return 1
-	ebegin "Starting speechd-up"
-	start-stop-daemon --start --quiet --nicelevel ${NICELEVEL} --exec /usr/bin/speechd-up -- -d -t
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping speechd-up"
-	start-stop-daemon --stop --quiet --pidfile /var/run/speechd-up.pid
-	eend $?
-}
diff --git a/app-accessibility/speechd-up/metadata.xml b/app-accessibility/speechd-up/metadata.xml
deleted file mode 100644
index 8a688c3b0195..000000000000
--- a/app-accessibility/speechd-up/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 type="person">
-<email>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-<email>accessibility@gentoo.org</email>
-<name>Gentoo Accessibility Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild b/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild
deleted file mode 100644
index 26494f4456b2..000000000000
--- a/app-accessibility/speechd-up/speechd-up-0.4-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-IUSE=""
-
-inherit eutils
-
-DESCRIPTION="Interface between speakup and speech-dispatcher"
-HOMEPAGE="http://www.freebsoft.org/speechd-up"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-up/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-DEPEND=">=app-accessibility/speech-dispatcher-0.6"
-RDEPEND="${DEPEND}
-	>=app-accessibility/speakup-3.0.2"
-
-src_compile() {
-	econf || die
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/speechd-up.rc speechd-up
-	newconfd "${FILESDIR}"/speechd-up.confd speechd-up
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	doinfo speechd-up.info
-}
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index fd6dfbefc1a6..568d66614dd8 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1 +1,3 @@
 DIST checksec-1.7.2.tar.gz 16717 SHA256 eb17f2162e7f563ba0f97d9cf15f92cf1ba2d360c8293a33d66573d5a48822a8 SHA512 1f1c1867b889266c0d035c3f7b028e61ed2cf3413caa789dfb8589b56834194e3367b3868a80984242dadb7629a9a5a7563376a2f37e3971899e2ecc319ee2f1 WHIRLPOOL 3abf206d666751b2449387848afb320185102ddc0f1685db2aa6f4e974a3349e1c4d9551565459d9070cac5218354af1919c5c70af6f0131b9443fcf24a72d35
+DIST checksec-1.7.3.tar.gz 49136 SHA256 d9bb3dd6be95a4d30d3ebe6adb8ae2aa64db0b9d2c475db00134a9596d555cbf SHA512 daf311cceb1a2132e87169b3c7a1254a2be418e7274ea9dda0aa7a1a6dbf72aa7531a7d157cd0a776fd7076e75db91ba5fc901fa94ab49d97f9ff7e4c2a56806 WHIRLPOOL 8be332a89727a6d397f5ba8a0e7032d85fce054ef68b83bd7d4460fc521b895eb37b7aa701ff84df6193bd0e032f5c5aa4e67d8823ee0854a1febf73febc10cf
+DIST checksec-1.7.4.tar.gz 51677 SHA256 ffa9b73b41f97d341fca5d46ebe93480110450bf37deb1126a29ea8548f854ae SHA512 ed14f5f8917983a10faa06a2659ccea3256799bc2a4a151ad06ca7b1a984b70673b4fd10191be7c97bbdf9e5def64161b00434b84130ae0464610afec8754e69 WHIRLPOOL ebaa662ed272489fef860650bb6ca094b6bbb992604235bbfbf4806a502dcd8393aff6ba5a1f20b43f4019209077c3d2aa6ef2e62180b4abbeb289c790267f08
diff --git a/app-admin/checksec/checksec-1.7.3.ebuild b/app-admin/checksec/checksec-1.7.3.ebuild
new file mode 100644
index 000000000000..d9168d5d804e
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
+}
+
+src_install() {
+	default
+	dobin ${PN}
+}
diff --git a/app-admin/checksec/checksec-1.7.4.ebuild b/app-admin/checksec/checksec-1.7.4.ebuild
new file mode 100644
index 000000000000..60545f7466d2
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/conky/conky-1.10.1.ebuild b/app-admin/conky/conky-1.10.1.ebuild
index 86a87b87e642..3e6759bfa516 100644
--- a/app-admin/conky/conky-1.10.1.ebuild
+++ b/app-admin/conky/conky-1.10.1.ebuild
@@ -76,6 +76,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-includewlan.patch"
+
 	# Allow user patches #478482
 	epatch_user
 }
@@ -139,7 +141,8 @@ src_configure() {
 		-DBUILD_BUILTIN_CONFIG=ON
 		-DBUILD_OLD_CONFIG=ON
 		-DBUILD_I18N=ON
-		-DMAINTAINER_MODE=ON
+		-DMAINTAINER_MODE=OFF
+		-DRELEASE=ON
 		-DBUILD_AUDACIOUS_LEGACY=OFF
 		-DBUILD_BMPX=OFF
 		-DDOC_PATH=/usr/share/doc/${PF}
diff --git a/app-admin/conky/files/conky-1.10.1-includewlan.patch b/app-admin/conky/files/conky-1.10.1-includewlan.patch
new file mode 100644
index 000000000000..82b09a749b9a
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.1-includewlan.patch
@@ -0,0 +1,13 @@
+diff -Naur a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+--- a/cmake/ConkyPlatformChecks.cmake	2015-11-18 20:47:45.000000000 +0500
++++ b/cmake/ConkyPlatformChecks.cmake	2016-01-31 20:04:58.036144590 +0500
+@@ -141,7 +141,8 @@
+ endif(BUILD_MYSQL)
+ 
+ if(BUILD_WLAN)
+-	check_include_file(iwlib.h IWLIB_H -D_GNU_SOURCE)
++	set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) 
++	check_include_files(iwlib.h IWLIB_H -D_GNU_SOURCE)
+ 	if(NOT IWLIB_H)
+ 		message(FATAL_ERROR "Unable to find iwlib.h")
+ 	endif(NOT IWLIB_H)
diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r1.ebuild
deleted file mode 100644
index e95e2e7a6b17..000000000000
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit git-r3 golang-base systemd user
-
-GO_PN="github.com/hashicorp/consul"
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="http://www.consul.io"
-SRC_URI="
-	https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> ${P}.tar.gz
-	https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
-	https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-	https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-	https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
-	https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
-	https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
-	https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz
-	https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-	https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-	https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-	https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-	https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
-	https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
-	https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
-	https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz
-	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
-	https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
-	https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
-	https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
-	https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
-	https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
-	https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz
-	https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz
-	https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
-	https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE="test web"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/go-1.4:=
-	dev-go/go-crypto:=
-	test? ( dev-go/go-tools )
-	web? (
-		dev-ruby/sass
-		dev-ruby/uglifier
-	)"
-RDEPEND=""
-
-STRIP_MASK="*.a"
-
-S="${WORKDIR}/src/${GO_PN}"
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			mkdir -p src/${go_package%/*} || die
-			mv ${go_package##*/}-* src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	local path
-	unpack_go_packages
-	# Create a writable GOROOT in order to avoid sandbox violations
-	# or other interference from installed instances.
-	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	while read -r path; do
-		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
-	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
-}
-
-src_prepare() {
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-e 's:-X main.GitCommit.*:" \\:' \
-		-i scripts/build.sh || die
-
-	# Disable tests that fail under network-sandbox
-	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
-		-i consul/server_test.go || die
-	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
-		-i command/agent/command_test.go || die
-}
-
-src_compile() {
-	emake
-
-	if use web; then
-		pushd ui >/dev/null || die
-		emake dist
-	fi
-}
-
-src_install() {
-	local x
-
-	dobin bin/*
-	rm -rf bin || die
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-	rm "${ED}etc/consul.d/ui.json.example" || die
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	if use web; then
-		insinto /var/lib/${PN}/ui
-		doins -r ui/dist/*
-	fi
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-
-	egit_clean "${WORKDIR}"/{pkg,src}
-
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
-
-	while read -r -d '' x; do
-		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
-			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
-		rm -rf "${WORKDIR}"/src/${x}
-	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
-	doins -r "${WORKDIR}"/src/${GO_PN}
-}
diff --git a/app-admin/consul/consul-0.5.2-r2.ebuild b/app-admin/consul/consul-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..1e80b04c9abe
--- /dev/null
+++ b/app-admin/consul/consul-0.5.2-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit golang-base systemd user
+
+GO_PN="github.com/hashicorp/consul"
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="
+	https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> ${P}.tar.gz
+	https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
+	https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
+	https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
+	https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
+	https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
+	https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
+	https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz
+	https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
+	https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
+	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+	https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
+	https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
+	https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
+	https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
+	https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
+	https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz
+	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
+	https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
+	https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
+	https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
+	https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
+	https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
+	https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz
+	https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz
+	https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
+	https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE="test web"
+
+RESTRICT="test"
+
+DEPEND="
+	app-arch/zip
+	>=dev-lang/go-1.4:=
+	dev-go/go-crypto:=
+	test? ( dev-go/go-tools )
+	web? (
+		dev-ruby/sass
+		dev-ruby/uglifier
+	)"
+RDEPEND=""
+
+STRIP_MASK="*.a"
+
+S="${WORKDIR}/src/${GO_PN}"
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			mkdir -p src/${go_package%/*} || die
+			mv ${go_package##*/}-* src/${go_package} || die
+		fi
+	done
+}
+
+src_unpack() {
+	local path
+	unpack_go_packages
+	# Create a writable GOROOT in order to avoid sandbox violations
+	# or other interference from installed instances.
+	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	while read -r path; do
+		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
+		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
+	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
+}
+
+src_prepare() {
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-X main.GitCommit.*:" \\:' \
+		-i scripts/build.sh || die
+
+	# Disable tests that fail under network-sandbox
+	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
+		-i consul/server_test.go || die
+	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
+		-i command/agent/command_test.go || die
+}
+
+src_compile() {
+	emake
+
+	if use web; then
+		pushd ui >/dev/null || die
+		emake dist
+	fi
+}
+
+src_install() {
+	local x
+
+	dobin bin/*
+	rm -rf bin || die
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+	rm "${ED}etc/consul.d/ui.json.example" || die
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	if use web; then
+		insinto /var/lib/${PN}/ui
+		doins -r ui/dist/*
+	fi
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
+
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
+	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
+	doins -r "${WORKDIR}"/src/${GO_PN}
+}
diff --git a/app-admin/consul/consul-0.6.3-r1.ebuild b/app-admin/consul/consul-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..90ec2beb0311
--- /dev/null
+++ b/app-admin/consul/consul-0.6.3-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit golang-base systemd user
+
+GO_PN="github.com/hashicorp/consul"
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="
+	https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/armon/circbuf/archive/bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz -> circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz
+	https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
+	https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz
+	https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
+	https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz
+	https://github.com/bgentry/speakeasy/archive/36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz -> speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz
+	https://github.com/DataDog/datadog-go/archive/bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz -> datadog-go-bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz
+	https://github.com/fsouza/go-dockerclient/archive/296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz -> go-dockerclient-296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz
+	https://github.com/elazarl/go-bindata-assetfs/archive/57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz -> go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz
+	https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
+	https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+	https://github.com/hashicorp/go-checkpoint/archive/e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz -> go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz
+	https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+	https://github.com/hashicorp/go-immutable-radix/archive/12e90058b2897552deea141eff51bb7a07a09e63.tar.gz -> go-immutable-radix-12e90058b2897552deea141eff51bb7a07a09e63.tar.gz
+	https://github.com/hashicorp/go-memdb/archive/31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz -> go-memdb-31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz
+	https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
+	https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+	https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz
+	https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz
+	https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+	https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+	https://github.com/hashicorp/memberlist/archive/9888dc523910e5d22c5be4f6e34520943df21809.tar.gz -> memberlist-9888dc523910e5d22c5be4f6e34520943df21809.tar.gz
+	https://github.com/hashicorp/net-rpc-msgpackrpc/archive/a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz -> net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz
+	https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz
+	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
+	https://github.com/hashicorp/raft-mdb/archive/55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz -> raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz
+	https://github.com/hashicorp/scada-client/archive/84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz -> scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz
+	https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+	https://github.com/hashicorp/yamux/archive/df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz -> yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz
+	https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
+	https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz
+	https://github.com/mattn/go-isatty/archive/56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz -> go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz
+	https://github.com/miekg/dns/archive/85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz -> dns-85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz
+	https://github.com/mitchellh/cli/archive/cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz -> cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz
+	https://github.com/mitchellh/gox/archive/39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz -> gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz
+	https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
+	https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
+	https://github.com/ryanuber/columnize/archive/983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz -> columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="test"
+
+DEPEND="
+	app-arch/zip
+	>=dev-lang/go-1.4:=
+	dev-go/go-crypto:=
+	dev-go/go-sys:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+STRIP_MASK="*.a"
+
+S="${WORKDIR}/src/${GO_PN}"
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			mkdir -p src/${go_package%/*}
+			mv ${go_package##*/}-* src/${go_package} || die
+		fi
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+	# Create a writable GOROOT in order to avoid sandbox violations
+	# or other interference from installed instances.
+	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	while read -r path; do
+		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
+		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
+	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
+}
+
+src_prepare() {
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-X main.GitCommit.*:" \\:' \
+		-i scripts/build.sh || die
+
+	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+	sed -e 's:golang.org/x/tools/cmd/stringer::' -i Makefile || die
+
+	# Disable tests that fail under network-sandbox
+	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
+		-i consul/server_test.go || die
+	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
+		-i command/agent/command_test.go || die
+}
+
+src_compile() {
+	PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake
+}
+
+src_install() {
+	local x
+
+	dobin bin/*
+	rm -rf bin || die
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+	rm "${ED}etc/consul.d/ui-dir.json.example" || die
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
+
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
+	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
+	doins -r "${WORKDIR}"/src/${GO_PN}
+}
diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild
deleted file mode 100644
index a2ff9c660b03..000000000000
--- a/app-admin/consul/consul-0.6.3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit git-r3 golang-base systemd user
-
-GO_PN="github.com/hashicorp/consul"
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="http://www.consul.io"
-SRC_URI="
-	https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/armon/circbuf/archive/bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz -> circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz
-	https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
-	https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz
-	https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
-	https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz
-	https://github.com/bgentry/speakeasy/archive/36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz -> speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz
-	https://github.com/DataDog/datadog-go/archive/bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz -> datadog-go-bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz
-	https://github.com/fsouza/go-dockerclient/archive/296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz -> go-dockerclient-296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz
-	https://github.com/elazarl/go-bindata-assetfs/archive/57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz -> go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz
-	https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
-	https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
-	https://github.com/hashicorp/go-checkpoint/archive/e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz -> go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz
-	https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
-	https://github.com/hashicorp/go-immutable-radix/archive/12e90058b2897552deea141eff51bb7a07a09e63.tar.gz -> go-immutable-radix-12e90058b2897552deea141eff51bb7a07a09e63.tar.gz
-	https://github.com/hashicorp/go-memdb/archive/31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz -> go-memdb-31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz
-	https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
-	https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
-	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-	https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz
-	https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz
-	https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
-	https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
-	https://github.com/hashicorp/memberlist/archive/9888dc523910e5d22c5be4f6e34520943df21809.tar.gz -> memberlist-9888dc523910e5d22c5be4f6e34520943df21809.tar.gz
-	https://github.com/hashicorp/net-rpc-msgpackrpc/archive/a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz -> net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz
-	https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz
-	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
-	https://github.com/hashicorp/raft-mdb/archive/55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz -> raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz
-	https://github.com/hashicorp/scada-client/archive/84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz -> scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz
-	https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
-	https://github.com/hashicorp/yamux/archive/df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz -> yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz
-	https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
-	https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz
-	https://github.com/mattn/go-isatty/archive/56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz -> go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz
-	https://github.com/miekg/dns/archive/85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz -> dns-85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz
-	https://github.com/mitchellh/cli/archive/cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz -> cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz
-	https://github.com/mitchellh/gox/archive/39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz -> gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz
-	https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-	https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
-	https://github.com/ryanuber/columnize/archive/983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz -> columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/go-1.4:=
-	dev-go/go-crypto:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-STRIP_MASK="*.a"
-
-S="${WORKDIR}/src/${GO_PN}"
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			mkdir -p src/${go_package%/*}
-			mv ${go_package##*/}-* src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	unpack_go_packages
-	# Create a writable GOROOT in order to avoid sandbox violations
-	# or other interference from installed instances.
-	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	while read -r path; do
-		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
-	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
-}
-
-src_prepare() {
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-e 's:-X main.GitCommit.*:" \\:' \
-		-i scripts/build.sh || die
-
-	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
-	sed -e 's:golang.org/x/tools/cmd/stringer::' -i Makefile || die
-
-	# Disable tests that fail under network-sandbox
-	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
-		-i consul/server_test.go || die
-	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
-		-i command/agent/command_test.go || die
-}
-
-src_compile() {
-	PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake
-}
-
-src_install() {
-	local x
-
-	dobin bin/*
-	rm -rf bin || die
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-	rm "${ED}etc/consul.d/ui-dir.json.example" || die
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-
-	egit_clean "${WORKDIR}"/{pkg,src}
-
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
-
-	while read -r -d '' x; do
-		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
-			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
-		rm -rf "${WORKDIR}"/src/${x}
-	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
-	doins -r "${WORKDIR}"/src/${GO_PN}
-}
diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild
index deebbb42ff82..0e865fe8e4c0 100644
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.ebuild
@@ -21,6 +21,7 @@ IUSE="test web"
 RESTRICT="test"
 
 DEPEND="
+	app-arch/zip
 	>=dev-lang/go-1.4:=
 	dev-go/go-crypto:=
 	test? ( dev-go/go-tools )
@@ -117,8 +118,8 @@ src_install() {
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-admin/eselect/eselect-1.4.5.ebuild b/app-admin/eselect/eselect-1.4.5.ebuild
index 68d8e46e0b73..10205fc7ef75 100644
--- a/app-admin/eselect/eselect-1.4.5.ebuild
+++ b/app-admin/eselect/eselect-1.4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 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="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/filebeat-bin/Manifest b/app-admin/filebeat-bin/Manifest
index a5766ccab4ef..3f802d1bda8c 100644
--- a/app-admin/filebeat-bin/Manifest
+++ b/app-admin/filebeat-bin/Manifest
@@ -1,2 +1,4 @@
 DIST filebeat-1.0.1-i686.tar.gz 3073413 SHA256 a9ccf9a4f1d3e2c840ad153ae4594a4cabccaa53c178c3ad585590e10994d7b8 SHA512 164835cb4dd98b6e897e004fdc0c099022be8e83ced89a0dbbbec119f32eaaf9f6ed5eaec41d3c86d5722df662577d83b9623b057ac7913038b04ee344ae5a85 WHIRLPOOL 9983b74569ff303cdfcff8968a0a93dab34e1f9c3d184f89e88e066106cd94a687e07a94e3ba6ac6019d786cad50a07ec8052043a5bdd3cbc095eaae64c50c0f
 DIST filebeat-1.0.1-x86_64.tar.gz 3265179 SHA256 662bceca18eabf9c81681b790776398a78fdf36604b5d0edc8abedd28980de52 SHA512 5ec0a0371790a425fac67ddb164fc4b347eb79468f85b8a64d78491a478aacfc2d3eaad62f654847c7381d4dc3686075e428ecc2271f415aa1cc83b5c84e72b7 WHIRLPOOL 58c86a41cdd2543d8de82e0572af27adac7d44d09c7866c984616c7dcb296087eaa25f6c7de234f27ed25698bad9d18a444bfd89166c5a415457a2f473fa6263
+DIST filebeat-1.1.1-i686.tar.gz 3421542 SHA256 c425223e0fd6fe2c768cf1982a5da997ec1ef183ebcbb3419d815c26851b4ff4 SHA512 e912407b1ebf265741fbeb2ecd742850f428e103a116773bf06e8835ef12179d10767d650f79342e440efe7786f88740787ff8c75cc0df0f7295de5d8f4b1eed WHIRLPOOL 2b937f428889e79c25bc80cbd499c02d42bc5583c681df6b1e6610a58d4ef5fa24254bfe1c51303b4b6dcfd05d6ff2bce4484c4d75fde0b2add47ae17da58b1f
+DIST filebeat-1.1.1-x86_64.tar.gz 3633191 SHA256 2df9ec1b4e0e78b1edfa678d70c1b4dde3c06f2f166accdb176617377061b583 SHA512 d9da1999302c5de476b7788102af0ab7786100f90cd957f2fe3e212b871d38c017aedfea7eaa32865dc0f3e21e256b6597a3575072e9320674d49fbc2f1ab1d8 WHIRLPOOL 1bf075c967a39a270cd37ae94d222fb0ec1cf2e7faf3e0bc74b1461093ea9547e67bb8969e5a4033e793653772de659ee39e20c06926ed44ce48228b915cc47d
diff --git a/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild b/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild
index 96d830c7b279..c905816e3be9 100644
--- a/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild
+++ b/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/app-admin/filebeat-bin/filebeat-bin-1.1.1.ebuild b/app-admin/filebeat-bin/filebeat-bin-1.1.1.ebuild
new file mode 100644
index 000000000000..c905816e3be9
--- /dev/null
+++ b/app-admin/filebeat-bin/filebeat-bin-1.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=${PN/-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="amd64? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-x86_64.tar.gz )
+	x86? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-i686.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_unpack() {
+	if use amd64; then
+		S="${WORKDIR}/${MY_P}-x86_64"
+	elif use x86; then
+		S="${WORKDIR}/${MY_P}-i686"
+	fi
+
+	default
+}
+
+src_install() {
+	keepdir /etc/${MY_PN}
+	keepdir /var/lib/${MY_PN}
+
+	fperms 0750 /var/lib/${MY_PN}
+
+	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+
+	insinto /etc/${MY_PN}
+	newins ${MY_PN}.yml ${MY_PN}.yml.example
+
+	dobin ${MY_PN}
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/${MY_PN}/${MY_PN}.yml ]]; then
+		elog "Before starting filebeat, you need to create a configuration file at:"
+		elog "/etc/${MY_PN}/${MY_PN}.yml"
+	fi
+}
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
index dd062b3ead9b..220f4c651deb 100644
--- a/app-admin/fleet/metadata.xml
+++ b/app-admin/fleet/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
index 7daa559ac305..96f779734d5c 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit eutils autotools readme.gentoo systemd
+
+inherit eutils autotools readme.gentoo-r1 systemd
 
 MY_P=${P/_beta/-beta}
 DBV=20080531
@@ -37,13 +38,17 @@ If hddtemp complains but finds your HDD temperature sensor, use the
 --quiet option to suppress the warning.
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-satacmds.patch
+	"${FILESDIR}"/${P}-byteswap.patch
+	"${FILESDIR}"/${P}-execinfo.patch
+	"${FILESDIR}"/${P}-nls.patch
+	"${FILESDIR}"/${P}-iconv.patch
+	"${FILESDIR}"/${P}-dontwake.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-satacmds.patch
-	epatch "${FILESDIR}"/${P}-byteswap.patch
-	epatch "${FILESDIR}"/${P}-execinfo.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	epatch "${FILESDIR}"/${P}-dontwake.patch
+	epatch "${PATCHES[@]}"
 	AT_M4DIR="m4" eautoreconf
 }
 
@@ -79,6 +84,10 @@ src_install() {
 	fi
 }
 
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
 update_db() {
 	local src=$1
 	local dst=$2
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index c518306cdc08..4339a37c3540 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>aidecoe@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="network-cron">
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="network-cron">
 		Monthly cronjob to update hddtemp.db.
 	</flag>
-</use>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 3082fe09157a..c9beb74f4519 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,4 @@
-DIST logstash-2.1.2.tar.gz 74425223 SHA256 5d396acf901558c49b231a954741b805a57a67a45ce6b22056fa296690b2cdab SHA512 aafec2ea88849f8a844ba4276a4193a374e4f549756117535f625e4b5b384304d411382066bc39f76ebab440a7ae417d31f6d5b43c1c16c9772cac6f02f4a0db WHIRLPOOL d96b89979debc71a10b90f5ee7efedcd2e4e858750886f3fde0991ac22a5f09b869ea2c3a68bbfc1f2bd630ac748c38ade44e4d5950b923619d6e1519a683b96
+DIST logstash-2.1.3.tar.gz 74433726 SHA256 c592ea6c63a64f44a08a4b86b8ce6e72847ffdf0cd207d1571dcfda899f7134f SHA512 76a25c4ac49b2d8d10ea13e60a249dad95b661f54310ad5ba7abf169065429342323e97d0bd1954542db31627d27762aabd0087186e3176a27066afc9b1e185c WHIRLPOOL 7da3f23e3fa0c09c7de0098dc09c5019e7bd5e7b3bf67b6df7b9d5d5ee06e6f2cb88c49b3865931cbe58342b28dd6035ea7da6889ff55d00ab6b87612a7ceff2
 DIST logstash-2.2.0.tar.gz 74440588 SHA256 aee2437f45c726ec354f0bf9634b3638428d48bef32beb412f827eb2cc736f78 SHA512 8a167971731bf0d0a7eddb023c57c66fa8ebeb0842756711795117bdb988018040ea50848c1f6e06ba748d76b723a39f758e275778270cf92acebb3284263ce0 WHIRLPOOL b07eba50168bd9ee9e7b55e8b9fd181353188db4b4c8e4dedc289cd8c8d4fae4c10650a8d968c06cd90e132f90adbc0805c077f1d891ef968e5ae02bf240dc27
+DIST logstash-2.2.2.tar.gz 74452781 SHA256 f0a29ec8fd327e42f3023bd6bf85a00ac20617bfc214df59c765453977398312 SHA512 bab0463f6d4aeccfac04007d318b8cf70d56c803dfaa7948fb7dc1ca29bb91ccc3b1c5b705bede585e4adb98e63b3515bbabfc1206378e3b53ead78cf08c3da4 WHIRLPOOL 92122b7687b7230ad9d9415d9bbcca737cabb46f512d2a86f4401205a3cdf0f31bee8bf6e0a42066a54234474b490c008ad2084f8ff5a5fc5af87532842de39a
 DIST logstash-all-plugins-2.2.0.tar.gz 129473672 SHA256 966b5408e66af003f96084bf6f8764855c00530db8b326513d795541a62e4d41 SHA512 0725275e312f9a936d750959ccc388bac0df91ff7dd1a74d501cfdfe20006a0a5008d0877012ad80b5caece3f64bdc86b79ffb20e2f07c4a8cd5bdd2daf8d1b2 WHIRLPOOL 3cfaf4693a0b7ef0343a973de344b063ad0d1928bf9316cc893ed88de9a7ef209a206d0cb881582c2213de9409874a959c44d874af82a5bad6468943fe4297c8
diff --git a/app-admin/logstash-bin/logstash-bin-2.1.2.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild
index 7348984dbaf9..7348984dbaf9 100644
--- a/app-admin/logstash-bin/logstash-bin-2.1.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild
new file mode 100644
index 000000000000..7348984dbaf9
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/etc/${MY_PN}/conf.d"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
+
+	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+}
+
+pkg_postinst() {
+	einfo "Getting started with logstash:"
+	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 0aed106e615c..10d7a893594a 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,3 +1,3 @@
 DIST mongo-tools-3.0.8.tar.gz 2185550 SHA256 b9860339ed59ed57bb29b26c820578c690baa2aaec98fe743561cc95023815f1 SHA512 95ea8377aef747f66ce827300cbc38bfa5b660ad25e4d66cf0dc9899cfe81ff2a67e9383a22c08158fed2d622a6f4d3b315e1234fb6118f246ef17f9cffa129a WHIRLPOOL 00298e54c8fd17a51a3293101defee94219c46929862695e08b2c21a66e59290b341f07c89add38dacfa8295c3fe83ce61cd3911e7489ddd75c2a65721910cce
 DIST mongo-tools-3.0.9.tar.gz 2185557 SHA256 41705fe815d189d6985ac6abad0b7467186488600cc3031732a25fea5c69a09f SHA512 d4b8d89242a0ab5b678eec7f9a75ad8cf199769046a399741960c605c7d0dc34d5f5e30d956ff4d51b01bc93b1841e132dc2daf6dade9b32d035f2c2f261e520 WHIRLPOOL ce8911d89d9874f1fbc18b63546b641866e94a7160edd705aece48f05b63a67dfc111cd44940a0956bc1d1e42431b33ea69d5f24eb216e99fcb080b55281ec89
-DIST mongo-tools-3.2.1.tar.gz 2226762 SHA256 e2a0527b8987ae954fc9ca071987b4c58ff53aa2bc0a4d8b03337f4d8aff1d89 SHA512 52e7402c232915e8bc481598a5f3a311ef7f4058448735ed14e142da180baf19aac95e641dbe58d0c71e114f35889d1cfa6a321114e4cf21edf7c525bf548249 WHIRLPOOL d0e30417f478c8f0aa7936638c0bec87f01dc278946dcde3187dbb060631126eaee2f0cdc535212cd2ad350f0c281d7398d66cb6416b7a0906d6c8e5d3cc5e19
+DIST mongo-tools-3.2.3.tar.gz 2227509 SHA256 280a4a5d12a0b36d780fcc6b9c24b48722f39a4acf5cfadf8c9b8679aa953bfd SHA512 c4cb9f12335a87a2c0de6a9dac79aa9e356a1a142868f02d002dd35a9b83f02ecf5cba6be453e9035b513935c77883cddd477369995fc0e174c68c6907b6ddc9 WHIRLPOOL ddcede3235f6931c8832c1254f6d216bdb4148b26a6aaa07df110a5042a6c05f55c8d6706496f93ee16409c2cecd4f7ae0fdd843ef9082679c33259b7caf9fe2
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.1.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.3.ebuild
index 0a92d4ba45db..0a92d4ba45db 100644
--- a/app-admin/mongo-tools/mongo-tools-3.2.1.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.2.3.ebuild
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 5006b1bb2bb4..1d2ee1cb6e19 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,2 +1 @@
-DIST puppetdb-3.2.2.tar.gz 25273184 SHA256 c6ed59055ef54a3af0fc571fae54f23a99e4f4781783c0a9be4ef0df1012b2dd SHA512 5fdd22c3a14e447a997bf223e7147be22c51e8dd44d636ab51bf35c44c813ac2898fbfe72efba3896189244d56abd9cbac3782c7c8ab2f1648b6b1f01b53de45 WHIRLPOOL e138e39a277fad9a0dc56a2c573515ca257b272356381ed5e4d031743e014c3605c9754bf07307389192bee8ed057d02697096102300c15c5ed83990171c61e0
 DIST puppetdb-3.2.3.tar.gz 25469315 SHA256 3b9d121e54da1511834d708437c9c9ca15db2818314f442511bbb2e576a7afaa SHA512 d15a497bce10e1af989e1deaba99794929916362e13393814d2c5545f80ee4fb0976758c3bd0ae41466bd0364ba5df417fa69afde8bf24e6573119cdbe814aa9 WHIRLPOOL 031c14df0df52320926030e32290fb8ab5115e800711d90b2c5acdc712fa7bbcefbc83afc380bbeff4f1b30654d724a8db01c9b5ace3f6bc0deeeb31127e4443
diff --git a/app-admin/puppetdb/puppetdb-3.2.2.ebuild b/app-admin/puppetdb/puppetdb-3.2.2.ebuild
deleted file mode 100644
index 9d2bed7b5e7d..000000000000
--- a/app-admin/puppetdb/puppetdb-3.2.2.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
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/export
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/import
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-3.2.3.ebuild b/app-admin/puppetdb/puppetdb-3.2.3.ebuild
index 9ad516467615..9d2bed7b5e7d 100644
--- a/app-admin/puppetdb/puppetdb-3.2.3.ebuild
+++ b/app-admin/puppetdb/puppetdb-3.2.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
diff --git a/app-admin/pydf/pydf-12.ebuild b/app-admin/pydf/pydf-12.ebuild
index da5e2e67c921..fe141d98ac76 100644
--- a/app-admin/pydf/pydf-12.ebuild
+++ b/app-admin/pydf/pydf-12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 42138ded617a..00b79a1990b3 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -2,4 +2,4 @@ DIST Rex-1.0.0.tar.gz 261873 SHA256 894ba5128842b33cbc5dfeabdbeded18f303d2efbb08
 DIST Rex-1.2.0.tar.gz 267664 SHA256 26a222bf418950b94b53c22c5fe87828a1503d6794a5516759914c5925f5f6fb SHA512 68467d00b6acdedd6b92dd51a8a6b42e3acf92fd28713a7ee7137744cd071b681e2e8f2fc5cf45df8979bdb78e9b49d2dbd52db7505f8aa9169b18e94e38719d WHIRLPOOL 453330d69b4a8e7e5f689fd10797233948a32fc239025fe68196ee2bfcd71f762f80e008e959cec209da58c8e1bb9be9ac66abaea9efe3bd70b4fcd38f903a8e
 DIST Rex-1.3.2.tar.gz 271446 SHA256 49be858e2ae51dda2fa2769b5e824ca2b5b7605f3b7e6c2f613b889e132e34b0 SHA512 589383b5a2c993e775be12ecd7b6ed5b525bd1f503311592bb302dd8558f5e0221fae6b459d4b52be418cb423fd294a759a63fce918b260e7c90fa153df0525a WHIRLPOOL ace24f03fc5ee5cb5b58bc14d4eb60f18598df645ad4c39260797012e2ecd2c40f72b3875f63dd5b4213990a6de817abcd511ade5d2928110072719e8b9c8ee2
 DIST Rex-1.3.3.tar.gz 274725 SHA256 111e80515fc3c1846668aa4ff0731443a58f3e74d78063dfc61fea96ca49cde6 SHA512 b2331e400027568f59496ff52f0a19bd009f66fea2a5b80ed9055859f59f0057afa50f61934cccd5af434c6f60dfa99700bc3904127b822a5ae684cb8bb6c70c WHIRLPOOL c8285e50f0259060ead8e86b120b3a16d6a1f506dec8eead33ac5e8a0af8371083a73315cf859c99433a7b8c902cbd48f383326c6ce2b0c4d900681baf623a51
-DIST Rex-1.3.3_02.tar.gz 284949 SHA256 816ad482aeb7c614b10066433d2789169b0513963d0a57b09ae1526727ec1499 SHA512 0e1e88627128bcb07e5fb2e8fb1b64e0cb412372cc44f7d1e2f4a6eb48229385f9a83c3b472e7176895eaa7523efe3000f510283ca98cc8f64967a33f9672200 WHIRLPOOL 5923b06c72d4139c1dab4e696f2092faeb05a3ea1fa480bc3dee19719e29dfdc4f1a045a1357ba8d9e6a7dee5987fc9cd27fcc7d71172833fe32cdc7354a83dd
+DIST Rex-1.3.3_03.tar.gz 285174 SHA256 213553011ca7bd351a257d1180701d8bb8bade090280296e1f10f6edb06ea09a SHA512 299c232d050bdbc27f951f7a584b639a3126c0e7f364e2016016c8bbedf828c5a158a76e36c47c5d4c61a7a80b5613cdfb04153ba8fda7edffa95d9ee5d4bcc6 WHIRLPOOL ab8286e34092c0f59a5f047ae8fd0992abf7703c653ae47f29521778305f15498a04e4ca634aa7384f4e83112b6a7e20756118aecaba9511f38a2ff784a6153b
diff --git a/app-admin/rex/rex-1.4.0_rc2.ebuild b/app-admin/rex/rex-1.4.0_rc2.ebuild
deleted file mode 100644
index 925841fba6da..000000000000
--- a/app-admin/rex/rex-1.4.0_rc2.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
-
-MODULE_AUTHOR=FERKI
-MODULE_A=Rex-1.3.3_02.tar.gz
-
-inherit perl-module
-
-DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
-
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-RDEPEND="
-	dev-perl/DBI
-	dev-perl/Devel-Caller
-	dev-perl/Digest-HMAC
-	dev-perl/Digest-SHA1
-	dev-perl/Expect
-	dev-perl/Hash-Merge
-	dev-perl/IO-String
-	dev-perl/IO-Tty
-	dev-perl/IPC-Shareable
-	dev-perl/JSON-XS
-	dev-perl/List-MoreUtils
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SFTP-Foreign
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	dev-perl/TermReadKey
-	dev-perl/Test-Deep
-	dev-perl/Text-Glob
-	dev-perl/URI
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/yaml
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-MIME-Base64
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Test-UseAllModules
-		virtual/perl-File-Temp
-	)
-"
-
-SRC_TEST="do"
-
-S="${WORKDIR}/${MODULE_A/.tar.gz/}"
diff --git a/app-admin/rex/rex-1.4.0_rc3.ebuild b/app-admin/rex/rex-1.4.0_rc3.ebuild
new file mode 100644
index 000000000000..0c3de4dab5fc
--- /dev/null
+++ b/app-admin/rex/rex-1.4.0_rc3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=FERKI
+MODULE_A=Rex-1.3.3_03.tar.gz
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	dev-perl/DBI
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Test-Deep
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/yaml
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
+
+SRC_TEST="do"
+
+S="${WORKDIR}/${MODULE_A/.tar.gz/}"
diff --git a/app-admin/rigo/Manifest b/app-admin/rigo/Manifest
deleted file mode 100644
index 520d012e476c..000000000000
--- a/app-admin/rigo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/app-admin/rigo/metadata.xml b/app-admin/rigo/metadata.xml
deleted file mode 100644
index 15f07e411445..000000000000
--- a/app-admin/rigo/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
-	<use>
-	</use>
-</pkgmetadata>
diff --git a/app-admin/rigo/rigo-254.ebuild b/app-admin/rigo/rigo-254.ebuild
deleted file mode 100644
index 13c04a556fc0..000000000000
--- a/app-admin/rigo/rigo-254.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils fdo-mime python-single-r1
-
-DESCRIPTION="Rigo, the Sabayon Application Browser"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/rigo"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] )
-	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
-	~sys-apps/rigo-daemon-${PV}[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	x11-libs/gtk+:3
-	x11-libs/vte:2.90
-	>=x11-misc/xdg-utils-1.1.0_rc1_p20120319"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	python_optimize "${D}/usr/lib/rigo/${PN}"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index cfcd19467a04..f286cff19efe 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -2,3 +2,4 @@ DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429d
 DIST salt-2015.5.9.tar.gz 5689839 SHA256 71e1c31ebe73edf17b43afcee7de689bb39cc6e97742cd0e110386106fa3fc5b SHA512 389fa09e2e89bb0631f5a2f1d7ef363f8b3a260d466cd7b5fdf7bfc296f5fb64fa355dc56a401df326cefe43e63904061db4fc01a3b5c1cd54fa34ee102a6ad9 WHIRLPOOL 094350e78b96c2633dedb2c4ab0caa959a634e84bf2e92145880eec883ec076765c8b897c873e8f601325a69e7e3fe139163eec45fc6daa109edbd9a884b0dc2
 DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861
 DIST salt-2015.8.5.tar.gz 6877624 SHA256 db395702f048ea384ccc440201c24d7044685977ae6a8588d0d0933246f0c673 SHA512 715709798fd1f4410ef204545a84e34d3ecc0f080905b7ae29ce19d273c1ed6865f56e025e59d2506301970ad05081ff119caec0ced03dcbe5803f9f00eb64f8 WHIRLPOOL 69dc332b21ade4735cd8e9d6a2cdfd61ee364a1c7aa3bf047c9d745b6135b94fdd6406117e056fbb6a8cb79dc3b07af5d2f7a781930255b1fe434838b8692de4
+DIST salt-2015.8.7.tar.gz 6877927 SHA256 61a2f9cff77dd11fc6bf7630d82d1955238818dfa7eedb53e6bf3edbbc9d6029 SHA512 b063c8e0f7cd1682fcb8f5a71fd9f2d71324070bcc4a88611bd4896a2de3269fa0cec1fe9698c74932d9f2a892816db2fc30612a2cbfcee64838ee73955d1a02 WHIRLPOOL 07e6c543e44c8a8a7413bc917bdc5754998285556ec8fda8fe4c278eaea0ca4abf4ae4bca617fca7fb34843408d30879bd880dbbe08197a74847337fa8eb6ef2
diff --git a/app-admin/salt/salt-2015.8.7.ebuild b/app-admin/salt/salt-2015.8.7.ebuild
new file mode 100644
index 000000000000..669ea91d430b
--- /dev/null
+++ b/app-admin/salt/salt-2015.8.7.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+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
+
+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}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${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}] )
+	vim-syntax? ( app-vim/salt-vim )"
+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-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"
+	"${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
+	"${FILESDIR}/${PN}-2015.8.4-boto-vpc-test.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,random_org}_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/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/setools/files/setools-3.3.8-no-check-file.patch b/app-admin/setools/files/setools-3.3.8-no-check-file.patch
new file mode 100644
index 000000000000..31848e9564b8
--- /dev/null
+++ b/app-admin/setools/files/setools-3.3.8-no-check-file.patch
@@ -0,0 +1,15 @@
+there's no real need to run AC_CHECK_FILE to see if a file exists.  if the
+static link fails later on, then the static lib didn't exist.  this also
+breaks cross-compiling.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -448,8 +448,6 @@
+               sepol_srcdir="")
+ if test "x${sepol_srcdir}" = "x"; then
+    sepol_srcdir=${sepol_devel_libdir}
+-   AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],,
+-      AC_MSG_ERROR([make sure libsepol-static is installed]))
+ else
+    AC_MSG_CHECKING([for compatible sepol source tree])
+    sepol_version=${sepol_srcdir}/VERSION
diff --git a/app-admin/setools/files/setools-3.3.8-policy-max.patch b/app-admin/setools/files/setools-3.3.8-policy-max.patch
new file mode 100644
index 000000000000..cf6917a671d1
--- /dev/null
+++ b/app-admin/setools/files/setools-3.3.8-policy-max.patch
@@ -0,0 +1,29 @@
+trying to run compiled code fails when cross-compiling.
+probe the value using the preprocessor instead.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -621,21 +621,8 @@
+ 	        sepol_new_errcodes="yes",
+                 sepol_new_errcodes="no")
+ 
+-AC_RUN_IFELSE(
+-   [AC_LANG_SOURCE([
+-#include <sepol/policydb/policydb.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-int main(void) {
+-    FILE *f = fopen("conftest.data", "w");
+-    if (f != NULL && fprintf(f, "%d", POLICYDB_VERSION_MAX) > 0) {
+-       fclose(f);
+-       exit(EXIT_SUCCESS);
+-    }
+-    exit(EXIT_FAILURE);
+-}])],
+-    sepol_policy_version_max=`cat conftest.data`,
+-    AC_MSG_FAILURE([could not determine maximum libsepol policy version]))
++printf "#include <sepol/policydb/policydb.h>\nPOLICYDB_VERSION_MAX\n" > conftest.c
++sepol_policy_version_max=`${CPP} -E -P ${CPPFLAGS} conftest.c | tail -1`
+ AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol])
+ CFLAGS="${sepol_save_CFLAGS}"
+ CPPFLAGS="${sepol_save_CPPFLAGS}"
diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
index 69b4c7c932f5..4df0e606d4b0 100644
--- a/app-admin/setools/setools-3.3.8-r7.ebuild
+++ b/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE="X debug java python"
 
 COMMONDEPEND=">=sys-libs/libsepol-2.4
@@ -58,6 +58,9 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch
 
+	epatch "${FILESDIR}"/${PN}-3.3.8-no-check-file.patch
+	epatch "${FILESDIR}"/${PN}-3.3.8-policy-max.patch
+
 	# Fix build failure due to double __init__.py installation
 	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
 	# Disable broken check for SWIG version. Bug #542032
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index de9943ad7e0a..5019032d666f 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
 else
 	#SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-admin/showconsole/Manifest b/app-admin/showconsole/Manifest
deleted file mode 100644
index 00ea82531c82..000000000000
--- a/app-admin/showconsole/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST showconsole-1.08.tar.bz2 20821 SHA256 3f3c1462c21db37054e109bbda23490de759311e8d182a3565f1ae8926d10e27 SHA512 b80c83350408211ba3e069befb2cc9ee53bfdde5ddeb43213bd02a70d65cf987c223cb22dabb687b9a21ccf7312bef17dee968d1d1cd6c66fc0b1ad6e0bd02b2 WHIRLPOOL 7ed12042b45a8771729d254ffd6c2ab7db0174b3e5c485bfd088faff7455cd45a2df4341dc6390106857becff850e3091ae93edcfe87cc2be81c36f1893a4583
diff --git a/app-admin/showconsole/files/1.07-no-TIOCGDEV.patch b/app-admin/showconsole/files/1.07-no-TIOCGDEV.patch
deleted file mode 100644
index 49a09cea2155..000000000000
--- a/app-admin/showconsole/files/1.07-no-TIOCGDEV.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- showconsole-1.07/libconsole.c.orig	2004-12-03 21:57:24.507411240 -0500
-+++ showconsole-1.07/libconsole.c	2004-12-03 21:59:26.820816776 -0500
-@@ -1021,13 +1021,8 @@
-     char * name = NULL;
-     DIR * dev;
- 
--#ifdef TIOCGDEV
-+#define TIOCGDEV       _IOR('T',0x32, unsigned int)
-     if (ioctl (0, TIOCGDEV, &tty) < 0) {
--	if (errno == EINVAL && !getenv("NOTIOCGDEV"))
--	    warn("Warning: the ioctl TIOCGDEV is not known by the kernel\n");
--#else
--#       error The ioctl TIOCGDEV is not defined (SuSE TIOCGDEV patch is missed)
--#endif
- 	if (!(name = ttyname(0)) || !strcmp(name, "/dev/console"))
- 	    tty = fallback(pid, ppid);
- 	else {
-@@ -1036,9 +1031,7 @@
- 	    name = lnk;
- 	    goto out;
- 	}
--#ifdef TIOCGDEV
-     }
--#endif
- 
-     if (!(dev = opendir("/dev")))
- 	error("can not opendir(/dev): %s\n", STRERR);
diff --git a/app-admin/showconsole/files/bootlogger.sh b/app-admin/showconsole/files/bootlogger.sh
deleted file mode 100644
index bea8568a0de6..000000000000
--- a/app-admin/showconsole/files/bootlogger.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# /lib/rcscripts/addons/bootlogger.sh:  Handle logging of output at boot
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-if [[ -x /sbin/blogd ]] ; then
-
-bootlog() {
-	[[ ${RC_BOOTLOG} == "yes" ]] || return 0
-
-	local opt=$1
-	shift
-	case ${opt} in
-	start) blogd_start "$@";;
-	sync)  blogd_sync "$@";;
-	quit)  blogd_quit "$@";;
-	esac
-}
-
-blogd_start() {
-	/sbin/blogd -q
-}
-
-blogd_sync() {
-	echo > /var/log/boot.msg
-	killall -IO blogd
-}
-
-blogd_quit() {
-	killall -QUIT blogd
-}
-
-fi
diff --git a/app-admin/showconsole/files/showconsole-1.08-build.patch b/app-admin/showconsole/files/showconsole-1.08-build.patch
deleted file mode 100644
index 520a1607430b..000000000000
--- a/app-admin/showconsole/files/showconsole-1.08-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/143768
-
---- showconsole-1.08/Makefile
-+++ showconsole-1.08/Makefile
-@@ -37,7 +37,7 @@
- 	     RM = rm -f
- 	  MKDIR = mkdir -p
- 	  RMDIR = rm -rf
--   INSTBINFLAGS = -s -m 0700
-+   INSTBINFLAGS = -m 0700
- 	INSTBIN = install $(INSTBINFLAGS)
-    INSTDOCFLAGS = -c -m 0444
- 	INSTDOC = install $(INSTDOCFLAGS)
diff --git a/app-admin/showconsole/files/showconsole-1.08-no-pthread-yield.patch b/app-admin/showconsole/files/showconsole-1.08-no-pthread-yield.patch
deleted file mode 100644
index 7592b5ef8e25..000000000000
--- a/app-admin/showconsole/files/showconsole-1.08-no-pthread-yield.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://sourceware.org/cgi-bin/cvsweb.cgi/~checkout~/linuxthreads/linuxthreads/FAQ.html?rev=1.2.2.1&content-type=text/html&cvsroot=glibc#E
-
-use sched_yield, not pthread_yield
-
-http://bugs.gentoo.org/119762
-
---- libconsole.c
-+++ libconsole.c
-@@ -439,7 +439,7 @@
- 		ret = 0;
- 	}
-     } else
--	pthread_yield();
-+	sched_yield();
- 
-     return ret;
- }
diff --git a/app-admin/showconsole/files/showconsole-1.08-quiet.patch b/app-admin/showconsole/files/showconsole-1.08-quiet.patch
deleted file mode 100644
index d03996056a5e..000000000000
--- a/app-admin/showconsole/files/showconsole-1.08-quiet.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- blogd.c
-+++ blogd.c
-@@ -183,6 +183,7 @@
- {
-     int fd, flags;
-     int ptm, pts, cntrtty = 1;
-+    int quiet = 0;
-     pid_t pid, ppid = getppid();
-     char ptsname[NAME_MAX+1];
-     struct termios t;
-@@ -193,7 +194,14 @@
-     myname = basename(*argv);
- 
-     if (argc > 2)
--	error("Too many args; usage: %s [/dev/tty<X>]\n", myname);
-+	error("Too many args; usage: %s [-q] [/dev/tty<X>]\n", myname);
-+
-+    if (argc > 1 && strcmp(argv[1], "-q") == 0) {
-+	quiet = 1;
-+	--argc;
-+	if (argc > 2)
-+	    argv[1] = argv[2];
-+    }
- 
-     if (argc == 2)
- 	tty = argv[1];
-@@ -282,6 +289,7 @@
- 	close(pts);
- 	close(ptm);
- 	close(fd);
-+	if (!quiet)
- 	fprintf(stdout, "\rBoot logging started on %s(%s) at %.24s\n", tty, name, stt);
- 	fflush(stdout);
- 	exit(0);
diff --git a/app-admin/showconsole/metadata.xml b/app-admin/showconsole/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/app-admin/showconsole/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-admin/showconsole/showconsole-1.08.ebuild b/app-admin/showconsole/showconsole-1.08.ebuild
deleted file mode 100644
index 5a623227f73c..000000000000
--- a/app-admin/showconsole/showconsole-1.08.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# This tarball is extracted from SuSe's sysvinit-2.86-#.src.rpm
-# You can find said src rpm via opensuse.org:
-# https://mirrors.kernel.org/opensuse/distribution/SL-OSS-*/inst-source/suse/src/
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="small daemon for logging console output during boot"
-HOMEPAGE="http://www.novell.com/linux/suse/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	epatch "${FILESDIR}"/1.07-no-TIOCGDEV.patch
-	epatch "${FILESDIR}"/${P}-quiet.patch
-	epatch "${FILESDIR}"/${P}-no-pthread-yield.patch #119762
-	epatch "${FILESDIR}"/${P}-build.patch #143768
-}
-
-src_compile() {
-	emake COPTS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/bootlogger.sh || die "rcscript addon"
-	rmdir "${D}"/usr/lib/lsb || die
-	dodoc showconsole-*.lsm README
-}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 78a6a1775b37..96b864010e4a 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -1 +1,2 @@
 DIST supervisor-3.1.3.tar.gz 391529 SHA256 e32c546fe8d2a6e079ec4819c49fd24534d4075a58af39118d04367918b3c282 SHA512 40795bfd1aee3eba9e51b6dc1bfcff20c42c0a42ca7ceecc35c428f7840d5d631303b7f0c4eee85375296fd4e9a48f6b405a87caf038f8ffbfe227b5160e7aa5 WHIRLPOOL da8f41907857c46633e93e1806449babd9230994a528c73946276c10387e380763b7b9fb884bb3376537d6eb55428e5873ed8e9a11cd410a3d6c8d7593907552
+DIST supervisor-3.2.1.tar.gz 410461 SHA256 d6b54903aab4214664b6f2c6400f673bee3e21aec7b14d08940ed431a3ead630 SHA512 a4fa8b1729a578c36c989e91a87c0ff4d2e5487b1beb58bd0695729553b5005cf4a282c6a193330c5b352d2467597bae330a28d6e42305c8108593fbf24b1b80 WHIRLPOOL 36f798f87a73e76b8cd79d4c417a64246e77b3114142a82fc322f302deb285f625f6a1bab738cb437116665b6172a1b643fa8c765e57591500c53ed6823b3372
diff --git a/app-admin/supervisor/supervisor-3.2.1.ebuild b/app-admin/supervisor/supervisor-3.2.1.ebuild
new file mode 100644
index 000000000000..049c53de7c3b
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.2.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 )	# py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# ALL versions of meld3 match to >=meld3-0.6.5
+RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+	# Somehow the test phase is called and run on invoking a doc build; harmless
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	newinitd "${FILESDIR}/init.d-r1" supervisord
+	newconfd "${FILESDIR}/conf.d" supervisord
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild b/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
index e32938d429e8..eb176d97a360 100644
--- a/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="libressl ssl static +tools"
 
 DEPEND="sys-devel/automake
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 72df6cfc6ccd..cbbaea3174f6 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,4 +1 @@
-DIST gox-0.3.0.tar.gz 13735 SHA256 29dc6b689f670a5444cc54cd9111549ccb01501901bc9197d0e1325a35157802 SHA512 cbc737a780403d1233af10a85b30676e0fcfbfbe99a740d0eff69bef4fd557c65d102c43b3b0dde0b8b935967be8cb33fab50d2baf481d27fa53285be6b1aef2 WHIRLPOOL f3a10a965c4cfe0707bad2f8307162564b00d2b0279d61311445714f28a17d97a4ee4d5a442a7aaaf25b9f44eff656a8b84485bdb0e5776cc7a1014350cff216
-DIST iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz 1110 SHA256 27aa65991036fe736d3c383378e49758097f5a11a20b40f44cc434eac97659f7 SHA512 a4314506416d6ab84c9cd96aeadc8d08c88df8f2a146b1e6a51e5f756c2e2409f39adf274487998d0229a46d81b2d0899717064459966f4dbfa5571cc9e85400 WHIRLPOOL 9fd40b227de5452642696326b0b0a66d95e2ddf738a1b6e7e712e201101bb84cc854161609836cae82515ba95ba1e5efd331ce68abdf79c654a9d7a874f849f3
-DIST vault-0.1.2.tar.gz 1158880 SHA256 b8d56f1ebd11f5d80a6a6728b6c9ac399c7e507e3e9fe8830966be50ba15d1b3 SHA512 49488d4fac62521e485a623a3f5fa384643e84bb9aff616efec2169d84731f9892b5ffa1ae475ce905032f6f8e816a372535bc328daf4ee5caf0344a3cd2e9bc WHIRLPOOL f1d678145fad5b8a988dacb8aabf02394a81b267aeabdd2a2968c0efc9576997e980800fe0f08fb70d2f6052fce5d9d94c6d46ee0b50d97ca68b404a78c2c381
 DIST vault-0.4.1.tar.gz 2108269 SHA256 e986424d9bb0ace5450e8ed576d102f1d2d3a9d2d4c2046710aa55464a9fc296 SHA512 5b46e7f28e4b79f48bdc03ee65177a2cc3e10b71a05f34bb78f9c00ee6b4249447c39f3830ce5bfa7a8289fad5fa532420f769c21bfc33168cfed86bacc228f5 WHIRLPOOL 5b5d65931dcb381f659fa423765783a78f812420c4de29102a50da8d7215fb96e34de39f407917a12a7aa21c3bbc01c751df278676aaefdd620edf6910949dbc
diff --git a/app-admin/vault/vault-0.1.2-r1.ebuild b/app-admin/vault/vault-0.1.2-r1.ebuild
deleted file mode 100644
index 558bf59e87e8..000000000000
--- a/app-admin/vault/vault-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fcaps golang-build systemd user
-
-GO_PN="github.com/hashicorp/${PN}"
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="
-	https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz -> gox-0.3.0.tar.gz
-	https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz -> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/go-oauth2:="
-RDEPEND=""
-
-STRIP_MASK="*.a"
-
-S="${WORKDIR}/src/${GO_PN}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ei' usr/bin/${PN}
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_unpack() {
-	local x
-
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${P} src/${GO_PN} || die
-
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	export GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" || die
-
-	export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
-
-	while read -r -d '' x; do
-		rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
-	done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
-
-	mkdir -p "${GOROOT}/src/github.com/mitchellh" || die
-	rm -rf "${GOROOT}/src/github.com/mitchellh/gox" || die
-	mv gox-0.3.0 "${GOROOT}/src/github.com/mitchellh/gox" || die
-	rm -rf "${GOROOT}/src/github.com/mitchellh/iochan" || die
-	mv iochan-* "${GOROOT}/src/github.com/mitchellh/iochan" || die
-}
-
-src_prepare() {
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-e 's:-ldflags.*:\\:' \
-		-i scripts/build.sh || die
-}
-
-src_compile() {
-	go install -v -x github.com/mitchellh/gox || die
-	PATH=${GOROOT}/bin:${PATH} emake dev
-}
-
-src_install() {
-	local x
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-
-	egit_clean "${WORKDIR}"/{pkg,src}
-
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
-
-	while read -r -d '' x; do
-		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
-			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
-		rm -rf "${WORKDIR}"/src/${x}
-	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
-	doins -r "${WORKDIR}"/src/${GO_PN}
-}
diff --git a/app-admin/vault/vault-0.4.1.ebuild b/app-admin/vault/vault-0.4.1.ebuild
index 98fbc4e8b747..7e0d80b73b3e 100644
--- a/app-admin/vault/vault-0.4.1.ebuild
+++ b/app-admin/vault/vault-0.4.1.ebuild
@@ -83,8 +83,8 @@ src_install() {
 		rm -rf "${S}"/src/${x}
 	done < <(find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto $(dirname /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*})
+	insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
 	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}
-	insinto $(dirname /usr/lib/go/src/${EGO_PN%/*})
+	insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}")
 	doins -r "${S}"/src/${EGO_PN%/*}
 }
diff --git a/app-admin/vault/vault-9999.ebuild b/app-admin/vault/vault-9999.ebuild
index 4c8a514f461e..531205c6e23a 100644
--- a/app-admin/vault/vault-9999.ebuild
+++ b/app-admin/vault/vault-9999.ebuild
@@ -98,8 +98,8 @@ src_install() {
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 001ca1ed1dcf..14d6342ead88 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,3 +1,4 @@
+DIST alien-8.95.tar.xz 56940 SHA256 37a22587c33810feab323474bdadbf969fda2eb4e720b2ca01b40d82d6f71a17 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c WHIRLPOOL 15c9044c8842058f847257ab9663b05cbcaa0e122bd056858c10befc3bcc118f5634323c50d6bae55c76e38df9f1dc287e1e19bb4f77862236148496b2270e41
 DIST alien_8.89.tar.gz 64478 SHA256 35d237e3a08fb86ae83b1b6d941aa696e1dff5b5c8eb83fa818995f15527e4d8 SHA512 55e8b99900f7f940bb4e38469ca10f02be20a4fb097f3d66649e50ab4dfc11a3c8aeaacca862872c02c68c482e1967ea0b12302e9660fbc7d920591bcd4be9ca WHIRLPOOL 2d4025819c824ad1a218ae0b4ba5ed837f5c8d2b7b5aaf2e94c71b2ddb21c47e8054e3d1b83cdd30022123ffa2dea1e0d5423793617b812d14d9ffca99d37715
 DIST alien_8.90.tar.gz 65014 SHA256 a520f0c6e1e0f8340712cc80a80b41d426b3034c41dfa256268f51beee3d75d7 SHA512 ca96a2b1039966f3bf5bc624cc9880d3426d9823ba8f8d8021c27bf1605b8072abbbf9befeb45e3210742cff51dff9beda9c636c592d230aac0e3c780ba2a83b WHIRLPOOL f88e2be871b04b98a4a495abd655ec09cb0c58c1aa5a7820da6986466ec61597bf243d42fbc871de6dd01cb29cb6f1a8a63798cf6ff8a6f8dd2eab0b7edc3ed3
 DIST alien_8.93.tar.gz 65289 SHA256 deb4e0c590ea7c44f2bc806b2c4cde6abbef32017ae6d06ee30539ae28faf896 SHA512 bb38286b5b2000d0cceecc19a03ed65c40b31b48ce22d16ecf5f082883dac87822abdf2897edccd959429d45efb257d76d4f833c188e9f22b6f7cc526f80c0f9 WHIRLPOOL c6710d8582b882a0c963ad0dc6ee362c7e02a55384ddbe25ddc079d22878009c59274febeba4c038e4be707f2ea7f4d92a833eddb603bcde9da05cae5b804a09
diff --git a/app-arch/alien/alien-8.95.ebuild b/app-arch/alien/alien-8.95.ebuild
new file mode 100644
index 000000000000..d2d615ecbdd6
--- /dev/null
+++ b/app-arch/alien/alien-8.95.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+bzip2"
+
+RDEPEND="
+	app-arch/rpm
+	app-arch/dpkg
+	dev-util/debhelper
+	>=app-arch/tar-1.14.91
+	bzip2? (
+		app-arch/bzip2
+	)"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
+		-i "${S}"/Makefile.PL || die "sed failed."
+}
diff --git a/app-arch/alien/metadata.xml b/app-arch/alien/metadata.xml
index 04525ebf32af..7bd44913f487 100644
--- a/app-arch/alien/metadata.xml
+++ b/app-arch/alien/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 type="person"><email>lordvan@gentoo.org</email></maintainer>
-  <maintainer type="person"><email>monsieurp@gentoo.org</email></maintainer>
+	<maintainer type="person">
+		<email>lordvan@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
new file mode 100644
index 000000000000..72895aebd200
--- /dev/null
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--bindir="${EPREFIX}"/bin \
+		--with-rmt="${EPREFIX}"/usr/sbin/rmt
+}
diff --git a/app-arch/cpio/cpio-2.12.ebuild b/app-arch/cpio/cpio-2.12.ebuild
index 559b65be7390..3f1baaa21b08 100644
--- a/app-arch/cpio/cpio-2.12.ebuild
+++ b/app-arch/cpio/cpio-2.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="A file archival tool which can also read and write tar files"
 HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
@@ -17,7 +17,6 @@ IUSE="nls"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	eautoreconf
 }
 
 src_configure() {
@@ -26,7 +25,3 @@ src_configure() {
 		--bindir="${EPREFIX}"/bin \
 		--with-rmt="${EPREFIX}"/usr/sbin/rmt
 }
-
-src_install() {
-	default
-}
diff --git a/app-arch/cpio/files/cpio-2.12-name-overflow.patch b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
new file mode 100644
index 000000000000..f85246884c39
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/572428
+https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00002.html
+http://seclists.org/oss-sec/2016/q1/136
+
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -1385,6 +1385,8 @@
+ 	  break;
+ 	}
+ 
++      if (file_hdr.c_namesize <= 1)
++	file_hdr.c_name = xrealloc (file_hdr.c_name, 2);
+       cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
+ 			      false);
+       
diff --git a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild b/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
index d58e1fe5d833..ba6dcb4ebf6d 100644
--- a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
+++ b/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+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
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index 36f46d915661..09183004e480 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1 +1 @@
-DIST trrntzip_v02_src.tar.gz 46971 SHA256 9e55f378ef5c75c452b3f52728a7503ca76e147e0ab2395b8c41de8c20995efd SHA512 802dd1bf55e0a31df75d8195c9d2d5610be8cb7f14d14278eba72b580aff3ad415711999db05a5425303380ebfc82a68896e276319e0ead5635d0a07615ba700 WHIRLPOOL 79c96f51a0b547b2651625a3b3aee6b7a769955e10b092654086a1d91a494d08f8dd732eee45b432ca97f4f6314af0f76907fa81b422ef94676e6d729994a61d
+DIST torrentzip-0.2.zip 69200 SHA256 3aa58e839743eebd97071e36585bb14cab0bddd22db646eb0765e1ae3ef2c749 SHA512 a6d6452940ab9070b96d598c7db306657afa34c3630160943260e6687e65985aa5aa8ad0b1319ee6470912207d6ef369fdb1168d5d528e8efd7405dc7722b1b8 WHIRLPOOL 0cad9f83e2d27795014be51b912d34350a59ad9c824f66237e1f15641daad812c92a7d5c6357e8d6a2517f08a381705f4eb057dc855700b007b99f3210046a1c
diff --git a/app-arch/torrentzip/files/fix-perms.patch b/app-arch/torrentzip/files/fix-perms.patch
deleted file mode 100644
index ea013663443f..000000000000
--- a/app-arch/torrentzip/files/fix-perms.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/trrntzip.c
-+++ src/trrntzip.c
-@@ -782,7 +782,7 @@
-
-           if (strstr (szTmpBuf, ".zip\0") && !(istat.st_mode & S_IWUSR))
-           {            
--            chmod (direntp->d_name, S_IWUSR);
-+            chmod (direntp->d_name, S_IWUSR | S_IRUSR);
-             mig.cEncounteredZips++;
-
-             if (!mig.fProcessLog)
diff --git a/app-arch/torrentzip/files/torrentzip-0.2-fix-function-declarations.patch b/app-arch/torrentzip/files/torrentzip-0.2-fix-function-declarations.patch
new file mode 100644
index 000000000000..c8ab8fcd8930
--- /dev/null
+++ b/app-arch/torrentzip/files/torrentzip-0.2-fix-function-declarations.patch
@@ -0,0 +1,23 @@
+--- configure.ac	2005-04-05 18:12:49.000000000 +0200

++++ configure.ac	2016-01-17 22:58:57.203979927 +0100

+@@ -1,7 +1,7 @@

+ AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])

+ 

+ AM_INIT_AUTOMAKE

+-AM_CONFIG_HEADER(config.h)

++#AM_CONFIG_HEADER(config.h)

+ AM_MAINTAINER_MODE

+ 

+ AC_PROG_CC

+@@ -11,6 +11,11 @@

+ AC_CHECK_LIB([m], [fmod], [], [AC_MSG_ERROR("Need libm to build TorrentZip")])

+ AC_CHECK_LIB([z], [zlibVersion], [], [AC_MSG_ERROR("Need libz to build TorrentZip")])

+ 

++AC_CHECK_DECL(OF, [],

++    [AC_CHECK_DECL(_Z_OF, [AC_DEFINE([OF(args)], [_Z_OF(args)])],

++	[AC_MSG_ERROR("Unsupported zlib version")], [#include "zlib.h"])],

++    [#include "zlib.h"])

++

+ AC_CONFIG_FILES([Makefile src/Makefile torrentzip.spec])

+ 

+ AC_OUTPUT

diff --git a/app-arch/torrentzip/torrentzip-0.2-r1.ebuild b/app-arch/torrentzip/torrentzip-0.2-r1.ebuild
deleted file mode 100644
index 41d5f4b21d3d..000000000000
--- a/app-arch/torrentzip/torrentzip-0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit versionator eutils autotools
-
-DESCRIPTION="Archiver that creates standard zips to create identical files over multiple systems"
-HOMEPAGE="https://sourceforge.net/projects/trrntzip"
-
-MY_PN=trrntzip
-MY_PV="$(replace_version_separator 1 '')"
-MY_P=${MY_PN}_v${MY_PV}
-S="${WORKDIR}"/${MY_PN}
-
-SRC_URI="mirror://sourceforge/trrntzip/${MY_P}_src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="sys-libs/zlib"
-RDEPEND=""
-
-S=${WORKDIR}/trrntzip
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/fix-perms.patch
-
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS
-}
diff --git a/app-arch/torrentzip/torrentzip-0.2-r2.ebuild b/app-arch/torrentzip/torrentzip-0.2-r2.ebuild
new file mode 100644
index 000000000000..e3cfa1a7da32
--- /dev/null
+++ b/app-arch/torrentzip/torrentzip-0.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+MY_PN="trrntzip"
+MY_PV="code-9"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Advanced archiver to create identical files over multiple systems"
+HOMEPAGE="https://sourceforge.net/projects/trrntzip"
+SRC_URI="http://sourceforge.net/code-snapshots/svn/t/tr/${MY_PN}/code/${MY_P}.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+DEPEND="sys-libs/zlib"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-function-declarations.patch"
+)
+
+src_prepare() {
+	# Source-code from sf.net snapshots has CRLF...
+	EPATCH_OPTS="--binary"
+
+	epatch "${PATCHES[@]}"
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	nonfatal dodoc README AUTHORS
+}
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 6cd339f0a4e9..66ab2f58d0be 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_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 ~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 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 71bad4bcfd9c..d13fdb3560d6 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1 +1,5 @@
+AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 SHA256 1211ad1019df0b30d4f4a3e364a67f5977d17424c605f00383c686dd1b22cd0a SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f WHIRLPOOL 0a2bf4003f0cfb5fc83b78d0d3c05cff6e28b8b4850a525550e0db39fa97edc71bc7ed9fb79e108912917a8e212ed3126e6ca60f8eb7f9299bad5db56d28fdc8
 DIST rdiff-backup-1.3.3.tar.gz 198412 SHA256 ee030ce638df0eb1047cf72578e0de15d9a3ee9ab24da2dc0023e2978be30c06 SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280 WHIRLPOOL 04f3257c8a1dd6b8c81ec1f7d3fb7d1e4bba9bb97020b0932d2a72d9279924147ec98c74e5f9952b5c14c50675ac03f7d7956875ce58c1e677571c9cfab57f89
+EBUILD rdiff-backup-1.3.3-r1.ebuild 818 SHA256 9b4a4f99dd470e24af3c314ecd2dfa45ee5f6c5e175e963a66ac0acedfadc5ef SHA512 a07a56d62b38b69c2209a66dd4923b84f165e3480f0edb9d271946efa961bae0637d022f7500a34ee30d719147f04b3e18b4a73737c285222fffd6cf02ef3619 WHIRLPOOL 375ad41959ae48b091f79854fda6091548ec951e97a3883e3a2972e065392874280eab2e886443bea0c57a42ee3f6d6da479b650ead3dced88e2ce56f436fd6f
+EBUILD rdiff-backup-1.3.3-r2.ebuild 878 SHA256 d5f684f3e347a138390ef7a0dffc5e0190ec2c8c4e9e61d14a8d92ba6e3c4ff8 SHA512 2a8f3af4172abea7bf2589602b1565704f24255903040b57bb79845ad6dd89c4c23db25ac2ebeb9467afd68739161c8798e23a052df88e84e2a1760f5991fbce WHIRLPOOL e33becdc25897e285a1c8a39cc57ea4704c4f99f0da404d3e932101f0cca451e95c55a3ab2822a7311ed0707a6f0b3b11ddc2c34c3d9bded7b1449957fbf606e
+MISC metadata.xml 528 SHA256 df5f0b98cce36fcc75c0a4bc9f20f5267a7d09ea707c279974b46512fa339dbe SHA512 6ed247ca5297a4ebe7586a6e6e0437368d781c20c18774bdf55b96adb78e6ed5916b18810ba04025805def8dc07ca7dff0d1ea66b5c8f3ed099ae5084f025f35 WHIRLPOOL 57b7130a085f954cd6060fe0a8d22e38a34794a8af80679d3bcc2b997c96213ff1c1aae7cc91c0d9cfb8da718e7cfa7bb1dafa0327f27850acdadfed7863d9c1
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch
deleted file mode 100644
index f9cad9ae6f67..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py
---- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py	2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py	2009-10-03 19:27:54.935647306 +0200
-@@ -135,10 +135,10 @@
- 	if not remote_cmd: return Globals.local_connection
- 
- 	Log("Executing " + remote_cmd, 4)
--	if os.name == "nt":
-+	if map(int, sys.version.split()[0].split('.')[:2]) >= [2, 6]:
- 		import subprocess
- 		try:
--			process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,
-+			process = subprocess.Popen(remote_cmd, shell=True, bufsize=0,
- 								stdin=subprocess.PIPE, 
- 								stdout=subprocess.PIPE)
- 			(stdin, stdout) = (process.stdin, process.stdout)
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
new file mode 100644
index 000000000000..16b97ab1c011
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
@@ -0,0 +1,16 @@
+--- rdiff-backup-1.2.8/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
++++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
+@@ -59,8 +59,13 @@
+   if (sm == NULL) return NULL;
+   sm->x_attr = NULL;
+ 
++#ifdef RS_DEFAULT_STRONG_LEN
+   sm->sig_job = rs_sig_begin((size_t)blocklen,
+ 							 (size_t)RS_DEFAULT_STRONG_LEN);
++#else
++  sm->sig_job = rs_sig_begin((size_t)blocklen,
++							 (size_t)8, RS_MD4_SIG_MAGIC);
++#endif
+   return (PyObject*)sm;
+ }
+ 
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index defaad06f8c3..7297ecd34258 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -2,6 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>maintainer-needed@gentoo.org</email>
+		<email>axelgenus@gmail.com</email>
+		<name>Alessandro Calorì</name>
+	<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sol1/rdiff-backup</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
index 408a8cb222fc..8f603b020a09 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1
+inherit distutils-r1 versionator
+
+UPSTREAM_PV=$(replace_all_version_separators '-')
 
 DESCRIPTION="Local/remote mirroring+incremental backup"
-HOMEPAGE="http://rdiff-backup.nongnu.org/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/sol1/rdiff-backup"
+SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +19,7 @@ KEYWORDS="alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~x86-interix ~amd64-linu
 IUSE="examples"
 
 DEPEND="
-	~net-libs/librsync-0.9.7
+	net-libs/librsync:0/1
 "
 RDEPEND="
 	dev-python/pyxattr[${PYTHON_USEDEP}]
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..95544cb575a7
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+UPSTREAM_PV=$(replace_all_version_separators '-')
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/sol1/rdiff-backup"
+SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+	net-libs/librsync:0/2
+"
+RDEPEND="
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	dev-python/pylibacl[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${P}-librsync-1.0.0.patch" )
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples.html )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
new file mode 100644
index 000000000000..bfb5436c157e
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}.1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+	"${FILESDIR}"/${P}-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+	econf \
+		$(usex debug "--enable-debug" "") \
+		--disable-stripping
+}
+
+src_install() {
+	dobin bonnie++ zcav bon_csv2html bon_csv2txt
+	sed -i -e \
+		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		bonnie++.8 || die #431684
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	einstalldocs
+}
diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
new file mode 100644
index 000000000000..3d92689541db
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
@@ -0,0 +1,35 @@
+From: Göktürk Yüksek <gokturk@binghamton.edu>
+Subject: [PATCH] Fix array indexing in Zcav::Read when max_loop > 1 and start_offset > 0
+
+In method Zcav::Read, the variable 'i' holds the block index. It is
+also used as an index to arrays of measurement values (read times and
+block counts) when (max_loops > 0). However, the blocks array and
+measurements arrays will be out of sync if some initial blocks are to
+be skipped (by having start_offset > 0). Using the same index value
+for arrays of different sizes causes segfaults. Fix it by substracting
+the start_offset properly when accessing the measurements arrays.
+
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=309319
+
+--- a/zcav_io.cpp
++++ b/zcav_io.cpp
+@@ -108,7 +108,7 @@
+     double total_read_time = 0.0;
+     bool nextLoop = false;
+     for( ; !nextLoop && (!max_size || i < max_size)
+-              && (loops == 0 || (m_times[i] && m_times[i][0] != -1.0))
++              && (loops == 0 || (m_times[i - start_offset] && m_times[i - start_offset][0] != -1.0))
+               && (!max_size || i < max_size); i++)
+     {
+       double read_time = access_data(i ? skip_rate - 1 : 0);
+@@ -135,8 +135,8 @@
+           m_times.push_back(new double[max_loops]);
+           m_count.push_back(0);
+         }
+-        m_times[i][loops] = read_time;
+-        m_count[i]++;
++        m_times[i - start_offset][loops] = read_time;
++        m_count[i - start_offset]++;
+       }
+     } // end loop for reading blocks
+ 
diff --git a/app-cdr/brasero/brasero-3.12.1-r1.ebuild b/app-cdr/brasero/brasero-3.12.1-r1.ebuild
index 5b591a429991..374380c4370a 100644
--- a/app-cdr/brasero/brasero-3.12.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
 IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
index 5c7d56381836..0e97839c5d2d 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="gcdmaster encode mad vorbis"
 
 RDEPEND="virtual/cdrtools
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
index 52dda7cdcf18..c20a73dd64a6 100644
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
@@ -369,3 +369,50 @@ See also: https://bugs.gentoo.org/show_bug.cgi?id=548004
 +fi
 +AC_LANG_POP
 +])dnl AX_PTHREAD
+--- cdrdao-1.2.3/m4/gconf-2.m4
++++ cdrdao-1.2.3/m4/gconf-2.m4
+@@ -0,0 +1,44 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl  you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  else
++    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++  fi
++
++  AC_ARG_WITH([gconf-source],
++	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
++			     [Config database for installing schema files.]),
++	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
++
++  AC_ARG_WITH([gconf-schema-file-dir],
++	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++			     [Directory for installing schema files.]),
++	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++  AC_ARG_ENABLE(schemas-install,
++  	AC_HELP_STRING([--disable-schemas-install],
++		       [Disable the schemas installation]),
++     [case ${enableval} in
++       yes|no) ;;
++       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++      esac])
++  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index cdd4e850c8fc..ec945cb12e49 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,2 +1,2 @@
 DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
-DIST letsencrypt-0.3.0.tar.gz 627761 SHA256 a21e496ab130cf9fcaeef69019a4eef7aaf86dad84131d601db531add4f98e1a SHA512 c3fbb6d8a50ee9a84b425d16f28626cecb3b50a5149c1263d02d447854d9117c6fe4f3f2eef7f026c9d7692a499a054895a2b007da9f768c203ea91836382f36 WHIRLPOOL fa87cb033c4a45737abeb706312ac9c4fa2ab921c07cc05f1feaeb4f083727f4ba1a819035345e5dfead536d762025ef8a4eeaa6d039b64efa3350f2a64e64a5
+DIST letsencrypt-0.4.0.tar.gz 634899 SHA256 d7df1faedd6f5c1ffc26fd855350fc3a107dd9fe5c1c2aa4c340024fe807a0f3 SHA512 f04c3fa49619e4e182ec8d10c6e05045d1e0e1a146bad75d9382cbfc6663ad0726c9beb496f0251e43d0dd45d78220c57dda0be8c2d946a515ab2c9f0359a549 WHIRLPOOL 64b531b31214fa6f7460ce3288dc573d281d350fe631447de8f0f18b74d38cb374438f678e7782c5bc72019766f4fe8668a6ff5f809560d09a713fa4eb58f9f8
diff --git a/app-crypt/acme/acme-0.3.0.ebuild b/app-crypt/acme/acme-0.4.0.ebuild
index 703410c10135..703410c10135 100644
--- a/app-crypt/acme/acme-0.3.0.ebuild
+++ b/app-crypt/acme/acme-0.4.0.ebuild
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
new file mode 100644
index 000000000000..1677b9878095
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -0,0 +1 @@
+DIST debian-archive-keyring_2014.3.tar.xz 61380 SHA256 46be978ec2f72b0277d9e71bda30ea1b2b9aa00b1952cb35e8b22a2c016f5e22 SHA512 6ae189976dca807705c76fab16d8219f042dc3c8a12e6f12872cc6faa8941831392d0b97a34367c24855f98621ba2eb56e71440291bc12a5cecc05ea2b5622ab WHIRLPOOL 94344189e21e42333e5f131aada6bda02d7f9bf72c809df00ef6e570810524bd9b9f4e79b55237b224155fb651205a60848ce037e4dae138b6449e97c1ace9ea
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
new file mode 100644
index 000000000000..0e10b93efd7a
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="http://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/jetring"
+
+MAKEOPTS+=' -j1'
diff --git a/app-crypt/debian-archive-keyring/metadata.xml b/app-crypt/debian-archive-keyring/metadata.xml
new file mode 100644
index 000000000000..75493d77fb70
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>sping@gentoo.org</email>
+    <name>Sebastian Pipping</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..1ff21245107c
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="http://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+	!<net-misc/openvpn-2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r vars.example openssl-1.0.cnf x509-types
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild
deleted file mode 100644
index 2143895237e4..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_P="EasyRSA-${PV}"
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="http://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libressl"
-
-DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-	libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}
-	!<net-misc/openvpn-2.3"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	exeinto /usr/share/easy-rsa
-	doexe easyrsa
-	insinto /usr/share/easy-rsa
-	doins vars.example openssl-1.0.cnf x509-types
-	dodoc README.quickstart.md ChangeLog
-	dodoc -r doc
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/gcr/gcr-3.18.0.ebuild b/app-crypt/gcr/gcr-3.18.0.ebuild
index 75d7ee0d486a..c896b7f9913a 100644
--- a/app-crypt/gcr/gcr-3.18.0.ebuild
+++ b/app-crypt/gcr/gcr-3.18.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~hppa ~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/gkeys-gen/gkeys-gen-0.2.ebuild b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
index a5b69e0236f6..924b7be35b8c 100644
--- a/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
+++ b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/app-crypt/gkeys/gkeys-0.2.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
index 0e78a860bab3..e477ffdda907 100644
--- a/app-crypt/gkeys/gkeys-0.2.ebuild
+++ b/app-crypt/gkeys/gkeys-0.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
index 4b653de3dbf2..f902135e60fa 100644
--- a/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tofu tools usb"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/jetring/Manifest b/app-crypt/jetring/Manifest
new file mode 100644
index 000000000000..8eed1c28e342
--- /dev/null
+++ b/app-crypt/jetring/Manifest
@@ -0,0 +1 @@
+DIST jetring_0.21.tar.gz 192974 SHA256 6a9ef726c1746ab57361dcda14c6ab0fdfd1dcb4ef1ffda9959251449c7a9814 SHA512 bc3bfa0afaa7e6e9a79688447bc9a23271fce951646f7d159ffeb4df749c36536612b6a371034586d63f1dfdbfee24aad68ac44a350bd8f1f4b18fd5dbbe1b7b WHIRLPOOL 255dbeb922a6d9a2b9fb3ba3c2976646cbab6e45c136e9498da87ad448bc19376db2f80e6d378c4fd4881d08f25a01a1a398596aeb823aea62d7be38e9b0430c
diff --git a/app-crypt/jetring/files/jetring-0.21-parallel.patch b/app-crypt/jetring/files/jetring-0.21-parallel.patch
new file mode 100644
index 000000000000..af5605fe0c82
--- /dev/null
+++ b/app-crypt/jetring/files/jetring-0.21-parallel.patch
@@ -0,0 +1,31 @@
+From 4554254608c97aed3f9e654ca219c53e3c4e2ec1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Feb 2016 18:47:46 +0100
+Subject: [PATCH] Address make warning "jobserver unavailable"
+
+To be precise:
+make[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6e62bda..43a14b7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,10 +3,10 @@ PROGS=jetring-accept jetring-apply jetring-build jetring-diff \
+ 	jetring-checksum
+ 
+ build:
+-	make -C example build
++	$(MAKE) -C example build
+ 
+ clean:
+-	make -C example clean
++	$(MAKE) -C example clean
+ 
+ install:
+ 	install -d $(DESTDIR)/usr/bin/
+-- 
+2.7.1
+
diff --git a/app-crypt/jetring/jetring-0.21.ebuild b/app-crypt/jetring/jetring-0.21.ebuild
new file mode 100644
index 000000000000..417345d376fb
--- /dev/null
+++ b/app-crypt/jetring/jetring-0.21.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="GPG keyring maintenance using changesets"
+HOMEPAGE="http://joeyh.name/code/jetring/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.21-parallel.patch
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}/
+	doins -r example
+
+	doman ${PN}*.[0-9]
+}
diff --git a/app-crypt/jetring/metadata.xml b/app-crypt/jetring/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/app-crypt/jetring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 9ed0424dfbc5..e379665c241a 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -4,5 +4,6 @@ DIST keybase-0.8.22.tar.gz 7101414 SHA256 4290251ddf7d1f124211731aa8d0dd47f43ba9
 DIST keybase-0.8.23.tar.gz 7101472 SHA256 20e7e7e7a125ddb3b0e7023c3dcaf12f12c7b183822592b164ca11dd1e6f9a25 SHA512 5030df4cdfdd8d1175f348d5e1fb201d558ddf149bcda679d433eb9ba4f361ae882dde73c6a99615854b7f5d7e5ddcc09e3fbda49f1110d9f205e48068edcc8d WHIRLPOOL 742d67597b35287b75f0a89b89d1b04815bbfdc7c7df29d9963b821091ec88c5db0715d96a06e73f3a7d4aecb5d3cf2a2309a3f14acfed3f9a38d02c28fa618e
 DIST keybase-0.8.24.tar.gz 7109062 SHA256 680eaadbae16724912c4bbbd916b20a116fb5d290e4f8e91d2c7093261a26856 SHA512 65b2a4a21f814617363615153bc034c94854297d0b53cd538cc90320fc48ae8e6c9c13e3c06ae729a4fbe035b6cbbb5020d6a0618aed2c94b0ee858f8b919cd2 WHIRLPOOL 889b90879b1f18650c13c048bf888aca85c4ca162d85cd60ba527eccfe3d8da9b9a313f7d6c6cd757feb949f200dbb2021daa2b45af70ad99403826241f0773a
 DIST keybase-0.8.25.tar.gz 7109238 SHA256 e34b128f48e27a1c3066b5f3f19d99df735f9be4f1c867d1d3d408c8e12983fd SHA512 b6986063c34a18bd91148e588d43545f8baf7849cf80ea03b88d26e1f3dd6684cc9e5ebd5e10ff5ac0639fa308c2e07f577b6a7ded6f5bf4bd4510e64bb31025 WHIRLPOOL 1413eed7f26ec6b2d17f63d6315baac48d6a7f0935c3608e4ffcd5cd8df7f13db01e8d93ce76b33b4e0ceb322f508a3601e37be6cad86c20e976bb33012f28db
+DIST keybase-1.0.12.0.tar.gz 43440809 SHA256 b45e25bbe40684c1f58e69bd2a35c2b8f0936477e28b2c54cab9d8783fed0e0e SHA512 1a6ce04c46c88c2607f70e591557b46bb836c366fb7d6d50056456403de2868a9da14b45ef96732e4f6d3cc1759ed492e610143e7cae370594e36bf898ecccee WHIRLPOOL 06325be4b35dc7c2f3f85033da857669c1ccf2e3e610254837ef44a1811234914195c3ddde2068a8a81d7c1e362021a79a3be9957b9dc4af2d0102977ca3450a
 DIST keybase-1.0.8.0.tar.gz 42949716 SHA256 b43fc29e9ec6d06fb7371a597ad7a2f28ee8e125ae8b9c9c34d1c4d176b6a76d SHA512 a4030d00415961d2c7d5d65ca682a11f6cd82b0d64bcbf9de6e4ce8f969faea05f3fc8a0084def9bd39528a75dfd80dcb6bbdae16e73d71b1c9dc6a7ece58771 WHIRLPOOL f8a59464759875e195068fe7422962ad570794442c408e99a55c4f4724108a086727c67fe753e698f3d653f1101278d1be657ca2889d7aaa878489f232574745
 DIST keybase-1.0.9.0.tar.gz 43337746 SHA256 01999048454877bc3b6a2934a8c1bfda4ebef31400698627a23b94450d5b2409 SHA512 7b6e0defe378fd3fa7d4577f95484947c6898079541448cb0f8c180fe5efdc43da42bd6b67c350c38701a01e62802041c5840315be877ace88e8d1f26d667c7f WHIRLPOOL f63c07b79eb9a96673cd5b909ce1c1877a4d5ff45a2275a8dfc9a6262c8a6f2784b05301023f9fce6b98044d4703721513751aec31bc4fa99dafc27e0deca04a
diff --git a/app-crypt/keybase/keybase-0.8.25.ebuild b/app-crypt/keybase/keybase-0.8.25.ebuild
index 22ca86a5b7ad..16d9289f61f5 100644
--- a/app-crypt/keybase/keybase-0.8.25.ebuild
+++ b/app-crypt/keybase/keybase-0.8.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-crypt/keybase/keybase-1.0.12.0.ebuild b/app-crypt/keybase/keybase-1.0.12.0.ebuild
new file mode 100644
index 000000000000..184ba0ab123b
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.12.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.5:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GO15VENDOREXPERIMENT=1 \
+		GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+}
diff --git a/app-crypt/letsencrypt/Manifest b/app-crypt/letsencrypt/Manifest
index f38a307922ad..98f79196dd83 100644
--- a/app-crypt/letsencrypt/Manifest
+++ b/app-crypt/letsencrypt/Manifest
@@ -1 +1 @@
-DIST letsencrypt-0.3.0.tar.gz 627761 SHA256 a21e496ab130cf9fcaeef69019a4eef7aaf86dad84131d601db531add4f98e1a SHA512 c3fbb6d8a50ee9a84b425d16f28626cecb3b50a5149c1263d02d447854d9117c6fe4f3f2eef7f026c9d7692a499a054895a2b007da9f768c203ea91836382f36 WHIRLPOOL fa87cb033c4a45737abeb706312ac9c4fa2ab921c07cc05f1feaeb4f083727f4ba1a819035345e5dfead536d762025ef8a4eeaa6d039b64efa3350f2a64e64a5
+DIST letsencrypt-0.4.0.tar.gz 634899 SHA256 d7df1faedd6f5c1ffc26fd855350fc3a107dd9fe5c1c2aa4c340024fe807a0f3 SHA512 f04c3fa49619e4e182ec8d10c6e05045d1e0e1a146bad75d9382cbfc6663ad0726c9beb496f0251e43d0dd45d78220c57dda0be8c2d946a515ab2c9f0359a549 WHIRLPOOL 64b531b31214fa6f7460ce3288dc573d281d350fe631447de8f0f18b74d38cb374438f678e7782c5bc72019766f4fe8668a6ff5f809560d09a713fa4eb58f9f8
diff --git a/app-crypt/letsencrypt/letsencrypt-0.3.0.ebuild b/app-crypt/letsencrypt/letsencrypt-0.4.0.ebuild
index 0ef00d4fa434..0ef00d4fa434 100644
--- a/app-crypt/letsencrypt/letsencrypt-0.3.0.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-0.4.0.ebuild
diff --git a/app-crypt/libsecret/libsecret-0.18.4.ebuild b/app-crypt/libsecret/libsecret-0.18.4.ebuild
index bed4d00f42bd..a5f757226e0e 100644
--- a/app-crypt/libsecret/libsecret-0.18.4.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.4.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="+crypt +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/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index dd95ae66c2cf..ef3c5ce86aae 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,3 +1,2 @@
-DIST libu2f-host-0.0.2.tar.xz 444176 SHA256 c9e5478f5d139c30603afe65ea7ef52b0b18c93df60103b1dafeb7f3d17acbd8 SHA512 1b10a5c8d3d071b0d5576a2247b2cc40327fe6fe7370a7680cede7ebda72bd7f0edfa1661b78074a85654a5d979f757c64c090360c69feddb9c3212dc0438deb WHIRLPOOL f8cc5d7524c8ed7943945af44e5b93b43463118b06b186460090df3c69871319e0a347c94a28467b782eb09e2653ef72ab98478d8acf720b86b807223b1ee0b1
-DIST libu2f-host-0.0.4.tar.xz 446604 SHA256 852231611bd5c526406b984ae3c92ce3423ffc7a0ef01f6a060a43b64725ead6 SHA512 09406f45bea4cbca2fd26a4ad546b2233f56e1df098976cbd24dcab08e27bf9131fdc52557b4c701b8ce27b0ece7b405e8cda889591a5e3dc9420611336d1060 WHIRLPOOL 84ac2c5e4170ff45ecb9595c73dabd6a34f79bdcf4ef9bf3ceb32c481febe0537e3ab129fcd7a63c73389b3dbc0742834574b739ed36c419b6bc84b5c01a4d5b
 DIST libu2f-host-1.0.0.tar.xz 454376 SHA256 18c56b9b5cfea2566925bba45b25a4e20b3ef8696905d8f2a06116316e164374 SHA512 ef953ffd8179e5ed4bcd1e02ccc82e671a7979b03a61ac73098be6509ab9d6badd6bb4e3e805de4ddbddbae3e8be71b091344f4230657464f6ba4ac3af171387 WHIRLPOOL cc76b778bcf20ef696900dd0ea65c0925052360a22e505a34ecb8738289d7bbaa88b31f2b25b91b6a1a22a240d01784bc6ef1cb9774c818fa0570328e9f13183
+DIST libu2f-host-1.1.0.tar.xz 455424 SHA256 441bb832ee42acf3a5e5a229444c610218da381eb7daaf2aa750c004dc756d86 SHA512 3861ea748ff6ae0bae756182c6c4bd9a25dafc6e28eec3d6aad0eb700dcddc56ba61ed0c6a60395b8a296764c83b3fadb6954f9001cfb880e93758aaeecf34df WHIRLPOOL b6a91afd99a70db8c78a2a72950f210bbcbea0322780b768611aa528ad0159647bdc7446e1dffd91f8d9b6bcbd8105b8b38c9eb5d9eb2db9ef7d193c97096f3e
diff --git a/app-crypt/libu2f-host/libu2f-host-0.0.2.ebuild b/app-crypt/libu2f-host/libu2f-host-0.0.2.ebuild
deleted file mode 100644
index e2be80325860..000000000000
--- a/app-crypt/libu2f-host/libu2f-host-0.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils linux-info udev
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-host/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="kernel_linux static-libs systemd"
-
-RDEPEND="
-	dev-libs/hidapi
-	dev-libs/json-c"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	systemd? ( sys-apps/systemd[acl] )"
-
-CONFIG_CHECK="~HIDRAW"
-
-src_prepare() {
-	autotools-utils_src_prepare
-
-	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
-		70-u2f.rules > 70-u2f-udev.rules || die
-}
-
-src_configure() {
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use kernel_linux; then
-		if use systemd; then
-			udev_dorules 70-u2f.rules
-		else
-			udev_newrules 70-u2f-udev.rules 70-u2f.rules
-		fi
-	fi
-}
diff --git a/app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild b/app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild
deleted file mode 100644
index f1d821109f40..000000000000
--- a/app-crypt/libu2f-host/libu2f-host-0.0.4.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 autotools-utils linux-info udev
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-host/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="kernel_linux static-libs systemd"
-
-RDEPEND="
-	dev-libs/hidapi
-	dev-libs/json-c"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	systemd? ( sys-apps/systemd[acl] )"
-
-CONFIG_CHECK="~HIDRAW"
-
-src_prepare() {
-	autotools-utils_src_prepare
-
-	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
-		70-u2f.rules > 70-u2f-udev.rules || die
-}
-
-src_configure() {
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use kernel_linux; then
-		if use systemd; then
-			udev_dorules 70-u2f.rules
-		else
-			udev_newrules 70-u2f-udev.rules 70-u2f.rules
-		fi
-	fi
-}
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.0.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.0.ebuild
new file mode 100644
index 000000000000..f3567fab1bf9
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils linux-info udev user
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux static-libs systemd"
+
+RDEPEND="
+	dev-libs/hidapi
+	dev-libs/json-c"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	systemd? ( sys-apps/systemd[acl] )"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	# The U2F device node will be owned by group 'plugdev'
+	# in non-systemd configurations
+	if ! use systemd; then
+		enewgroup plugdev
+	fi
+}
+
+src_prepare() {
+	autotools-utils_src_prepare
+
+	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+		70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_configure() {
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use kernel_linux; then
+		if use systemd; then
+			udev_dorules 70-u2f.rules
+		else
+			udev_newrules 70-u2f-udev.rules 70-u2f.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd; then
+		elog "Users must be a member of the 'plugdev' group"
+		elog "to be able to access U2F devices"
+	fi
+}
diff --git a/app-crypt/openvpn-blacklist/Manifest b/app-crypt/openvpn-blacklist/Manifest
index 8f42e2e0a1f0..cd14bb5b4e81 100644
--- a/app-crypt/openvpn-blacklist/Manifest
+++ b/app-crypt/openvpn-blacklist/Manifest
@@ -1 +1,2 @@
 DIST openvpn-blacklist_0.4.tar.gz 1808103 SHA256 01d0cddab3db957661dc8019c1b672068699f1f7cf8633748b6222601ecb0108 SHA512 3301f7425520eb086306acb30bd718465208b5aa5606e879b65f936161d1955b93254d9c1dd6f5d66ec6480850652afadabb05db2a0df9fd5acb73a5ed5c19e3 WHIRLPOOL 7eba98ff8e1281e5008f01a360aa37aba87a494d187ef1a83599aa57d16cb2980e021af4ee25abc92c83eee1a8c287b4567f671a4bca0753ef1ea68120aa2600
+DIST openvpn-blacklist_0.5.tar.gz 1828347 SHA256 7c26fcffa21f251bf6193324ba9f4faff8d08d4bb999c5415947237ed77ba4d4 SHA512 589216cb2f10b6ea0cf2179f8b47ce2d2ed03916ad5d8a62e22dce71f432101a735d16093855ff43a1d6618fe94e75b9127bbd63408556197e91de6735e713aa WHIRLPOOL 8ade318c144ced52a4635dfcee02d1e583479677d50ec5a2782bd576fc5e7119f4e5f1dd840abc65e1d8fc8f9481cb6cb024bf5f155b0e32a94dad11c324ba52
diff --git a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild
new file mode 100644
index 000000000000..bf23a497aef9
--- /dev/null
+++ b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions in 2006-2008"
+HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang openvpn-vulnkey
+}
+
+src_install() {
+	dobin openvpn-vulnkey
+	doman openvpn-vulnkey.1
+	dodir /usr/share/openvpn-blacklist
+	insinto /usr/share/openvpn-blacklist
+	newins debian/blacklist.prefix blacklist.RSA-2048
+	cut "${S}/blacklist.RSA-2048" -d ' ' -f 2 | cut -b13- | sort \
+		>> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"|| die
+}
diff --git a/app-crypt/sbsigntool/sbsigntool-0.6.ebuild b/app-crypt/sbsigntool/sbsigntool-0.6.ebuild
deleted file mode 100644
index 5810850a8a04..000000000000
--- a/app-crypt/sbsigntool/sbsigntool-0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	virtual/pkgconfig"
-
-src_prepare() {
-	local iarch
-	case ${ARCH} in
-		ia64)  iarch=ia64 ;;
-		x86)   iarch=ia32 ;;
-		amd64) iarch=x86_64 ;;
-		*)     die "unsupported architecture: ${ARCH}" ;;
-	esac
-	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
-	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
-	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
-}
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
index ac67ccb901b9..6e45e716b406 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P//_p*}-19-g61de83c.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/app-crypt/seahorse/seahorse-3.18.0.ebuild b/app-crypt/seahorse/seahorse-3.18.0.ebuild
index a9164561378e..b2ed12f03202 100644
--- a/app-crypt/seahorse/seahorse-3.18.0.ebuild
+++ b/app-crypt/seahorse/seahorse-3.18.0.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/shishi/Manifest b/app-crypt/shishi/Manifest
deleted file mode 100644
index 5adc5265bc68..000000000000
--- a/app-crypt/shishi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST shishi-1.0.1.tar.gz 4999488 SHA256 9d7e4738df21116422585b347ad1c985d2bafd32c8665b4c5563617573e2868d SHA512 cb24baae75072e7ee20946d1d15a16c8a77e44f110f88e5f17e64d5e0110c0a00f18e8651b6f162a6e13c1a39b248ca03849c3d8ae4f8d7512dbc77f54f8d98c WHIRLPOOL 45b92a57b8b3a06a7a84160bacdc370883d8a9417f4f9b6feef36e5d6654d8db79695623265cfae6982a60679a3041741a3cbd4dafa4c75b91aebc7c08dd5e1c
-DIST shishi-1.0.2.tar.gz 4917167 SHA256 0d9c8113feb22ee574187413c564140e3fa8c67fa4601fb073aec9cbc471580c SHA512 4f39b8d8cb5fbb9f2cedb55eb69620b0bc5d65a7859152db905aeafec7f2b93af459d427d06eb40fbd2870b18eb25e52c52ab0c0a265654f9ab2c3c0f7b98bab WHIRLPOOL bc96b441b37c53619acd9e5da71d0a35cbe39ca3a60fe259eba478cb7616b41fce2e663f6ce636bdccd5df93c534a3016b97540249baa13e851bb0af350b8bed
diff --git a/app-crypt/shishi/files/shishi-1.0.2_automake-1.12.patch b/app-crypt/shishi/files/shishi-1.0.2_automake-1.12.patch
deleted file mode 100644
index a1593c6a57ae..000000000000
--- a/app-crypt/shishi/files/shishi-1.0.2_automake-1.12.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-bug #424095
---- a/configure.ac	2012-03-12 11:18:21.000000000 -0700
-+++ b/configure.ac	2012-07-08 15:43:18.597050382 -0700
-@@ -43,6 +43,9 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(termios.h pwd.h syslog.h resolv.h arpa/nameser.h netinet/in6.h)
- 
-+# Defined for >= automake 1.12
-+m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
-+
- # Used when creating libshishi-XX.def.
- SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
- AC_SUBST(SOVERSION)
---- a/m4/po.m4	2012-03-12 11:18:53.000000000 -0700
-+++ b/m4/po.m4	2012-07-08 14:59:00.247043443 -0700
-@@ -24,7 +24,7 @@
- [
-   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_INSTALL])dnl
--  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
-   AC_REQUIRE([AM_NLS])dnl
- 
-   dnl Release version of the gettext macros. This is used to ensure that
diff --git a/app-crypt/shishi/files/shishi_automake-1.12.patch b/app-crypt/shishi/files/shishi_automake-1.12.patch
deleted file mode 100644
index 484906d3c865..000000000000
--- a/app-crypt/shishi/files/shishi_automake-1.12.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-bug #424095
-diff -urN shishi-1.0.1-orig/configure.ac shishi-1.0.1/configure.ac
---- shishi-1.0.1-orig/configure.ac	2012-03-12 11:18:21.000000000 -0700
-+++ shishi-1.0.1/configure.ac	2012-07-08 15:43:18.597050382 -0700
-@@ -24,7 +24,7 @@
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
-+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
- AM_SILENT_RULES([yes])
- 
- # Library code modified:                              REVISION++
-@@ -43,6 +43,9 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(termios.h pwd.h syslog.h resolv.h arpa/nameser.h netinet/in6.h)
- 
-+# Defined for >= automake 1.12
-+m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
-+
- # Used when creating libshishi-XX.def.
- SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
- AC_SUBST(SOVERSION)
-diff -urN shishi-1.0.1-orig/m4/po.m4 shishi-1.0.1/m4/po.m4
---- shishi-1.0.1-orig/m4/po.m4	2012-03-12 11:18:53.000000000 -0700
-+++ shishi-1.0.1/m4/po.m4	2012-07-08 14:59:00.247043443 -0700
-@@ -24,7 +24,7 @@
- [
-   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_INSTALL])dnl
--  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
-   AC_REQUIRE([AM_NLS])dnl
- 
-   dnl Release version of the gettext macros. This is used to ensure that
diff --git a/app-crypt/shishi/files/shishi_gets.patch b/app-crypt/shishi/files/shishi_gets.patch
deleted file mode 100644
index 12137204f455..000000000000
--- a/app-crypt/shishi/files/shishi_gets.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/gl/stdio.in.h b/gl/stdio.in.h
-index 06d9780..fa04a10 100644
---- a/gl/stdio.in.h
-+++ b/gl/stdio.in.h
-@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s));
- # endif
- _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides C11
-+   removed it.  */
-+#ifdef gets
-+#undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/app-crypt/shishi/files/shishi_resolv.patch b/app-crypt/shishi/files/shishi_resolv.patch
deleted file mode 100644
index 6eb6beaa92ff..000000000000
--- a/app-crypt/shishi/files/shishi_resolv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.ac	2012-03-12 20:18:21.000000000 +0200
-+++ configure.ac	2012-03-14 22:03:15.854332138 +0200
-@@ -82,7 +82,27 @@
- 
- # Checks for library functions.
- AC_CHECK_FUNCS(signal select ngettext gethostbyname getpwnam getuid)
--AC_CHECK_LIB(resolv, res_query,, AC_MSG_WARN([[no libresolv, SRV RRs not used]]))
-+
-+# libresolv provides only __res_query on some architectures
-+# so we cannot just use AC_CHECK_LIB
-+_save_LIBS="$LIBS"
-+LIBS="$LIBS -lresolv"
-+AC_MSG_CHECKING(for res_query in -lresolv)
-+AC_LINK_IFELSE([
-+#include <resolv.h>
-+int main()
-+{
-+  res_query (0, 0, 0, 0, 0);
-+  return 0;
-+}],
-+[_res_query_in_resolv=yes],
-+[_res_query_in_resolv=no])
-+AC_MSG_RESULT([$_res_query_in_resolv])
-+if test "x$_res_query_in_resolv" = "xno"; then
-+  LIBS="$_save_LIBS"
-+  AC_MSG_WARN([[no libresolv, SRV RRs not used]])
-+fi
-+
- AC_SEARCH_LIBS(socket, socket)
- AC_SEARCH_LIBS(gethostbyname, nsl)
- 
diff --git a/app-crypt/shishi/files/shishid.confd b/app-crypt/shishi/files/shishid.confd
deleted file mode 100644
index 9f0c2dad9841..000000000000
--- a/app-crypt/shishi/files/shishid.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/shishid
-
-# Options to pass to the Shishi KDC server.  Please see shishid man page for details.
-#
-# OPTIONS="--no-tls"
-
diff --git a/app-crypt/shishi/files/shishid.init b/app-crypt/shishi/files/shishid.init
deleted file mode 100644
index ae5f9434d3ad..000000000000
--- a/app-crypt/shishi/files/shishid.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-daemon="Shishi KDC"
-exec="/usr/sbin/shishid"
-pid_file="/var/run/shishid.pid"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ${daemon}"
-	start-stop-daemon --start --quiet --background -m --pidfile ${pid_file} \
-	  --exec ${exec} -- ${OPTIONS} 1>&2
-	eend $? "Error starting $daemon"
-}
-
-stop() {
-	ebegin "Stopping $daemon"
-	start-stop-daemon --stop --quiet --pidfile ${pid_file} --exec ${exec} 1>&2
-	eend $? "Error stopping $daemon"
-}
diff --git a/app-crypt/shishi/metadata.xml b/app-crypt/shishi/metadata.xml
deleted file mode 100644
index c178f1043237..000000000000
--- a/app-crypt/shishi/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>
-<maintainer type="project">
-  <email>kerberos@gentoo.org</email>
-  <name>Kerberos</name>
-</maintainer>
-<longdescription lang="en">GNU Shishi, a free implementation of the Kerberos 5 network security system</longdescription>
-<use>
-  <flag name="des">Enable DES related encryption/checksum types.</flag>
-  <flag name="3des">Enable 3DES encryption/checksum type.</flag>
-  <flag name="aes">Enable AES encryption/checksum types.</flag>
-  <flag name="md">Enable unkeyed MD4/MD5 checksum types.</flag>
-  <flag name="null">Enable dummy NULL encryption/checksum type.</flag>
-  <flag name="arcfour">Enable ARCFOUR encryption/checksum type.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-crypt/shishi/shishi-1.0.1-r1.ebuild b/app-crypt/shishi/shishi-1.0.1-r1.ebuild
deleted file mode 100644
index 95fb4bd1284b..000000000000
--- a/app-crypt/shishi/shishi-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit multilib autotools eutils
-
-DESCRIPTION="A free implementation of the Kerberos 5 network security system"
-HOMEPAGE="https://www.gnu.org/software/shishi/"
-SRC_URI="mirror://gnu/shishi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnutls idn ipv6 nls pam +des +3des +aes +md +null +arcfour static-libs"
-
-DEPEND="gnutls? ( net-libs/gnutls )
-		idn? ( net-dns/libidn )
-		dev-libs/libtasn1
-		dev-libs/libgcrypt:0
-		dev-libs/libgpg-error
-		virtual/libiconv
-		virtual/libintl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix finding libresolv.so
-	epatch "${FILESDIR}/${PN}_resolv.patch"
-	# fix building with automake-1.12 bug #424095
-	epatch "${FILESDIR}/${PN}_automake-1.12.patch"
-	# fix building with glibc-2.16.0
-	epatch "${FILESDIR}/${PN}_gets.patch"
-
-	# don't create a new database
-	sed -i -e '/install-data-hook/s/^/#/' Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pam) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_with idn libidn-prefix) \
-		$(use_enable gnutls starttls) \
-		$(use_enable des) \
-		$(use_enable 3des) \
-		$(use_enable aes) \
-		$(use_enable md) \
-		$(use_enable null) \
-		$(use_enable arcfour) \
-		$(use_enable static-libs static) \
-		--with-system-asn1 \
-		--with-libgcrypt \
-		--with-html-dir=/usr/share/doc/${P} \
-		--with-db-dir=/var/shishi \
-		--with-pam-dir=/$(get_libdir)/security \
-		--disable-rpath \
-		--with-packager="Gentoo" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	keepdir /var/shishi
-	fperms 0700 /var/shishi
-	echo "db file /var/shishi" >> "${D}/etc/shishi/shisa.conf" || die
-
-	newinitd "${FILESDIR}/shishid.init" shishid
-	newconfd "${FILESDIR}/shishid.confd" shishid
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
-	doman doc/man/* doc/*.1
-	dohtml doc/reference/html/*
-	doinfo doc/*.info*
-
-	rm -f "${D}/$(get_libdir)/security/pam_shishi.la"
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/app-crypt/shishi/shishi-1.0.1-r2.ebuild b/app-crypt/shishi/shishi-1.0.1-r2.ebuild
deleted file mode 100644
index 390d48d987d4..000000000000
--- a/app-crypt/shishi/shishi-1.0.1-r2.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=5
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="A free implementation of the Kerberos 5 network security system"
-HOMEPAGE="https://www.gnu.org/software/shishi/"
-SRC_URI="mirror://gnu/shishi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnutls idn ipv6 nls pam +des +3des +aes +md +null +arcfour static-libs"
-
-DEPEND="gnutls? ( net-libs/gnutls )
-		idn? ( net-dns/libidn )
-		dev-libs/libtasn1
-		dev-libs/libgcrypt:0
-		dev-libs/libgpg-error
-		virtual/libiconv
-		virtual/libintl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix finding libresolv.so
-	epatch "${FILESDIR}/${PN}_resolv.patch"
-	# fix building with automake-1.12 bug #424095
-	epatch "${FILESDIR}/${PN}_automake-1.12.patch"
-	# fix building with glibc-2.16.0
-	epatch "${FILESDIR}/${PN}_gets.patch"
-
-	# don't create a new database
-	sed -i -e '/install-data-hook/s/^/#/' Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DMAX_ERROR_DESCRIPTION_SIZE=ASN1_MAX_ERROR_DESCRIPTION_SIZE
-	econf \
-		$(use_enable pam) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_with idn libidn-prefix) \
-		$(use_enable gnutls starttls) \
-		$(use_enable des) \
-		$(use_enable 3des) \
-		$(use_enable aes) \
-		$(use_enable md) \
-		$(use_enable null) \
-		$(use_enable arcfour) \
-		$(use_enable static-libs static) \
-		--with-system-asn1 \
-		--with-libgcrypt \
-		--with-html-dir=/usr/share/doc/${P} \
-		--with-db-dir=/var/shishi \
-		--with-pam-dir=/$(get_libdir)/security \
-		--disable-rpath \
-		--with-packager="Gentoo" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	keepdir /var/shishi
-	fperms 0700 /var/shishi
-	echo "db file /var/shishi" >> "${D}/etc/shishi/shisa.conf" || die
-
-	newinitd "${FILESDIR}/shishid.init" shishid
-	newconfd "${FILESDIR}/shishid.confd" shishid
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
-	doman doc/man/* doc/*.1
-	dohtml doc/reference/html/*
-	doinfo doc/*.info*
-
-	rm -f "${D}/$(get_libdir)/security/pam_shishi.la"
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/app-crypt/shishi/shishi-1.0.1.ebuild b/app-crypt/shishi/shishi-1.0.1.ebuild
deleted file mode 100644
index a0c9d0e966eb..000000000000
--- a/app-crypt/shishi/shishi-1.0.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit multilib autotools eutils
-
-DESCRIPTION="A free implementation of the Kerberos 5 network security system"
-HOMEPAGE="https://www.gnu.org/software/shishi/"
-SRC_URI="mirror://gnu/shishi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnutls idn ipv6 nls pam +des +3des +aes +md +null +arcfour static-libs"
-
-DEPEND="gnutls? ( net-libs/gnutls )
-		idn? ( net-dns/libidn )
-		dev-libs/libtasn1
-		dev-libs/libgcrypt:0
-		dev-libs/libgpg-error
-		virtual/libiconv
-		virtual/libintl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix finding libresolv.so
-	epatch "${FILESDIR}/${PN}_resolv.patch"
-	# fix building with automake-1.12 bug #424095
-	epatch "${FILESDIR}/${PN}_automake-1.12.patch"
-
-	# don't create a new database
-	sed -i -e '/install-data-hook/s/^/#/' Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pam) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_with idn libidn-prefix) \
-		$(use_enable gnutls starttls) \
-		$(use_enable des) \
-		$(use_enable 3des) \
-		$(use_enable aes) \
-		$(use_enable md) \
-		$(use_enable null) \
-		$(use_enable arcfour) \
-		$(use_enable static-libs static) \
-		--with-system-asn1 \
-		--with-libgcrypt \
-		--with-html-dir=/usr/share/doc/${P} \
-		--with-db-dir=/var/shishi \
-		--with-pam-dir=/$(get_libdir)/security \
-		--disable-rpath \
-		--with-packager="Gentoo" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	keepdir /var/shishi
-	fperms 0700 /var/shishi
-	echo "db file /var/shishi" >> "${D}/etc/shishi/shisa.conf" || die
-
-	newinitd "${FILESDIR}/shishid.init" shishid
-	newconfd "${FILESDIR}/shishid.confd" shishid
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
-	doman doc/man/* doc/*.1
-	dohtml doc/reference/html/*
-	doinfo doc/*.info*
-
-	rm -f "${D}/$(get_libdir)/security/pam_shishi.la"
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/app-crypt/shishi/shishi-1.0.2.ebuild b/app-crypt/shishi/shishi-1.0.2.ebuild
deleted file mode 100644
index a5074ac2618d..000000000000
--- a/app-crypt/shishi/shishi-1.0.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="A free implementation of the Kerberos 5 network security system"
-HOMEPAGE="https://www.gnu.org/software/shishi/"
-SRC_URI="mirror://gnu/shishi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnutls idn ipv6 nls pam +des +3des +aes +md +null +arcfour static-libs"
-
-DEPEND="gnutls? ( net-libs/gnutls )
-		idn? ( net-dns/libidn )
-		dev-libs/libtasn1
-		dev-libs/libgcrypt:0
-		dev-libs/libgpg-error
-		virtual/libiconv
-		virtual/libintl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix building with automake-1.12 bug #424095
-	epatch "${FILESDIR}/${P}_automake-1.12.patch"
-
-	# don't create a new database
-	sed -i -e '/install-data-hook/s/^/#/' Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pam) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_with idn libidn-prefix) \
-		$(use_enable gnutls starttls) \
-		$(use_enable des) \
-		$(use_enable 3des) \
-		$(use_enable aes) \
-		$(use_enable md) \
-		$(use_enable null) \
-		$(use_enable arcfour) \
-		$(use_enable static-libs static) \
-		--with-libgcrypt \
-		--with-html-dir=/usr/share/doc/${P} \
-		--with-db-dir=/var/shishi \
-		--with-pam-dir=/$(get_libdir)/security \
-		--disable-rpath \
-		--with-packager="Gentoo" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	keepdir /var/shishi
-	fperms 0700 /var/shishi
-	echo "db file /var/shishi" >> "${D}/etc/shishi/shisa.conf" || die
-
-	newinitd "${FILESDIR}/shishid.init" shishid
-	newconfd "${FILESDIR}/shishid.confd" shishid
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
-	doman doc/man/* doc/*.1
-	dohtml doc/reference/html/*
-	doinfo doc/*.info*
-
-	rm -f "${D}/$(get_libdir)/security/pam_shishi.la"
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/app-crypt/simp_le/metadata.xml b/app-crypt/simp_le/metadata.xml
index 4244fae5893a..e0b907a3396b 100644
--- a/app-crypt/simp_le/metadata.xml
+++ b/app-crypt/simp_le/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
deleted file mode 100644
index 66652f77692d..000000000000
--- a/app-crypt/truecrypt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST TrueCrypt-7.2-source-unix.tar.gz 1061292 SHA256 59720350125dc7e325eb8e6d86f939f826492a2ebba247079bed3b0e1a9b66e8 SHA512 e0b238f01a8b89f752a4288cf0f6ae5b86bf0d60e6418cd2b0b47fc9d789418d9181500daeeff32006970e58d0ea73f00b78814d6360759d79741272877ea5fb WHIRLPOOL 8b2e3aa773c795c32532c51898f33f084edf89e663daf934d5f3ef14c78cbd5d4e62d1befd447d35ab6283c8ba1ed183b52ed4b58f56ed72dd1078239c47e995
-DIST truecrypt-7.1a-pkcs11.h 43544 SHA256 662d39cec5a0063c8aacc430d4fcba4b31b80a174f1e824dcc359f1c1420bc2c SHA512 bffce5344383a07c4313c30ee1cb0ed7063a749527521bd964263deb5d951cc181acf9c4386bcd2ad44d40be35b3a08d56b1404730b4994e43760db71649ef3c WHIRLPOOL bc5bfbcf711f8d8d8f13625bd2ea98b195662ca458b9186a6a1a01f51897ba1e9a488b91ddfec97af7fdbb770637db27b5c124ba5fa376a415c512af3c6aac74
-DIST truecrypt-7.1a.tar.gz 1949303 SHA256 e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc SHA512 b5e766023168015cb91bfd85c9e2621055dd98408215e02704775861b5070c5a0234a00c64c1bf7faa34e6d0b51ac71cd36169dd7a6f84d7a34ad0cfa304796a WHIRLPOOL 5e7f4360746a30639aea96eaf4deac268289c111c0efa96f50487527f04064992c26ad4c8ae0fd565d80e77f0ce8add82b03930d877fe5adedc8a733b482fe38
-DIST truecrypt-7.2-pkcs11.h 43544 SHA256 662d39cec5a0063c8aacc430d4fcba4b31b80a174f1e824dcc359f1c1420bc2c SHA512 bffce5344383a07c4313c30ee1cb0ed7063a749527521bd964263deb5d951cc181acf9c4386bcd2ad44d40be35b3a08d56b1404730b4994e43760db71649ef3c WHIRLPOOL bc5bfbcf711f8d8d8f13625bd2ea98b195662ca458b9186a6a1a01f51897ba1e9a488b91ddfec97af7fdbb770637db27b5c124ba5fa376a415c512af3c6aac74
diff --git a/app-crypt/truecrypt/files/execstack-fix.diff b/app-crypt/truecrypt/files/execstack-fix.diff
deleted file mode 100644
index b76bfcc580c0..000000000000
--- a/app-crypt/truecrypt/files/execstack-fix.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- Crypto/Aes_hw_cpu.asm.old	2011-06-01 17:12:53.078000001 -0400
-+++ Crypto/Aes_hw_cpu.asm	2011-06-01 17:12:53.080000002 -0400
-@@ -328,3 +328,12 @@
- 

- 

- %endif	; __BITS__ != 16

-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
---- Crypto/AesSmall_x86.asm.old	2011-06-01 17:12:53.084000002 -0400
-+++ Crypto/AesSmall_x86.asm	2011-06-01 17:12:53.086000002 -0400
-@@ -1442,3 +1442,12 @@
-     db  v8(0xe1),v8(0x69),v8(0x14),v8(0x63),v8(0x55),v8(0x21),v8(0x0c),v8(0x7d)

- 

- %endif

-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
---- Crypto/Aes_x64.asm.old	2011-06-01 17:12:53.090000002 -0400
-+++ Crypto/Aes_x64.asm	2011-06-01 17:12:53.092000002 -0400
-@@ -905,3 +905,12 @@
- %endif

- 

- %endif

-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
---- Crypto/Aes_x86.asm.old	2011-06-01 17:12:53.096000002 -0400
-+++ Crypto/Aes_x86.asm	2011-06-01 17:12:53.097000002 -0400
-@@ -644,3 +644,12 @@
-     do_exit

- 

- %endif

-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
diff --git a/app-crypt/truecrypt/files/makefile-archdetect.diff b/app-crypt/truecrypt/files/makefile-archdetect.diff
deleted file mode 100644
index 312dcfa27002..000000000000
--- a/app-crypt/truecrypt/files/makefile-archdetect.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2010-09-05 10:32:10.000000000 -0400
-+++ Makefile.new	2011-06-01 15:23:24.975000088 -0400
-@@ -120,7 +120,7 @@
- 
- export CPU_ARCH ?= unknown
- 
--ARCH = $(shell uname -p)
-+ARCH = $(shell uname -m)
- ifeq "$(ARCH)" "unknown"
- 	ARCH = $(shell uname -m)
- endif
diff --git a/app-crypt/truecrypt/files/truecrypt-7.1a-build.patch b/app-crypt/truecrypt/files/truecrypt-7.1a-build.patch
deleted file mode 100644
index e0b05d503b64..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-7.1a-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Add dl library, bug#481060.
-
----
-
-diff -urNp truecrypt-7.1a-source.org/Main/Main.make truecrypt-7.1a-source/Main/Main.make
---- truecrypt-7.1a-source.org/Main/Main.make	2012-02-07 12:36:48.000000000 +0200
-+++ truecrypt-7.1a-source/Main/Main.make	2013-12-08 21:50:07.224586712 +0200
-@@ -105,7 +105,7 @@ TC_VERSION = $(shell grep VERSION_STRING
- 
- $(APPNAME): $(LIBS) $(OBJS)
- 	@echo Linking $@
--	$(CXX) -o $(APPNAME) $(LFLAGS) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS)
-+	$(CXX) -o $(APPNAME) $(LFLAGS) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) -ldl
- 
- ifeq "$(TC_BUILD_CONFIG)" "Release"
- ifndef NOSTRIP
diff --git a/app-crypt/truecrypt/files/truecrypt-stop.sh b/app-crypt/truecrypt/files/truecrypt-stop.sh
deleted file mode 100644
index 50bb0b749fb0..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-stop.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
-
-# Try to remove any dm-crypt mappings
-if [ -x /usr/bin/truecrypt ]; then
-	ebegin "Removing truecrypt mappings"
-	! /usr/bin/truecrypt -l > /dev/null 2>&1  || /usr/bin/truecrypt -d
-	eend $?
-fi
diff --git a/app-crypt/truecrypt/files/truecrypt.init b/app-crypt/truecrypt/files/truecrypt.init
deleted file mode 100644
index 8b47d73b520d..000000000000
--- a/app-crypt/truecrypt/files/truecrypt.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	after localmount
-	if [ -e /lib/librc.so ]; then
-		need device-mapper
-	fi
-}
-
-start() {
-	if [ ! -e /lib/librc.so ]; then
-		eerror "The ${myservice} init script is written for baselayout-2"
-		eerror "Please do not use it with baselayout-1"
-		return 1
-	fi
-}
-
-stop() {
-	if [ ! -e /lib/librc.so ]; then
-		eerror "The ${myservice} init script is written for baselayout-2"
-		eerror "Please do not use it with baselayout-1"
-		return 1
-	fi
-
-	. /lib/rcscripts/addons/truecrypt-stop.sh
-}
diff --git a/app-crypt/truecrypt/metadata.xml b/app-crypt/truecrypt/metadata.xml
deleted file mode 100644
index ae09eee9c58c..000000000000
--- a/app-crypt/truecrypt/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<use>
-		<flag name="asm">Enable assembly for optimization</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">truecrypt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-crypt/truecrypt/truecrypt-7.1a.ebuild b/app-crypt/truecrypt/truecrypt-7.1a.ebuild
deleted file mode 100644
index 5145efcd2d7a..000000000000
--- a/app-crypt/truecrypt/truecrypt-7.1a.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils pax-utils
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz
-	${P}-pkcs11.h"
-
-LICENSE="truecrypt-3.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="X +asm"
-RESTRICT="mirror fetch bindist"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	sys-fs/fuse
-	x11-libs/wxGTK:2.8[X?]
-	app-admin/sudo"
-DEPEND="${RDEPEND}
-	!ppc? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P}-source"
-
-#See bug 241650.
-pkg_nofetch() {
-	elog "Please download the source archive \"TrueCrypt ${PV} Source.tar.gz\" from:"
-	elog "http://www.truecrypt.org/downloads2"
-	elog "Then put the file in ${DISTDIR}/${P}.tar.gz"
-
-	# until we support restricted fetch per URI
-	elog ""
-	elog "Please execute:"
-	elog "curl 'http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=blob_plain;f=src/pkcs11.h;hb=38bdba0bb1ab93950489c645938c93ed577f9139' > ${DISTDIR}/${P}-pkcs11.h"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
-	linux-info_pkg_setup
-
-	local WX_GTK_VER="2.8"
-	if use X; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets base-unicode
-	fi
-}
-
-src_prepare() {
-	if has_version x11-libs/wxGTK[X]; then
-		# Fix linking when NOGUI=1
-		sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed"
-	fi
-
-	epatch "${FILESDIR}/makefile-archdetect.diff"
-	epatch "${FILESDIR}/execstack-fix.diff"
-	epatch "${FILESDIR}/${P}-build.patch"
-	mkdir "${T}"/pkcs11 || die
-	ln -s "${DISTDIR}"/${P}-pkcs11.h "${T}"/pkcs11/pkcs11.h || die
-}
-
-src_compile() {
-	local EXTRA
-
-	use X || EXTRA+=" NOGUI=1"
-	use asm  || EXTRA+=" NOASM=1"
-	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
-
-	emake \
-		${EXTRA} \
-		NOSTRIP=1 \
-		NOTEST=1 \
-		VERBOSE=1 \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		TC_EXTRA_CFLAGS="${CFLAGS}" \
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		TC_EXTRA_LFLAGS="${LDFLAGS}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		PKCS11_INC="${T}/pkcs11/"
-}
-
-src_test() {
-	"${S}/Main/truecrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	dobin Main/truecrypt
-	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf"
-	exeinto "/$(get_libdir)/rcscripts/addons"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	if use X; then
-		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm
-		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System"
-	fi
-
-	pax-mark -m "${D}/usr/bin/truecrypt"
-}
-
-pkg_postinst() {
-	elog "There is now an init script for TrueCrypt for Baselayout-2."
-	elog "If you are a baselayout-2 user and you would like the TrueCrypt"
-	elog "mappings removed on shutdown in order to prevent other file systems"
-	elog "from unmounting then run:"
-	elog "rc-update add truecrypt boot"
-	elog
-
-	ewarn "If you're getting errors about DISPLAY while using the terminal"
-	ewarn "it's a known upstream bug. To use TrueCrypt from the terminal"
-	ewarn "all that's necessary is to run: unset DISPLAY"
-	ewarn "This will make the display unaccessable from that terminal "
-	ewarn "but at least you will be able to access your volumes."
-	ewarn
-
-	ewarn "TrueCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/truecrypt/truecrypt-7.2.ebuild b/app-crypt/truecrypt/truecrypt-7.2.ebuild
deleted file mode 100644
index 43ab197efacc..000000000000
--- a/app-crypt/truecrypt/truecrypt-7.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils pax-utils
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="mirror://sourceforge/${PN}/TrueCrypt/Other/TrueCrypt-${PV}-source-unix.tar.gz
-	http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=blob_plain;f=src/pkcs11.h;hb=38bdba0bb1ab93950489c645938c93ed577f9139 -> ${P}-pkcs11.h"
-
-LICENSE="truecrypt-3.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="X +asm"
-RESTRICT="bindist"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	sys-fs/fuse
-	x11-libs/wxGTK:2.8[X?]
-	app-admin/sudo"
-DEPEND="${RDEPEND}
-	!ppc? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P}-source"
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
-	linux-info_pkg_setup
-
-	local WX_GTK_VER="2.8"
-	if use X; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets base-unicode
-	fi
-}
-
-src_prepare() {
-	if has_version x11-libs/wxGTK[X]; then
-		# Fix linking when NOGUI=1
-		sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed"
-	fi
-
-	epatch "${FILESDIR}/makefile-archdetect.diff"
-	epatch "${FILESDIR}/execstack-fix.diff"
-	epatch "${FILESDIR}/${PN}-7.1a-build.patch"
-	mkdir "${T}"/pkcs11 || die
-	ln -s "${DISTDIR}"/${P}-pkcs11.h "${T}"/pkcs11/pkcs11.h || die
-}
-
-src_compile() {
-	local EXTRA
-
-	use X || EXTRA+=" NOGUI=1"
-	use asm  || EXTRA+=" NOASM=1"
-	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
-
-	emake \
-		${EXTRA} \
-		NOSTRIP=1 \
-		NOTEST=1 \
-		VERBOSE=1 \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		TC_EXTRA_CFLAGS="${CFLAGS}" \
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		TC_EXTRA_LFLAGS="${LDFLAGS}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		PKCS11_INC="${T}/pkcs11/"
-}
-
-src_test() {
-	"${S}/Main/truecrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	dobin Main/truecrypt
-	dodoc Readme.txt
-	exeinto "/$(get_libdir)/rcscripts/addons"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	if use X; then
-		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm
-		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System"
-	fi
-
-	pax-mark -m "${D}/usr/bin/truecrypt"
-}
-
-pkg_postinst() {
-	elog "There is now an init script for TrueCrypt for Baselayout-2."
-	elog "If you are a baselayout-2 user and you would like the TrueCrypt"
-	elog "mappings removed on shutdown in order to prevent other file systems"
-	elog "from unmounting then run:"
-	elog "rc-update add truecrypt boot"
-	elog
-
-	ewarn "If you're getting errors about DISPLAY while using the terminal"
-	ewarn "it's a known upstream bug. To use TrueCrypt from the terminal"
-	ewarn "all that's necessary is to run: unset DISPLAY"
-	ewarn "This will make the display unaccessable from that terminal "
-	ewarn "but at least you will be able to access your volumes."
-	ewarn
-
-	ewarn "TrueCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
new file mode 100644
index 000000000000..6b7c28b8829d
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -0,0 +1 @@
+DIST ubuntu-keyring_2012.05.19.tar.gz 18495 SHA256 8b3bb00770c7b1e5c0abb215ecf8c383cb3b709292a52aeb1022b5556e768b69 SHA512 3f33099255af9aad1ae8ae845074e714dc846134f49934b221a74c21ef35af5172dc1d845d3819cb28f353abd23df690b15fa0e7f74f8e2a882ddef1ab150f54 WHIRLPOOL 3c0fb09c0295c036fd35d1d53f5aef7ea5d40228563c253dc2e232a059baaa9f443daad34e841fdd9bd216950fcfda81145b85606bc43e9b783cb723d6241c6e
diff --git a/app-crypt/ubuntu-keyring/metadata.xml b/app-crypt/ubuntu-keyring/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
new file mode 100644
index 000000000000..90a1b93a4665
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/vivid/ubuntu-keyring"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
diff --git a/app-dicts/dictd-vera/Manifest b/app-dicts/dictd-vera/Manifest
index b32139dcd00f..7169119150be 100644
--- a/app-dicts/dictd-vera/Manifest
+++ b/app-dicts/dictd-vera/Manifest
@@ -1 +1,2 @@
 DIST vera-1.22.tar.gz 229397 SHA256 271688e1b2305c27ecc276335bfb7370af316eee1da9c2865de74dca6734ddaa SHA512 3fe10ae52d8aa593bc4ce23eaffbf8d1cbc0127fcce3538508389335a9e1bc2964d1ca8915616b0711cc9da36f8ea231e050dbeddf75bef799f21e538731234a WHIRLPOOL c162090c27efb9d80b0209d09285090ca7046a7c280c56688ca9049d5e5f854bd68a84be7133845bfb2a16ca9831ff6c082676fc0854aac0f106437a35d067fd
+DIST vera-1.23.tar.gz 236439 SHA256 ffd7f0283b7b9ca5ef69723a8f99faa9c9b33dca5e9a84c8ea4849394cd9e0ab SHA512 f16f2d24715131f60238c49f43d79bcd02b47c8e999de381c2139289f05859659a9f3ae79e3ed8d4b3dae447666cb8391ad7a072dff91275857b901fd0748c78 WHIRLPOOL 2d7e2fe1577bf4b6b430cb6c3d24e5a2055a213c607af36535e5f331a52cf29ad527727d11a9e612c6f9baa1a4bd713ef59f81b398aefcd4e94b7d2a1e157c9c
diff --git a/app-dicts/dictd-vera/dictd-vera-1.23.ebuild b/app-dicts/dictd-vera/dictd-vera-1.23.ebuild
new file mode 100644
index 000000000000..849fff47d050
--- /dev/null
+++ b/app-dicts/dictd-vera/dictd-vera-1.23.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="V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict"
+HOMEPAGE="http://home.snafu.de/ohei/vera/vueber-e.html"
+SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="FDL-1.3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=app-text/dictd-1.5.5"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/vera-${PV}
+
+src_compile () {
+#	sed -f debian/dict-vera/sedfile vera.? >vera1 || die
+#	sed '1,2!s/^/   /' vera. > vera || die
+#	cat vera1>>vera || die
+	cat vera.[0-9a-z] | /usr/bin/dictfmt -f -u http://home.snafu.de/ohei \
+		-s "V.E.R.A. -- Virtual Entity of Relevant Acronyms" \
+	   vera || die
+	/usr/bin/dictzip -v vera.dict || die
+}
+
+src_install () {
+	dodir /usr/lib/dict
+	insinto /usr/lib/dict
+	doins vera.dict.dz
+	doins vera.index
+	dodoc changelog README
+}
diff --git a/app-dicts/dictd-wn/Manifest b/app-dicts/dictd-wn/Manifest
index aa2796802d04..e57ede526794 100644
--- a/app-dicts/dictd-wn/Manifest
+++ b/app-dicts/dictd-wn/Manifest
@@ -1,2 +1 @@
-DIST dict-wn-1.5-pre.tar.gz 8464107 SHA256 5c5fc0e7d82332f5e3f1f23e1ea97ea229d129f765f824d61b67be652bd7ed6d SHA512 729ca258bc08a3ff6f8afaf1b42c6575caaacbaaa8684e840f5957390bc7045da14b2ea3d3fa3e8b0f362a727bd88fde0c5d3ea0210bd472c0ff5b50553ba43d WHIRLPOOL bac0473e2c4778f77a6d2e3509a81b7a0796ee2dccf4375bcd38170ca25ab9165d0b457cfee8a023e38c0d141c47b3b144ead7c9b52d3aab47c130240edf1cde
-DIST dict-wn-2.0.tar.gz 8160961 SHA256 db14005b0ba122c2c5994d59b9d25534d8fe9a89d5b2426cad91fbed2a04c266 SHA512 597c788c8300b6942495042b4f24518d44123506a5a71a48cd55411d42c224d267f25ae1f9edc4fc764a0c5ade3ca1defe5657fc8f3b416a284caa42b5a2fede WHIRLPOOL e88810aa8e0a842698db7fd86676497029be6d71df134e0a38407d2a424462ec6f243be5cf4c71d6e48e27c3c861fd835f703bf03986a8ddd1101b53ba869d79
+DIST dict-wn_3.0-33_all.deb 10610306 SHA256 2e5460d58dba859163aaa172e5ebabbec116016144df48c46fb5af6c42727302 SHA512 94a72c4fc8d8864abfb4372742f82534977d9472ef3751e58dd017e4ee78db0d541614c54a47634c9d1fbc25eec136f6dc5146845e971f87447ff091ac0278cb WHIRLPOOL 8a7cc6713e9a43ee5a01cbc720498e428ac1ce9b78bf116bbfc2fb28181b036dab1fae35095762f9f0d6d105f972b77e27048855774f88b96b1f8def92edcf98
diff --git a/app-dicts/dictd-wn/dictd-wn-1.5-r1.ebuild b/app-dicts/dictd-wn/dictd-wn-1.5-r1.ebuild
deleted file mode 100644
index fdb26f3231c2..000000000000
--- a/app-dicts/dictd-wn/dictd-wn-1.5-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MY_P=${P/td/t}-pre
-DESCRIPTION="WordNet for dict"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/lib/dict
-	doins wn.dict.dz wn.index || die
-}
diff --git a/app-dicts/dictd-wn/dictd-wn-2.0.ebuild b/app-dicts/dictd-wn/dictd-wn-2.0.ebuild
deleted file mode 100644
index 1b56748ad4e0..000000000000
--- a/app-dicts/dictd-wn/dictd-wn-2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-MY_P=${P/td/t}
-DESCRIPTION="WordNet for dict"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "compile failed"
-	emake db || die "compile database failed"
-}
-
-src_install() {
-	insinto /usr/lib/dict
-	doins wn.dict.dz wn.index || die
-}
diff --git a/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild b/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild
new file mode 100644
index 000000000000..340a05a4808e
--- /dev/null
+++ b/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit unpacker
+
+DESCRIPTION="WordNet for dict"
+HOMEPAGE="http://wordnet.princeton.edu/"
+SRC_URI="mirror://debian/pool/main/w/wordnet/dict-wn_${PV/_p/-}_all.deb"
+
+LICENSE="Princeton"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+DEPEND=">=app-text/dictd-1.5.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	insinto /usr/lib/dict
+	doins usr/share/dictd/{wn.dict.dz,wn.index}
+}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
index 148b84314a61..f659f814ef36 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0/9" # 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[dbus]
diff --git a/app-doc/elisp-manual/elisp-manual-24.5.ebuild b/app-doc/elisp-manual/elisp-manual-24.5.ebuild
index 29dd172e2b33..52727c54711d 100644
--- a/app-doc/elisp-manual/elisp-manual-24.5.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-24.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="FDL-1.3+"
 SLOT="24"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 
 DEPEND="app-arch/xz-utils
 	sys-apps/texinfo"
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
index 659b93645e9b..f14b10a2060d 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="!<=app-office/gnucash-2.2.1"
diff --git a/app-doc/xmltoman/xmltoman-0.4.ebuild b/app-doc/xmltoman/xmltoman-0.4.ebuild
index 7879031fa480..45fdf25b79b0 100644
--- a/app-doc/xmltoman/xmltoman-0.4.ebuild
+++ b/app-doc/xmltoman/xmltoman-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/app-editors/diakonos/metadata.xml b/app-editors/diakonos/metadata.xml
index defaad06f8c3..097975e3adc2 100644
--- a/app-editors/diakonos/metadata.xml
+++ b/app-editors/diakonos/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild
index 22a9f3d6064d..a021bc7d19e2 100644
--- a/app-editors/emacs/emacs-23.4-r14.ebuild
+++ b/app-editors/emacs/emacs-23.4-r14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-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 ~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 ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
index 77d3faa30dee..7e3576106130 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
@@ -15,7 +15,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 vala zeitgeist"
diff --git a/app-editors/gedit/gedit-3.18.3.ebuild b/app-editors/gedit/gedit-3.18.3.ebuild
index c7b16adada7e..455abdaa13e2 100644
--- a/app-editors/gedit/gedit-3.18.3.ebuild
+++ b/app-editors/gedit/gedit-3.18.3.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="
 	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"
+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="
diff --git a/app-editors/ghex/ghex-3.18.0.ebuild b/app-editors/ghex/ghex-3.18.0.ebuild
index aca99daf6040..cfaff3fb49c2 100644
--- a/app-editors/ghex/ghex-3.18.0.ebuild
+++ b/app-editors/ghex/ghex-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
new file mode 100644
index 000000000000..60107fd5af7c
--- /dev/null
+++ b/app-editors/ghostwriter/Manifest
@@ -0,0 +1 @@
+DIST ghostwriter-1.2.5.tar.gz 508173 SHA256 4bf0f9450231504416037e4a667d8c8e2940bda0e03e624ba9bb2eda78a7937b SHA512 195e984dc6109a4fedacf92e2e78ec81fee76c1edc701c12afa82aafaed73f90d6a008ac21a4338636235b1d161fc22ad94fee3c8873b85135728c67e63c0260 WHIRLPOOL c172d4cdc2c30faa993242b981b873edf19d58ef060d6c22da4b01fdaee37f756b34a9c6288dec7131a9082b6acd93c8edcecbd365f8a141996e719a773c86e9
diff --git a/app-editors/ghostwriter/ghostwriter-1.2.5.ebuild b/app-editors/ghostwriter/ghostwriter-1.2.5.ebuild
new file mode 100644
index 000000000000..1823a98d9138
--- /dev/null
+++ b/app-editors/ghostwriter/ghostwriter-1.2.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="A cross-platform, aesthetic, distraction-free Markdown editor"
+HOMEPAGE="http://wereturtle.github.io/ghostwriter/"
+SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="qt5"
+
+DEPEND="
+	qt5? (
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+	)
+	!qt5? ( dev-qt/qtwebkit:4 )
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	if use qt5; then
+		eqmake5 "PREFIX=/usr"
+	else
+		eqmake4 "PREFIX=/usr"
+	fi
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/app-editors/ghostwriter/metadata.xml b/app-editors/ghostwriter/metadata.xml
new file mode 100644
index 000000000000..c2f8b71d3a06
--- /dev/null
+++ b/app-editors/ghostwriter/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 type="person">
+		<email>suhr@i2pmail.org</email>
+		<name>Сухарик</name>
+		<description>Proxied maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 38cfe401d40a..c77a09cccdc5 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,5 +1,6 @@
 DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
 DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
+DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
diff --git a/app-editors/gvim/gvim-7.4.1342.ebuild b/app-editors/gvim/gvim-7.4.1342.ebuild
new file mode 100644
index 000000000000..0334154ca244
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.1342.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-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"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? (
+		|| ( $(python_gen_useflags '*') )
+		?? ( $(python_gen_useflags 'python2*') )
+		?? ( $(python_gen_useflags 'python3*') )
+	)
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			>=x11-libs/gtk+-2.6:2
+			x11-libs/libXft
+			gnome? ( >=gnome-base/libgnomeui-2.6 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				neXt? ( x11-libs/neXtaw )
+				!neXt? ( x11-libs/libXaw )
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	if use python ; then
+		py_add_interp() {
+			local v
+
+			[[ ${EPYTHON} == python3* ]] && v=3
+			myconf+=(
+				--enable-python${v}interp
+				vi_cv_path_python${v}="${PYTHON}"
+			)
+		}
+
+		python_foreach_impl py_add_interp
+	else
+		myconf+=(
+			--disable-pythoninterp
+			--disable-python3interp
+		)
+	fi
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk gnome               GNOME2
+	# -aqua gtk -gnome              GTK2
+	# -aqua -gtk  motif             MOTIF
+	# -aqua -gtk -motif neXt        NEXTAW
+	# -aqua -gtk -motif -neXt       ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk ; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Make gvim not try to connect to X. See :help gui-x11-start
+	# in vim for how this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../testvim nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/latexila/latexila-3.18.2.ebuild b/app-editors/latexila/latexila-3.18.2.ebuild
index eaa433197844..b2bcfdef0e36 100644
--- a/app-editors/latexila/latexila-3.18.2.ebuild
+++ b/app-editors/latexila/latexila-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection +latexmk rubber"
 
 # gspell-0.1 is required for this cycle
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index ebbad181c973..9c962eec965c 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,2 +1,3 @@
 DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551
 DIST neovim-0.1.1.tar.gz 7584560 SHA256 f39bcab23457c66ce0d67dcf8029743703f860413db0070f75d4f0ffad27c6c1 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333 WHIRLPOOL 9df0d6d59bdda2def2d8a393eec579f341256aff18c485cbb08c96637c597ee4df73a68a09105e776605194412274df2c82b78f7ca0e0bc1e20d4780fcdfa57f
+DIST neovim-0.1.2.tar.gz 7610804 SHA256 549881465eff82454660ae92d857d6ffa22383d45c94c46f3753fd1b0e699247 SHA512 dc03d92ff296f3ff55225d514479f1ac201a5a65eb8a6c02e71935ca44feb8ab15897b26a2ea46e53771f902c57b027d07e02f95673268ee060c6b77c4aa90e4 WHIRLPOOL ef1253249120c89c6efc15520263c889a9972df0c11e9353dedeee112c46ee9b92355fa3dabdf2d15cb7d0416681d1c8b55a9c02266048154f3afe104fdf4ff9
diff --git a/app-editors/neovim/neovim-0.1.2.ebuild b/app-editors/neovim/neovim-0.1.2.ebuild
new file mode 100644
index 000000000000..fdc0c7e45843
--- /dev/null
+++ b/app-editors/neovim/neovim-0.1.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python +jemalloc"
+
+CDEPEND="dev-lang/luajit:2
+	>=dev-libs/libtermkey-0.17
+	>=dev-libs/libuv-1.2.0
+	>=dev-libs/msgpack-1.0.0
+	>=dev-libs/unibilium-1.1.1
+	dev-libs/libvterm
+	dev-lua/lpeg
+	dev-lua/messagepack
+	jemalloc? ( dev-libs/jemalloc )
+"
+DEPEND="${CDEPEND}
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${CDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-python/neovim-python-client )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/globals.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	# make less.sh macro actually work with neovim
+	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	export USE_BUNDLED_DEPS=OFF
+	append-cflags "-Wno-error"
+	local mycmakeargs=(
+		$(cmake-utils_use_enable jemalloc JEMALLOC)
+		-DLIBUNIBILIUM_USE_STATIC=OFF
+		-DLIBTERMKEY_USE_STATIC=OFF
+		-DLIBVTERM_USE_STATIC=OFF
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
index d4c38976da93..e2a7df12b0f1 100644
--- a/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 arm ~ppc x86"
 IUSE="X png unicode xv"
 RESTRICT="test"
 
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index c106eb7b2511..77fc334c6154 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,3 @@
 DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c6660853668b350f3369e76d155edd6c SHA512 d2b3fa901afa9870f6cecc7ab3126b91f1420ca1b14ddd4f609c2ada7121388840b5be679914694664f3bbf876ee8522aa6b0c82a23f837844f788fa10a46323 WHIRLPOOL 3be71e5d7ec612ae4e4fec17ca544f6d0e7cb7421fcdeb517d3c13156ed07f5e5e7c3e352cf604bfb5f2287964fdc173a1bac0eeab41ee1cda8b265ad0f57686
-DIST ReText-5.0.2.tar.gz 140853 SHA256 7ef898abc8aed70502fd4d69ed7e8ab43cc978fcbe6864da5771379c1e315bdd SHA512 b28dd24aa5253106880bd6a5a3a16f96670c3145a2cb46da520407d6705f055ee52aaef9c0a8e27c2900b5fdde6a67c599cb8945f7daa6e3ef4456e1fd7c9b0f WHIRLPOOL 0ee1a7497ca3d6fef8356777d93e369d06de542b20974055ddf66cc8e12d33c7716d3b4b5f0360b40037c90d146fddbff4c3b48c96929efafd8f43e278240c0f
-DIST ReText-5.1.0.tar.gz 151833 SHA256 09b12892a0520bb8b0692f5aec7aa88911d07a5048a3402a9e9d4ac57322b5ca SHA512 3dbfe4992195119513c571291c344338dccf55c52d000cc69da63d0e51e5f2d9c5a0a2fba6570e525c96f1f9243a7465391a59b840a1fb7dd4513a0b4909ca5c WHIRLPOOL 76826184a3e8ac3ea3f5c10c31a3630ad8bc37a1bce0d771fc250f1f53acb9dd2f888aa67adf946368a5baebcdab0306100ea0e632dcd36edd81cdcd1a247838
-DIST ReText-5.2.0.tar.gz 156953 SHA256 463b524435d7b068d90304ae719f96a9c8b957323206549ae5a02ffe5fa82b17 SHA512 9a40fb0e39145ee9bc29945af488e74ea8aa5a78b220f28d1c3de5060daf6f3a6864b4e852165847bb4b5905ca4f0684d56b24864baa05f96468f5d4d0172c6b WHIRLPOOL be4b10f7158de253ac1a104e5053d80afcf5ecc6928ba8a009c8bbdac9166a735cb60d56c268c6f1651f3d7c6c4d9daac46caa4696795e68c1dbf870dc759afd
 DIST ReText-5.2.1.tar.gz 157119 SHA256 02164ae2bba6f47a2ec5e11aa06aefbcd96bea1b84a96c5673dbe18d8ccb2a69 SHA512 1d11f6824b64a082425ac2e8b67da15d4df5352539b66a8297dba0cd4f4236b7328966e97104c3fd7a641067a84023f65ba856f932d8489ff4e80722471835d8 WHIRLPOOL 24e7c756f61c210320b0ab9a67c99f43ccf5739310a01d9ee98d779e8b45b27dbc828b0c573973b2e4d2b8e07f2edd56660de685930a7a2ed8ceb50ab6fb6f91
 DIST ReText-5.3.0.tar.gz 160163 SHA256 9ec0cee93e6731fbf00b86574cb47c3132f62291e762f5e47258a3171bfdd21d SHA512 d6ff8e61b1e13de72c5d1741795fddb3a1ba443b2aa6aba6ca933ae38e09c8dac38085bfd73e0c1773dec9a72df1f08d64ef22d2396694530bade6ff8a485223 WHIRLPOOL 98537b5244a583c04604a6b1626a3813b6506dfefda6d40c85aaae076b30c7e14a0b8a363e431d9bd5ceea41a31f07785663a018bbdae1dc897a29eec22c99c1
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index 7b0d4d18ec9a..f43cddd5a1cf 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -4,7 +4,6 @@
   <maintainer type="person">
     <email>mrueg@gentoo.org</email>
     <name>Manuel Rüger</name>
-    <description>CC him on bugs</description>
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">retext</remote-id>
diff --git a/app-editors/retext/retext-5.0.2.ebuild b/app-editors/retext/retext-5.0.2.ebuild
deleted file mode 100644
index d4ea07735488..000000000000
--- a/app-editors/retext/retext-5.0.2.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
-
-PYTHON_COMPAT=( python3_{3,4} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk uk vi zh_CN zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
-HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-}
diff --git a/app-editors/retext/retext-5.1.0.ebuild b/app-editors/retext/retext-5.1.0.ebuild
deleted file mode 100644
index 8578f0966c16..000000000000
--- a/app-editors/retext/retext-5.1.0.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=( python3_{3,4} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk vi zh_CN zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-}
diff --git a/app-editors/retext/retext-5.2.0.ebuild b/app-editors/retext/retext-5.2.0.ebuild
deleted file mode 100644
index f147eaa705e8..000000000000
--- a/app-editors/retext/retext-5.2.0.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=( python3_{3,4} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-}
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index e88b9d0ade6d..a68f959734dc 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,2 +1 @@
-DIST tea-41.0.0.tar.bz2 381891 SHA256 b20bfe3235a4f405bcd984adfabde2302a15cf8512e19f8b97bc43ce9911632b SHA512 aff52922be7650a23fcafe5a8106d5955bc7c68a901ad6a3982b71196ac8856939d3bc61236babbed21a749c2fc205510ef081ac35d7d33fcf2d2700ebb5cbaf WHIRLPOOL ed913f3fb424e47fbbecab445ccd9c34c9ad66befdda950fee05958459b87efad67cfea37548c5ab8456b849c860f0cd3ef59e386aaa99c01b5041dae02c1afc
 DIST tea-41.1.0.tar.bz2 381370 SHA256 65ea128739802b7626a5a59de12b0e885dcef7a83f7bcd06b6d3aea830ed8717 SHA512 a46e0cdfce5c7d453c7783c59ad98b2b029847ddcc8ce0655c6e1ae45825426ac1b271ca7ad90f0219d8f796f507f6bdba0f2c764c563c8c23503b94be817eb7 WHIRLPOOL a3d00f5e42a145be2a7f3bf846832bf2a7e95e957abf4c928118be7607adb57fddfb906fbedaf7fa51665b25629beae0fe5b4db40886f42dfcf5c166e43717b5
diff --git a/app-editors/tea/tea-41.0.0.ebuild b/app-editors/tea/tea-41.0.0.ebuild
deleted file mode 100644
index 396aa853ef7b..000000000000
--- a/app-editors/tea/tea-41.0.0.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
-PLOCALES="de fr ru"
-
-inherit eutils l10n qmake-utils
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="http://semiletov.org/tea/ http://tea.ourproject.org/"
-SRC_URI="http://semiletov.org/${PN}/dloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE="aspell hunspell"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	sys-libs/zlib
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-"
-DEPEND="${RDEPEND}
-	hunspell? ( virtual/pkgconfig )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO )
-
-src_configure() {
-	eqmake4 src.pro \
-		$(use aspell || echo CONFIG+=noaspell) \
-		$(use hunspell || echo CONFIG+=nohunspell)
-}
-
-src_install() {
-	dobin bin/tea
-
-	newicon icons/tea-icon-v3-01.png ${PN}.png
-	make_desktop_entry ${PN} 'Tea Editor'
-
-	# translations
-	insinto /usr/share/qt4/translations
-	local lang
-	for lang in $(l10n_get_locales); do
-		doins translations/${PN}_${lang}.qm
-	done
-
-	# docs
-	dohtml manuals/en.html
-	if use linguas_ru; then
-		dodoc NEWS-RU
-		dohtml manuals/ru.html
-	fi
-}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 38cfe401d40a..c77a09cccdc5 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,5 +1,6 @@
 DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
 DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
+DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
diff --git a/app-editors/vim-core/vim-core-7.4.1342.ebuild b/app-editors/vim-core/vim-core-7.4.1342.ebuild
new file mode 100644
index 000000000000..5e2f6a16ebcd
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.1342.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIM_VERSION="7.4"
+inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-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"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	cd src || die "cd src failed"
+	emake \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		install-icons \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r4 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
diff --git a/app-editors/vim-qt/Manifest b/app-editors/vim-qt/Manifest
index ba264146fb7e..98e341c3d008 100644
--- a/app-editors/vim-qt/Manifest
+++ b/app-editors/vim-qt/Manifest
@@ -1,2 +1 @@
-DIST vim-qt-20140827.tar.gz 12251966 SHA256 61eba646bf25fd3caa40943ecd91e5e7a813e11ca71d899e9e844e3f69e97a60 SHA512 0ab352a64f138e68059311908b2e4b0cbbec55c2fa889ff64f863670c3d1ee0022d26877175090d5c256eb1cdfaf7d23d385044a68e2eb8b50b1cdab2a20827f WHIRLPOOL ea397f465902796761c44e6521ab6b2660498d1e3ce4821d3265517ba1c72984b93e580549be921e156771f2ccbb86fce1c830035ad00513eb9e42c1f1ff6abd
 DIST vim-qt-20150102.tar.gz 12285083 SHA256 1a3553f491e7990d4256c3c70f2d9d1804c2de5c6ac2c12845b173ff3d531157 SHA512 37434ff6cbac3dd97e3c5cb328a857afa8a8ddc4cea7b3879a06b4dd418e5b7516a68dc5c2b0c9c8b6332d316fc593b120400eab04c444c0065f3b74ae2d682d WHIRLPOOL 60d9838532b25ad8c31638e51ccf82769382dccb420c070068537ad7c15314dbc2b5fd177ed9d57674b3f593937f3c539bdd7a98e305eab40059a29ae4bf2b09
diff --git a/app-editors/vim-qt/vim-qt-20140827-r3.ebuild b/app-editors/vim-qt/vim-qt-20140827-r3.ebuild
deleted file mode 100644
index 6c21af0f9d99..000000000000
--- a/app-editors/vim-qt/vim-qt-20140827-r3.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="threads"
-inherit eutils fdo-mime flag-o-matic prefix python-single-r1
-
-DESCRIPTION="Qt GUI version of the Vim text editor"
-HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://bitbucket.org/equalsraf/${PN}.git"
-		"https://github.com/equalsraf/${PN}.git"
-		"git://gitorious.org/${PN}/${PN}.git"
-	)
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-package-${PV}"
-fi
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl cscope debug lua luajit nls perl python racket ruby"
-
-REQUIRED_USE="luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=app-eselect/eselect-vi-1.1.8
-	>=app-editors/vim-core-7.4.417[acl?]
-	sys-libs/ncurses
-	>=dev-qt/qtcore-4.7.0:4
-	>=dev-qt/qtgui-4.7.0:4
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	lua? ( luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] ) )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	export LC_COLLATE="C" # prevent locale brokenness
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Read vimrc from /etc/vim/
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-}
-
-src_configure() {
-	use debug && append-flags "-DDEBUG"
-
-	local myconf="--with-features=huge --disable-gpm --enable-multibyte"
-	myconf+=" $(use_enable acl)"
-	myconf+=" $(use_enable cscope)"
-	myconf+=" $(use_enable nls)"
-	myconf+=" $(use_enable lua luainterp)"
-	myconf+=" $(use_with luajit)"
-	myconf+=" $(use_enable perl perlinterp)"
-	myconf+=" $(use_enable racket mzschemeinterp)"
-	myconf+=" $(use_enable ruby rubyinterp)"
-
-	if ! use cscope ; then
-		sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed failed'
-	fi
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	if use python ; then
-		if [[ ${EPYTHON} == python3* ]] ; then
-			myconf+=" --enable-python3interp"
-			export vi_cv_path_python3="${PYTHON}"
-		else
-			myconf+=" --enable-pythoninterp"
-			export vi_cv_path_python="${PYTHON}"
-		fi
-	else
-		myconf+=" --disable-pythoninterp --disable-python3interp"
-	fi
-
-	econf ${myconf} --enable-gui=qt --with-vim-name=qvim --with-modified-by=Gentoo-${PVR}
-}
-
-src_install() {
-	dobin src/qvim
-	dosym qvim /usr/bin/qvimdiff
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/qvim.1
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/qvimdiff.1
-
-	# track https://bitbucket.org/equalsraf/vim-qt/issue/93/include-desktop-file-in-source
-	# for inclusion of desktop file
-	newmenu "${FILESDIR}"/vim-qt.desktop vim-qt.desktop
-	doicon -s 64 src/qt/icons/vim-qt.png
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild b/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
index a83941d94f44..304449d7828c 100644
--- a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
+++ b/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,7 +45,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )"
+	ruby? ( dev-lang/ruby:2.0 )"
 DEPEND="${RDEPEND}
 	dev-util/ctags
 	sys-devel/autoconf
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 38cfe401d40a..c77a09cccdc5 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,5 +1,6 @@
 DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
 DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
+DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
diff --git a/app-editors/vim/vim-7.4.1342.ebuild b/app-editors/vim/vim-7.4.1342.ebuild
new file mode 100644
index 000000000000..d0e5706af1cf
--- /dev/null
+++ b/app-editors/vim/vim-7.4.1342.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-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"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? (
+		|| ( $(python_gen_useflags '*') )
+		?? ( $(python_gen_useflags 'python2*') )
+		?? ( $(python_gen_useflags 'python3*') )
+	)
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+		)
+
+		if use python ; then
+			py_add_interp() {
+				local v
+
+				[[ ${EPYTHON} == python3* ]] && v=3
+				myconf+=(
+					--enable-python${v}interp
+					vi_cv_path_python${v}="${PYTHON}"
+				)
+			}
+
+			python_foreach_impl py_add_interp
+		else
+			myconf+=(
+				--disable-pythoninterp
+				--disable-python3interp
+			)
+		fi
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../vim nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
index b3b4d9d2881c..55cab280e0b4 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
diff --git a/app-emacs/with-editor/with-editor-2.5.0-r2.ebuild b/app-emacs/with-editor/with-editor-2.5.0-r2.ebuild
new file mode 100644
index 000000000000..c52af4ced54d
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.5.0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="http://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=">=app-emacs/dash-2.12.1"
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
diff --git a/app-emulation/aranym/Manifest b/app-emulation/aranym/Manifest
deleted file mode 100644
index 7751ff866a79..000000000000
--- a/app-emulation/aranym/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST afros812.zip 9087862 SHA256 7d60230694734a42d912f47d03653f60ffd5a034d89771df35a414b6a6af6263 SHA512 0e9522740dc38c34b1fab4a999485caca0af95692d281bf2887fe6dddf48cceaf6c4d8b9802f402e2bd00726fb01c557ffb5731838ebd94b9eec987f1f0ce545 WHIRLPOOL bc641fef78cff4fb14448b0054eb39505a507d73f1511fb0d801f06637e0c81e2311c6c1fe1391aea379f967d5f20032e4ffb5184d9a9f39f3530c3cfeb63550
-DIST aranym_0.9.14.orig.tar.gz 1831715 SHA256 04e85337fbf54cb3c80c2d26ce22f51337abc2ddc730d9bf9ed3b171def4b9fa SHA512 8145546bf6f6ffea8f4ea24f0fbfc19d1b33146b30473757dcf04c7603125f7f3a36f266ad190baf310510fa50b5f9ecfe2cd8627dea292d3851e6c64cf4fc17 WHIRLPOOL 86ad78d2a7ff0c66f94875bfb6d80957436bf594bd201884d8fee3e541aa11f5d03d16500807b3d9172155c5284e94d4d251913f08869def4d4bfd33f1d24bc7
-DIST aranym_0.9.16.orig.tar.gz 1778730 SHA256 11e7ca0dd93d42966c2ec70749a3c1e4345656ad1108a126ecd9754391a308c6 SHA512 b2848b1c6726b0e85f76da144a3f4f478bed13a1bc528658a448499c5e3434d5adb2ff6e0625d814a6e15a6d1ca9fe8922a3f282b50b1cb7763bb09c64342ae8 WHIRLPOOL 48a5cf68c4243c18292e3948d688ee8dc29306986b05177cc469cd6915dabe8733994f1578272acfac939cbae77d27a3bb4ced8fa41aa70cfb70ce503b6c717d
diff --git a/app-emulation/aranym/aranym-0.9.14.ebuild b/app-emulation/aranym/aranym-0.9.14.ebuild
deleted file mode 100644
index dfb397f37bb3..000000000000
--- a/app-emulation/aranym/aranym-0.9.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Atari Running on Any Machine, a VM running Atari ST/TT/Falcon OS and TOS/GEM applications"
-HOMEPAGE="http://aranym.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aranym/${P/-/_}.orig.tar.gz
-	mirror://sourceforge/aranym/afros812.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+fullmmu +lilo opengl usbhost X"
-
-RDEPEND="games-emulation/emutos
-	media-libs/libsdl
-	opengl? ( virtual/opengl )
-	X? ( media-libs/libsdl[X] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_configure() {
-	filter-flags -mpowerpc-gfxopt
-
-	local myconf=""
-	if [[ ${ARCH} == x86 ]]; then
-		myconf="${myconf} --enable-jit-compiler"
-	fi
-
-	if ! use X; then
-		myconf="${myconf} --disable-nfjpeg --disable-nfclipbrd"
-	fi
-
-	econf \
-		$(use_enable X gui) \
-		$(use_enable opengl) \
-		$(use_enable fullmmu) \
-		$(use_enable lilo) \
-		$(use_enable usbhost) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_PROGRAM="install" install
-
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/afros
-
-	dodoc "${D}"/usr/share/doc/${PN}/*
-	rm -r "${D}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
-	elog "To run ARAnyM with AFROS type: aranym --config /usr/share/aranym/afros/config"
-}
diff --git a/app-emulation/aranym/aranym-0.9.16.ebuild b/app-emulation/aranym/aranym-0.9.16.ebuild
deleted file mode 100644
index 42dc1347a456..000000000000
--- a/app-emulation/aranym/aranym-0.9.16.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Atari Running on Any Machine, a VM running Atari ST/TT/Falcon OS and TOS/GEM applications"
-HOMEPAGE="http://aranym.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aranym/${P/-/_}.orig.tar.gz
-	mirror://sourceforge/aranym/afros812.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+fullmmu +lilo opengl usbhost X"
-
-RDEPEND="games-emulation/emutos
-	media-libs/libsdl
-	opengl? ( virtual/opengl )
-	X? ( media-libs/libsdl[X] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_configure() {
-	filter-flags -mpowerpc-gfxopt
-
-	local myconf=""
-	if [[ ${ARCH} == x86 ]]; then
-		myconf="${myconf} --enable-jit-compiler"
-	fi
-
-	if ! use X; then
-		myconf="${myconf} --disable-nfjpeg --disable-nfclipbrd"
-	fi
-
-	econf \
-		$(use_enable X gui) \
-		$(use_enable opengl) \
-		$(use_enable fullmmu) \
-		$(use_enable lilo) \
-		$(use_enable usbhost) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_PROGRAM="install" install
-
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/afros
-
-	dodoc "${D}"/usr/share/doc/${PN}/*
-	rm -r "${D}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
-	elog "To run ARAnyM with AFROS type: aranym --config /usr/share/aranym/afros/config"
-}
diff --git a/app-emulation/aranym/metadata.xml b/app-emulation/aranym/metadata.xml
deleted file mode 100644
index 8ace45a94ef7..000000000000
--- a/app-emulation/aranym/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-		ARAnyM is an acronym: Atari Running on Any Machine. It is a virtual
-		machine software for running the Atari ST/TT/Falcon operating systems
-		(TOS, FreeMiNT, MagiC and others) and TOS/GEM applications. In the
-		combination of ARAnyM/Linux and AFROS you basically get a completely
-		free TOS/MiNT compatible operating system running on any machine.
-		That's a break-through for all Atari users - now you can turn almost
-		any hardware into your familiar TOS/GEM system.
-	</longdescription>
-	<use>
-		<flag name="fullmmu">Enable full 68040 MMU emulation</flag>
-		<flag name="lilo">Enable Linux-m68k loader</flag>
-		<flag name="usbhost">Enable NatFeat USB</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">aranym</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/docker-swarm/Manifest b/app-emulation/docker-swarm/Manifest
index 11b40d44caa3..0e7a64519307 100644
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@@ -1,2 +1 @@
-DIST docker-swarm-0.4.0.tar.gz 853254 SHA256 c3ee1a34ce86da4d31f652c871dfa120fc78d5cc835e391034d740e83b48f7a3 SHA512 ffaa5560d67cafcc97b091d87b7792d6a0bfed2fb08837854a8313175742d535ee671fe45c4b96eeb69bf613a31e2e37cf92524f93ad20fbfbd54647b956c9c1 WHIRLPOOL 3acb07bfbcf33d70dffbfff4c5028767f36d51bd3500143d50e109d062cfd0107dfdc9f45724d08f874d81e15429089ed18a664fd591c26d7f2ff14ea933f93a
 DIST docker-swarm-1.0.1.tar.gz 1187966 SHA256 33c6566af395affbf9861d1491613c48a70e6c61c532910cef2210be7b1323f7 SHA512 ed5e6a37cd0f5a816367cab451d21ac20183f8ce767a30dc3086f849da8e0d2662c9f9b7e56d826e7e8cf5d4ec3d9f1ee8c159cca294af7ec45c2c1a21eaaf80 WHIRLPOOL e17705a3bef077e5fed552131aa7cd4891934a537dc93bbb8dfe81bf2e82c281d7f74a5150febdde26f492cf5ad4eec8417aac9a7edc6e48812f4af3ed1b624e
diff --git a/app-emulation/docker-swarm/docker-swarm-0.4.0.ebuild b/app-emulation/docker-swarm/docker-swarm-0.4.0.ebuild
deleted file mode 100644
index bb35aaeb8a82..000000000000
--- a/app-emulation/docker-swarm/docker-swarm-0.4.0.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
-
-EGO_PN=github.com/docker/${PN##*-}/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A Docker-native clustering system"
-HOMEPAGE="https://docs.docker.com/${PN##*-}/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=""
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN%/*}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:${S}/Godeps/_workspace:$(get_golibdir_gopath)" \
-		go build -v -work -x ${EGO_BUILD_FLAGS} -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild b/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
index bb35aaeb8a82..cc963c2c0349 100644
--- a/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 RESTRICT="test"
-DEPEND=""
+DEPEND="!!<app-admin/consul-0.6.3-r1"
 RDEPEND=""
 S=${WORKDIR}/${P}/src/${EGO_PN%/*}
 
diff --git a/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
index 527e5766ef72..eea792e4c167 100644
--- a/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,6 +38,7 @@ IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
 REQUIRED_USE="|| ( kvm xen lxc )"
 
 HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
+	<dev-lang/ghc-7.8
 	dev-haskell/json:0=
 	dev-haskell/curl:0=
 	dev-haskell/network:0=
diff --git a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
index d3c3812b80d9..c7362d27e427 100644
--- a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ if [[ ${PV} == "9999" ]] ; then
 		media-fonts/urw-fonts"
 else
 	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Ganeti is a virtual server management software tool"
@@ -41,6 +41,7 @@ USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
 GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
 
 HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
+	<dev-lang/ghc-7.8
 	dev-haskell/json:0=
 	dev-haskell/curl:0=
 	dev-haskell/network:0=
diff --git a/app-emulation/libcacard/files/libcacard-0.1.2-underlinking.patch b/app-emulation/libcacard/files/libcacard-0.1.2-underlinking.patch
new file mode 100644
index 000000000000..086508fca2c1
--- /dev/null
+++ b/app-emulation/libcacard/files/libcacard-0.1.2-underlinking.patch
@@ -0,0 +1,354 @@
+Fix underlinking issues caused by missing -pthread flag:
+* libtool: link: x86_64-pc-linux-gnu-gcc -O2 -pipe -march=sandybridge --param l1-cache-line-size=64 --param l1-cache-size=32 --param l2-cache-size=4096 -Wl,-O1 -Wl,--as-needed -o .libs/vscclient vscclient.o  ./.libs/libcacard.so -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4
+* vscclient.o:vscclient.c:function main: error: undefined reference to 'pthread_create'
+See also: https://bugs.gentoo.org/show_bug.cgi?id=494450
+
+--- libcacard-0.1.2/configure.ac
++++ libcacard-0.1.2/configure.ac
+@@ -69,6 +69,11 @@
+ fi
+ ])
+ 
++dnl Pthread handling
++AX_PTHREAD
++CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
++LIBS="${LIBS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
++
+ dnl handle the passthru option. passthru allows you to access the cards directly
+ AC_ARG_ENABLE(passthru,
+ AC_HELP_STRING([--enable-passthru], [allow passthru mode]),
+--- libcacard-0.1.2/m4/ax_pthread.m4
++++ libcacard-0.1.2/m4/ax_pthread.m4
+@@ -0,0 +1,332 @@
++# ===========================================================================
++#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC to any special C compiler that is needed for
++#   multi-threaded programs (defaults to the value of CC otherwise). (This
++#   is necessary on AIX to use the special cc_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also link it with them as well. e.g. you should link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threads programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
++#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 21
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on True64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
++        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test x"$ax_pthread_ok" = xno; then
++                PTHREAD_LIBS=""
++                PTHREAD_CFLAGS=""
++        fi
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try.  Items starting with a "-" are
++# C compiler flags, and other items are library names, except for "none"
++# which indicates that we try without any flags at all, and "pthread-config"
++# which is a program returning the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
++# -pthreads: Solaris/gcc
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads too;
++#      also defines -D_REENTRANT)
++#      ... -mt is also the pthreads flag for HP/aCC
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case ${host_os} in
++        solaris*)
++
++        # On Solaris (at least, for some versions), libc contains stubbed
++        # (non-functional) versions of the pthreads routines, so link-based
++        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
++        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
++        # a function called by this macro, so we could check for that, but
++        # who knows whether they'll stub that too in a future libc.)  So,
++        # we'll just look for -pthreads and -lpthread first:
++
++        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++        ;;
++
++        darwin*)
++        ax_pthread_flags="-pthread $ax_pthread_flags"
++        ;;
++esac
++
++# Clang doesn't consider unrecognized options an error unless we specify
++# -Werror. We throw in some extra Clang-specific options to ensure that
++# this doesn't happen for GCC, which also accepts -Werror.
++
++AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
++save_CFLAGS="$CFLAGS"
++ax_pthread_extra_flags="-Werror"
++CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
++                  [AC_MSG_RESULT([yes])],
++                  [ax_pthread_extra_flags=
++                   AC_MSG_RESULT([no])])
++CFLAGS="$save_CFLAGS"
++
++if test x"$ax_pthread_ok" = xno; then
++for flag in $ax_pthread_flags; do
++
++        case $flag in
++                none)
++                AC_MSG_CHECKING([whether pthreads work without any flags])
++                ;;
++
++                -*)
++                AC_MSG_CHECKING([whether pthreads work with $flag])
++                PTHREAD_CFLAGS="$flag"
++                ;;
++
++                pthread-config)
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                if test x"$ax_pthread_config" = xno; then continue; fi
++                PTHREAD_CFLAGS="`pthread-config --cflags`"
++                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++                ;;
++
++                *)
++                AC_MSG_CHECKING([for the pthreads library -l$flag])
++                PTHREAD_LIBS="-l$flag"
++                ;;
++        esac
++
++        save_LIBS="$LIBS"
++        save_CFLAGS="$CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
++
++        # Check for various functions.  We must include pthread.h,
++        # since some functions may be macros.  (On the Sequent, we
++        # need a special flag -Kthread to make this header compile.)
++        # We check for pthread_join because it is in -lpthread on IRIX
++        # while pthread_create is in libc.  We check for pthread_attr_init
++        # due to DEC craziness with -lpthreads.  We check for
++        # pthread_cleanup_push because it is one of the few pthread
++        # functions on Solaris that doesn't have a non-functional libc stub.
++        # We try pthread_create on general principles.
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++                        static void routine(void *a) { a = 0; }
++                        static void *start_routine(void *a) { return a; }],
++                       [pthread_t th; pthread_attr_t attr;
++                        pthread_create(&th, 0, start_routine, 0);
++                        pthread_join(th, 0);
++                        pthread_attr_init(&attr);
++                        pthread_cleanup_push(routine, 0);
++                        pthread_cleanup_pop(0) /* ; */])],
++                [ax_pthread_ok=yes],
++                [])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = xyes; then
++                break;
++        fi
++
++        PTHREAD_LIBS=""
++        PTHREAD_CFLAGS=""
++done
++fi
++
++# Various other checks:
++if test "x$ax_pthread_ok" = xyes; then
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++
++        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++        AC_MSG_CHECKING([for joinable pthread attribute])
++        attr_name=unknown
++        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                           [int attr = $attr; return attr /* ; */])],
++                [attr_name=$attr; break],
++                [])
++        done
++        AC_MSG_RESULT([$attr_name])
++        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
++            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
++                               [Define to necessary symbol if this constant
++                                uses a non-standard name on your system.])
++        fi
++
++        AC_MSG_CHECKING([if more special flags are required for pthreads])
++        flag=no
++        case ${host_os} in
++            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
++            osf* | hpux*) flag="-D_REENTRANT";;
++            solaris*)
++            if test "$GCC" = "yes"; then
++                flag="-D_REENTRANT"
++            else
++                # TODO: What about Clang on Solaris?
++                flag="-mt -D_REENTRANT"
++            fi
++            ;;
++        esac
++        AC_MSG_RESULT([$flag])
++        if test "x$flag" != xno; then
++            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
++        fi
++
++        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++            [ax_cv_PTHREAD_PRIO_INHERIT], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
++            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        # More AIX lossage: compile with *_r variant
++        if test "x$GCC" != xyes; then
++            case $host_os in
++                aix*)
++                AS_CASE(["x/$CC"],
++                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                  [#handle absolute path differently from PATH based program lookup
++                   AS_CASE(["x$CC"],
++                     [x/*],
++                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++                ;;
++            esac
++        fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$ax_pthread_ok" = xyes; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++        :
++else
++        ax_pthread_ok=no
++        $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
diff --git a/app-emulation/libcacard/libcacard-0.1.2.ebuild b/app-emulation/libcacard/libcacard-0.1.2.ebuild
index 78a3c4b1a49b..065ba5d801b2 100644
--- a/app-emulation/libcacard/libcacard-0.1.2.ebuild
+++ b/app-emulation/libcacard/libcacard-0.1.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
+
+inherit autotools eutils
 
 DESCRIPTION="Library for emulating CAC cards"
 HOMEPAGE="http://spice-space.org/"
@@ -17,6 +19,14 @@ RDEPEND=">=dev-libs/nss-3.13
 	>=sys-apps/pcsc-lite-1.8"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	# --enable-passthru works only on W$
@@ -26,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || rm "${D}"/usr/lib*/*.la
+	prune_libtool_files --all
 }
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
index a5ccb744bdff..0ce6e0862ab3 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.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/lxd/Manifest b/app-emulation/lxd/Manifest
index d68b9fb13bfa..ebd047c00473 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,3 @@
-DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
 DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
 DIST lxd-2.0.0_beta1.tar.bz2 2253384 SHA256 443d8004aea80a9295eeb28c81b930947163b5af5e7c5ec15e6123938268bd6c SHA512 21cc90e18173f832f7aa2f39762ba1c47ac54dbb947519302075d10f8c55cce766d436cb7f9ec96cb2fe538952b801398ce3b1320d878e8835d58e4fb3b81c86 WHIRLPOOL 85a11976fbf74f8b408c75aa7abf645d3e27eed3f82021fbcb7b2d8db95cc986fdf2cd6a38ef8749857027b380382e66678fb1f1656274159dbc2531c3860761
+DIST lxd-2.0.0_beta3.tar.bz2 2283443 SHA256 a3bdf6c081ebed01fcd1ae92a6d3ebf2e7d6ffea606fe3cb83559366e7dc90aa SHA512 3f80c1236ac9a92a350b4221478dd69eb2693672d73859738b691b9462155d0a907de90deab9950980500ab0faa5ec815bc6191cedf2d34d3757757f585570ec WHIRLPOOL 6d425c26ef37bc65871cf08946f0a80e5b9a3e01da5edd07605e94a2b418e6d2163ee90210c4439350000c35a18efa97102dcbab90ccd1577d6164b5b2e271b4
diff --git a/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
deleted file mode 100644
index 9964af6aec43..000000000000
--- a/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2015-12-28 19:23:28.425122306 -0600
-+++ Makefile	2015-12-28 19:25:09.482123654 -0600
-@@ -12,17 +12,11 @@
- 
- .PHONY: default
- default:
--	# Must run twice due to go get race
--	-go get -t -v -d ./...
--	-go get -t -v -d ./...
- 	go install -v ./...
- 	@echo "LXD built succesfuly"
- 
- .PHONY: client
- client:
--	# Must run twice due to go get race
--	-go get -t -v -d ./...
--	-go get -t -v -d ./...
- 	go install -v ./lxc
- 	@echo "LXD client built succesfuly"
- 
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch
new file mode 100644
index 000000000000..d2e622ec73b7
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	2016-02-19 00:16:40.720102639 +0000
++++ Makefile	2016-02-19 00:18:10.886096473 +0000
+@@ -12,17 +12,11 @@
+ 
+ .PHONY: default
+ default:
+-	# Must run twice due to go get race
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+ 	go install -v $(DEBUG) ./...
+ 	@echo "LXD built successfully"
+ 
+ .PHONY: client
+ client:
+-	# Must run twice due to go get race
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+ 	go install -v $(DEBUG) ./lxc
+ 	@echo "LXD client built successfully"
+ 
diff --git a/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch
index 7373b66969b7..7373b66969b7 100644
--- a/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch
diff --git a/app-emulation/lxd/files/lxd-0.26.confd b/app-emulation/lxd/files/lxd-2.0.0_beta3.confd
index 3d553276a5e3..3d553276a5e3 100644
--- a/app-emulation/lxd/files/lxd-0.26.confd
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3.confd
diff --git a/app-emulation/lxd/files/lxd-0.26.initd b/app-emulation/lxd/files/lxd-2.0.0_beta3.initd
index ec23258c19d1..ec23258c19d1 100644
--- a/app-emulation/lxd/files/lxd-0.26.initd
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3.initd
diff --git a/app-emulation/lxd/lxd-0.26.ebuild b/app-emulation/lxd/lxd-0.26.ebuild
deleted file mode 100644
index ce1664213feb..000000000000
--- a/app-emulation/lxd/lxd-0.26.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 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="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-# The compiler is forced in golang-base:
-# DEPEND=">=dev-lang/go-1.4.2:="
-# ... so the dep is omitted here (and I disagree with := in this case)
-
-DEPEND="
-	dev-go/go-crypto
-	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,seccomp]
-		net-analyzer/openbsd-netcat
-		net-misc/bridge-utils
-		net-misc/rsync[xattr]
-		sys-apps/iproute2
-		virtual/acl
-	)
-"
-
-# 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}" || die "Failed to change to deep src dir"
-
-	epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
-	# Upstream requires the openbsd flavor of netcat (with -U), but
-	# Gentoo installs that with a renamed binary
-	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
-	# Warn on unhandled locale changes
-	l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
-	golang-build_src_compile
-
-	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
-	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
-	use daemon && dosbin bin/lxd
-
-	cd "src/${EGO_PN}"
-
-	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)
-
-	einfo
-	einfo "Though not strictly required, some features are enabled at run-time"
-	einfo "when the relevant helper programs are detected:"
-	einfo "- sys-apps/apparmor"
-	einfo "- sys-fs/btrfs-progs"
-	einfo "- sys-fs/lvm2"
-	einfo "- sys-fs/lxcfs"
-	einfo "- sys-fs/zfs"
-	einfo "- sys-process/criu"
-	einfo
-	einfo "Since these features can't be disabled at build-time they are"
-	einfo "not USE-conditional."
-}
diff --git a/app-emulation/lxd/lxd-2.0.0_beta3.ebuild b/app-emulation/lxd/lxd-2.0.0_beta3.ebuild
new file mode 100644
index 000000000000..f57f3fbc6b42
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.0.0_beta3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 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="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
+DEPEND="
+	dev-go/go-crypto
+	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,seccomp]
+		net-analyzer/openbsd-netcat
+		net-misc/bridge-utils
+		net-misc/rsync[xattr]
+		sys-apps/iproute2
+		virtual/acl
+	)
+"
+
+# 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}" || die "Failed to change to deep src dir"
+
+	epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+	# Upstream requires the openbsd flavor of netcat (with -U), but
+	# Gentoo installs that with a renamed binary
+	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+	tmpgoroot="${T}/goroot"
+	mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+	cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+	# Warn on unhandled locale changes
+	l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+	golang-build_src_compile
+
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+	tmpgoroot="${T}/goroot"
+	if use daemon; then
+		# Build binaries
+		GOPATH="${S}:${tmpgoroot}" emake
+	else
+		# build client tool
+		GOPATH="${S}:${tmpgoroot}" 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
+	use daemon && dosbin bin/lxd
+
+	cd "src/${EGO_PN}"
+
+	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/lxd-client 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)
+
+	einfo
+	einfo "Though not strictly required, some features are enabled at run-time"
+	einfo "when the relevant helper programs are detected:"
+	einfo "- sys-apps/apparmor"
+	einfo "- sys-fs/btrfs-progs"
+	einfo "- sys-fs/lvm2"
+	einfo "- sys-fs/lxcfs"
+	einfo "- sys-fs/zfs"
+	einfo "- sys-process/criu"
+	einfo
+	einfo "Since these features can't be disabled at build-time they are"
+	einfo "not USE-conditional."
+}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.0.0_p3000743.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.0.0_p3000743.ebuild
index 3cc623f333f9..43e587902d94 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-10.0.0_p3000743.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.0.0_p3000743.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -113,6 +113,9 @@ src_install() {
 		fperms 4755 /usr/bin/vmware-user-suid-wrapper
 		dobin scripts/common/vmware-xdg-detect-de
 
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/open-vm-tools.desktop
+
 		elog "To be able to use the drag'n'drop feature of VMware for file"
 		elog "exchange, please add the users to the 'vmware' group."
 	fi
diff --git a/app-emulation/q4wine/q4wine-1.2_p2.ebuild b/app-emulation/q4wine/q4wine-1.2_p2.ebuild
index 686546e9b44d..4493d4b60b55 100644
--- a/app-emulation/q4wine/q4wine-1.2_p2.ebuild
+++ b/app-emulation/q4wine/q4wine-1.2_p2.ebuild
@@ -21,14 +21,26 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+dbus debug +icoutils +wineappdb"
+IUSE="+dbus debug +icoutils qt5 +wineappdb"
 
 DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[qt4(+),X]
-	dev-qt/qtsql:4[sqlite]
-	dbus? ( dev-qt/qtdbus:4 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsingleapplication[qt5(+),X]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dbus? ( dev-qt/qtdbus:5 )
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[qt4(+),X]
+		dev-qt/qtsql:4[sqlite]
+		dbus? ( dev-qt/qtdbus:4 )
+	)
 "
 RDEPEND="${DEPEND}
 	app-admin/sudo
@@ -51,9 +63,9 @@ src_configure() {
 	l10n_for_each_locale_do construct_LINGUAS
 	local mycmakeargs=(
 		-DLINGUAS="${enabled_linguas}"
-		-DQT5=OFF
 		-DWITH_SYSTEM_SINGLEAPP=ON
 		$(cmake-utils_use debug)
+		$(cmake-utils_use qt5)
 		$(cmake-utils_use_with dbus)
 		$(cmake-utils_use_with icoutils)
 		$(cmake-utils_use_with wineappdb)
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 6269bb7f2f4a..70a4faabe839 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,2 +1 @@
-DIST qemu-2.4.1.tar.bz2 25087522 SHA256 e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177 SHA512 fde32b71a50d888c1055e61f4e6dfc45bb97e8e9ebee490c545965fbdcbd5ffd859fbf20648abed1f4fa9fcc5635e9b22e1829bbe802fc8aaf989d6013235917 WHIRLPOOL a698cfa5d2d138eeddb3c6bea57e3b89ca5d47165c04ed1cfd66a81647ac59cbdd594c919abef67bf198278da1160c5b9f3a0da84cd73827f3eb19a6e6f05436
 DIST qemu-2.5.0.tar.bz2 25464996 SHA256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 WHIRLPOOL 8f5717989d8d234ecf1763ee386b2e1f20c3b17918de130c6dae255e4523a230b2b01a759eba25e4b9f604c680d9b868c56f58bd71b7c6c2c22a2e46804435ef
diff --git a/app-emulation/qemu/files/qemu-1.7.0-cflags.patch b/app-emulation/qemu/files/qemu-1.7.0-cflags.patch
deleted file mode 100644
index cd003f6de023..000000000000
--- a/app-emulation/qemu/files/qemu-1.7.0-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -3131,8 +3131,6 @@ fi
- if test "$gcov" = "yes" ; then
-   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
-   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
--elif test "$debug" = "no" ; then
--  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
- fi
- 
- 
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-fix-mtc0.patch b/app-emulation/qemu/files/qemu-2.4-mips-fix-mtc0.patch
deleted file mode 100644
index 07c2be51869c..000000000000
--- a/app-emulation/qemu/files/qemu-2.4-mips-fix-mtc0.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d54a299b83a07642c85a22bfe19b69ca4def9ec4 Mon Sep 17 00:00:00 2001
-From: Leon Alrae <leon.alrae@imgtec.com>
-Date: Wed, 9 Sep 2015 12:44:25 +0100
-Subject: [PATCH] target-mips: correct MTC0 instruction on MIPS64
-
-MTC0 on a 64-bit processor should move entire 64-bit GPR content to CP0
-register.
-
-Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
-Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
----
- target-mips/translate.c |   18 +++++++-----------
- 1 files changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/target-mips/translate.c b/target-mips/translate.c
-index 0883782..a59b670 100644
---- a/target-mips/translate.c
-+++ b/target-mips/translate.c
-@@ -4765,12 +4765,6 @@ static inline void gen_mtc0_store32 (TCGv arg, target_ulong off)
-     tcg_temp_free_i32(t0);
- }
- 
--static inline void gen_mtc0_store64 (TCGv arg, target_ulong off)
--{
--    tcg_gen_ext32s_tl(arg, arg);
--    tcg_gen_st_tl(arg, cpu_env, off);
--}
--
- static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
- {
-     const char *rn = "invalid";
-@@ -5629,12 +5623,14 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
-             break;
-         case 5:
-             CP0_CHECK(ctx->insn_flags & ASE_MT);
--            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPESchedule));
-+            tcg_gen_st_tl(arg, cpu_env,
-+                          offsetof(CPUMIPSState, CP0_VPESchedule));
-             rn = "VPESchedule";
-             break;
-         case 6:
-             CP0_CHECK(ctx->insn_flags & ASE_MT);
--            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPEScheFBack));
-+            tcg_gen_st_tl(arg, cpu_env,
-+                          offsetof(CPUMIPSState, CP0_VPEScheFBack));
-             rn = "VPEScheFBack";
-             break;
-         case 7:
-@@ -5884,7 +5880,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
-     case 14:
-         switch (sel) {
-         case 0:
--            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_EPC));
-+            tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC));
-             rn = "EPC";
-             break;
-         default:
-@@ -6057,7 +6053,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
-         switch (sel) {
-         case 0:
-             /* EJTAG support */
--            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_DEPC));
-+            tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC));
-             rn = "DEPC";
-             break;
-         default:
-@@ -6160,7 +6156,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
-     case 30:
-         switch (sel) {
-         case 0:
--            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_ErrorEPC));
-+            tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEPC));
-             rn = "ErrorEPC";
-             break;
-         default:
--- 
-1.7.0.4
-
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-fix-rdhwr.patch b/app-emulation/qemu/files/qemu-2.4-mips-fix-rdhwr.patch
deleted file mode 100644
index 998ec6646e55..000000000000
--- a/app-emulation/qemu/files/qemu-2.4-mips-fix-rdhwr.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From cdfcad788394ff53e317043e07b8e34f4987c659 Mon Sep 17 00:00:00 2001
-From: Alex Smith <alex.smith@imgtec.com>
-Date: Tue, 8 Sep 2015 11:34:11 +0100
-Subject: [PATCH 1/1] target-mips: Fix RDHWR on CP0.Count
-
-For RDHWR on the CP0.Count register, env->CP0_Count was being returned.
-This value is a delta against the QEMU_CLOCK_VIRTUAL clock, not the
-correct current value of CP0.Count. Use cpu_mips_get_count() instead.
-
-Signed-off-by: Alex Smith <alex.smith@imgtec.com>
-Cc: Aurelien Jarno <aurelien@aurel32.net>
-Cc: Leon Alrae <leon.alrae@imgtec.com>
-Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
-Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
-Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
----
- target-mips/op_helper.c |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
-index 1aa9e3c..94de108 100644
---- a/target-mips/op_helper.c
-+++ b/target-mips/op_helper.c
-@@ -2184,10 +2184,15 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
- target_ulong helper_rdhwr_cc(CPUMIPSState *env)
- {
-     if ((env->hflags & MIPS_HFLAG_CP0) ||
--        (env->CP0_HWREna & (1 << 2)))
-+        (env->CP0_HWREna & (1 << 2))) {
-+#ifdef CONFIG_USER_ONLY
-         return env->CP0_Count;
--    else
-+#else
-+        return (int32_t)cpu_mips_get_count(env);
-+#endif
-+    } else {
-         helper_raise_exception(env, EXCP_RI);
-+    }
- 
-     return 0;
- }
--- 
-1.7.0.4
-
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-move-interrupts-new-func.patch b/app-emulation/qemu/files/qemu-2.4-mips-move-interrupts-new-func.patch
deleted file mode 100644
index 0ea5df5afcb8..000000000000
--- a/app-emulation/qemu/files/qemu-2.4-mips-move-interrupts-new-func.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Pending upstream inclusion
-
-Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03573.html
-Patchwork: https://patchwork.ozlabs.org/patch/517392/
-X-Gentoo-Bug: 563162
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
-diff --git a/target-mips/cpu.c b/target-mips/cpu.c
-index 4027d0f..144eea9 100644
---- a/target-mips/cpu.c
-+++ b/target-mips/cpu.c
-@@ -58,7 +58,9 @@ static bool mips_cpu_has_work(CPUState *cs)
-        check for interrupts that can be taken. */
-     if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
-         cpu_mips_hw_interrupts_pending(env)) {
--        has_work = true;
-+        if (cpu_mips_hw_interrupts_enabled(env)) {
-+            has_work = true;
-+        }
-     }
- 
-     /* MIPS-MT has the ability to halt the CPU.  */
-diff --git a/target-mips/cpu.h b/target-mips/cpu.h
-index c91883d..210370e 100644
---- a/target-mips/cpu.h
-+++ b/target-mips/cpu.h
-@@ -639,23 +639,24 @@ static inline int cpu_mmu_index (CPUMIPSState *env)
-     return env->hflags & MIPS_HFLAG_KSU;
- }
- 
--static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
-+static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env)
- {
--    int32_t pending;
--    int32_t status;
--    int r;
--
--    if (!(env->CP0_Status & (1 << CP0St_IE)) ||
--        (env->CP0_Status & (1 << CP0St_EXL)) ||
--        (env->CP0_Status & (1 << CP0St_ERL)) ||
-+    return (env->CP0_Status & (1 << CP0St_IE)) &&
-+        !(env->CP0_Status & (1 << CP0St_EXL)) &&
-+        !(env->CP0_Status & (1 << CP0St_ERL)) &&
-+        !(env->hflags & MIPS_HFLAG_DM) &&
-         /* Note that the TCStatus IXMT field is initialized to zero,
-            and only MT capable cores can set it to one. So we don't
-            need to check for MT capabilities here.  */
--        (env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT)) ||
--        (env->hflags & MIPS_HFLAG_DM)) {
--        /* Interrupts are disabled */
--        return 0;
--    }
-+        !(env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT));
-+}
-+
-+/* Check if there is pending and not masked out interrupt */
-+static inline bool cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
-+{
-+    int32_t pending;
-+    int32_t status;
-+    bool r;
- 
-     pending = env->CP0_Cause & CP0Ca_IP_mask;
-     status = env->CP0_Status & CP0Ca_IP_mask;
-@@ -669,7 +670,7 @@ static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
-         /* A MIPS configured with compatibility or VInt (Vectored Interrupts)
-            treats the pending lines as individual interrupt lines, the status
-            lines are individual masks.  */
--        r = pending & status;
-+        r = (pending & status) != 0;
-     }
-     return r;
- }
-diff --git a/target-mips/helper.c b/target-mips/helper.c
-index 01c4461..2d86323 100644
---- a/target-mips/helper.c
-+++ b/target-mips/helper.c
-@@ -759,7 +759,8 @@ bool mips_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
-         MIPSCPU *cpu = MIPS_CPU(cs);
-         CPUMIPSState *env = &cpu->env;
- 
--        if (cpu_mips_hw_interrupts_pending(env)) {
-+        if (cpu_mips_hw_interrupts_enabled(env) &&
-+            cpu_mips_hw_interrupts_pending(env)) {
-             /* Raise it */
-             cs->exception_index = EXCP_EXT_INTERRUPT;
-             env->error_code = 0;
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-wake-up-on-irq.patch b/app-emulation/qemu/files/qemu-2.4-mips-wake-up-on-irq.patch
deleted file mode 100644
index 559a4afdb0d8..000000000000
--- a/app-emulation/qemu/files/qemu-2.4-mips-wake-up-on-irq.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Pending upstream inclusion
-
-Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03572.html
-Patchwork: https://patchwork.ozlabs.org/patch/517391/
-X-Gentoo-Bug: 563162
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-diff --git a/target-mips/cpu.c b/target-mips/cpu.c
-index 144eea9..cbeca04 100644
---- a/target-mips/cpu.c
-+++ b/target-mips/cpu.c
-@@ -53,12 +53,13 @@ static bool mips_cpu_has_work(CPUState *cs)
-     CPUMIPSState *env = &cpu->env;
-     bool has_work = false;
- 
--    /* It is implementation dependent if non-enabled interrupts
--       wake-up the CPU, however most of the implementations only
-+    /* Prior to MIPS Release 6 it is implementation dependent if non-enabled
-+       interrupts wake-up the CPU, however most of the implementations only
-        check for interrupts that can be taken. */
-     if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
-         cpu_mips_hw_interrupts_pending(env)) {
--        if (cpu_mips_hw_interrupts_enabled(env)) {
-+        if (cpu_mips_hw_interrupts_enabled(env) ||
-+            (env->insn_flags & ISA_MIPS32R6)) {
-             has_work = true;
-         }
-     }
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7504.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7504.patch
deleted file mode 100644
index e86e0c639893..000000000000
--- a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7504.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 837f21aacf5a714c23ddaadbbc5212f9b661e3f7 Mon Sep 17 00:00:00 2001
-From: Prasad J Pandit <pjp@fedoraproject.org>
-Date: Fri, 20 Nov 2015 11:50:31 +0530
-Subject: [PATCH] net: pcnet: add check to validate receive data
- size(CVE-2015-7504)
-
-In loopback mode, pcnet_receive routine appends CRC code to the
-receive buffer. If the data size given is same as the buffer size,
-the appended CRC code overwrites 4 bytes after s->buffer. Added a
-check to avoid that.
-
-Reported by: Qinghao Tang <luodalongde@gmail.com>
-Cc: qemu-stable@nongnu.org
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- hw/net/pcnet.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
-index 0eb3cc4..309c40b 100644
---- a/hw/net/pcnet.c
-+++ b/hw/net/pcnet.c
-@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
-                 uint32_t fcs = ~0;
-                 uint8_t *p = src;
- 
--                while (p != &src[size-4])
-+                while (p != &src[size])
-                     CRC(fcs, *p++);
-                 crc_err = (*(uint32_t *)p != htonl(fcs));
-             }
-@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s)
-         bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT);
- 
-         /* if multi-tmd packet outsizes s->buffer then skip it silently.
--           Note: this is not what real hw does */
--        if (s->xmit_pos + bcnt > sizeof(s->buffer)) {
-+         * Note: this is not what real hw does.
-+         * Last four bytes of s->buffer are used to store CRC FCS code.
-+         */
-+        if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) {
-             s->xmit_pos = -1;
-             goto txdone;
-         }
--- 
-2.6.2
-
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7512.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7512.patch
deleted file mode 100644
index 4fee9ef5da9d..000000000000
--- a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7512.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8b98a2f07175d46c3f7217639bd5e03f2ec56343 Mon Sep 17 00:00:00 2001
-From: Jason Wang <jasowang@redhat.com>
-Date: Mon, 30 Nov 2015 15:00:06 +0800
-Subject: [PATCH] pcnet: fix rx buffer overflow(CVE-2015-7512)
-
-Backends could provide a packet whose length is greater than buffer
-size. Check for this and truncate the packet to avoid rx buffer
-overflow in this case.
-
-Cc: Prasad J Pandit <pjp@fedoraproject.org>
-Cc: qemu-stable@nongnu.org
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- hw/net/pcnet.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
-index 309c40b..1f4a3db 100644
---- a/hw/net/pcnet.c
-+++ b/hw/net/pcnet.c
-@@ -1064,6 +1064,12 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
-             int pktcount = 0;
- 
-             if (!s->looptest) {
-+                if (size > 4092) {
-+#ifdef PCNET_DEBUG_RMD
-+                    fprintf(stderr, "pcnet: truncates rx packet.\n");
-+#endif
-+                    size = 4092;
-+                }
-                 memcpy(src, buf, size);
-                 /* no need to compute the CRC */
-                 src[size] = 0;
--- 
-2.6.2
-
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7549.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7549.patch
deleted file mode 100644
index 897fe347c857..000000000000
--- a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7549.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/568214
-
-From 43b11a91dd861a946b231b89b7542856ade23d1b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
-Date: Fri, 26 Jun 2015 14:25:29 +0200
-Subject: [PATCH] msix: implement pba write (but read-only)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-qpci_msix_pending() writes on pba region, causing qemu to SEGV:
-
-  Program received signal SIGSEGV, Segmentation fault.
-  [Switching to Thread 0x7ffff7fba8c0 (LWP 25882)]
-  0x0000000000000000 in ?? ()
-  (gdb) bt
-  #0  0x0000000000000000 in  ()
-  #1  0x00005555556556c5 in memory_region_oldmmio_write_accessor (mr=0x5555579f3f80, addr=0, value=0x7fffffffbf68, size=4, shift=0, mask=4294967295, attrs=...) at /home/elmarco/src/qemu/memory.c:434
-  #2  0x00005555556558e1 in access_with_adjusted_size (addr=0, value=0x7fffffffbf68, size=4, access_size_min=1, access_size_max=4, access=0x55555565563e <memory_region_oldmmio_write_accessor>, mr=0x5555579f3f80, attrs=...) at /home/elmarco/src/qemu/memory.c:506
-  #3  0x00005555556581eb in memory_region_dispatch_write (mr=0x5555579f3f80, addr=0, data=0, size=4, attrs=...) at /home/elmarco/src/qemu/memory.c:1176
-  #4  0x000055555560b6f9 in address_space_rw (as=0x555555eff4e0 <address_space_memory>, addr=3759147008, attrs=..., buf=0x7fffffffc1b0 "", len=4, is_write=true) at /home/elmarco/src/qemu/exec.c:2439
-  #5  0x000055555560baa2 in cpu_physical_memory_rw (addr=3759147008, buf=0x7fffffffc1b0 "", len=4, is_write=1) at /home/elmarco/src/qemu/exec.c:2534
-  #6  0x000055555564c005 in cpu_physical_memory_write (addr=3759147008, buf=0x7fffffffc1b0, len=4) at /home/elmarco/src/qemu/include/exec/cpu-common.h:80
-  #7  0x000055555564cd9c in qtest_process_command (chr=0x55555642b890, words=0x5555578de4b0) at /home/elmarco/src/qemu/qtest.c:378
-  #8  0x000055555564db77 in qtest_process_inbuf (chr=0x55555642b890, inbuf=0x55555641b340) at /home/elmarco/src/qemu/qtest.c:569
-  #9  0x000055555564dc07 in qtest_read (opaque=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", size=22) at /home/elmarco/src/qemu/qtest.c:581
-  #10 0x000055555574ce3e in qemu_chr_be_write (s=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", len=22) at qemu-char.c:306
-  #11 0x0000555555751263 in tcp_chr_read (chan=0x55555642bcf0, cond=G_IO_IN, opaque=0x55555642b890) at qemu-char.c:2876
-  #12 0x00007ffff64c9a8a in g_main_context_dispatch (context=0x55555641c400) at gmain.c:3122
-
-(without this patch, this can be reproduced with the ivshmem qtest)
-
-Implement an empty mmio write to avoid the crash.
-
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
----
- hw/pci/msix.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/hw/pci/msix.c b/hw/pci/msix.c
-index 2fdada4..64c93d8 100644
---- a/hw/pci/msix.c
-+++ b/hw/pci/msix.c
-@@ -200,8 +200,14 @@ static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr,
-     return pci_get_long(dev->msix_pba + addr);
- }
- 
-+static void msix_pba_mmio_write(void *opaque, hwaddr addr,
-+                                uint64_t val, unsigned size)
-+{
-+}
-+
- static const MemoryRegionOps msix_pba_mmio_ops = {
-     .read = msix_pba_mmio_read,
-+    .write = msix_pba_mmio_write,
-     .endianness = DEVICE_LITTLE_ENDIAN,
-     .valid = {
-         .min_access_size = 4,
--- 
-2.6.2
-
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8345.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8345.patch
deleted file mode 100644
index f01d9ac3418b..000000000000
--- a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8345.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/566792
-
-From 00837731d254908a841d69298a4f9f077babaf24 Mon Sep 17 00:00:00 2001
-From: Stefan Weil <sw@weilnetz.de>
-Date: Fri, 20 Nov 2015 08:42:33 +0100
-Subject: [PATCH] eepro100: Prevent two endless loops
-
-http://lists.nongnu.org/archive/html/qemu-devel/2015-11/msg04592.html
-shows an example how an endless loop in function action_command can
-be achieved.
-
-During my code review, I noticed a 2nd case which can result in an
-endless loop.
-
-Reported-by: Qinghao Tang <luodalongde@gmail.com>
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- hw/net/eepro100.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
-index 60333b7..685a478 100644
---- a/hw/net/eepro100.c
-+++ b/hw/net/eepro100.c
-@@ -774,6 +774,11 @@ static void tx_command(EEPRO100State *s)
- #if 0
-         uint16_t tx_buffer_el = lduw_le_pci_dma(&s->dev, tbd_address + 6);
- #endif
-+        if (tx_buffer_size == 0) {
-+            /* Prevent an endless loop. */
-+            logout("loop in %s:%u\n", __FILE__, __LINE__);
-+            break;
-+        }
-         tbd_address += 8;
-         TRACE(RXTX, logout
-             ("TBD (simplified mode): buffer address 0x%08x, size 0x%04x\n",
-@@ -855,6 +860,10 @@ static void set_multicast_list(EEPRO100State *s)
- 
- static void action_command(EEPRO100State *s)
- {
-+    /* The loop below won't stop if it gets special handcrafted data.
-+       Therefore we limit the number of iterations. */
-+    unsigned max_loop_count = 16;
-+
-     for (;;) {
-         bool bit_el;
-         bool bit_s;
-@@ -870,6 +879,13 @@ static void action_command(EEPRO100State *s)
- #if 0
-         bool bit_sf = ((s->tx.command & COMMAND_SF) != 0);
- #endif
-+
-+        if (max_loop_count-- == 0) {
-+            /* Prevent an endless loop. */
-+            logout("loop in %s:%u\n", __FILE__, __LINE__);
-+            break;
-+        }
-+
-         s->cu_offset = s->tx.link;
-         TRACE(OTHER,
-               logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
--- 
-2.6.2
-
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8504.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8504.patch
deleted file mode 100644
index 7b0102a3bc86..000000000000
--- a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8504.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/567828
-
-From 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3 Mon Sep 17 00:00:00 2001
-From: Prasad J Pandit <pjp@fedoraproject.org>
-Date: Thu, 3 Dec 2015 18:54:17 +0530
-Subject: [PATCH] ui: vnc: avoid floating point exception
-
-While sending 'SetPixelFormat' messages to a VNC server,
-the client could set the 'red-max', 'green-max' and 'blue-max'
-values to be zero. This leads to a floating point exception in
-write_png_palette while doing frame buffer updates.
-
-Reported-by: Lian Yihan <lianyihan@360.cn>
-Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
-Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- ui/vnc.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ui/vnc.c b/ui/vnc.c
-index 7538405..cbe4d33 100644
---- a/ui/vnc.c
-+++ b/ui/vnc.c
-@@ -2198,15 +2198,15 @@ static void set_pixel_format(VncState *vs,
-         return;
-     }
- 
--    vs->client_pf.rmax = red_max;
-+    vs->client_pf.rmax = red_max ? red_max : 0xFF;
-     vs->client_pf.rbits = hweight_long(red_max);
-     vs->client_pf.rshift = red_shift;
-     vs->client_pf.rmask = red_max << red_shift;
--    vs->client_pf.gmax = green_max;
-+    vs->client_pf.gmax = green_max ? green_max : 0xFF;
-     vs->client_pf.gbits = hweight_long(green_max);
-     vs->client_pf.gshift = green_shift;
-     vs->client_pf.gmask = green_max << green_shift;
--    vs->client_pf.bmax = blue_max;
-+    vs->client_pf.bmax = blue_max ? blue_max : 0xFF;
-     vs->client_pf.bbits = hweight_long(blue_max);
-     vs->client_pf.bshift = blue_shift;
-     vs->client_pf.bmask = blue_max << blue_shift;
--- 
-2.6.2
-
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index e093bf85a901..d036967f112f 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -13,6 +13,9 @@
 		<flag name="fdt">Enables firmware device tree support</flag>
 		<flag name="glusterfs">Enables GlusterFS cluster fileystem via
 			<pkg>sys-cluster/glusterfs</pkg></flag>
+		<flag name="gnutls">Enable TLS support for the VNC console server.
+		For 1.4 and newer this also enables WebSocket support.
+		For 2.0 through 2.3 also enables disk quorum support.</flag>
 		<flag name="gtk2">Use gtk-2 instead of gtk-3</flag>
 		<flag name="iscsi">Enable direct iSCSI support via
 		<pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux
@@ -35,9 +38,6 @@
 		<flag name="snappy">Enable support for snappy compression</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="tci">Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
-		<flag name="tls">Enable TLS support for the VNC console server.
-		For 1.4 and newer this also enables WebSocket support.
-		For 2.0 through 2.3 also enables disk quorum support.</flag>
 		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
 		<flag name="png">Enable png image support for the VNC console server</flag>
 		<flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
diff --git a/app-emulation/qemu/qemu-2.4.1-r2.ebuild b/app-emulation/qemu/qemu-2.4.1-r2.ebuild
deleted file mode 100644
index a42f99b19463..000000000000
--- a/app-emulation/qemu/qemu-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,642 +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 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[egl,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
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C 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}"/${PN}-2.4.1-CVE-2015-{7504,7512}.patch #567144
-	epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8345.patch #566792
-	epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8504.patch #567828
-	epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-7549.patch #568214
-	epatch "${FILESDIR}"/${PN}-2.4-mips-* #563162
-	[[ -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
-}
-
-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.5.0.ebuild b/app-emulation/qemu/qemu-2.5.0.ebuild
deleted file mode 100644
index 70f595ea5b5c..000000000000
--- a/app-emulation/qemu/qemu-2.5.0.ebuild
+++ /dev/null
@@ -1,651 +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 \
-gnutls 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 usb usbredir +uuid vde +vhost-net \
-virgl 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 tilegx"
-
-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.
-#
-# Older versions of gnutls are supported, but it's simpler to just require
-# the latest versions.  This is also why we require nettle.
-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(+)] )
-	gnutls? (
-		dev-libs/nettle[static-libs(+)]
-		>=net-libs/gnutls-3.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[egl,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? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	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(+)] )
-	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(+)] )
-	virgl? ( media-libs/virglrenderer[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
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C 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-2.5.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
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--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 gnutls)
-		$(conf_softmmu gnutls nettle)
-		$(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)
-		$(conf_softmmu snappy)
-		$(conf_softmmu spice)
-		$(conf_softmmu ssh libssh2)
-		$(conf_softmmu usb libusb)
-		$(conf_softmmu usbredir usb-redir)
-		$(conf_softmmu uuid)
-		$(conf_softmmu vde)
-		$(conf_softmmu vhost-net)
-		$(conf_softmmu virgl virglrenderer)
-		$(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/" || die
-
-	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
-}
-
-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/rkt/Manifest b/app-emulation/rkt/Manifest
index d74b026c6ca6..3da236a5088f 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,2 +1,4 @@
 DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
+DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5
 DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
+DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 790b77b4fb60..33d47776dd7f 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mail@stefanjunker.de</email>
-		<name>Stefan Junker</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
 	</maintainer>
 	<longdescription lang="en">
 		rkt is a new container runtime, designed for composability, security,
@@ -18,6 +14,7 @@
 	<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_fly">Build stage1-fly.aci</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>
diff --git a/app-emulation/rkt/rkt-1.0.0.ebuild b/app-emulation/rkt/rkt-1.0.0.ebuild
new file mode 100644
index 000000000000..858b0c342316
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.0.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 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="794.1.0"
+PXE_SYSTEMD_VERSION="v222"
+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_fly +actool"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly )"
+
+DEPEND=">=dev-lang/go-1.4.1
+	app-arch/cpio
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny"
+
+RDEPEND="!app-emulation/rocket"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_configure() {
+	local flavors myeconfargs=(
+		--with-stage1-default-images-directory="/usr/share/rkt"
+		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+	)
+
+	# TODO:
+	#  - fix rkt_stage1_kvm to not download kernel sources with wget
+	#  - fix rkt_stage1_src to not download systemd sources with git clone
+	#  - fix rkt_stage1_host to not fail during launch
+
+	# enable flavors (first is default)
+	use rkt_stage1_coreos && flavors+=",coreos"
+	use rkt_stage1_fly && flavors+=",fly"
+	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+	if use rkt_stage1_coreos; then
+		myeconfargs+=(
+			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+		)
+	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/"*.aci
+
+	# create symlink for default stage1 image path
+	if use rkt_stage1_coreos; then
+		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_fly; then
+		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+	fi
+
+	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/virtualbox-additions/metadata.xml b/app-emulation/virtualbox-additions/metadata.xml
index ff95e9c2ad46..c7be278b6458 100644
--- a/app-emulation/virtualbox-additions/metadata.xml
+++ b/app-emulation/virtualbox-additions/metadata.xml
@@ -5,8 +5,4 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-bin/metadata.xml b/app-emulation/virtualbox-bin/metadata.xml
index 606af8f29e3b..8c28d5495ef9 100644
--- a/app-emulation/virtualbox-bin/metadata.xml
+++ b/app-emulation/virtualbox-bin/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 type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+        <maintainer type="project">
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 <use>
 	<flag name="additions">Install Guest System Tools ISO</flag>
 	<flag name="chm">Install kchmviewer binary to enable online help (in MS CHM format)</flag>
diff --git a/app-emulation/virtualbox-extpack-oracle/metadata.xml b/app-emulation/virtualbox-extpack-oracle/metadata.xml
index ff95e9c2ad46..c7be278b6458 100644
--- a/app-emulation/virtualbox-extpack-oracle/metadata.xml
+++ b/app-emulation/virtualbox-extpack-oracle/metadata.xml
@@ -5,8 +5,4 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml
index 4ed7567d1ee4..c7be278b6458 100644
--- a/app-emulation/virtualbox-guest-additions/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <maintainer type="person">
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index a4aa4afb294a..62fc44fdd899 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -5,10 +5,6 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 <use>
 	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
 </use>
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 2e30fb880106..3dd12a57e6f4 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -5,10 +5,6 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 <use>
 	<flag name="additions">Install Guest System Tools ISO</flag>
 	<flag name="extensions">Install extension module packages</flag>
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 83297a8a6449..f29dd761f7b9 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -5,4 +5,5 @@ DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9
 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
 DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
+DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild
new file mode 100644
index 000000000000..bf577ad81ca7
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND=">=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 4a880d308c6e..98368b39dc75 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,16 +1,19 @@
 DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac
+DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5
 DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
 DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
 DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
 DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
+DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
 DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
+DIST xen-gentoo-patches-6.tar.xz 23864 SHA256 96e774bd03c9df341fdb2f5d6cf231549c8d7a004c3c902c07b5cb690428d4c6 SHA512 7f4966bb7dad02b213a3cbefcc312573039feaec964a2deaa6aa7f8fa488b6e31176834a4e2cf6ac380548f1b8251c7700d16d1cbc7b88fcee440f6cccd7f177 WHIRLPOOL a41cae3441370e0e18fbf28ac7a780adfaa0d6af12dc62f1dfe90f52f01ebbd8055e3b5b399ae11602b29b8a206aafe2cbecb79948233bd072e73294468f3b08
 DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
+DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
 DIST xen-qemu-patches-0.tar.gz 3224 SHA256 ff1ac02a6d91e4abdbe069e1bb75d0b798deff5c2c72d1efb5459c72f4278f00 SHA512 4fd0c663a733436188aca364e927ac430d9bbef9859da65c074d7fd66c330645b05ff1f3e849f4581dfcd7054801d65edcff8445c1c63c2725f11e3903415af0 WHIRLPOOL 5504d7ffbd3c1970026c1f43252d9c76f10c5448ede247719e2698aa8f8e93b20e4cc353da5582b3b6887fb3fd7d1e13765f664ea60daeb6020f052eaca9b9f4
-DIST xen-security-patches-1.tar.gz 7040 SHA256 30733e9ca71bf4291ff212eb191afb22687ccd9b2579767fe0ee013152980c76 SHA512 89c72897f18a86c2060bb76a182e7cca72ad2f33a3aab964ecae66e057aeecafee2e9986204d6feb98f81ccb740460ee2cb37663b1ab79f47adc1dd73e0091bc WHIRLPOOL c27e612b87b4a30abbf59e6be019e2c21a78bfbdf1715da5498d95607d390d616251768d419ac5ce76087bbf7cdfc410dd0088ba48e425082cea971efcb64346
-DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf157c63d62fc1119f17255b2388e03ab SHA512 209dea670467ff1df18428c15b25229c05d676d1a2f646cddb221544ae888241ade48a22be037f97dce249ac322c1f30bb477675e5e2cc04a2fbd839e02f1f57 WHIRLPOOL ae66a2fbc0d0f0a555d407ebd3198fa58ee043515fb9821d7b9eda46d088bc87b3de16fe015fd1142294429dd2c1c7826e414a55980e27123185c1a86fb0a8a6
-DIST xen-security-patches-3.tar.gz 7349 SHA256 a1876b918c0a608618f349deed11b547a65c5909c31d72a89340d4908c572f46 SHA512 f5e8e7ab5d9be6aa036e52627931f1b2648de642664b2922f9cab64f44d19ac8682f5beb7fdbcb842ee19346202093fade3f10e39ba60fcb12a101deb4408818 WHIRLPOOL 14ee65babe4edd901914c8b8ddb5d7b54e6738d77642514fe611bf84541ae0a932bcb48f86179d5e7a6741135b9c7b129e8244cc22922c4e592604a696b6082f
 DIST xen-security-patches-5.tar.gz 8716 SHA256 afd114f2cb1b623ac1709d75c771006f91b5b2a0a0695f4da3d6aa6f6b340d9f SHA512 f2276759cb418e252052701f5e41e626e1d232098bd7e393e7e58286d356ef33f249c2f9d7b5b1219279de7c4c66832f0d4f761d36bc51e7c10cea973dd9882e WHIRLPOOL 18cb29a0fde10f1bac698c577713db1307c02408778b5d128a4f017ae8be6fba893feb9b8f09fe2d8164dc761d136190d1dbee8a3eb4caa35d8bf976a498d405
 DIST xen-security-patches-6.tar.gz 8308 SHA256 b0dc1df6b27073a83b12a17a04a01e74af8c19a1c96d9dda580bb738eaab25f3 SHA512 b9155eef3f18e47288a6a6bb570a073d4c84449fe11fbac4c35cceaa4f7c06624597f63a8768bddd735c345b8c430aeee18b71f43e9b188de3cfa0cbf608dc0a WHIRLPOOL 9933ed07a2419170070a9eedfda200ec5ebef67b6b98c1b435793008c126347cdc8c0ef9ff2cb4fe0b7333ff51211545a3fe2ff726ca7c22d46f231d6d1e82aa
 DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
+DIST xen-security-patches-8.tar.gz 9416 SHA256 3c0e6e8428f1890c8dda72ac94244fa3d6611b3612ef59ffed29b59481806a12 SHA512 f5ee325a8b25079ea256cb5a2e039e6738dee999be6d9d91ade875663c36f72a086bcb0bd1bb243483afb921da401c5d7453fea7405323fdaf8cf6e06a221049 WHIRLPOOL c30f14bb8a1a3ad22a962d4050027fa89a373f742c3eb7a161e1490beb186c6221f24247cd84b07e7f266c38aae6ef386f2e4db29a4b43cceaaaa54b644bb4f1
+DIST xen-security-patches-9.tar.gz 9793 SHA256 2167d7bc2a631cf13d5b49c9577dbc8d128517e8ecbf90ef85c38f52ab3187aa SHA512 42f4997f35cc06333584a9a3c65366493094b60a6c67928b6165f3fb7d35d3a8f9dc0c3eadd4522de0d99bcc8511afba1d5e543396399b37983eb547abedca44 WHIRLPOOL 8abb68b4ac10fbc2b590c8a29cd2474d5392d3958542dad7f21ba4ad51c7541bb1686ed2629323e214c3e72b0de7212f25a4681f653d4179404c9f4c53e3d83a
 DIST xen-upstream-patches-0.tar.gz 2297 SHA256 bf21272ad029391d30bf31896efcadc75267538f6c7de5d239453f19659d58ee SHA512 3f5d60aaebd181bddab4dd02e0064de2f75672f44a687a7331fa40e81d56763fea84504081a449d11403b21ad0ba2dac075f0b1796809ef8d16e244f6be99e3d WHIRLPOOL 4ebe79c8f2ea1c45e88e59941e477ed5639dbca3fe95c9a67e07afb0f4b6fb8b7fea8e58422d7c8f906299e4f37c14b4db15200997e5a92b647df98fa93e10c7
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 942f157e6d5d..44e5472fa0a8 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -80,6 +80,8 @@ _gx033=" xen-tools-4.4.2-gcc99.patch"
 _gx034=" xen-tools-4.5.0-gcc99.patch"
 
 _gx035=" xen-tools-4.2-pod-docs-r1.patch"
+# disable stackcheck for hardened system, bug 569810
+_gx036=" xen-tools-4.6-no-stackcheck.patch"
 # xen-tools-4.2.5 patches set
 _gpv_xen_tools_425_0="
 ${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx005}
@@ -115,3 +117,10 @@ ${_gx022} ${_gx017} ${_gx031}
 ${_gx027} ${_gx032}
 ${_gx028} ${_gx029}
 "
+# xen-tools-4.6.1 patches set
+_gpv_xen_tools_461_0="
+${_gx008} ${_gx021}
+${_gx022} ${_gx017} ${_gx031}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029} ${_gx036}
+"
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 9b082eb179f6..5009c6f323e3 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="flask">Enable the Flask XSM module from NSA</flag>
 		<flag name="hvm">Enable support for hardware based virtualization (VT-x,AMD-v)</flag>
 		<flag name="qemu">Enable IOEMU support via the use of qemu-dm</flag>
+		<flag name="qemu-traditional">Build the old qemu traditional device model (useful only if you cannot change to the new device model e.g. Windows VMs)</flag>
 		<flag name="pygrub">Install the pygrub boot loader</flag>
 		<flag name="screen">Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
 		<flag name="system-qemu">Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag>
diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild
deleted file mode 100644
index ba2f756b35dd..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild
+++ /dev/null
@@ -1,472 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV=${PV/_/-}
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=
-	SECURITY_VER=7
-	SEC_VER=1
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=4
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=1
-
-	SEABIOS_VER=1.7.5
-	OVMF_PV=20150629
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}
-	https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-${SEC_VER}.tar.gz"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
-
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	qemu? ( !system-qemu )"
-
-COMMON_DEPEND="
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	pygrub? ( $(python_gen_impl_dep ncurses) )
-	ovmf? ( $(python_gen_impl_dep sqlite) )
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-doc/doxygen
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patcheset"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		source "${WORKDIR}"/patches-security/${PV}.conf
-		# apply main xen patches
-		# In contrast to xen-4.5.2-r2.ebuild, these are moved into the dir structure
-		# prepared and deposited by dlan in his devspace
-		mv "${WORKDIR}"/{xsa156-4.5.patch,xsa15[8-9].patch,xsa160-4.6.patch} \
-			"${WORKDIR}"/patches-security/xen || die
-		XEN_SECURITY_MAIN="${XEN_SECURITY_MAIN} xsa156-4.5.patch xsa15[8-9].patch xsa160-4.6.patch"
-		for i in ${XEN_SECURITY_MAIN}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-traditional patches
-		mv "${WORKDIR}"/xsa162-qemut.patch \
-			"${WORKDIR}"/patches-security/qemut/ || die
-		XEN_SECURITY_QEMUT="xsa162-qemut.patch"
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-xen/upstream patches
-		mv "${WORKDIR}"/xsa162-qemuu.patch \
-                        "${WORKDIR}"/patches-security/qemuu/ || die
-		XEN_SECURITY_QEMUU="xsa162-qemuu.patch"
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if [[ -n ${OVMF_VER} ]] && use ovmf; then
-		einfo "Try to apply Ovmf patch set"
-		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-ovmf
-		popd > /dev/null
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# use /var instead of /var/lib, consistat with previous ebuild
-	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-		m4/paths.m4 configure tools/configure || die
-	# use /run instead of /var/run
-	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-		m4/paths.m4 configure tools/configure || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_with system-qemu) \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		"
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use qemu || myconf+=" --with-system-qemu"
-	use amd64 && myconf+=" --enable-qemu-traditional"
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
deleted file mode 100644
index acef34ad2cac..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
+++ /dev/null
@@ -1,473 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV=${PV/_/-}
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=
-	SECURITY_VER=7
-	# vars set to reflect https://dev.gentoo.org/~idella4/
-	SEC_VER=2
-	QEMU_VER=0
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=4
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=1
-
-	SEABIOS_VER=1.7.5
-	OVMF_PV=20150629
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
-
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	qemu? ( !system-qemu )"
-
-COMMON_DEPEND="
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	pygrub? ( $(python_gen_impl_dep ncurses) )
-	ovmf? ( $(python_gen_impl_dep sqlite) )
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-doc/doxygen
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patcheset"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		source "${WORKDIR}"/patches-security/${PV}.conf
-		# apply main xen patches
-		# Two parallel systems, both work
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-			epatch $i
-		done
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			 epatch "${WORKDIR}"/patches-security/qemut/$i
-		done
-		for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-			epatch $i
-		done
-		popd > /dev/null
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			epatch "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-			epatch $i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if [[ -n ${OVMF_VER} ]] && use ovmf; then
-		einfo "Try to apply Ovmf patch set"
-		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-ovmf
-		popd > /dev/null
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# use /var instead of /var/lib, consistat with previous ebuild
-	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-		m4/paths.m4 configure tools/configure || die
-	# use /run instead of /var/run
-	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-		m4/paths.m4 configure tools/configure || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_with system-qemu) \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		"
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use qemu || myconf+=" --with-system-qemu"
-	use amd64 && myconf+=" --enable-qemu-traditional"
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
index d2be7c5d90cd..94994ca49c49 100644
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
@@ -233,14 +233,16 @@ src_prepare() {
 	fi
 
 	# Ovmf's patchset
-	if [[ -n ${OVMF_VER} ]] && use ovmf; then
-		einfo "Try to apply Ovmf patch set"
-		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-ovmf
-		popd > /dev/null
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
 		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
 	fi
 
diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r5.ebuild
new file mode 100644
index 000000000000..650d23dc5db7
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r5.ebuild
@@ -0,0 +1,475 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=7
+	# vars set to reflect https://dev.gentoo.org/~idella4/
+	SEC_VER=8
+	QEMU_VER=0
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=1
+
+	SEABIOS_VER=1.7.5
+	OVMF_PV=20150629
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( $(python_gen_impl_dep ncurses) )
+	ovmf? ( $(python_gen_impl_dep sqlite) )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		# Two parallel systems, both work
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			 epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" --enable-qemu-traditional"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild
deleted file mode 100644
index e9f84c002c6d..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild
+++ /dev/null
@@ -1,463 +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,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=7
-	SEC_VER=1
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=4
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=1
-
-	SEABIOS_VER=1.8.2
-	OVMF_PV=20150629
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}
-	https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-${SEC_VER}.tar.gz"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	qemu? ( !system-qemu )"
-
-COMMON_DEPEND="
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? ( $(python_gen_impl_dep sqlite) )
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-doc/doxygen
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? (
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patch set"
-		source "${WORKDIR}"/patches-security/${PV}.conf
-		# apply main xen patches
-		# In contrast to xen-4.5.2-r2.ebuild, these are moved into the dir structure
-		# prepared and deposited by dlan in his devspace
-		mv "${WORKDIR}"/{xsa15[6-9].patch,xsa160-4.6.patch} \
-			"${WORKDIR}"/patches-security/xen || die
-		XEN_SECURITY_MAIN="${XEN_SECURITY_MAIN} xsa15[6-9].patch xsa160-4.6.patch"
-		for i in ${XEN_SECURITY_MAIN}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-traditional patches
-		mv "${WORKDIR}"/xsa162-qemut.patch \
-			"${WORKDIR}"/patches-security/qemut/ || die
-		XEN_SECURITY_QEMUT="xsa162-qemut.patch"
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-xen/upstream patches
-		mv "${WORKDIR}"/xsa162-qemuu.patch \
-			"${WORKDIR}"/patches-security/qemuu/ || die
-		XEN_SECURITY_QEMUU="xsa162-qemuu.patch"
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if [[ -n ${OVMF_VER} ]] && use ovmf; then
-		einfo "Try to apply Ovmf patch set"
-		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-ovmf
-		popd > /dev/null
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# use /var instead of /var/lib, consistat with previous ebuild
-	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-		m4/paths.m4 configure tools/configure || die
-	# use /run instead of /var/run
-	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-		m4/paths.m4 configure tools/configure || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_with system-qemu) \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use qemu || myconf+=" --with-system-qemu"
-	use amd64 && myconf+=" --enable-qemu-traditional"
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
deleted file mode 100644
index 3481cb69607d..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2016 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,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=7
-	# vars set to reflect https://dev.gentoo.org/~idella4/
-	SEC_VER=3
-	QEMU_VER=0
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=4
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=1
-
-	SEABIOS_VER=1.8.2
-	OVMF_PV=20150629
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	qemu? ( !system-qemu )"
-
-COMMON_DEPEND="
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? ( $(python_gen_impl_dep sqlite) )
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-doc/doxygen
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? (
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patch set"
-		source "${WORKDIR}"/patches-security/${PV}.conf
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-			epatch $i
-		done
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			epatch "${WORKDIR}"/patches-security/qemut/$i
-		done
-		for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-			epatch $i
-		done
-		popd > /dev/null
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			epatch "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-			epatch $i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if [[ -n ${OVMF_VER} ]] && use ovmf; then
-		einfo "Try to apply Ovmf patch set"
-		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-ovmf
-		popd > /dev/null
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# use /var instead of /var/lib, consistat with previous ebuild
-	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-		m4/paths.m4 configure tools/configure || die
-	# use /run instead of /var/run
-	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-		m4/paths.m4 configure tools/configure || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_with system-qemu) \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use qemu || myconf+=" --with-system-qemu"
-	use amd64 && myconf+=" --enable-qemu-traditional"
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r6.ebuild
deleted file mode 100644
index b0c8b5fc8268..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r6.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2016 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,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=7
-	# vars set to reflect https://dev.gentoo.org/~idella4/
-	# first instance of UPS_VER (usptream ver)
-	UPS_VER=0
-	SEC_VER=3
-	QEMU_VER=0
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=4
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=1
-
-	SEABIOS_VER=1.8.2
-	OVMF_PV=20150629
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	qemu? ( !system-qemu )"
-
-COMMON_DEPEND="
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? ( $(python_gen_impl_dep sqlite) )
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-doc/doxygen
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? (
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream \
-				"${WORKDIR}"/libexec.patch
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patch set"
-		source "${WORKDIR}"/patches-security/${PV}.conf
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-			epatch $i
-		done
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			epatch "${WORKDIR}"/patches-security/qemut/$i
-		done
-		for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-			epatch $i
-		done
-		popd > /dev/null
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			epatch "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-			epatch $i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if [[ -n ${OVMF_VER} ]] && use ovmf; then
-		einfo "Try to apply Ovmf patch set"
-		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-ovmf
-		popd > /dev/null
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# use /var instead of /var/lib, consistat with previous ebuild
-	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-		m4/paths.m4 configure tools/configure || die
-	# use /run instead of /var/run
-	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-		m4/paths.m4 configure tools/configure || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_with system-qemu) \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use qemu || myconf+=" --with-system-qemu"
-	use amd64 && myconf+=" --enable-qemu-traditional"
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r8.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r8.ebuild
new file mode 100644
index 000000000000..17c69f75ff91
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r8.ebuild
@@ -0,0 +1,469 @@
+# Copyright 1999-2016 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,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=7
+	# vars set to reflect https://dev.gentoo.org/~idella4/
+	# first instance of UPS_VER (usptream ver)
+	UPS_VER=0
+	SEC_VER=5
+	QEMU_VER=0
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=1
+
+	SEABIOS_VER=1.8.2
+	OVMF_PV=20150629
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? ( $(python_gen_impl_dep sqlite) )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream \
+				"${WORKDIR}"/libexec.patch
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patch set"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patch set"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r9.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r9.ebuild
new file mode 100644
index 000000000000..2d03445f4799
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r9.ebuild
@@ -0,0 +1,469 @@
+# Copyright 1999-2016 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,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=7
+	# vars set to reflect https://dev.gentoo.org/~idella4/
+	# first instance of UPS_VER (usptream ver)
+	UPS_VER=0
+	SEC_VER=9
+	QEMU_VER=0
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=1
+
+	SEABIOS_VER=1.8.2
+	OVMF_PV=20150629
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam +qemu-traditional python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? ( $(python_gen_impl_dep sqlite) )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream \
+				"${WORKDIR}"/libexec.patch
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patch set"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patch set"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
new file mode 100644
index 000000000000..c84766cebc9e
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
@@ -0,0 +1,472 @@
+# Copyright 1999-2016 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,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	# vars set to reflect https://dev.gentoo.org/~idella4/
+	# first instance of UPS_VER (usptream ver)
+	UPS_VER=
+	SEC_VER=
+	QEMU_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=6
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.8.2
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? ( $(python_gen_impl_dep sqlite) )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream \
+				"${WORKDIR}"/libexec.patch
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patch set"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
+			epatch $i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 09a51fbac205..645c1026d4db 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,10 @@
 DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
 DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
+DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
 DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
-DIST xen-security-patches-1.tar.gz 7040 SHA256 30733e9ca71bf4291ff212eb191afb22687ccd9b2579767fe0ee013152980c76 SHA512 89c72897f18a86c2060bb76a182e7cca72ad2f33a3aab964ecae66e057aeecafee2e9986204d6feb98f81ccb740460ee2cb37663b1ab79f47adc1dd73e0091bc WHIRLPOOL c27e612b87b4a30abbf59e6be019e2c21a78bfbdf1715da5498d95607d390d616251768d419ac5ce76087bbf7cdfc410dd0088ba48e425082cea971efcb64346
-DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf157c63d62fc1119f17255b2388e03ab SHA512 209dea670467ff1df18428c15b25229c05d676d1a2f646cddb221544ae888241ade48a22be037f97dce249ac322c1f30bb477675e5e2cc04a2fbd839e02f1f57 WHIRLPOOL ae66a2fbc0d0f0a555d407ebd3198fa58ee043515fb9821d7b9eda46d088bc87b3de16fe015fd1142294429dd2c1c7826e414a55980e27123185c1a86fb0a8a6
-DIST xen-security-patches-4.tar.gz 7731 SHA256 b51c6616a303b4d5123fed1e58240163c8e0cf8e0de32db58c11a40a48124d52 SHA512 cef89bb68bdb4a5f947d6be8ae7a799276fd187e396c5ba85f8aa2b0b5349ba606d3742d5b8d8212df6da38f8af9711416d9a25176e713240a0a7f2194d84fc5 WHIRLPOOL 912dc869fa4eb355a86023133adcb818e87f4979d537a885b3f1c6e35ff141b7d7a33e81105dcddf34aafa4c306df79a210346f5037337173923e1dc8280ac47
 DIST xen-security-patches-5.tar.gz 8716 SHA256 afd114f2cb1b623ac1709d75c771006f91b5b2a0a0695f4da3d6aa6f6b340d9f SHA512 f2276759cb418e252052701f5e41e626e1d232098bd7e393e7e58286d356ef33f249c2f9d7b5b1219279de7c4c66832f0d4f761d36bc51e7c10cea973dd9882e WHIRLPOOL 18cb29a0fde10f1bac698c577713db1307c02408778b5d128a4f017ae8be6fba893feb9b8f09fe2d8164dc761d136190d1dbee8a3eb4caa35d8bf976a498d405
 DIST xen-security-patches-6.tar.gz 8308 SHA256 b0dc1df6b27073a83b12a17a04a01e74af8c19a1c96d9dda580bb738eaab25f3 SHA512 b9155eef3f18e47288a6a6bb570a073d4c84449fe11fbac4c35cceaa4f7c06624597f63a8768bddd735c345b8c430aeee18b71f43e9b188de3cfa0cbf608dc0a WHIRLPOOL 9933ed07a2419170070a9eedfda200ec5ebef67b6b98c1b435793008c126347cdc8c0ef9ff2cb4fe0b7333ff51211545a3fe2ff726ca7c22d46f231d6d1e82aa
+DIST xen-security-patches-8.tar.gz 9416 SHA256 3c0e6e8428f1890c8dda72ac94244fa3d6611b3612ef59ffed29b59481806a12 SHA512 f5ee325a8b25079ea256cb5a2e039e6738dee999be6d9d91ade875663c36f72a086bcb0bd1bb243483afb921da401c5d7453fea7405323fdaf8cf6e06a221049 WHIRLPOOL c30f14bb8a1a3ad22a962d4050027fa89a373f742c3eb7a161e1490beb186c6221f24247cd84b07e7f266c38aae6ef386f2e4db29a4b43cceaaaa54b644bb4f1
+DIST xen-security-patches-9.tar.gz 9793 SHA256 2167d7bc2a631cf13d5b49c9577dbc8d128517e8ecbf90ef85c38f52ab3187aa SHA512 42f4997f35cc06333584a9a3c65366493094b60a6c67928b6165f3fb7d35d3a8f9dc0c3eadd4522de0d99bcc8511afba1d5e543396399b37983eb547abedca44 WHIRLPOOL 8abb68b4ac10fbc2b590c8a29cd2474d5392d3958542dad7f21ba4ad51c7541bb1686ed2629323e214c3e72b0de7212f25a4681f653d4179404c9f4c53e3d83a
 DIST xen-upstream-patches-0.tar.gz 2297 SHA256 bf21272ad029391d30bf31896efcadc75267538f6c7de5d239453f19659d58ee SHA512 3f5d60aaebd181bddab4dd02e0064de2f75672f44a687a7331fa40e81d56763fea84504081a449d11403b21ad0ba2dac075f0b1796809ef8d16e244f6be99e3d WHIRLPOOL 4ebe79c8f2ea1c45e88e59941e477ed5639dbca3fe95c9a67e07afb0f4b6fb8b7fea8e58422d7c8f906299e4f37c14b4db15200997e5a92b647df98fa93e10c7
diff --git a/app-emulation/xen/xen-4.5.2-r2.ebuild b/app-emulation/xen/xen-4.5.2-r2.ebuild
deleted file mode 100644
index d703dcf280c1..000000000000
--- a/app-emulation/xen/xen-4.5.2-r2.ebuild
+++ /dev/null
@@ -1,190 +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 )
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
-	live_eclass="git-2"
-else
-	KEYWORDS="amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=
-	SECURITY_VER=0
-	SEC_VER=1
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}
-		https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-${SEC_VER}.tar.gz"
-
-fi
-
-inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask xsm"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="flask? ( xsm )
-	arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	elif use xsm ; then
-		export "XSM_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		# apply main xen patches
-		# Add patches from tarball in devspace ~idella4 to those from ~dlan
-		mkdir "${WORKDIR}"/patches-security/xen || die
-		mv "${WORKDIR}"/{xsa156-4.5.patch,xsa15[8-9].patch,xsa160-4.6.patch} \
-			"${WORKDIR}"/patches-security/xen || die
-		XEN_SECURITY_MAIN="xsa156-4.5.patch xsa15[8-9].patch xsa160-4.6.patch"
-		for i in ${XEN_SECURITY_MAIN}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		epatch "${FILESDIR}"/${PN}-4.5-efi.patch
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	# remove -Werror for gcc-4.6's sake
-	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
-		xargs sed -i 's/ *-Werror */ /'
-	# not strictly necessary to fix this
-	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
-	epatch_user
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-}
-
-pkg_postinst() {
-	local msg="INSTALL_MASK=/boot/xen-syms"
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.5.2-r3.ebuild b/app-emulation/xen/xen-4.5.2-r3.ebuild
deleted file mode 100644
index d76cc3dbf415..000000000000
--- a/app-emulation/xen/xen-4.5.2-r3.ebuild
+++ /dev/null
@@ -1,192 +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 mount-boot flag-o-matic python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=
-	SECURITY_VER=0
-	# var set to reflect https://dev.gentoo.org/~idella4/
-	SEC_VER=2
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask xsm"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="flask? ( xsm )
-	arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	elif use xsm ; then
-		export "XSM_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-			epatch $i
-		done
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		epatch "${FILESDIR}"/${PN}-4.5-efi.patch
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	# remove -Werror for gcc-4.6's sake
-	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
-		xargs sed -i 's/ *-Werror */ /'
-	# not strictly necessary to fix this
-	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
-	epatch_user
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.5.2-r5.ebuild b/app-emulation/xen/xen-4.5.2-r5.ebuild
new file mode 100644
index 000000000000..7e17547a02eb
--- /dev/null
+++ b/app-emulation/xen/xen-4.5.2-r5.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=0
+	# var set to reflect https://dev.gentoo.org/~idella4/
+	SEC_VER=8
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+	arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.5-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-emulation/xen/xen-4.6.0-r5.ebuild b/app-emulation/xen/xen-4.6.0-r5.ebuild
deleted file mode 100644
index f4d07387fecf..000000000000
--- a/app-emulation/xen/xen-4.6.0-r5.ebuild
+++ /dev/null
@@ -1,190 +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 mount-boot flag-o-matic python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=0
-	# var set to reflect https://dev.gentoo.org/~idella4/
-	SEC_VER=4
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-			epatch $i
-		done
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	# remove -Werror for gcc-4.6's sake
-	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
-		xargs sed -i 's/ *-Werror */ /'
-	# not strictly necessary to fix this
-	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
-	epatch_user
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.6.0-r6.ebuild b/app-emulation/xen/xen-4.6.0-r6.ebuild
deleted file mode 100644
index 557fe40b34f7..000000000000
--- a/app-emulation/xen/xen-4.6.0-r6.ebuild
+++ /dev/null
@@ -1,193 +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 mount-boot flag-o-matic python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=0
-	# var set to reflect https://dev.gentoo.org/~idella4/
-	SEC_VER=4
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-			epatch $i
-		done
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	# remove -Werror for gcc-4.6's sake
-	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
-		xargs sed -i 's/ *-Werror */ /'
-	# not strictly necessary to fix this
-	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
-	epatch_user
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.6.0-r7.ebuild b/app-emulation/xen/xen-4.6.0-r7.ebuild
deleted file mode 100644
index c9b19e3fd9af..000000000000
--- a/app-emulation/xen/xen-4.6.0-r7.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=0
-	# var set to reflect https://dev.gentoo.org/~idella4/
-	# first instance of UPS_VER (usptream ver)
-	UPS_VER=0
-	SEC_VER=4
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN}-upstream-patches-${UPS_VER}.tar.gz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream \
-				"${WORKDIR}"/libexec.patch
-	fi
-
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-			epatch $i
-		done
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	# remove -Werror for gcc-4.6's sake
-	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
-		xargs sed -i 's/ *-Werror */ /'
-	# not strictly necessary to fix this
-	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
-	epatch_user
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.6.0-r9.ebuild b/app-emulation/xen/xen-4.6.0-r9.ebuild
new file mode 100644
index 000000000000..b0eaa007988d
--- /dev/null
+++ b/app-emulation/xen/xen-4.6.0-r9.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=0
+	# var set to reflect https://dev.gentoo.org/~idella4/
+	# first instance of UPS_VER (usptream ver)
+	UPS_VER=0
+	SEC_VER=9
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN}-upstream-patches-${UPS_VER}.tar.gz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches-${SEC_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream \
+				"${WORKDIR}"/libexec.patch
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-emulation/xen/xen-4.6.1.ebuild b/app-emulation/xen/xen-4.6.1.ebuild
new file mode 100644
index 000000000000..3a1959d9fee7
--- /dev/null
+++ b/app-emulation/xen/xen-4.6.1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	# var set to reflect https://dev.gentoo.org/~idella4/
+	# first instance of UPS_VER (usptream ver)
+	UPS_VER=
+	SEC_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN}-upstream-patches-${UPS_VER}.tar.gz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches-${SEC_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream \
+				"${WORKDIR}"/libexec.patch
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 52eb0ceceb52..dbfcd6cf0118 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -19,8 +19,9 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
+# python-exec-2.4.2 for working -l option
 RDEPEND=">=app-admin/eselect-1.2.3
-	>=dev-lang/python-exec-2.3"
+	>=dev-lang/python-exec-2.4.2"
 
 src_prepare() {
 	[[ ${PV} == "99999999" ]] && eautoreconf
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index a4f39e33dae0..6fa2adf81f58 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -1,4 +1,3 @@
 DIST manpages-de-1.10.tar.xz 1440524 SHA256 5966b553881ff670ed8c43759a1b570c287ba3ba0588c0b8c93328a0232afc7c SHA512 ab5c351e7bc4a40568d954c6c6e9999cb526ab1d20ee73bf1cc5ee6d9bbe0ab34ba557a849b5a386613a19235b70a20303046a5abd02101ddc9ac6fdef62059b WHIRLPOOL 47df53610c7304e4ab9c811665049a82ee0c9a065ddc1bb550189d61fff19e5642fd8cc5324f4ac82e50978edd86c01e1da0e02c23ddc7545c69debc411bd23b
+DIST manpages-de-1.11.tar.xz 1459316 SHA256 ec3dae3d8287dad8aa834fdf86bb4621476376a3ce2576ca7a944c0830845bbe SHA512 3559ae8f073cefbbf9aba34862edfe947847d49cb22c49c71b851059db58aa27ad5f42a1b112554082f0aba72256f16d181fdf0d39780c3ac5a841d5990f9b80 WHIRLPOOL cbc2d5513f64250da22670162ab6b2d67c0d2ed3a5498b634325485f9d1f409f03721a373427f80f71098f9eb6c594ffce46df9f6ba0f3540b6761e004d7e545
 DIST manpages-de-1.7.tar.xz 1300384 SHA256 7bb014f4ffdc7a303791bb0ee672d901348babcb4c23002cecd3fc145831728a SHA512 d70f25daf10e233358b705c06a7c9e123fffc492429b4b9e1717c5db3a47d92fefb5e628fc75056306bc8bf0da7146aabd2c80a77cb50a430d2e11d6ce9712e0 WHIRLPOOL d8198220f4998e2550166a4b79434c4c1031c1e320b4b858dbf1468c1b1f19aa1d6a02816acd470191546dd5b08b4d1fff4fe612652866db932ee5b4e3dae33a
-DIST manpages-de-1.8.tar.xz 1345324 SHA256 e9d82b7bf41accd492b66b7ef2cbaefb5ce30c5ab2a2ad9ae1833424a8b93d6f SHA512 284be71610ddc11f578179f809ecaf2d92eb77b4ba1281ce21f3486e312c2888fc2d830967589702f0df6cee28da6adb4737b416cf8214001ddd14de0292ecd3 WHIRLPOOL e5d2b4afc6cd1b9231f8d837d7507a494b152c30687540bc128994f56e70e29ce9c3918621fb4ed3e62a1be21cddf4a324dd0379160b631885cbce064e0201e3
-DIST manpages-de-1.9.tar.xz 1415628 SHA256 2c6c02ecd428b9b3cb9298ea2ef0b4972c6e569479e7d5a969d7086c2d7150e8 SHA512 5f01e817274490a90118c875a46f2b5767e62dacc8904f6a327a0883f96c895c7e07d1a76ad2947404552ed93abddd21c16ab51f6f1d076403003dfa0ec34426 WHIRLPOOL d68a1fc0bbf6751c78e0b1beac94d32e7b83539a5571d3546018fc896b70f919ac751c467823796cba0fd59867ca8bcf06a4214beebb004e94551e6545bf2c4e
diff --git a/app-i18n/man-pages-de/man-pages-de-1.11.ebuild b/app-i18n/man-pages-de/man-pages-de-1.11.ebuild
new file mode 100644
index 000000000000..4f6cf7deefe3
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-1.11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+MY_P="${PN/-/}-${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="http://alioth.debian.org/projects/manpages-de/"
+SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND="${RDEPEND}
+	app-text/po4a"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-bzip2.patch
+
+	# Use the same compression as every other manpage
+	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
+	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
+		PORTAGE_COMPRESS_LOCAL="#"
+	fi
+	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
+		case ${PORTAGE_COMPRESS_LOCAL} in
+			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+			;;
+		esac
+	fi
+	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
+		po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
+	eautoreconf
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake mandir="${ED}"/usr/share/man install
+	dodoc CHANGES README
+}
diff --git a/app-i18n/man-pages-de/man-pages-de-1.8.ebuild b/app-i18n/man-pages-de/man-pages-de-1.8.ebuild
deleted file mode 100644
index 339d9f61e960..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-1.8.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 autotools
-
-MY_P="${PN/-/}-${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="http://alioth.debian.org/projects/manpages-de/"
-SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-DEPEND="${RDEPEND}
-	app-text/po4a"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-bzip2.patch
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES README
-}
diff --git a/app-i18n/man-pages-de/man-pages-de-1.9.ebuild b/app-i18n/man-pages-de/man-pages-de-1.9.ebuild
deleted file mode 100644
index 339d9f61e960..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-1.9.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 autotools
-
-MY_P="${PN/-/}-${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="http://alioth.debian.org/projects/manpages-de/"
-SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-DEPEND="${RDEPEND}
-	app-text/po4a"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-bzip2.patch
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES README
-}
diff --git a/app-i18n/scim-canna/Manifest b/app-i18n/scim-canna/Manifest
deleted file mode 100644
index 781beca14db7..000000000000
--- a/app-i18n/scim-canna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scim-canna-1.0.1.tar.gz 516186 SHA256 f26f99d04c06465cbdf3540db762eb919b22ac1b338e9b30a35712287c4851c9 SHA512 711b67211c9d1f4cb8ca09b88d455718607aa2d99e47a753fa8d71d2e1f0df8c649b64d08149785eeaa98d1399b9ca92e3df7e1be8f150ce99f28f82491b8bc1 WHIRLPOOL 27094098763df0427637acb7751dad1e36f658e7b97d25c1346d341501eb2f22bbb016951924870b9d0bf330c7db7945ff13b88a4c3691c7b7fd2b06cf7319d8
diff --git a/app-i18n/scim-canna/metadata.xml b/app-i18n/scim-canna/metadata.xml
deleted file mode 100644
index 29c9014b1b86..000000000000
--- a/app-i18n/scim-canna/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 type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge-jp">scim-imengine</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/scim-canna/scim-canna-1.0.1.ebuild b/app-i18n/scim-canna/scim-canna-1.0.1.ebuild
deleted file mode 100644
index 0d8af91e191e..000000000000
--- a/app-i18n/scim-canna/scim-canna-1.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Japanese input method Canna IMEngine for SCIM"
-HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMCanna"
-SRC_URI="mirror://sourceforge.jp/scim-imengine/29155/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/scim-1.0
-	>=app-i18n/canna-3.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export GTK_IM_MODULE=scim"
-	elog "export QT_IM_MODULE=scim"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog
-}
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
new file mode 100644
index 000000000000..e1f1e8154335
--- /dev/null
+++ b/app-i18n/translate-shell/Manifest
@@ -0,0 +1 @@
+DIST translate-shell-0.9.3.tar.gz 66134 SHA256 cb0da68cc984cb275e3c8fddfb1b56a846cef41dad729890ad9b3d7ef35dc807 SHA512 8656be0cdacfe5c26cf26c748479def1603d633545f4770ed1da2cf36c0ec72e99f5d34b38eb9b90327b563c0fbf68281ea13d6b22ee73d426030e8c2e35dc1b WHIRLPOOL 8c48da9e6b4c79cae63cd17bed045ba0ae741d157960f2c6f5ea0ca352c09735a5b2caa9e288cc8ec22c6c6768f0c68d9f4ed98bb886f872562020208c526333
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
new file mode 100644
index 000000000000..85f4c9697720
--- /dev/null
+++ b/app-i18n/translate-shell/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<maintainer type="person">
+                <email>patrick@gentoo.org</email>
+                <name>Patrick Lauer</name>
+        </maintainer>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<longdescription lang="en">
+		Translate Shell (formerly Google Translate CLI) is a command-line
+		translator powered by Google Translate (default), Bing Translator, and
+		Yandex.Translate.  
+	</longdescription>
+	<use>
+		<flag name="fribidi">Enable RTL language support</flag>
+		<flag name="tts">Enable text-to-speech support</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-i18n/translate-shell/translate-shell-0.9.3.ebuild b/app-i18n/translate-shell/translate-shell-0.9.3.ebuild
new file mode 100644
index 000000000000..339331f5151d
--- /dev/null
+++ b/app-i18n/translate-shell/translate-shell-0.9.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Online command-line translator"
+HOMEPAGE="https://www.soimort.org/translate-shell/"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+curl fribidi test tts"
+
+RDEPEND="
+	app-misc/rlwrap
+	>=sys-apps/gawk-4.0.2
+	curl? ( net-misc/curl[ssl] )
+	fribidi? ( dev-libs/fribidi )
+	tts? ( || (
+		media-sound/mpg123
+		app-accessibility/espeak
+		media-video/mpv
+		media-video/mplayer
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( app-editors/emacs )
+	"
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+}
diff --git a/app-laptop/prey/Manifest b/app-laptop/prey/Manifest
deleted file mode 100644
index 63191d5eb4c2..000000000000
--- a/app-laptop/prey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prey-0.5.4-linux.zip 646891 SHA256 5d0f6f3e3a48dc5668ff82de55e202e5c28b3fab1f4d71dd55c22b8565583d7e SHA512 15e13b08dd786b3fddf39f8d0e02ceb0e2503be09ea3abde9cfc6431fb2c8388c077f2960dd82d9fb2119929274f2f57e70f642cd8cf3c6e6d76af9701c56724 WHIRLPOOL 3d7e10cfb5926a7f6a5a46c638bb859e6b4b2decb49a979f39573e8f4d2a9c66904e595c144dc4039018d567cd3810f69ef31658018ab3e2dd167ee8bcbbd114
diff --git a/app-laptop/prey/files/prey-0.5.3-mplayer-support.patch b/app-laptop/prey/files/prey-0.5.3-mplayer-support.patch
deleted file mode 100644
index 970f50d751d9..000000000000
--- a/app-laptop/prey/files/prey-0.5.3-mplayer-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- modules/webcam/platform/linux/functions.orig	2011-01-19 22:49:55.457000055 -0700
-+++ modules/webcam/platform/linux/functions	2011-01-20 18:19:11.046000085 -0700
-@@ -9,6 +9,7 @@
- 
- 	# do we have streamer installed ?
- 	local streamer=`which streamer`
-+	local mencoder=`which mencoder`
- 	if [ -n "$streamer" ]; then
- 
- 		# take four pictures every 0.5 seconds as JPEG
-@@ -37,19 +38,32 @@
- 			fi
- 
- 		fi
--
-+	elif [ -n "${mencoder}" ]; then
-+		# not sure how to do this same thing with mencoder
-+		mplayer tv:// -tv driver=v4l2:noaudio:device=/dev/video0 -frames 10 -vo jpeg &> /dev/null
-+		if [ $? == 0 ]; then
-+			mv 00000010.jpg "${webcam__picture}" > /dev/null
-+			rm 000000*.jpg > /dev/null
-+		fi
- 	fi
- 
- }
- 
- capture_video() {
- 
--	# we should already know if we do have streamer
-+	local frames=$(( $webcam__video_capture_time * $webcam__frames_per_second ))
-+	
-+	# do we have streamer installed ?
-+	local streamer=`which streamer`
-+	local mencoder=`which mencoder`
-+	
- 	if [ -n "$streamer" ]; then
--
--		local frames=$(( $webcam__video_capture_time * $webcam__frames_per_second ))
- 		$streamer -o "$webcam__video" -f yuv2 -F stereo -r $webcam__frames_per_second -t $frames
--
-+	elif [ -n "${mencoder}" ]; then
-+		${mencoder} tv:// -tv driver=v4l2:noaudio:device=/dev/video0 -ovc lavc -ffourcc DX50 -ofps ${webcam__frames_per_second} -endpos ${webcam__video_capture_time} -o "${tmpdir}/prey-video.avi" &> /dev/null
-+		if [ $? == 0 ]; then
-+			webcam__video="${tmpdir}/prey-video.avi"
-+		fi
- 	fi
- 
- }
diff --git a/app-laptop/prey/files/prey-0.5.4-cron-functions.patch b/app-laptop/prey/files/prey-0.5.4-cron-functions.patch
deleted file mode 100644
index 963b685292c7..000000000000
--- a/app-laptop/prey/files/prey-0.5.4-cron-functions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: prey/core/functions
-===================================================================
---- prey.orig/core/functions
-+++ prey/core/functions
-@@ -194,12 +194,12 @@ get_delay_for(){
- 
- get_current_delay(){
- 	# crontab -l | grep prey | sed "s/^..\([0-9]*\).*/\1/"
--	crontab -l 2> /dev/null | grep prey | head -1 | sed 's/ \/.*//'
-+	sed -i 's/ \/.*//' /etc/cron.d/prey.cron
- }
- 
- update_execution_delay(){
- 	local full_path=$(full_path "$base_path")
--	(crontab -l 2> /dev/null | grep -v prey; echo "${1}" "${full_path}/prey.sh > /var/log/prey.log 2>&1") | crontab -
-+	echo "${new_delay}" "/usr/bin/prey.sh > /var/log/prey.log" > /etc/cron.d/prey.cron
- }
- 
- # if device is missing we'll make sure the current delay matches the one
-@@ -273,7 +273,7 @@ verify_installation(){
- 		log " !! Cron daemon not found! Try running it with 'sudo /etc/init.d/cron start'."
- 	fi
- 	log " -- Checking for crontab entry..."
--	local result=`crontab -l | grep 'prey.sh' | wc -l 2> /dev/null`
-+	local result=`wc -l /etc/cron.d/prey.cron 2> /dev/null`
- 	if [ "$result" -gt 0 ]; then
- 		log " -- Found!"
- 	else
diff --git a/app-laptop/prey/files/prey-0.5.4-gtk-ui.patch b/app-laptop/prey/files/prey-0.5.4-gtk-ui.patch
deleted file mode 100644
index 6a50a4e0426e..000000000000
--- a/app-laptop/prey/files/prey-0.5.4-gtk-ui.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: prey/platform/linux/prey-config.py
-===================================================================
---- prey.orig/platform/linux/prey-config.py
-+++ prey/platform/linux/prey-config.py
-@@ -23,7 +23,7 @@ import base64
- 
- app_name = 'prey-config'
- lang_path = 'lang'
--script_path = os.sys.path[0]
-+script_path = '/usr/share/prey/platform/linux/'
- 
- ################################################
- # gettext localization
-@@ -42,7 +42,7 @@ _ = gettext.gettext
- ################################################
- 
- PREY_PATH = '/usr/share/prey'
--PREY_CONFIG_FILE = PREY_PATH + '/config'
-+PREY_CONFIG_FILE = '/etc/config'
- PREY_COMMAND = PREY_PATH + '/prey.sh > /var/log/prey.log 2>&1'
- CONTROL_PANEL_URL = 'http://control.preyproject.com'
- CONTROL_PANEL_URL_SSL = 'https://control.preyproject.com'
diff --git a/app-laptop/prey/files/prey-cron-functions.patch b/app-laptop/prey/files/prey-cron-functions.patch
deleted file mode 100644
index 0e5486d27d9b..000000000000
--- a/app-laptop/prey/files/prey-cron-functions.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: prey/core/functions
-===================================================================
---- prey.orig/core/functions
-+++ prey/core/functions
-@@ -170,7 +170,7 @@ remove_files(){
- 
- get_current_delay(){
- 	# crontab -l | grep prey | sed "s/^..\([0-9]*\).*/\1/"
--	crontab -l | grep prey | head -1 | sed 's/ \/.*//'
-+	sed -i 's/ \/.*//' /etc/cron.d/prey.cron
- }
- 
- get_delay_for(){
-@@ -197,7 +197,7 @@ get_delay_for(){
- 
- update_execution_delay(){
- 	local full_path=`full_path "$base_path"`
--	(crontab -l | grep -v prey; echo "${new_delay}" "${full_path}/prey.sh > /var/log/prey.log") | crontab -
-+	echo "${new_delay}" "/usr/bin/prey.sh > /var/log/prey.log" > /etc/cron.d/prey.cron
- }
- 
- ####################################################################
-@@ -250,7 +250,7 @@ verify_installation(){
- 		log " !! Cron daemon not found! Try running it with 'sudo /etc/init.d/cron start'."
- 	fi
- 	log " -- Checking for crontab entry..."
--	local result=`crontab -l | grep 'prey.sh' | wc -l 2> /dev/null`
-+	local result=`wc -l /etc/cron.d/prey.cron 2> /dev/null`
- 	if [ "$result" -gt 0 ]; then
- 		log " -- Found!"
- 	else
diff --git a/app-laptop/prey/files/prey.cron b/app-laptop/prey/files/prey.cron
deleted file mode 100644
index fe036185a2d5..000000000000
--- a/app-laptop/prey/files/prey.cron
+++ /dev/null
@@ -1 +0,0 @@
-#*/20 * * * * /usr/bin/prey &>/dev/null
diff --git a/app-laptop/prey/metadata.xml b/app-laptop/prey/metadata.xml
deleted file mode 100644
index 1621c528d42f..000000000000
--- a/app-laptop/prey/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>
-<use>
-	<flag name="alarm">Module for playing an audio file</flag>
-	<flag name="alert">Display a warning message when the computer seems to be stolen"</flag>
-	<flag name="geo">Module for retrieving the physical location of the stolen computer</flag>
-	<flag name="lock">Lock stolen computer</flag>
-	<flag name="network">Get network information (active connections, traceroute) from stolen computer</flag>
-	<flag name="secure">Delete or hide sensitive user data</flag>
-	<flag name="session">Get screenshots from user session</flag>
-	<flag name="userpriv">Create a prey user group so regular users can access and modify the prey configuration. Use it with caution</flag>
-	<flag name="webcam">Use computer's webcam to take screenshots of the thief</flag>
-</use>
-<longdescription lang="en">
-</longdescription>
-</pkgmetadata>
diff --git a/app-laptop/prey/prey-0.5.4-r1.ebuild b/app-laptop/prey/prey-0.5.4-r1.ebuild
deleted file mode 100644
index 40077d72216f..000000000000
--- a/app-laptop/prey/prey-0.5.4-r1.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=4
-
-inherit eutils readme.gentoo user
-
-DESCRIPTION="Tracking software for asset recovery"
-HOMEPAGE="http://preyproject.com/"
-SRC_URI="http://preyproject.com/releases/${PV}/${P}-linux.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk userpriv"
-
-LINGUAS="en it sv es"
-for x in ${LINGUAS}; do
-	IUSE="${IUSE} linguas_${x}"
-done
-
-MODULES="+alarm +alert +geo lock +network secure +session webcam"
-IUSE="${IUSE} ${MODULES}"
-
-DEPEND=""
-#TODO: some of these deps may be dependent on USE
-RDEPEND="${DEPEND}
-	app-shells/bash
-	virtual/cron
-	|| ( net-misc/curl net-misc/wget )
-	dev-perl/IO-Socket-SSL
-	dev-perl/Net-SSLeay
-	sys-apps/net-tools
-	alarm? ( media-sound/mpg123
-			 media-sound/pulseaudio
-		   )
-	alert? ( || ( ( gnome-extra/zenity ) ( kde-apps/kdialog ) ) )
-	gtk? ( dev-python/pygtk )
-	lock? ( dev-python/pygtk )
-	network? ( net-analyzer/traceroute )
-	session? ( sys-apps/iproute2
-			   || ( media-gfx/scrot media-gfx/imagemagick )
-			 )
-	webcam? ( || ( ( media-video/mplayer[encode,jpeg,v4l] ) ( media-tv/xawtv ) ) )"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if use userpriv; then
-		enewgroup ${PN}
-	fi
-	if use gtk; then
-		ewarn "You have the 'gtk' useflag enabled"
-		ewarn "This means that the ${PN} configuration"
-		ewarn "will be accessible via a graphical user"
-		ewarn "interface. This may allow the thief to alter"
-		ewarn "or disable the ${PN} functionality"
-	fi
-}
-
-src_prepare() {
-	DISABLE_AUTOFORMATTING="yes"
-	use userpriv && has_version "${CATEGORY}/${PN}:${SLOT}[-userpriv]" && FORCE_PRINT_ELOG="yes"
-	! use userpriv && has_version "${CATEGORY}/${PN}:${SLOT}[userpriv]" && FORCE_PRINT_ELOG="yes"
-
-	DOC_CONTENTS="--Configuration--
-Make sure you follow the next steps before running prey for the
-first time.
-"
-
-	if use userpriv; then
-		DOC_CONTENTS+="- Add your user to ${PN} group using:
-# gpasswd -a <your_user> ${PN}"
-	else
-		DOC_CONTENTS+="You don't seem to have 'userpriv' enabled so
-${PN} configuration is only accessible as root"
-	fi
-
-	DOC_CONTENTS+="
-- Create an account on http://preyproject.com/
-- Modify the core and module configuration in /etc/prey
-- Uncomment the line in /etc/cron.d/prey.cron"
-
-	# remove system module since it depends on hal and we don't
-	# have hal in portage anymore
-	rm -rf "${S}"/modules/system || die
-
-	epatch "${FILESDIR}"/${P}-cron-functions.patch \
-		"${FILESDIR}"/${P}-gtk-ui.patch \
-		"${FILESDIR}"/${PN}-0.5.3-mplayer-support.patch
-	sed -i -e 's,readonly base_path=`dirname "$0"`,readonly \
-		base_path="/usr/share/prey",' \
-		"${S}"/prey.sh || die
-	# Fix base path. Bug #438728
-	sed -i -e "/readonly/s:base_path=.*:base_path=/usr/share/${PN}:" \
-		prey.sh || die
-}
-
-src_install() {
-	# Remove config app if -gtk
-	if use gtk; then
-		# fix the path
-		doicon "${S}"/pixmaps/${PN}.png
-		newbin "${S}"/platform/linux/${PN}-config.py ${PN}-config
-		make_desktop_entry ${PN}-config "Prey Configuration" ${PN} \
-			"System;Monitor"
-	else
-		rm -f "${S}"/platform/linux/prey-config.py || die
-	fi
-
-	# clear out unneeded language files
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" || rm -f lang/${lang} modules/*/lang/${lang}
-	done
-
-	# Core files
-	insinto /usr/share/prey
-	doins -r "${S}"/core "${S}"/lang "${S}"/pixmaps "${S}"/platform "${S}"/version
-
-	# Main script
-	newbin ${PN}.sh ${PN}
-
-	# Put the configuration file into /etc, strict perms, symlink
-	insinto /etc/prey
-	newins config ${PN}.conf
-	# some scripts require /usr/share/prey/config file to be present
-	# so symlink it to prey.conf
-	dosym /etc/${PN}/${PN}.conf /usr/share/${PN}/config
-	use userpriv && { fowners root:${PN} /etc/prey ; }
-	fperms 770 /etc/prey
-	use userpriv && { fowners root:${PN} /etc/prey/prey.conf ; }
-	fperms 660 /etc/prey/prey.conf
-
-	# Add cron.d script
-	insinto /etc/cron.d
-	doins "${FILESDIR}/prey.cron"
-	use userpriv && { fowners root:${PN} /etc/cron.d/prey.cron ; }
-	fperms 660 /etc/cron.d/prey.cron
-
-	dodoc README
-
-	# modules
-	cd "${S}"/modules
-	for mod in *
-	do
-		use ${mod} || continue
-
-		# move config, if present, to /etc/prey
-		if [ -f $mod/config ]
-		then
-			insinto "/etc/prey"
-			newins "$mod/config" "mod-$mod.conf"
-			use userpriv && { fowners root:${PN} "/etc/${PN}/mod-$mod.conf" ; }
-			fperms 660 "/etc/${PN}/mod-$mod.conf"
-			# Rest of the module in its expected location
-			insinto /usr/share/prey/modules
-			doins -r "$mod"
-			if [[ $mod == "lock" ]]; then
-				fperms 555 \
-					"/usr/share/${PN}/modules/lock/platform/linux/${PN}-lock"
-			fi
-		fi
-	done
-
-	readme.gentoo_create_doc
-}
diff --git a/app-misc/bijiben/bijiben-3.18.2.ebuild b/app-misc/bijiben/bijiben-3.18.2.ebuild
index 064c8693059b..d271a20a0b6e 100644
--- a/app-misc/bijiben/bijiben-3.18.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.18.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"
 
 RDEPEND="
diff --git a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
index 3776fb96edf4..ee91d8037cc2 100644
--- a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
@@ -57,7 +57,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" +cacert"
 
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 96e8e025c8dc..47133fad76c8 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
-DIST carbon-c-relay-1.4.tar.gz 71367 SHA256 8575be832d204a0c12e4cd793ae05d5c2683974a90e93aeb70e69199b7991d45 SHA512 389d08bccdbd2e566a2580017fb14afd37b0c609f20ecdef526f4810d50c84e06f396a161f0ad4eb7d1810cada9f24640b19afe7a18dd241a16d435cc72d8d0d WHIRLPOOL ad639e96e7589e7cd84e71d4840afeab9f18e768ee98fa9ab6e3d69e4255ad74e5b715e71667eaf330e9a7cc20ce2158058683081bb91785863cbcd5e6a4dccf
 DIST carbon-c-relay-1.5.tar.gz 71236 SHA256 59a64e9567204a6bf2e294123a3b31b483ea3cf6bf1395d3a17272d7ee9ad0b0 SHA512 ca8709a72aaa78de9aedd26a7b953be4550c226d8afaf494d96cb6de683bec871bc7e3d7e8c1ec593dc59783b8ca3c6dff46d83b208c1ffaf86edaa09e44c357 WHIRLPOOL ce328538515cd433d016f24fb11f3b90ef959414d2c3f47c6acab3101893ef42df6de73eebf4a6291d9b471c87e4bc5ec1e046ef50aaf737cc7f08d56cdeda2a
 DIST carbon-c-relay-1.7.tar.gz 71240 SHA256 5cc3c14fa6d466143bd97bcde2c79e0d497e441378178e38da496ccdcde09111 SHA512 2820d9fe83ee5dd0f0ff4a7855951ff1ea1ccb23e585fd2b0932975335a8121b7578a3de9d78a09619689e70262db6a31099471f49b861cec2fa87ffee35a737 WHIRLPOOL 13fb7516a9b594c0d819c00b267a9f12cb428de005d16094a7d6bbc910c8a6d15ce2be3253fe7105dec2b96d91363fce86e37d63cf7a6d683f4757ba6a61a728
+DIST carbon-c-relay-1.8.tar.gz 72017 SHA256 e284b6cf2cb12996e41ee0a8e25f1e17a3b4510bdae3b3a549f22875507f5646 SHA512 1865507cd5404bb74715eeffc4bc2ff2e77668ea477566e4391d2fb695d4cd8dbf8222acaa2b9db39c12110fe2e18b4482ed378c5eb6c5ec95193e4c1cd4b550 WHIRLPOOL 1a8bc8e1504ed9e126d6609cf6c28d812d6a6cd29a6bf88e98b6213c277a1bd29430eeb5f0a39aac22548108d3fcbeb8e4ec3f1a79c92d5c5297a4c8d15e9105
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild
deleted file mode 100644
index 263b0462af5b..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_prepare() {
-	tc-export CC
-	tc-has-openmp || export OPENMP_FLAGS=
-}
-
-src_install() {
-	newbin relay ${PN}
-	dodoc README.md
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-1.8.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-1.8.ebuild
new file mode 100644
index 000000000000..ab8f7df59c0b
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-1.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	enewgroup carbon
+	enewuser carbon -1 -1 -1 carbon
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	newbin relay ${PN}
+	dodoc README.md
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/geoclue/geoclue-2.4.1.ebuild b/app-misc/geoclue/geoclue-2.4.1.ebuild
index ab0513220c5c..9926a5269c7d 100644
--- a/app-misc/geoclue/geoclue-2.4.1.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="+introspection +modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/gnote/gnote-3.18.1.ebuild b/app-misc/gnote/gnote-3.18.1.ebuild
index b8c8e82a2625..052aa7deb0ca 100644
--- a/app-misc/gnote/gnote-3.18.1.ebuild
+++ b/app-misc/gnote/gnote-3.18.1.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/granule/Manifest b/app-misc/granule/Manifest
deleted file mode 100644
index 13eb2581c093..000000000000
--- a/app-misc/granule/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST granule-1.4.0-7.tar.gz 677428 SHA256 356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9 SHA512 a5e3640c06b573a2bca01a4b893fec7ff363185e121a09c23f99297651518f7745f130b31165c47ee0c603c3ff2f59d996197c4b507edc8487998ddb80cef8b6 WHIRLPOOL 54f13dea2f0aa0a56e5b9f382c9b677d75293b26dce2acc3b6ecfa049844389c53a8dcab3e857220ef24b8bb545ffe3a479c9db520916944686044afe851a6d0
diff --git a/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch b/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch
deleted file mode 100644
index 252c41e77973..000000000000
--- a/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix build with gcc4.8 and -fpermissive
-Bug-Debian: http://bugs.debian.org/701292
-Last-Update: 2013-08-11
-
---- granule-1.4.0-7.orig/src/Granule.cpp
-+++ granule-1.4.0-7/src/Granule.cpp
-@@ -56,7 +56,7 @@ ASSA_DECL_SINGLETON(Granule);
- 
- static const int TIMEOUT = 2000;  // 2 seconds (1,000 mls = 1 sec).
- 
--template <> xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
-+xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
- 
- /*******************************************************************************
-                           Member Functions
diff --git a/app-misc/granule/granule-1.4.0-r1.ebuild b/app-misc/granule/granule-1.4.0-r1.ebuild
deleted file mode 100644
index 2f6e8785f90e..000000000000
--- a/app-misc/granule/granule-1.4.0-r1.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
-inherit eutils
-
-DESCRIPTION="A flashcard program that implements Leitner cardfile methodology"
-HOMEPAGE="http://granule.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-7.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-cpp/gtkmm-2.4.1:2.4
-	>=dev-cpp/libassa-3.5.0
-	x11-libs/gtk+:2
-	dev-cpp/glibmm:2
-	>=dev-libs/libsigc++-2.0
-	x11-libs/pango
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-7"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-template-with-permissive.patch
-	sed -i -e "s:Application;::" \
-		-i -e "/^Icon/s:\.png::" granule.desktop.in || die
-}
diff --git a/app-misc/granule/granule-1.4.0.ebuild b/app-misc/granule/granule-1.4.0.ebuild
deleted file mode 100644
index e4cb4d359246..000000000000
--- a/app-misc/granule/granule-1.4.0.ebuild
+++ /dev/null
@@ -1,39 +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 flashcard program that implements Leitner cardfile methodology"
-HOMEPAGE="http://granule.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-7.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-cpp/gtkmm-2.4.1:2.4
-	>=dev-cpp/libassa-3.5.0
-	x11-libs/gtk+:2
-	dev-cpp/glibmm:2
-	>=dev-libs/libsigc++-2.0
-	x11-libs/pango
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-7"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-template-with-permissive.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-misc/granule/metadata.xml b/app-misc/granule/metadata.xml
deleted file mode 100644
index a4a3cec908cd..000000000000
--- a/app-misc/granule/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 type="person">
-		<email>angelos@gentoo.org</email>
-		<name>Christoph Mende</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">granule</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
new file mode 100644
index 000000000000..b9f6e50e3820
--- /dev/null
+++ b/app-misc/khal/Manifest
@@ -0,0 +1 @@
+DIST khal-0.7.0.tar.gz 109801 SHA256 c6b0c81df56133e4592f02d8e9b60702079da2affd1b09ba96358ccd8eec9402 SHA512 cad0bd8c5e869ffb5333e62747f0c5f71ae4a82adf60889922fcc61b4befefd926b0d642fcb8aec471aafc3fab6f042fa4253d381936c229582a8196319a1505 WHIRLPOOL bd265e0c2ff84014ae7b706722e8b850221458ad4c24dd9137321c06048ed1b5442eb93b7d18338a97f201b6e598bef2be3abe375b80f9530306e2617c73cfbd
diff --git a/app-misc/khal/khal-0.7.0.ebuild b/app-misc/khal/khal-0.7.0.ebuild
new file mode 100644
index 000000000000..a720dac58a72
--- /dev/null
+++ b/app-misc/khal/khal-0.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 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} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+	dev-python/icalendar[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	dev-python/pkginfo[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	zsh-completion? ( app-shells/zsh )"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.txt README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/__khal
+	fi
+}
diff --git a/app-misc/khal/metadata.xml b/app-misc/khal/metadata.xml
new file mode 100644
index 000000000000..9733c2c2dc5d
--- /dev/null
+++ b/app-misc/khal/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/lcd-stuff/Manifest b/app-misc/lcd-stuff/Manifest
deleted file mode 100644
index d0345ceb3249..000000000000
--- a/app-misc/lcd-stuff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lcd-stuff-0.1.6.tar.bz2 126696 SHA256 c42ff77f5cf2b88bb7b46b73453f3f2d20617d93ebf1b5ff28ce365afa40500e SHA512 62abfcd207710685501551a81050f903606ad459deeb4b716d03b9657e332615b63cc402027006ab218bc4c59ac1149a21b8da506f62742252312394b5e87395 WHIRLPOOL df444c2c3dbeafae5cb912c63d8e768f587daadf5d13098f29793f7548d532f710d8c0c0f9c4c4aadf86bcfad9ec5f210851e6e2790ac55f0b0a2a23f910a7a5
diff --git a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-mpd.patch b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-mpd.patch
deleted file mode 100644
index f8f5cdb9ea36..000000000000
--- a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-mpd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch by Andrej Kacian <ticho@gentoo.org> from bug #177587
-
-
-diff -ur lcd-stuff-0.1.2-orig/src/mpd.c lcd-stuff-0.1.2/src/mpd.c
---- lcd-stuff-0.1.2-orig/src/mpd.c	2007-05-10 23:26:55.000000000 +0200
-+++ lcd-stuff-0.1.2/src/mpd.c	2007-05-10 23:27:59.000000000 +0200
-@@ -119,14 +119,13 @@
-             case MPD_DATA_TYPE_PLAYLIST:
-                 g_ptr_array_add(array, g_path_get_basename(data->playlist));
-                 g_free(data->playlist);
-+                data->playlist = NULL;
-                 break;
- 
-             case MPD_DATA_TYPE_DIRECTORY:
--                g_free(data->directory);
--                break;
--
-             case MPD_INFO_ENTITY_TYPE_SONG:
-                 g_free(data->directory);
-+                data->directory = NULL;
-                 break;
- 
-             default:
diff --git a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-r1.initd b/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-r1.initd
deleted file mode 100644
index c59bc87974c1..000000000000
--- a/app-misc/lcd-stuff/files/lcd-stuff-0.1.2-r1.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PIDFILE=/var/run/${SVCNAME}.pid
-
-depend() {
-	use LCDd
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec \
-		/usr/bin/lcd-stuff -- -f 1 -s 1 -r "${REPORTLEVEL}" -a "${ADDRESS}" -p "${TCPPORT}" -c "${CONFIGFILE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${PIDFILE} --name "lcd-stuff"
-	eend $?
-}
diff --git a/app-misc/lcd-stuff/files/lcd-stuff-0.1.3-socket-h.patch b/app-misc/lcd-stuff/files/lcd-stuff-0.1.3-socket-h.patch
deleted file mode 100644
index d717927c756d..000000000000
--- a/app-misc/lcd-stuff/files/lcd-stuff-0.1.3-socket-h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Robert Buchholz <rbu@gentoo.org>
-To: lcdproc@lists.omnipotent.net
-Subject: Re: [Lcdproc] [ANNOUNCE] lcd-stuff 0.1.3
-Cc: Bernhard Walle <bernhard.walle@gmx.de>
-Date: Wed, 8 Aug 2007 22:06:33 +0200
-
-When compiling against the latest version of libmrss
-(0.18.0), compilation breaks because mrss.h includes
-sys/socket.h. That header uses SHUT_RDWR as a variable name
-(which has to be undefined), but lcd-stuff's shared/sockets.h
-defines that macro.
-
-The attached patch fixes this on lcd-stuff's side.
-
-Index: lcd-stuff-0.1.3/src/rss.c
-===================================================================
---- lcd-stuff-0.1.3.orig/src/rss.c
-+++ lcd-stuff-0.1.3/src/rss.c
-@@ -24,12 +24,12 @@
- #include <string.h>
- #include <errno.h>
- 
-+#include <mrss.h>
-+
- #include <shared/report.h>
- #include <shared/sockets.h>
- #include <shared/str.h>
- 
--#include <mrss.h>
--
- #include "rss.h"
- #include "main.h"
- #include "constants.h"
diff --git a/app-misc/lcd-stuff/files/lcd-stuff.confd b/app-misc/lcd-stuff/files/lcd-stuff.confd
deleted file mode 100644
index c32169ba42ff..000000000000
--- a/app-misc/lcd-stuff/files/lcd-stuff.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/conf.d/lcd-stuff: Configuration for lcd-stuff LCDproc client
-
-# Host name that is running LCDd
-ADDRESS=localhost
-
-# TCP Port of LCDd on $ADDRESS
-TCPPORT=13666
-
-# Report level (0: none, 5: debug)
-REPORTLEVEL=2
-
-# Configuration file for lcd-stuff
-CONFIGFILE="/etc/lcd-stuff.conf"
diff --git a/app-misc/lcd-stuff/lcd-stuff-0.1.6.ebuild b/app-misc/lcd-stuff/lcd-stuff-0.1.6.ebuild
deleted file mode 100644
index 30289f998c48..000000000000
--- a/app-misc/lcd-stuff/lcd-stuff-0.1.6.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=2
-inherit eutils
-
-DESCRIPTION="lcd-stuff is a client for lcdproc that displays RSS, Weather, MPD and new mail"
-HOMEPAGE="http://lcd-stuff.berlios.de/"
-#SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2" # and GPL-2 only
-
-RDEPEND="app-misc/lcdproc
-	net-misc/curl
-	dev-libs/glib
-	imap? ( net-libs/libetpan )
-	mpd? ( >=media-libs/libmpd-0.12.0 )
-	mp3? ( media-libs/taglib )
-	xml? ( net-libs/libnxml )
-	rss? ( net-libs/libmrss net-libs/libnxml )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-IUSE="imap mpd mp3 xml rss"
-
-src_configure() {
-	local XMLRSSLIB="$(use_enable rss mrss)"
-	if use rss ; then
-		# If we want rss, we must also have xml
-		XMLRSSLIB="${XMLRSSLIB} --enable-nxml"
-	else
-		XMLRSSLIB="${XMLRSSLIB} $(use_enable xml nxml)"
-	fi
-
-	econf \
-		$(use_enable imap libetpan) \
-		$(use_enable mpd  libmpd)   \
-		$(use_enable mp3  taglib_c) \
-		$XMLRSSLIB \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins lcd-stuff.conf
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-0.1.2-r1.initd" ${PN}
-
-	dodoc ChangeLog README
-}
diff --git a/app-misc/lcd-stuff/metadata.xml b/app-misc/lcd-stuff/metadata.xml
deleted file mode 100644
index 3c3c6a9c88a8..000000000000
--- a/app-misc/lcd-stuff/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>bernhard.walle@gmx.de</email>
-<name>Bernhard Walle</name>
-<description>Upstream maintainer wants to be CC'ed directly on bugs.</description>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
-<longdescription lang="en">
-  lcd-stuff is a client for app-misc/lcdproc written in C. It features
-  displaying of e-mail using POP3 and IMAP, mpd control, news items using RSS,
-  display of the weather from weather.com and it can fill your MP3 player with
-  directory and file names based on the title.
-</longdescription>
-<use>
-  <flag name="mpd">Add support for display of mpd controlled music
-    (<pkg>media-libs/libmpd</pkg>)</flag>
-</use>
-</pkgmetadata>
diff --git a/app-misc/magneto-loader/Manifest b/app-misc/magneto-loader/Manifest
deleted file mode 100644
index 520d012e476c..000000000000
--- a/app-misc/magneto-loader/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/app-misc/magneto-loader/magneto-loader-254.ebuild b/app-misc/magneto-loader/magneto-loader-254.ebuild
deleted file mode 100644
index 42f5b6b706e3..000000000000
--- a/app-misc/magneto-loader/magneto-loader-254.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Official Sabayon Linux Entropy Notification Applet Loader"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/magneto"
-
-DEPEND="${PYTHON_DEPS}
-	~sys-apps/magneto-core-${PV}[${PYTHON_USEDEP}]
-	~app-admin/rigo-${PV}[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-loader-install || die "make install failed"
-}
diff --git a/app-misc/magneto-loader/metadata.xml b/app-misc/magneto-loader/metadata.xml
deleted file mode 100644
index 15f07e411445..000000000000
--- a/app-misc/magneto-loader/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
-	<use>
-	</use>
-</pkgmetadata>
diff --git a/app-misc/multimon/Manifest b/app-misc/multimon/Manifest
deleted file mode 100644
index 475280672055..000000000000
--- a/app-misc/multimon/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST multimon-1.0-ubuntu.patch.xz 18532 SHA256 2d1e990dec9a949e7293a18eee7559d3df53133fc78c129e38d5b5fc439a6586 SHA512 1773bf4d1b0be59c2187543328a1cd59d097f026418b3c96afbd48f9c8491fb1c082d5d2e58b1d3242a912737915b5cdaf6e879ae82f2e7bc292919579ebcc28 WHIRLPOOL b49e64f5694db7791574bf2fddb9ca071b912bb4510701fafeed614cc8805df9130ce6bfeae9c380fecfd46656f3ff0f8d80625d93585c1ccff28e1e71d544ed
-DIST multimon.tar.gz 49256 SHA256 bb4957f10ffbe0bdefb91170beeba22edba7cac265855fe47960d5f7033b5255 SHA512 e52a30996a66ca68a25490d3c522fe71454d0b3d4a0dd8ba567483fa8afe6350b68f391e7b8a4f5cd0c8440762b9cd7258c8efb5cc737c8780c3c2af77a9dba5 WHIRLPOOL ec0b97860037321e8cc29340bc41faddb2d073f361f83d656310f63ba8eaad51b5ac7102b08ba503b24c333714be4377afdf19075f10c189eaf5e20e3a6684b0
diff --git a/app-misc/multimon/files/multimon-1.0-flags.patch b/app-misc/multimon/files/multimon-1.0-flags.patch
deleted file mode 100644
index 232cb4e15ac2..000000000000
--- a/app-misc/multimon/files/multimon-1.0-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.orig	1997-12-08 17:56:05.000000000 +0100
-+++ Makefile	2010-10-20 06:16:56.000000000 +0200
-@@ -8,7 +8,7 @@
- else
- CFLAGS		+=-O3 -DSUN_AUDIO -DARCH_SPARC
- endif
--LDFLAGSX	=-lX11 -L/usr/X11R6/lib -R/usr/X11R6/lib -lsocket -lnsl
-+LIBSX	=-lX11 -L/usr/X11R6/lib -R/usr/X11R6/lib -lsocket -lnsl
- else
- ifeq ($(DEBUG),y)
- CFLAGS		+=-g -O -m486 -malign-loops=2 -malign-jumps=2 \
-@@ -17,7 +17,7 @@
- CFLAGS		+=-O3 -m486 -malign-loops=2 -malign-jumps=2 \
- 		  -malign-functions=2 -DARCH_I386
- endif
--LDFLAGSX	=-lX11 -L/usr/X11R6/lib
-+LIBSX	=-lX11 -L/usr/X11R6/lib
- endif
- 
- 
-@@ -28,7 +28,7 @@
- 
- AS		=as
- LD		=ld
--LDFLAGS		=-lm
-+LIBS		=-lm
- HOSTCC		=gcc
- CC		=gcc
- MAKE		=make
-@@ -67,13 +67,13 @@
- 		$(MKDIR) $(BINDIR)
- 
- $(BINDIR)/multimon:	$(OBJ_L2) $(OBJ_L1) $(OBJ_MISC)
--			$(CC) $^ $(LDFLAGS) $(LDFLAGSX) -o $@
-+			$(CC) $(LDFLAGS) $^ $(LIBS) $(LIBSX) -o $@
- 
- $(BINDIR)/gen:		$(OBJ_GEN)
--			$(CC) $^ $(LDFLAGS) -o $@
-+			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- $(BINDIR)/mkcostab:	$(BINDIR)/mkcostab.o
--			$(CC) $^ $(LDFLAGS) -o $@
-+			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- costabi.c costabf.c:	$(BINDIR)/mkcostab
- 			$(BINDIR)/mkcostab
diff --git a/app-misc/multimon/files/multimon-1.0-includes.patch b/app-misc/multimon/files/multimon-1.0-includes.patch
deleted file mode 100644
index 940841382d00..000000000000
--- a/app-misc/multimon/files/multimon-1.0-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mkcostab.c.orig	1997-12-08 17:56:06.000000000 +0100
-+++ mkcostab.c	2010-10-20 06:20:08.000000000 +0200
-@@ -23,6 +23,7 @@
- 
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h> /* exit() */
- 
- /* ---------------------------------------------------------------------- */
- 
---- xdisplay.c.orig	1997-12-08 17:56:06.000000000 +0100
-+++ xdisplay.c	2010-10-20 06:19:37.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <stdlib.h> /* abort() exit() */
- 
- /* ---------------------------------------------------------------------- */
- 
diff --git a/app-misc/multimon/files/multimon-1.0-prll.patch b/app-misc/multimon/files/multimon-1.0-prll.patch
deleted file mode 100644
index 0664bea9e9c1..000000000000
--- a/app-misc/multimon/files/multimon-1.0-prll.patch
+++ /dev/null
@@ -1,75 +0,0 @@
- Makefile |   35 ++++++++++++++++-------------------
- 1 files changed, 16 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 74453f2..28a3b7d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,15 +37,15 @@ AR		=ar
- STRIP		=strip
- MKDIR		=mkdir
- 
--all:		$(BINDIR) $(BINDIR)/multimon $(BINDIR)/gen
-+all:		 multimon gen
- 
--$(BINDIR)/%.s:	%.c
-+%.s:	%.c
- 		$(CC) $(CFLAGS) -S -o $@ $<
- 
--$(BINDIR)/%.o:	$(BINDIR)/%.s
-+%.o:	%.s
- 		$(AS) -c -o $@ $<
- 
--$(BINDIR)/%.o:	%.c
-+%.o:	%.c
- 		$(CC) $(CFLAGS) -c -o $@ $<
- 
- SRC_L2		=hdlc.c pocsag.c
-@@ -57,26 +57,23 @@ SRC_MISC	=unixinput.c costabf.c xdisplay.c
- 
- SRC_GEN		=gen.c gen_dtmf.c gen_sin.c gen_zvei.c gen_hdlc.c costabi.c
- 
--OBJ_L2		=$(SRC_L2:%.c=$(BINDIR)/%.o)
--OBJ_L1		=$(SRC_L1:%.c=$(BINDIR)/%.o)
--OBJ_MISC	=$(SRC_MISC:%.c=$(BINDIR)/%.o)
-+OBJ_L2		=$(SRC_L2:%.c=%.o)
-+OBJ_L1		=$(SRC_L1:%.c=%.o)
-+OBJ_MISC	=$(SRC_MISC:%.c=%.o)
- 
--OBJ_GEN		=$(SRC_GEN:%.c=$(BINDIR)/%.o)
-+OBJ_GEN		=$(SRC_GEN:%.c=%.o)
- 
--$(BINDIR):
--		$(MKDIR) $(BINDIR)
--
--$(BINDIR)/multimon:	$(OBJ_L2) $(OBJ_L1) $(OBJ_MISC)
-+multimon:	$(OBJ_L2) $(OBJ_L1) $(OBJ_MISC)
- 			$(CC) $(LDFLAGS) $^ $(LIBS) $(LIBSX) -o $@
- 
--$(BINDIR)/gen:		$(OBJ_GEN)
-+gen:		$(OBJ_GEN)
- 			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
--$(BINDIR)/mkcostab:	$(BINDIR)/mkcostab.o
-+mkcostab:	mkcostab.o
- 			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
--costabi.c costabf.c:	$(BINDIR)/mkcostab
--			$(BINDIR)/mkcostab
-+costabi.c costabf.c:	mkcostab
-+			./mkcostab
- 
- clean:
- 		$(RM) -f core `find . -name '*.[oas]' -print`
-@@ -85,8 +82,8 @@ clean:
- 
- 
- depend dep:
--		$(CPP) -M $(CFLAGS) $(SRC_MISC) $(SRC_L1) $(SRC_L2) $(SRC_GEN) mkcostab.c > $(BINDIR)/.depend
-+		$(CPP) -M $(CFLAGS) $(SRC_MISC) $(SRC_L1) $(SRC_L2) $(SRC_GEN) mkcostab.c > .depend
- 
--ifeq ($(BINDIR)/.depend,$(wildcard $(BINDIR)/.depend))
--include $(BINDIR)/.depend
-+ifeq (.depend,$(wildcard .depend))
-+include .depend
- endif
diff --git a/app-misc/multimon/metadata.xml b/app-misc/multimon/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/app-misc/multimon/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-misc/multimon/multimon-1.0-r2.ebuild b/app-misc/multimon/multimon-1.0-r2.ebuild
deleted file mode 100644
index 89fb2972fb58..000000000000
--- a/app-misc/multimon/multimon-1.0-r2.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=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Decoding digital transmission codes"
-HOMEPAGE="http://www.baycom.org/~tom/ham/linux/multimon.html"
-SRC_URI="http://www.baycom.org/~tom/ham/linux/multimon.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/multimon
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-prll.patch \
-		"${FILESDIR}"/${P}-includes.patch
-	sed \
-		-e '/^$(BINDIR)\//s:$: $(BINDIR):g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	# bug #369713
-	emake CFLAGS="${CFLAGS}" CC=$(tc-getCC)
-}
-
-src_install() {
-	mv gen multimon-gen
-	dobin multimon-gen mkcostab multimon
-}
-
-pkg_postinst() {
-	ewarn "The gen command has been renamed to multimon-gen to avoid conflicts"
-	ewarn "with dev-ruby/gen (#247156)"
-}
diff --git a/app-misc/multimon/multimon-1.0-r3.ebuild b/app-misc/multimon/multimon-1.0-r3.ebuild
deleted file mode 100644
index c21cd6034d83..000000000000
--- a/app-misc/multimon/multimon-1.0-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Decoding digital transmission codes"
-HOMEPAGE="http://www.baycom.org/~tom/ham/linux/multimon.html"
-SRC_URI="http://www.baycom.org/~tom/ham/linux/multimon.tar.gz
-		 https://dev.gentoo.org/~lu_zero/distfiles/${P}-ubuntu.patch.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/multimon
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-ubuntu.patch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-prll.patch \
-		"${FILESDIR}"/${P}-includes.patch
-	sed \
-		-e '/^$(BINDIR)\//s:$: $(BINDIR):g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	# bug #369713
-	emake CFLAGS="${CFLAGS}" CC=$(tc-getCC)
-}
-
-src_install() {
-	mv gen multimon-gen
-	dobin multimon-gen mkcostab multimon
-	doman multimon.1 multimon-gen.1
-}
-
-pkg_postinst() {
-	ewarn "The gen command has been renamed to multimon-gen to avoid conflicts"
-	ewarn "with dev-ruby/gen (#247156)"
-}
diff --git a/app-misc/ompload/Manifest b/app-misc/ompload/Manifest
deleted file mode 100644
index 390ee0b5a46d..000000000000
--- a/app-misc/ompload/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ompload-20101220 6707 SHA256 514a82a1a0266b2db03d18910f181a543952740963ad782503b76c7205572a66 SHA512 6ec9e35b748a650658b8b9dcbdbd8fd9d5df519148647c9ad591a1b8701a4c283333650a82422201799a0797334b1e4f875ae62d90449f32f7cad8c1344f8a29 WHIRLPOOL 323546a20ea131255ef45f1071414bc41e759e2c66ef46ac7a54034d0959113c9e040e796b6a4db824655e8771c5a6737f251941dd6d283dd408da436a8c841e
diff --git a/app-misc/ompload/ompload-20101220.ebuild b/app-misc/ompload/ompload-20101220.ebuild
deleted file mode 100644
index b573653284e7..000000000000
--- a/app-misc/ompload/ompload-20101220.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-DESCRIPTION="CLI script for uploading files to http://ompldr.org/"
-HOMEPAGE="http://ompldr.org/"
-SRC_URI="mirror://gentoo/${P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/ruby-1.8
-	net-misc/curl"
-
-src_unpack() {
-	install -D "${DISTDIR}"/${P} "${S}"/${PN} || die
-}
-
-src_install() {
-	dobin ${PN} || die
-}
diff --git a/app-misc/pax-utils/pax-utils-1.1.5.ebuild b/app-misc/pax-utils/pax-utils-1.1.5.ebuild
index e6c63527c47a..fc7931905711 100644
--- a/app-misc/pax-utils/pax-utils-1.1.5.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.1.5.ebuild
@@ -37,7 +37,7 @@ _emake() {
 src_configure() {
 	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
 	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10' || true
+	   has_version '<sys-libs/glibc-2.10'
 	then
 		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
 	else
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 39ea66aa68ab..5fb9c932111b 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,2 +1,2 @@
 DIST pdfpc-3.1.1.tgz 199004 SHA256 ec5ffb9c2b55d1bac76172a6a13ed527ceed8cf0d659aca5e302f6a7185f00f2 SHA512 554203094b18fe11fd085414961de6644df3c258ad52d46ad171cfd6c2199028bcbaa9560bdaba63d83f858b467407cc276972b34f341cc25260db1d1358e88d WHIRLPOOL bddcba6a4285ea2b58dd01f76b7b050db630eaa97de5bba32a66f7f85563e6a99763a52e82286297f605dfa59d9ff918007baab297e587968ac1c83e3d69e8a8
-DIST pdfpc-4.0.1.tar.gz 74405 SHA256 7c40cb87f9f1ce5e1683e96cc815572ea4c0a30e9db691501401ad271d27a3fb SHA512 701cf57b13b3abb2bacf086a29464a24d9eb67b095a89e770fade12f512d78773899bc9c71bc888e85b0a0acf2a122dd819b0259a1ab850a4f7af5fbc7369cdb WHIRLPOOL 0e1054b2aedce013c7f4397b05c66f658e6de88fe4fe6e857e8bd6bf33b5b68f3acda8fd327cffb9b2db7d1726543cdb5afdd342be1b8286a55799f5c5be9688
+DIST pdfpc-4.0.2.tar.gz 75962 SHA256 591da2f984dd7714b0607aff450b99649f9a8caaf311a38be8f5e2e1e565be96 SHA512 01c957976d69b2e469989bb6b5957fd29b20e3a285c854fd42680f6c790849dfd3b4480c65ad5fcd5bd4106f92494626d46c943f6e9d6c0a0cb88168dc52b89f WHIRLPOOL 94cf57074285a6f25f9292c7b2ea21392b78133ed4e13579e030429af6a179ad5e4e17a1a488fc2e6ff29041101cb140166335e699ba7041a5b992c330ed6311
diff --git a/app-misc/pdfpc/pdfpc-4.0.1.ebuild b/app-misc/pdfpc/pdfpc-4.0.1.ebuild
deleted file mode 100644
index 7faff1565cb1..000000000000
--- a/app-misc/pdfpc/pdfpc-4.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.30" # fix sed line if you increase this
-
-inherit vala cmake-utils
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="http://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler:=[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0.8
-	gnome-base/librsvg
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	sed -i -e "s/valac-0.20/valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
-	vala_src_prepare
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.0.2.ebuild b/app-misc/pdfpc/pdfpc-4.0.2.ebuild
new file mode 100644
index 000000000000..e57e35c8c750
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.30" # fix sed line if you increase this
+
+inherit vala cmake-utils
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="http://pdfpc.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler:=[cairo]
+	dev-libs/glib:2
+	dev-libs/libgee:0.8
+	gnome-base/librsvg
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	sys-apps/dbus
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	sed -i -e "s/valac-0.20/valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
+	vala_src_prepare
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
new file mode 100644
index 000000000000..ba5576cb5085
--- /dev/null
+++ b/app-misc/qlcplus/Manifest
@@ -0,0 +1 @@
+DIST qlcplus_4.10.2b.tar.gz 9711691 SHA256 1bcd2eef3e327714b3a83d0f0ff4695caa81bc1336f35abce29a047232b1a780 SHA512 d9716bcdd7289a0d5b94482ae3a7a4a047dc548c0a0b0b488c1f5af50280921a6769fe6479810862291d08508884a1403327be7722681a3a367ee3f77b895eab WHIRLPOOL 5b08afb4cac96926220140dba7283666829dc46e0fdcc517f28442c0b311febce81d0127adc3eaeb7bb3b7a570662558daa98a661acecd9b889e3669d8105ef8
diff --git a/app-misc/ompload/metadata.xml b/app-misc/qlcplus/metadata.xml
index 3c3d5ced6412..3c3d5ced6412 100644
--- a/app-misc/ompload/metadata.xml
+++ b/app-misc/qlcplus/metadata.xml
diff --git a/app-misc/qlcplus/qlcplus-4.10.2b.ebuild b/app-misc/qlcplus/qlcplus-4.10.2b.ebuild
new file mode 100644
index 000000000000..08f19bab0781
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.10.2b.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils qt4-r2 eutils virtualx
+
+DESCRIPTION="QLC+ - Q Light Controller Plus to control DMX interfaces"
+HOMEPAGE="http://www.qlcplus.org/"
+SRC_URI="http://www.${PN}.org/downloads/${PV/b/}/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="dev-libs/glib:2
+	virtual/libusb:0
+	virtual/libusb:1
+	media-libs/alsa-lib
+	media-libs/libmad
+	media-libs/libsndfile
+	sci-libs/fftw:3.0
+	virtual/udev
+	|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
+	qt4? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtscript:4
+		dev-qt/qttest:4 )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5[widgets]
+		dev-qt/qtnetwork
+		dev-qt/qtscript:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5 )"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/b/}
+
+src_prepare() {
+	sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \
+		plugins/hid/hid.pro \
+		plugins/udmx/src/src.pro \
+		plugins/dmxusb/src/src.pro \
+		plugins/spi/spi.pro \
+		plugins/peperoni/unix/unix.pro || die
+}
+
+src_configure() {
+	use qt5 && eqmake5
+	use qt4 && eqmake4
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
new file mode 100644
index 000000000000..58de49634b78
--- /dev/null
+++ b/app-misc/tmate/Manifest
@@ -0,0 +1,2 @@
+DIST tmate-2.2.0-upstream-patches-0.tar.xz 6784 SHA256 aa5b0ca858bb652418aa5200f0f5dcda0827295c16fb73fd34594d718a65878a SHA512 3e16e0b7988d3d1942fcac0a535d2cc8d7156d26332dc84fd21c4761afae40159282b0fbeb71cd5f6525b5a1c7a46e7813c8e6a11851592077570c1a001a73a7 WHIRLPOOL fb05b5d90f2542bb2e8fdc8c5df988338d5626bd48899697b8c16b9078ca71d2b2682c648f5f7c37ed8cd4a9966b1c6d5524823b34a4ac4cb9833a62325bb39c
+DIST tmate-2.2.0.tar.gz 610793 SHA256 932148b24d9c67e524ce744c9480b5603c9f976afb6ad7ca6d63246cd9e7fd3a SHA512 e9429833cdb8c28873d01bfc6b9a0d1241e30346ef1b3efae6763389c8444943b831283c1ea65e49c68d11936d6586186b38e0f7c14d373d9f63e841026c3338 WHIRLPOOL e1a2203e9a63466244d9d61e6e06d4dea77a9eb3e7069c1c87c115e5ce370e3b3b7ad2d7fc8b4c740030ee980b4d52833066f853a05d1c611a5d5c4810c89a36
diff --git a/app-misc/tmate/metadata.xml b/app-misc/tmate/metadata.xml
new file mode 100644
index 000000000000..3398ef8b263c
--- /dev/null
+++ b/app-misc/tmate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-misc/tmate/tmate-2.2.0.ebuild b/app-misc/tmate/tmate-2.2.0.ebuild
new file mode 100644
index 000000000000..f58ded2db269
--- /dev/null
+++ b/app-misc/tmate/tmate-2.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit eutils autotools-utils
+
+DESCRIPTION="Instant terminal sharing"
+HOMEPAGE="http://tmate.io/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+UPSTREAM_VER=0
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${UPSTREAM_PATCHSET_URI}"
+
+RDEPEND="
+	sys-libs/zlib[static-libs?]
+	dev-libs/openssl[static-libs?]
+	dev-libs/libevent[static-libs?]
+	dev-libs/msgpack[static-libs?]
+	>=net-libs/libssh-0.6.0[static-libs?]
+"
+DEPEND="${RPDEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply tmate Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
diff --git a/app-misc/tmux-mem-cpu-load/Manifest b/app-misc/tmux-mem-cpu-load/Manifest
index 339ceeaa86ed..90d469183bb4 100644
--- a/app-misc/tmux-mem-cpu-load/Manifest
+++ b/app-misc/tmux-mem-cpu-load/Manifest
@@ -1,2 +1 @@
-DIST tmux-mem-cpu-load-2.1.0.tar.gz 2705 SHA256 846036b3d9b0f5e6b6e88988f483f0d82060ca2bbe9fbbd4f4d63ac287eccb7c SHA512 18db125eededc3b2d75f74563e2173daa9fd0a72a9e1eefa93010d3a338403a1393c1a49471e03703d0a72ce7a407070836e5f0486a19e83c02abe1bbec2d2b9 WHIRLPOOL fa64abb9f6e5f43311e13c7777dee835f0b75d9fef1c12c548d8705a86cc67cb18c1164d160d2ce216f8cea7d5b6ae9aae24f80fbac544bdcec20fa2011dbe94
 DIST tmux-mem-cpu-load-2.2.1.tar.gz 9893 SHA256 fd90bd8d66f275f4cae36dc5bd05a2826ca3be63a86b916ef7a2b9d956817b9d SHA512 44d677bbe9eb457b8857c603f469c46767878b2b8af8f169f2b01393ce65fc8da3c33288bc0743b3c2846b77de798437130a7676ca95c5cab52cd4166d9ded73 WHIRLPOOL 4512f46972cd7f3eb6c4881ac735b71a4084b3e8a66906d85d9761343617647477f8b4559860a9104b3eaecf2486aea5a2c8a7c7f0011c878c2114259eba5823
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.1.0.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.1.0.ebuild
deleted file mode 100644
index 31c90c144e4a..000000000000
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils
-
-IUSE=""
-if [[ ${PV} == *9999* ]]; then
-	inherit git
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://www.github.com/thewtex/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
-HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/thewtex-${PN}-*
-		S=$(pwd)
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.rst || die
-}
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
index 4859b34f0ff4..7ae7c4e22dbc 100644
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	KEYWORDS=""
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1.ebuild
deleted file mode 100644
index 0b4e8fc01dba..000000000000
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1.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="3"
-
-inherit cmake-utils
-
-IUSE=""
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
-HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DOCS=( README.rst )
diff --git a/app-misc/tmux/tmux-2.1.ebuild b/app-misc/tmux/tmux-2.1.ebuild
index 9a9ea612da85..9862e65ee629 100644
--- a/app-misc/tmux/tmux-2.1.ebuild
+++ b/app-misc/tmux/tmux-2.1.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 		=dev-libs/libevent-2.0*
 		>=dev-libs/libevent-2.1.5-r4
 	)
-	!sys-apps/utempter
+	sys-libs/libutempter
 	sys-libs/ncurses:0="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 1e3c5867dabc..2709b1a41bdb 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -20,6 +20,7 @@ IUSE="debug selinux vim-syntax"
 
 CDEPEND="
 	>=dev-libs/libevent-2.0.10
+	sys-libs/libutempter
 	sys-libs/ncurses:0="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
diff --git a/app-misc/tracker/tracker-1.6.1.ebuild b/app-misc/tracker/tracker-1.6.1.ebuild
index edee4792e3a8..3009e3d07b42 100644
--- a/app-misc/tracker/tracker-1.6.1.ebuild
+++ b/app-misc/tracker/tracker-1.6.1.ebuild
@@ -18,7 +18,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/usbirboy/Manifest b/app-misc/usbirboy/Manifest
deleted file mode 100644
index 99ca6f47fe05..000000000000
--- a/app-misc/usbirboy/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST usbirboy-0.2.1.tar.gz 38664 SHA256 144e6e29dcce004f4999e2f90551529346516c478ae0773f753fda3abaed3ffd SHA512 f26daa847214f60e0883f261cf11d758f0d7a61434e2ec3c7dcee9862362d4a0d16225619cf920528a9a40f245eee97a3531112c1b57e1bec4d191a4196f161c WHIRLPOOL b1b31cdf874d8b0c040f4921bcab47d5292fba56600cab64c9b8e340c04267f3f1099473aa250043e775176cb0df4ba6b6eb1e4ee9616a7482ebfd95dfe652ab
-DIST usbirboy-0.3.1.tar.gz 49649 SHA256 cb879c1c67bb8deba385a12d5d97ca9ea6b148e77d1cd985a4fa3054b71d5cc6 SHA512 49f5c9eed4272b3066a87bfbacf95b39f1912a0fd22e580a87cf6b850e4ce98adb2c7ffb08b4c3db6d5b9cf298caa279ebeb51372eb95b9edf0b1ca02ecfba60 WHIRLPOOL e542f81644ca84953b2c789676a8f7b469358e0283262cb4881dfe0e4e87b8c140b5b47c68699057bcf5ccff0ba9771dfcd40ed1859d945604223c6e2e6084c0
diff --git a/app-misc/usbirboy/files/usbirboy-0.2.1-kernel-2.6.16.diff b/app-misc/usbirboy/files/usbirboy-0.2.1-kernel-2.6.16.diff
deleted file mode 100644
index bc2a2f0b3194..000000000000
--- a/app-misc/usbirboy/files/usbirboy-0.2.1-kernel-2.6.16.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ru usbirboy-0.2.1-orig/usbirboykmod/usbirboy.c usbirboy-0.2.1/usbirboykmod/usbirboy.c
---- usbirboy-0.2.1-orig/usbirboykmod/usbirboy.c	2006-06-08 07:52:54.211338228 +0200
-+++ usbirboy-0.2.1/usbirboykmod/usbirboy.c	2006-06-08 07:57:26.989743855 +0200
-@@ -76,6 +76,14 @@
- #define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, __u32)
- 
- 
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-+#define USBIRBOY_THIS_MODULE(x) x,
-+#else /* >= 2.6.16 */
-+#define USBIRBOY_THIS_MODULE(x)
-+#endif
-+
- 
- /* prevent races between open() and disconnect() */
- static DECLARE_MUTEX (disconnect_sem);
-@@ -778,7 +784,7 @@
- 
- /*defines user space function bodies*/
- static struct file_operations usbirboy_fops = {
--	.owner =	THIS_MODULE,
-+	USBIRBOY_THIS_MODULE(.owner =	THIS_MODULE)
- 	.read =		usbirboy_user_read,
- 	.ioctl = 	usbirboy_user_ioctl,
- 	.open =		usbirboy_user_open,
-@@ -790,13 +796,13 @@
- static struct usb_class_driver usbirboy_class = {
- 	.name =		DRIVER_NAME,
- 	.fops =		&usbirboy_fops,
--	.mode =		S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
-+	USBIRBOY_THIS_MODULE(.mode =		S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH)
- 	.minor_base =	USBIRBOY_MINOR_BASE,
- };
- 
- /*driver info for kernel*/
- static struct usb_driver usbirboy_driver = {
--        .owner =        THIS_MODULE,
-+        USBIRBOY_THIS_MODULE(.owner =        THIS_MODULE)
-         .name =         DRIVER_NAME,
-         .id_table =     usbirboy_device_table,
-         .probe =        usbirboy_usb_probe,
diff --git a/app-misc/usbirboy/files/usbirboy-0.2.1-module_param.diff b/app-misc/usbirboy/files/usbirboy-0.2.1-module_param.diff
deleted file mode 100644
index 176ed375fb72..000000000000
--- a/app-misc/usbirboy/files/usbirboy-0.2.1-module_param.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Nur in usbirboy-0.2.1/usbirboykmod: Modules.symvers.
-Nur in usbirboy-0.2.1/usbirboykmod/.tmp_versions: usbirboy.mod.
-diff -ru usbirboy-0.2.1-orig/usbirboykmod/usbirboy.c usbirboy-0.2.1/usbirboykmod/usbirboy.c
---- usbirboy-0.2.1-orig/usbirboykmod/usbirboy.c	2006-07-03 10:30:07.393102962 +0200
-+++ usbirboy-0.2.1/usbirboykmod/usbirboy.c	2006-07-03 10:34:02.999771952 +0200
-@@ -90,7 +90,8 @@
- 
- /* define debug kernel option */
- static int debug = 0;
--MODULE_PARM(debug, "i");
-+module_param(debug, bool, 0644);
-+MODULE_PARM_DESC(debug, "Enable debugging messages");
- 
- static struct usb_driver usbirboy_driver;
- static struct usb_class_driver usbirboy_class;
-Nur in usbirboy-0.2.1/usbirboykmod: usbirboy.ko.
-Nur in usbirboy-0.2.1/usbirboykmod: .usbirboy.ko.cmd.
-Nur in usbirboy-0.2.1/usbirboykmod: usbirboy.mod.c.
-Nur in usbirboy-0.2.1/usbirboykmod: usbirboy.mod.o.
-Nur in usbirboy-0.2.1/usbirboykmod: .usbirboy.mod.o.cmd.
-Nur in usbirboy-0.2.1/usbirboykmod: usbirboy.o.
-Nur in usbirboy-0.2.1/usbirboykmod: .usbirboy.o.cmd.
-Nur in usbirboy-0.2.1-orig/usbirboykmod: .usbirboy.o.d.
diff --git a/app-misc/usbirboy/files/usbirboy-0.2.1-nice-kernel-msgs.diff b/app-misc/usbirboy/files/usbirboy-0.2.1-nice-kernel-msgs.diff
deleted file mode 100644
index 8cac30623f9c..000000000000
--- a/app-misc/usbirboy/files/usbirboy-0.2.1-nice-kernel-msgs.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru usbirboy-0.2.1-orig/usbirboykmod/usbirboy.c usbirboy-0.2.1/usbirboykmod/usbirboy.c
---- usbirboy-0.2.1-orig/usbirboykmod/usbirboy.c	2006-07-06 11:47:10.353523729 +0200
-+++ usbirboy-0.2.1/usbirboykmod/usbirboy.c	2006-07-06 11:49:45.352506621 +0200
-@@ -65,6 +65,8 @@
- #define __END_DEBUG }
- 
- 
-+#define usbirboy_info(format, arg...) printk(KERN_INFO "%s: " format "\n" , \
-+	DRIVER_NAME , ## arg)
- 
- /* Strait from lirc.h adopted ioctl definitions */
- /* Lets hope they dont change those*/
-@@ -636,7 +638,7 @@
- 
-   
-   /* let the user know what node this device is now attached to */
--  info("USB-IR-Boy device attached to usbirboy with minor %d\n", irdev->minor);
-+  usbirboy_info("USB-IR-Boy device attached to usbirboy with minor %d", irdev->minor);
-   __DEBUG
-     printk("<----- %s \n", __FUNCTION__);
-   __END_DEBUG
-@@ -725,7 +727,7 @@
- 	usbirboy_cleanup (usbirdev);
- 	up (&disconnect_sem);
- 
--	info( "USB-IR-Boy device disconnected. Minor: %d\n",minor);
-+	usbirboy_info( "USB-IR-Boy device disconnected. Minor: %d",minor);
- 	__DEBUG
- 	printk("<----- %s \n", __FUNCTION__);
- 	__END_DEBUG
-@@ -754,7 +756,7 @@
-       return -1;
-     }
-    
--  info( DRIVER_DESC ":" DRIVER_VERSION);
-+  usbirboy_info( DRIVER_DESC ":" DRIVER_VERSION);
- 
-   __DEBUG
-   printk("<----- %s \n", __FUNCTION__);
-@@ -772,7 +774,7 @@
-   __END_DEBUG
- 	usb_deregister (&usbirboy_driver);
- 	
--  info( "usbirboy_driver deregistered...\n");
-+  usbirboy_info( "driver deregistered...");
-   __DEBUG
-     printk("<----- %s \n", __FUNCTION__);
-   __END_DEBUG
diff --git a/app-misc/usbirboy/metadata.xml b/app-misc/usbirboy/metadata.xml
deleted file mode 100644
index 34cd99026cc7..000000000000
--- a/app-misc/usbirboy/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">usbirboy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/usbirboy/usbirboy-0.2.1-r1.ebuild b/app-misc/usbirboy/usbirboy-0.2.1-r1.ebuild
deleted file mode 100644
index ba716fc47dc3..000000000000
--- a/app-misc/usbirboy/usbirboy-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit linux-mod eutils
-
-DESCRIPTION="Use home made infrared receiver connected via USB"
-HOMEPAGE="http://usbirboy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${P}/usbirboykmod"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if ! kernel_is -ge 2 6; then
-		die "This package works only with 2.6 kernel!"
-	fi
-
-	if ! linux_chkconfig_present USB; then
-		die "You need a kernel with enabled USB support!"
-	fi
-
-	MODULE_NAMES="usbirboy(misc:${S})"
-	BUILD_PARAMS="INCLUDE=${KV_DIR}"
-	BUILD_TARGETS="default"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-kernel-2.6.16.diff"
-	epatch "${FILESDIR}/${P}-module_param.diff"
-	epatch "${FILESDIR}/${P}-nice-kernel-msgs.diff"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	newdoc ../usbirboymcu/README README.mcu
-
-	insinto /usr/share/${PN}
-	doins ../mcubin/usbirboy.s19
-
-	# Add configuration for udev
-	dodir /etc/udev/rules.d
-	echo 'KERNEL=="usbirboy", NAME="%k", SYMLINK="lirc"' \
-		> "${D}etc/udev/rules.d/55-${PN}.rules"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog
-	elog "Firmware file has been installed to /usr/share/${PN}"
-	elog
-}
diff --git a/app-misc/usbirboy/usbirboy-0.3.1-r1.ebuild b/app-misc/usbirboy/usbirboy-0.3.1-r1.ebuild
deleted file mode 100644
index fe9b8383adac..000000000000
--- a/app-misc/usbirboy/usbirboy-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit linux-mod eutils
-
-DESCRIPTION="Use home made infrared receiver connected via USB"
-HOMEPAGE="http://usbirboy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${P}/usbirboykmod"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if ! kernel_is -ge 2 6; then
-		die "This package works only with 2.6 kernel!"
-	fi
-
-	if ! linux_chkconfig_present USB; then
-		die "You need a kernel with enabled USB support!"
-	fi
-
-	MODULE_NAMES="usbirboy(misc:${S})"
-	BUILD_PARAMS="INCLUDE=${KV_DIR}"
-	BUILD_TARGETS="clean all"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	newdoc ../usbirboymcu/README README.mcu
-
-	insinto /usr/share/${PN}
-	doins ../mcubin/usbirboy.s19
-
-	# Add configuration for udev
-	dodir /etc/udev/rules.d
-	echo 'KERNEL=="usbirboy", SYMLINK+="lirc"' \
-		> "${D}etc/udev/rules.d/30-${PN}.rules"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog
-	elog "Firmware file has been installed to /usr/share/${PN}"
-	elog
-}
diff --git a/app-misc/usbirboy/usbirboy-0.3.1.ebuild b/app-misc/usbirboy/usbirboy-0.3.1.ebuild
deleted file mode 100644
index c25c5ead0c75..000000000000
--- a/app-misc/usbirboy/usbirboy-0.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit linux-mod eutils
-
-DESCRIPTION="Use home made infrared receiver connected via USB"
-HOMEPAGE="http://usbirboy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${P}/usbirboykmod"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if ! kernel_is -ge 2 6; then
-		die "This package works only with 2.6 kernel!"
-	fi
-
-	if ! linux_chkconfig_present USB; then
-		die "You need a kernel with enabled USB support!"
-	fi
-
-	MODULE_NAMES="usbirboy(misc:${S})"
-	BUILD_PARAMS="INCLUDE=${KV_DIR}"
-	BUILD_TARGETS="clean all"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	newdoc ../usbirboymcu/README README.mcu
-
-	insinto /usr/share/${PN}
-	doins ../mcubin/usbirboy.s19
-
-	# Add configuration for udev
-	dodir /etc/udev/rules.d
-	echo 'KERNEL=="usbirboy", NAME="%k", SYMLINK="lirc"' \
-		> "${D}etc/udev/rules.d/55-${PN}.rules"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog
-	elog "Firmware file has been installed to /usr/share/${PN}"
-	elog
-}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 02657c07ca4a..f8d4724d166e 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,3 +1,3 @@
 DIST vifm-0.7.2.tar.bz2 468086 SHA256 f95e49a8518dd1acc9b7b750658a98bcf1cb538e25520a5a300b5812108fbc8d SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9 WHIRLPOOL 9c954dbe659e3303315642738bafb962f6f20820af0fe587b3c525ad7a93aca3f9090fe5d2d871a291ce95c9add81f7d717ae5adbdcbe2a58d2889e0bf3e50dc
-DIST vifm-0.8.1-beta.tar.bz2 819256 SHA256 e0e3e4d7cc06ac75e4acdd1c03f1b91e433b0df3ef817024e27bdc268f32b80f SHA512 873d6cecb3926395d48a3b56cd7c30f3dee930394c31c520d7eb4f12a6a938c632246b84f271dc98841eebe494fa1cf4b2c36bb560ad95574185dbdd47f888c7 WHIRLPOOL 5cde8d5010b7d96b142a662d9188f82f05ea41eb98372ab4628026bfc209b7afa991bd4fc3d9206c3b8e4cc251a20c056b5d11dff4752528c44c3152d92d5f96
+DIST vifm-0.8.1a.tar.bz2 832500 SHA256 974fb2aa5e32d2c729ceff678c595070c701bd30a6ccc5cb6ca64807a9dd4422 SHA512 3cd182fd52b8695468ceb9cb812b9b4e336c42ce101119c8423028403839d8b04fe2ece6d30830325d374cda93a82f0e1d4f427d5095545fa888a991dfcbc714 WHIRLPOOL 48ce3ca228aacfcaf36a80bb4440dbaf038785919aaeb19e1f069aea5b1a5941de4abfdb02cbc797e9848d0d746a1bd2df3e485d38bc1130de920a42fb01ed4c
 DIST vifm-0.8.tar.bz2 756795 SHA256 69eb6b50dcf462f4233ff987f0b6a295df08a27bc42577ebef725bfe58dbdeeb SHA512 b4727b7a9f577eb05c4e8830849a00759cbeb35457c8fa533136a0a68124312f2bb8c5c21239fbbd34f567ddaca247ede05e48e72b890bb4f15d12adebc23210 WHIRLPOOL 78d030cc9eda292ce75656eedc3ede3e02c87522517d7b7d49f0e993dbfc438a5b5e0dcf8fed531eeb1e045f01d5418d1e7fbc84cb53da800bb54d7ab4a636d7
diff --git a/app-misc/vifm/vifm-0.8.1_beta.ebuild b/app-misc/vifm/vifm-0.8.1_beta.ebuild
deleted file mode 100644
index f72a0efbe4e4..000000000000
--- a/app-misc/vifm/vifm-0.8.1_beta.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools vim-doc versionator
-
-MY_P=$(replace_version_separator 4 '-' ${PF})
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="http://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r99:5
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-DOCS="AUTHORS FAQ NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable developer) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	einstall
-	dodoc ${DOCS}
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/"${t}"/"${PN}".vim
-		done
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	use vim && update_vim_helptags
-}
diff --git a/app-misc/vifm/vifm-0.8.1a.ebuild b/app-misc/vifm/vifm-0.8.1a.ebuild
new file mode 100644
index 000000000000..bec2322fba88
--- /dev/null
+++ b/app-misc/vifm/vifm-0.8.1a.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools vim-doc versionator
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="http://vifm.info/"
+SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r99:5
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS="AUTHORS FAQ NEWS README TODO"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable developer) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	einstall
+	dodoc ${DOCS}
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".vim
+		done
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index a9f0acb6b9e5..7a8264327590 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,3 +1,3 @@
 DIST wcd-5.2.7.tar.gz 622613 SHA256 e5f56824e054c6726186271b20a5de3c5b167116b97785a925907981cf3e3b39 SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e WHIRLPOOL 3354e380dceaed394e0eb9bac3f474edc819270a117baf5812a1e7252b2cef207862746af2b21dd71de837459bc6281a45a9099f5a6351def49e3c1ce780960d
-DIST wcd-5.3.0.tar.gz 617825 SHA256 9375c9b055e0ebff8d0b0a11673229bb9770071bda76249cf2494532794ecd9b SHA512 76f7039428a2792e200a4b070df2e861a5ad5c3a24b26348438974c0dd7bb564a1d495215d07920313da296bb704e5cd4708dc82c1ed2a2f1d79a268b5bb9610 WHIRLPOOL e19431a44e14fb0974e878ddd77800515846e46411415e2eb5db1e8dcf4d6df51e5373203196395d54439ca3b3aae6bc23e12afaf21920452acf1362a670d32d
 DIST wcd-5.3.1.tar.gz 625579 SHA256 bd1705529311e8825a20af742c4c4004857917c623ee9e8fc63ff5c1fb56d525 SHA512 c06882e901555d36fc863fba80ea3bf9633aae4d20e8f151f81c871b3280744bc2cbb66d63d17fe9fd7f0e305a6509c3c198a4366e7fc1a5667ef41e60b61a74 WHIRLPOOL d8baff515bd7938272c7cd323408f19ad7c8a8a4f17914d56543d852568237e86728534dabc7ef3ae7a559e23d71f3229b885dc54109447553bc1dc5384ac7e1
+DIST wcd-5.3.2.tar.gz 595071 SHA256 a16434cb7a177ec8e9be67a1cfe7f6406a7c9190726d0ead5c44afdc4b8d3612 SHA512 3bc8fc27f170576530066bdd0af66887a4ffdd8824c36985d55588c575729b25b4c713cf67f2d70c820fdb7ed7fdaef89375673bc96c7251e74f786fb9501c08 WHIRLPOOL eb198f8ea14fd5d9d4f092abce00ece7e7428afe26bb7a4cdb43ee487ad4bc5fae27e0a3c7b357007037ab2d8d4cad6f63f08f9ca2ff90db7b64cf09521fe51b
diff --git a/app-misc/wcd/wcd-5.3.0.ebuild b/app-misc/wcd/wcd-5.3.0.ebuild
deleted file mode 100644
index 6d6877d3af55..000000000000
--- a/app-misc/wcd/wcd-5.3.0.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 eutils toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
-	app-text/ghostscript-gpl"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${P}/src
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.2.5-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile="${mycompile} ENABLE_NLS="
-	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
-	emake \
-		${mycompile}
-}
-
-src_install() {
-	local DOCS="../README.txt"
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/wcd/wcd-5.3.2.ebuild b/app-misc/wcd/wcd-5.3.2.ebuild
new file mode 100644
index 000000000000..94d357d5d5aa
--- /dev/null
+++ b/app-misc/wcd/wcd-5.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+	app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"/${P}/src
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.5-gentoo.patch
+)
+
+src_prepare() {
+	# Required for stupid eapply function
+	pushd .. &>/dev/null || die
+	default
+	popd &>/dev/null || die
+	tc-export CC
+}
+
+src_compile() {
+	local mycompile="LFS=1"
+	use nls || mycompile="${mycompile} ENABLE_NLS="
+	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
+	emake \
+		${mycompile}
+}
+
+src_install() {
+	local DOCS="../README.txt"
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-mobilephone/anyremote/Manifest b/app-mobilephone/anyremote/Manifest
index 3cb998023789..9a529626f809 100644
--- a/app-mobilephone/anyremote/Manifest
+++ b/app-mobilephone/anyremote/Manifest
@@ -1,2 +1 @@
-DIST anyremote-6.4.tar.gz 2425993 SHA256 342eee7efdb88925d3729553db6d6314bdc6063b51d317931864f77a46254574 SHA512 7baf48e01356dd6f325ca62e005e04af22b4959f95bffb9144327c40ae6a9ebb295f3aab8b638fbf98439fdf748cd1bcb4fd8d3399f81827b657fe9a7311eae8 WHIRLPOOL b183e05e1826215ccdb15bedfc9faffca2be8cbce81fe355cdfe9479b8d267cd76e005909174cbeaddfd9b7992ee8f96cbd6a82271281f08738999a26680f3a3
 DIST anyremote-6.5.tar.gz 2440051 SHA256 e94cd12bd6c1a04f1f0107266fcfa46d8d8e04d3872c22e76346bea192c31225 SHA512 e6190ec9ea4c66b7b85d77a9e056aeaf83d9730356780e9a54c0d27e31ce89399564b20e4bd62543aa72771049f34d359111d2c015e15fca5891d088391d2b73 WHIRLPOOL bbffc9d3dc662f086d4c4c6fa4a7edc2e86efc60e1c2588e46c3489ff5ecfd5ef93dd54f42c67a3d8f6e17f11565addef6cce75ab2154f229482403dd1aa0c62
diff --git a/app-mobilephone/anyremote/anyremote-6.4.ebuild b/app-mobilephone/anyremote/anyremote-6.4.ebuild
deleted file mode 100644
index 9b586735c3b5..000000000000
--- a/app-mobilephone/anyremote/anyremote-6.4.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
-
-DESCRIPTION="Anyremote provides wireless bluetooth, infrared or cable remote control service"
-HOMEPAGE="http://anyremote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bluetooth dbus"
-
-RDEPEND="bluetooth? ( net-wireless/bluez )
-	dbus? ( sys-apps/dbus )
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}/" $(use_enable bluetooth) $(use_enable dbus)
-}
diff --git a/app-mobilephone/anyremote/anyremote-6.5.ebuild b/app-mobilephone/anyremote/anyremote-6.5.ebuild
index d6ede70bcbc8..400cb997c101 100644
--- a/app-mobilephone/anyremote/anyremote-6.5.ebuild
+++ b/app-mobilephone/anyremote/anyremote-6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="avahi bluetooth dbus"
 
 RDEPEND="
diff --git a/app-mobilephone/obexd/Manifest b/app-mobilephone/obexd/Manifest
deleted file mode 100644
index 4c762263a7d5..000000000000
--- a/app-mobilephone/obexd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST obexd-0.46.tar.xz 343372 SHA256 f245374813a1f4da39a1f24ae2458a1c886bd0f56a39920e176199898355e943 SHA512 a49d7f1c92e66528f47c03df12548b460fb8cf76dea71b7c5bede349e2eeb215071aef7a4f0dc45ba81af933c8ff5cda2a45c3b9b7edb49e4567011688ca77cf WHIRLPOOL ecca111740102dd3daaefcbbf540d4c3b87381951d9c3e2501d8f1435b26af4bc70883f8ab19b58e96e21a673abeb998d3bfa42bd4952692754e072a0a03d90a
-DIST obexd-0.48.tar.xz 350548 SHA256 6dfd10e1444b0d8a66f2d745d70336cd28e533e893a48f69879c4bb6d079edfb SHA512 5f349805d74e070d170fc715ab0ae8e4524fc62016352911cda999fa6e3da0f60e5be763e84ac303cd624cc51c89a47c2062e22b47ae7b56f90d017ff99cff5d WHIRLPOOL 0a5f3db03d8192561a4ce354a839500d7bb590f41d4c109c064da33dc040c5c72af357ab4d37f24771b0d4d9add981f42473e82c9c8532e894f588fec354aaca
diff --git a/app-mobilephone/obexd/metadata.xml b/app-mobilephone/obexd/metadata.xml
deleted file mode 100644
index ab4e9e0e6b75..000000000000
--- a/app-mobilephone/obexd/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
-		<description>
-			Taking care of this until Tiziano has enough time
-			for maintaing this.
-		</description>
-	</maintainer>
-	<use>
-		<flag name="nokia">Add support for Nokia backup
-		plugin</flag>
-  		<flag name="server">Enables server installation, it's
-  		incompatible with obex-data-server provided one</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-mobilephone/obexd/obexd-0.46.ebuild b/app-mobilephone/obexd/obexd-0.46.ebuild
deleted file mode 100644
index f0749ef75dd1..000000000000
--- a/app-mobilephone/obexd/obexd-0.46.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="OBEX Server and Client"
-HOMEPAGE="http://www.bluez.org/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="-eds nokia -server usb"
-
-DOCS="AUTHORS ChangeLog README doc/*.txt"
-
-RDEPEND="eds? ( gnome-extra/evolution-data-server )
-	!eds? ( dev-libs/libical )
-	>=net-wireless/bluez-4.99
-	>=dev-libs/openobex-1.4
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.4
-	server? ( !app-mobilephone/obex-data-server )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-
-src_configure() {
-	econf \
-		--disable-debug \
-		$(use_with eds phonebook ebook) \
-		$(use_enable nokia pcsuite) \
-		$(use_enable server) \
-		$(use_enable usb)
-}
diff --git a/app-mobilephone/obexd/obexd-0.48.ebuild b/app-mobilephone/obexd/obexd-0.48.ebuild
deleted file mode 100644
index 3d88dbb92c53..000000000000
--- a/app-mobilephone/obexd/obexd-0.48.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="OBEX Server and Client"
-HOMEPAGE="http://www.bluez.org/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="-eds nokia -server usb"
-
-DOCS="AUTHORS ChangeLog README doc/*.txt"
-
-RDEPEND="eds? ( gnome-extra/evolution-data-server )
-	!eds? ( dev-libs/libical )
-	>=net-wireless/bluez-4.100
-	>=dev-libs/openobex-1.4
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.4
-	server? ( !app-mobilephone/obex-data-server )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-
-src_configure() {
-	econf \
-		--disable-debug \
-		$(use_with eds phonebook ebook) \
-		$(use_enable nokia pcsuite) \
-		$(use_enable server) \
-		$(use_enable usb)
-}
diff --git a/app-office/calligra/calligra-2.8.5.ebuild b/app-office/calligra/calligra-2.8.5.ebuild
index 2e1ba2c91ff7..7e3abfbc3306 100644
--- a/app-office/calligra/calligra-2.8.5.ebuild
+++ b/app-office/calligra/calligra-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -126,7 +126,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]
diff --git a/app-office/calligra/calligra-2.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild
index fb7b7339e10b..3615a0dffb2f 100644
--- a/app-office/calligra/calligra-2.8.7.ebuild
+++ b/app-office/calligra/calligra-2.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -128,7 +128,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]
diff --git a/app-office/calligra/calligra-2.9.10.ebuild b/app-office/calligra/calligra-2.9.10.ebuild
index 04f1143cdc42..b53f1a5ba6bb 100644
--- a/app-office/calligra/calligra-2.9.10.ebuild
+++ b/app-office/calligra/calligra-2.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -117,7 +117,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]
diff --git a/app-office/calligra/calligra-2.9.11.ebuild b/app-office/calligra/calligra-2.9.11.ebuild
index 3a544c470772..06d6e3355e71 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -117,7 +117,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]
diff --git a/app-office/calligra/calligra-2.9.6.ebuild b/app-office/calligra/calligra-2.9.6.ebuild
index 3d401ecb5ad5..ae7485fd8254 100644
--- a/app-office/calligra/calligra-2.9.6.ebuild
+++ b/app-office/calligra/calligra-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -118,7 +118,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]
diff --git a/app-office/calligra/calligra-2.9.7.ebuild b/app-office/calligra/calligra-2.9.7.ebuild
index db56918f1f62..722ca6078da2 100644
--- a/app-office/calligra/calligra-2.9.7.ebuild
+++ b/app-office/calligra/calligra-2.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -118,7 +118,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 04f1143cdc42..b53f1a5ba6bb 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -117,7 +117,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]
diff --git a/app-office/gnucash/gnucash-2.6.11.ebuild b/app-office/gnucash/gnucash-2.6.11.ebuild
index 78aa0f8afd46..604bd46404c6 100644
--- a/app-office/gnucash/gnucash-2.6.11.ebuild
+++ b/app-office/gnucash/gnucash-2.6.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index e1152c95d080..b3a7e8668899 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,3 +1,3 @@
 DIST gnumeric-1.12.24.tar.xz 18526768 SHA256 c59d5271b27366008bccb4d53ad8333da36d837003a018892f2da325c1449551 SHA512 71bed41a1b50ed57e9ab4993df8d963cb14a9f6f3fbf87d81c30f71359a23c4092daab00079936e587a118041a303c1c563bcd3f38f2aaea78a9ae5593dcdd4b WHIRLPOOL 648930de4d37d25db471fe9b639b91a64a1d1ebf1a50291ef2c79a23d4082b7249e6197467e86ce752e96699b38a7c3d86730cead7d0438c7e6605521b61e7b8
-DIST gnumeric-1.12.25.tar.xz 18536284 SHA256 9709a8fccfc371a07b1590d037a43e525531d5a46f31c5c5fe223c6054cecdb6 SHA512 260d08391b336437df7f9160ca7ceaf123f2ae84afaea81e7be3b52a3999d40b03b5292ed14a7682d4376c90ef3d69ae12a4767cf1a8fb75761e66ee1e801684 WHIRLPOOL 1f245120c2dac7cd10283597e3364d7937e646f07438f20f52af4f536ca26a1594371851316163f20dd75c0bc1047058a055edecf451b710fde459b241bcc6ef
 DIST gnumeric-1.12.26.tar.xz 18537376 SHA256 48250718133e998f7b2e73f71be970542e46c9096afb936dbcb152cf5394ee14 SHA512 8a9ae470d3d9df9b44783abdb9a46a63433a797936fe5a19ccc7fbafb890282af8dd12fa89ff7352cec1506a51d2775c5b8078b4d35527a7bfdb18ba269e557b WHIRLPOOL 0327ff9c8c61a3ba9c6016d2f82e70f0de3ba07fa684a985830f65ea14afd5c0b2de4d6479569a4759fd6985f892dcc5d8b350e43c9090d1043f65162b510452
+DIST gnumeric-1.12.27.tar.xz 18558196 SHA256 383a5b6eca17f0a5a0b552edcc10320fa719d10c69c7b6fb29d5a11808f1d1c9 SHA512 7111c311bc7e0ac8e6ad016ff68667b215c1d0aec20d26a573a4c14b4ca3c3fb3002bf6ff15d6472d635ef6f6eadff7532dd65ea00d531a8e15ff24b3d261554 WHIRLPOOL a7a93f4c37f5b30d626c796d516d7ff6bca92845081bc0b92f0f539c023853f095acaf2876e668c650b7ae3375604dc372fdeb9789e8088e6e116306515641f4
diff --git a/app-office/gnumeric/gnumeric-1.12.25.ebuild b/app-office/gnumeric/gnumeric-1.12.25.ebuild
deleted file mode 100644
index a78dd0792a06..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.25.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="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 flag-o-matic python-single-r1
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="+introspection libgda perl python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.38.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.22:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg]
-
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
-	libgda? ( gnome-extra/libgda:5[gtk] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl) \
-		$(use_with python)
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.27.ebuild b/app-office/gnumeric/gnumeric-1.12.27.ebuild
new file mode 100644
index 000000000000..a5297b4d1894
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.27.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="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 flag-o-matic python-single-r1
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+introspection libgda perl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.38.0:2
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.27:0.10
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.8.7:3
+	x11-libs/cairo:=[svg]
+
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
+	libgda? ( gnome-extra/libgda:5[gtk] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl) \
+		$(use_with python)
+}
diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 25cb5488131f..878334422936 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,2 +1 @@
-DIST kraft-0.58.tar.xz 556404 SHA256 12c92dbdae05d01a491111ed42dfa6f487ec477f60e536e5a80efa6592997524 SHA512 450d68022f5ea1a19b6b9461f3db65233cdc6939cae5367a4c95d22eb6207881cbd798d723a87d43d3f20e84d8ffb2d601a3245324fa1c10078300c5b8e06845 WHIRLPOOL 60371a2db0bc6b39d3c6ce0f20922e8749df3ae74bcafb7a43c5861b9715dff7aef8407f2446702394bf697dca647e3d61989fa733e0b40514e493ecd25f93ca
 DIST kraft-0.59.tar.xz 560116 SHA256 e05ff0b78a073bafffa5c0e41fe458461216b66fd57fc9432a1064a7be2b2034 SHA512 53576855e3a4ac054818cc3fcb5d123222c0a5839ba621ea7c1f390f1e3180b5c87b00daa09a57fbea64cbd1dc857c4cb7645c5f539635811ef236c76483dc36 WHIRLPOOL d442c33ecbee4f0b3d8f33b358a5f7fab9f9c99d5e70019ca9d5910a3b717530008b6b09c3573132a27681f9e554f83f1798bc6b5a71d71fd10c81884692dd6e
diff --git a/app-office/kraft/kraft-0.58.ebuild b/app-office/kraft/kraft-0.58.ebuild
deleted file mode 100644
index 3df9c7c9bc9f..000000000000
--- a/app-office/kraft/kraft-0.58.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
-
-KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nds
-nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
-inherit kde4-base
-
-DESCRIPTION="Software for operating a small business, helping create documents such as offers and invoices"
-HOMEPAGE="http://www.volle-kraft-voraus.de/"
-SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	dev-cpp/ctemplate
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[mysql,sqlite]
-	$(add_kdeapps_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
diff --git a/app-office/kraft/kraft-0.59.ebuild b/app-office/kraft/kraft-0.59.ebuild
index 58ceb537edb1..a527bb180123 100644
--- a/app-office/kraft/kraft-0.59.ebuild
+++ b/app-office/kraft/kraft-0.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,13 +8,13 @@ KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nd
 nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
 inherit kde4-base
 
-DESCRIPTION="Software for operating a small business, helping create documents such as offers and invoices"
+DESCRIPTION="Software for operating a small business, creating documents such as invoices"
 HOMEPAGE="http://www.volle-kraft-voraus.de/"
 SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 40a419e1b4d4..778c657a4f85 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,2 +1,3 @@
 DIST ledger-2.6.3.tar.gz 551325 SHA256 e2c99d930fcf64b7fa901215c7fa25e3327f6365e8ee049620ef3632d53bf363 SHA512 825e670d25d2f8d1791480fb5da4190f7b342ecc9b47bca60fd6f0e606e5af5f3f767ec7043339660396ef4c90451f4a4122d812b8761acf4ea964b67dbd43b5 WHIRLPOOL e6d351ce8899079daa9cb0d1f9493b2b551a6d44e8ad7949c28ac8e544f80c87d54f06b350adfc21c4c8582e9042547313a506fa74096671bae30b462ae3e2df
+DIST ledger-3.1.1.tar.gz 842364 SHA256 90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5 WHIRLPOOL 89a83818adbe206167dbfc999dd589f1943d199cf84979fa82754f597a863c115fec85bbdabc4413714b4253502833170e6327bfc0d2321c392b9a3d73400061
 DIST ledger-3.1.tar.gz 817624 SHA256 eeb5d260729834923fc94822bcc54ca3080c434f81466a3f5dc4274b357ce694 SHA512 caa84330eee05d3e88820e8afd4a906d22f6aaa9de4abc2f6813636754e052e6ec4d1b3d2fce68215aededc72651405c62aaf16a2c1b69d34e1b10ffece48519 WHIRLPOOL fc3ce5e8eb59e1d4f83101063ebefd1379172c1be0e4f504079519924859b8127d616e7e3714837be49c7b38674b1684e321347d1f8561aeeba586b538341142
diff --git a/app-office/ledger/files/50ledger-gentoo-3.1.1.el b/app-office/ledger/files/50ledger-gentoo-3.1.1.el
new file mode 100644
index 000000000000..1c2c5bde2f8b
--- /dev/null
+++ b/app-office/ledger/files/50ledger-gentoo-3.1.1.el
@@ -0,0 +1,5 @@
+
+;;; app-office/ledger site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ledger-mode "ledger-mode" "A mode for editing ledger data files." t)
diff --git a/app-office/ledger/ledger-3.1-r1.ebuild b/app-office/ledger/ledger-3.1-r1.ebuild
index c1714fd590b2..67bff52a5a60 100644
--- a/app-office/ledger/ledger-3.1-r1.ebuild
+++ b/app-office/ledger/ledger-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ IUSE="doc emacs"
 SITEFILE=50${PN}-gentoo-${PV}.el
 
 RDEPEND="
-	dev-libs/boost:=
+	<dev-libs/boost-1.58:=
 	dev-libs/gmp:0
 	dev-libs/mpfr:0
 	emacs? ( virtual/emacs )
diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
new file mode 100644
index 000000000000..b4338f9bc387
--- /dev/null
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils elisp-common python-single-r1
+
+DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
+HOMEPAGE="http://ledger-cli.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc emacs python"
+
+SITEFILE=50${PN}-gentoo-${PV}.el
+
+CHECKREQS_MEMORY=8G
+
+COMMON_DEPEND="
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	emacs? ( virtual/emacs )
+	python? ( dev-libs/boost:=[python] )
+	!python? ( dev-libs/boost:= )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	python? ( dev-python/cheetah )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/utfcpp
+	doc? ( sys-apps/texinfo )
+"
+
+DOCS=(README.md)
+
+# Building with python integration seems to fail without 8G available
+# RAM(!)  Since the memory check in check-reqs doesn't count swap, it
+# may be unfair to fail the build entirely on the memory test alone.
+# Therefore check-reqs_pkg_pretend is deliberately omitted so that we
+# ewarn but not not eerror.
+pkg_pretend() {
+	:
+}
+pkg_setup() {
+	if use python; then
+	   check-reqs_pkg_setup
+	   python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Want to type "info ledger" not "info ledger3"
+	sed -i -e 's/ledger3/ledger/g' \
+	doc/ledger3.texi \
+	doc/CMakeLists.txt \
+	test/CheckTexinfo.py \
+	tools/cleanup.sh \
+	tools/gendocs.sh \
+	tools/prepare-commit-msg \
+	tools/spellcheck.sh \
+	|| die "Failed to update info file name in file contents"
+
+	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build emacs EMACSLISP)
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build doc WEB_DOCS)
+		$(cmake-utils_use_use python PYTHON)
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_make doc
+}
+
+src_install() {
+	# Prevent installing ledger.so into python site-packages.  It's an
+	# unnecessary copy of libledger.so and generates security warnings.
+	sed -i -e '/python/d' ../${P}_build/src/cmake_install.cmake \
+		|| die "Failed to disable installation of ledger.so"
+
+	enable_cmake-utils_src_install
+
+	# This source dir appears to include some helper code for serving
+	# reports to a browser ("ledger server").  I can't quite get it to
+	# work and the docs say it's a work-in-progress.  It's a little
+	# interesting, though, so I'll leave these installed as a preview of
+	# features to come.
+	if use python; then
+		mv python ${PN} || die "Couldn't rename python module static files dir"
+		python_domodule ${PN}
+	fi
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo
+	einfo "Since version 3, vim support is released separately."
+	einfo "See https://github.com/ledger/vim-ledger"
+	einfo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+# rainy day TODO:
+# - IUSE test
diff --git a/app-office/ledger/ledger-3.1.ebuild b/app-office/ledger/ledger-3.1.ebuild
deleted file mode 100644
index 6cdf9d9a5148..000000000000
--- a/app-office/ledger/ledger-3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
-HOMEPAGE="http://ledger-cli.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:0
-	dev-libs/mpfr:0
-"
-DEPEND="${RDEPEND}
-	dev-libs/utfcpp
-"
-
-DOCS=(README.md)
diff --git a/app-office/ledger/metadata.xml b/app-office/ledger/metadata.xml
index 9d91b41fc7d9..56dda141644b 100644
--- a/app-office/ledger/metadata.xml
+++ b/app-office/ledger/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
+    <email>stasibear@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
     <email>yac@gentoo.org</email>
   </maintainer>
   <upstream>
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 56dec9636c69..87406ad05978 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -501,3 +501,339 @@ DIST LibreOffice_5.0.4.2_Linux_x86_rpm_langpack_xh.tar.gz 502409 SHA256 11968253
 DIST LibreOffice_5.0.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 571609 SHA256 34a0343515cc396f56f3e6dbf8b4dea0200126ce106f6b9e01472c0e4a89c188 SHA512 ede27aa80b3659d0b5fb155961e50d49b17d81b551019f5e4bcb51e9fe816efb9fda3208d01e7adf139af86fcb87effef5c9f70d1e0dc495a908b7fc1ead1c3d WHIRLPOOL 699ac9b6ee464c04f3cd0ff9a00949637e32a0d614f3a974dd5023253c7ac4fc9cf3e20a5ecbf8a08b38aa7377062bb7e396c06a4d815552af78e9a96e99de59
 DIST LibreOffice_5.0.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 569740 SHA256 e89954fb79630a21ec33a771de4c1877b77322bc047b27f51b08fced91274dd0 SHA512 bac729c00b1b7a1e4c56aa1e3d53a3251494e6cace784cb4ce639dc8e4e3bb6d981760e3d4c410d35e43dc0024a2590de6ef83e5613c87c957a8056f8a365ee7 WHIRLPOOL 09477df7df52ca305089b8c00a335956729a97f0d99b97b3c6fc31630e631df6113abb8e891570ef6180401b04471bd830a09be394e3809ba24da220e1cc00fb
 DIST LibreOffice_5.0.4.2_Linux_x86_rpm_langpack_zu.tar.gz 503184 SHA256 460344311024d9a57d14d9f279adeb31d36f4c1a31aac63ce4ca11296173f79e SHA512 f592d1a89215eddb934a7fcf9c4b6c2518728d7eb9055fa6d777f39775f9ac5e7d1318aef5e9d1c038f0332df3e84f6c892c853d444d308ecac8cc38ccc01758 WHIRLPOOL 96ac82e9b72082924a3713aa380dba3a7f17340daf969461db8f976b1f08c591437a28372086596ee3d33205eaad72584db39d6cede8c6e075e93440c6d8c73b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_am.tar.gz 7197123 SHA256 27fb614d05bdb0dfc27a4cc0fa66852545bc2ab1c1cbda26cedf9ba9345357bf SHA512 d5936abc1c2255281a91cdf0084cc49fa866c925abe635005550db11a2ff438732937014f8531092c1dd6c9fb6ccaea5cb03242fb568bb3f061a169628b2d774 WHIRLPOOL 07e29554c49e73a7a28a20244668bf2b956a1c6c53c34ccb78565396f662010eef370d71349b07ee58a150099c05d8f67569ba45fec07d4ed6ca90d84ca87882
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ast.tar.gz 8014058 SHA256 6e44225485d170ffd9a582bca2b9d488d9ed616bf7aa20424190c2c782260929 SHA512 5de9a5450029b62009a73af91deaa110458ffc566bf35700b1ac9b9d16ee019dd1c9f88d359031f6855d2d3224933dc8899d626d0efbcf9eabd693c87aabe727 WHIRLPOOL 0af8b6bfbc77ce65103b73fc17a412cc96c3c132de09cba970b3760be0fdfa5886db51b72e399fd444353c18ec08023eb65a3dfbfada96cfb088fc0429c55176
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_bg.tar.gz 8240090 SHA256 b2f3d18a432e04af2e0614843a720c4e5eed5612c00abbc88d98d0c78454ce04 SHA512 d0606cb082743aa47e55ae94bf1ad20e8490491e6626d8f5522d0e1a49377a3ded6b097399a0b2d5f96ff82b4ad722a99c5935c87566b9e8d911d825cdcafa05 WHIRLPOOL 017ec4f69c8a897df056147a313efbcd98c307ba41ae9b883057354c0262b362f7bac80c451ac97292ee6d3489ad70df89bd5b869ab4dbc9650aab039bab0fcc
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9794089 SHA256 8b4bac86138c22c7612496b5963a9d17fad2a0ae0d0561e129c91a7b16c2c61f SHA512 ba4b4c547961b02c6e65c900070de2790937616a62c9e9550a377e8c4b74ae2765cdd27f4f801385718f3c95df1fe5a27a8dc0e6095b8c85b8e8fd370c0546cd WHIRLPOOL 7563f8178410392177e682aa59a5cb19b569f9a5b6b0eb644755e1242c35f85ab1b1bbfe43170cd35a6679069254048843308448c56e46739ffb18d93e7f5368
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_bn.tar.gz 9794204 SHA256 73f47a8043bec07305051f1e24fd8db4a235a8ef7a95dbcfb91b68cb9cadad06 SHA512 ce2216f58fc10894ab0c960931337e9c31143017d458931065c781834b48ecaeae9c5a56d28d4889282226129b18401eaf76660de8540169f41b24580f583b4b WHIRLPOOL 5eb6c4b52d4427550237b8c47d178ec17b1011ab89439f9d5e48884e7b016151672e2f453c47b3713c3d6284d05a04003c0f74d08e2bacd9cf1e692c3c958333
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_bo.tar.gz 9461793 SHA256 d0e3964ab0aa683bfff1dd9e50e0cc8a8e0b1b38a6e025d45aa0692a49f1bdc3 SHA512 60be90cf71e9375c73ee5bf50963012aa4c423141ea1d10681d30dff69431e14e1d4605520437362a52bdf8b089df384f910e4b50a649335966bd76091103899 WHIRLPOOL 10a5faa445a1d756842076fefab41a16c8ca1aadcb622e7ffcbd7bc1ed00e4ff12b731bd03e02da046c508a0aae25797efa8b42bd6c03472125c228516c7282f
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_bs.tar.gz 7075596 SHA256 ea6db5228bb8f30279f101e45b81d95630277c9ed5e373ddb10c6a434e7c9cdf SHA512 7b62ea4e909ded77659103de684df240a4ddbc4e9985b973c96bda2a5b907aaf171fbff02e773bd9b720ee356c8321e9e972358236b81c0ff3977522f63d6743 WHIRLPOOL 01e3c6220191e404649181f18d8b7488c54c33e0b3dc65518acd90d5c134bc4cae0afab0c6498d6048e2828c7d730a7826adc59884e8ba2d5fd98e74162c1d20
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7886522 SHA256 21d3b8d9e8fd8080db8f6a381cfbc676bb39925e8c8bd5ec4e456c0a8cbda737 SHA512 f70ab30ba52ae0c64e4399811683d397f09249fc5bb26fcfaa4b11db43640d68f631a7c3099bc377f6b5281d0e5ef8fd0bb13d8241edeed2a4518c2f8910a0cf WHIRLPOOL 1e94ad4d24c03ad180158145ec7984bca4551319f21ae124b505af5d001d38c98c5c2296146271e85f2cc7e69b5671b83250d7758ba57209b1da54773105f4e1
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ca.tar.gz 7880451 SHA256 e78e2895c4c2ff7673e4b776d8d33531f4aa4ac2cbe8151856e45543bdcc5656 SHA512 c4edd7c8678a96832a5de7c38f07a8881db25fd77c9126fa7fbbbd616a952e696991be5b3bbea87e27b26e0fd05d0f2b462b36d40635ef4f05f589082788a149 WHIRLPOOL ae7c572516908c8ab66b084259fd59bcfe9574a1fc202963e92f3f311c96e6824b971c036966bbefe3c772b5758eb87aee3a04cb02090f8bd8ed40cde92ab794
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_cs.tar.gz 7497508 SHA256 a13518c60bb8f5546fa8c86c4e08c8e062590a38e80b14e34c00c8d02257e354 SHA512 8e49d1be4113f4d62c04a22937084a5f8e6ffc035b5b8057a5da1fa1da75ce5b0000c2f20224ed2b85ee7e7a699fb6aebc9cf00f1df6912f3daab84af0f99b41 WHIRLPOOL 6708d66e9c2ba8d40bc4f1742ee09c0a391825e86a5743c8d2670e972be523c45cbb44fd0976012d664168c61dd6a7956060ce4af7ab6e94790394f69771a5da
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_da.tar.gz 7505433 SHA256 cfddd6d982c8c2af7962b40e4c9e4f1d833b58b1b759041e0d5ee3ff116c47f6 SHA512 ef4bf81cf6c9d56d33c84880eb4fb08b6dcb3d51ce65bf20a1489def6c738815dd3226aa89b4841110c97ad71c4314a9c325aa3cddea656742501a189a566307 WHIRLPOOL 62f337977875bb4616461910c9279ccd12c45d78092e32d49b9155b572f96043ee5d2057037f57e1e834ec478c87381a2e9d449c213dc5a78b0a90789479496e
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_de.tar.gz 8063083 SHA256 7dfe443359c48573d5148d9040f5f7be1bfc073cf279766d4b4a93f62fd379d0 SHA512 ffcbf13d58f71e7e0562c21419bc6f1d03882d944ab5ca824d3e4b0a7450e2f6690b8f6bd95309e63462c079a1a4626ce9d98508438dc242aea2e4544f8ee4ef WHIRLPOOL 746e61b3ad90fe40e70112dab2ca57e51b87942208ccbc1503386ad42c6e5d95c62ee5184f7961bafa067f215cb5cbc8aeba3142b2bd08d0178d9818e15be9d7
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_dz.tar.gz 10364756 SHA256 b260e04517ba0951d3b07ac1d21c1e5c6a8564c0b95a3396b0dcd99bbe87fd91 SHA512 fcfb7d4bcb3bd09c563592a38dd1afd23abf0066de1eedb131f8ca0d3b40a530fc8b34d413f8fd12956f0b9f6cc56f262186e6871bab7e1d0987ef9f08f044c1 WHIRLPOOL 4b66b1acd457446ac1c917621bcba9d2835a79549668abb81e14d05da36f95d1ee0716bf6fbc8241252d44988fe36b8e6276f49b17f49b7f3bdc08a028118c5c
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_el.tar.gz 8876997 SHA256 c1d2431584c773d096416696bb184f2bd9d974369edf7627f61a82ddd5ae5013 SHA512 db938673166771e7260d243789ca014832541f034a647bcf8289d99502fe5ffe85af1fa26c3683d399ba33a77cdc77cfd6be7d68206cba59f47bbc9423affa7c WHIRLPOOL b69cfa58234852b86d2235738e6c8345fc24717f7edf4e7a7f39f97fae8b2c990d675528a67b0e1f4711ed19084ca819cebf84016c8e5884e48e9934172ba743
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6374726 SHA256 8c2cf6f289c8b0bdcffc78e13045fe943d7ae63347f36f8e65d31cdf33e01ce4 SHA512 429e0591a4da00e50a065cc6d25bba03b148cd36dcd41da1fde4aa85ac46a3cc83805d54cc487ea7284d4504e3adde92f53bdd5227aa9179b93a035e31f6805d WHIRLPOOL 3d0c545d5f19f9721c3410de8754284f65a9e9a6f2cbe6a0b51917590375de9ff49b1893440ccb28b496fe49ae3c2a32bb7f54918bf3e0fd869045f4f6eb3cb6
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_en-US.tar.gz 6414877 SHA256 8768715dcc7a9cf32b96a955f35cf9d7bba0939afaa5073ff59624313898f005 SHA512 3035d41dbd2e4a1da481a08083fafba210d42461b8c207c941bc45146854eaf14ec1c1322f9d99e43644b371faa45f54222408970a11ea449b464bdf508ae1b6 WHIRLPOOL af69e9e6cf8b617de64ef0a5c46943f917f56c31cf3cfd08d615152c36d2364f4a9b4ca853b971097fbdd92216a671e48c38d0214b4a7cf8fe07d306185a9b98
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6360552 SHA256 c9b693c3cf3e6d3e0a2861327b63c9235fa6ddcdb7795cbb1d49f123eeb62d75 SHA512 756ba9de59ea6a0982002a8681281e1fa1ea4a4bdc6d0c930505b57422ccd2968ea6fc381db939e98af2b29267d1bfc129a6cfac5e2c2e006e3884d2ed196f6e WHIRLPOOL fcecdd766bacbb53549f1140c12e646d270cbcd3d8bd71a0b8274056c0c849b4f2501aa92b77e10ce3df636fcc2efcaf56430ed23a80632d2b28be696fa20d04
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_eo.tar.gz 6943840 SHA256 92f6becc32ce20c23fdc0f975431e5f2a0f437ecd750d205b536a498bc31ef53 SHA512 2473d1ae9bf9a939bd96a6e717ba18a4dbab0059f899ec27342585d5c9624b695b7e595808510b5ab978487c456e1cdeb3384fd8b2d2f43c9b2b9a5b7bf8cd7c WHIRLPOOL 75fb34a579fbed3ee61029c65b19bef7c2ec1e2581fe9ca09c3f2fdf180c9a2c39dbd29e502d857c6b9b3645f182ea01cd4dffada6316f5a18ea0d5b524f1b9a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_es.tar.gz 7919204 SHA256 3a597a4710299bcf59df59c7be278454ae1e23568505ed837f2bb5e6edf87233 SHA512 011ef8d1cb0ce542a924b5204299d42f6d8a2c6fef6b28d897557442229a974153d8fc177f1344bf1de82ef69d79f9d6dc7d4b423de8d6139a053d6f4ca558f1 WHIRLPOOL 62a1e5fe92bf64cb4c92231836e8eb7f02569f024ed89889097664fa1aea3c63236fdd92d40fbeab7fe7e1eaff00defcafe1accc3c5a640d64c4ae9f71000189
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_et.tar.gz 7428188 SHA256 98a1409784c7d60e6a864e0f95e383426df9ec8afe37c055cc136e04eacd1833 SHA512 e7cde906d929fa4429bdf24282dbfb3644d05631e631c2807cd6d1a58c559e2b9b1640f01979feb0c7e929a969e2ac5ae7129da42d571ddc87dbb73d17037db6 WHIRLPOOL 8df7a809185823964389758610505b04ed0a6f388afb73ccd7694de53da0b6b200040d410d3eda8c3507b2e90483f9b745aab0b82643171fb64e6ff8fa3b335d
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_eu.tar.gz 7567895 SHA256 fc7358759639437c91593c4bb8400a10f05c91828ad597564360cdfd91270d46 SHA512 158a0acc5d948cb28b16588d5d43bef10099c6902d4dc1c69745c18dead5c80e7ce35c48e5def6f13e39788d7c18062dc42412cc31519ed3c10ed7f5d1399049 WHIRLPOOL ecd25d9187b145532e08775c972fc42a1dfbaa4f3c0cfa7a97e200d3c9c0b8c48432efa4f8a96c3455939f87d8129b9c9a2027908574536bf121bfd9ea70749a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_fi.tar.gz 7678294 SHA256 89c1d3725330e9dbecf87c976ec42b99a0a9a309b1ae9d64d803e662d6223113 SHA512 262779bdf298244774d675ff056a0e6a2ebd50ed1696f57c5c0d94912f9b23f42177527811acee6b58e311175b6733a8e43826a4e82a01c2641abd928b0a6ad2 WHIRLPOOL df0181f77a9dbfe43b793a83c7e9c8ed44084ee75450c05826f89033c2afd4d0087590c8c2531945b293ea9ba71dfb0f188cec867f207244a2779bb3cc064724
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_fr.tar.gz 8095357 SHA256 5ed284794ab173828ef307df182491111e86d891c7693ff520afb0b59dd0f1a4 SHA512 e306d6977f2a703d37b138f34d6478d5108b6d31f6510a95da2b0c84d4866a22b11e59b299b98e631dce6cf3773497c73a6fb7bc95bf704a27d6c8c9332203d3 WHIRLPOOL afa27c16c28a0173cc27f6f55ead396004c90c5eb44f530ab1123d0510c4b1f55d93a895ddca062d90cc481698a76a3d722775732687f553cd8122cc257051b1
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_gl.tar.gz 7663448 SHA256 4d18546dad6320ca41d5be54e36c392c4ef2056645fc3768307388c63ed5c7a8 SHA512 32d514542fe58e4024b1505742ec11c33ea85dd9e8892f49faef14a0598e3ca64f697df60c2c09030809d243a69a7ecf98c08fccd624bb82a2d7c56d26da3e2b WHIRLPOOL 3875fbb5a4e6360b89791adb8d352921235c4e67ffd4ca391eec845121a435cbe5c3d20c1f66edba9534d7163e5099b3d0ae56fe5677cb548a9719d1f4bb25c9
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_gu.tar.gz 6583516 SHA256 fff9d488baf02254c276b1291d019a644efcabe0c0c858b1407591baf3e9c139 SHA512 d9e2f28b68591fcc071b2a0d09ac28c998c0c00db57e6820a731578648e76349704f71d76a51dc8f9d9b147a52a9a3c15d16b60e419b99ed997af6e4fb253634 WHIRLPOOL 898beedac807e74186fe8da37ef8fb9324594a8f681c0351d035955c883c6b37441f50952caa439bf3d4b3e0228298be30d3a05efa3f252629e320009679486f
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_he.tar.gz 6200891 SHA256 a55c26df9707af39bd67363bd450156f2395db010d6d8e81a81fa10b94a6931a SHA512 b4e489f8fc186e23d9d6c7f1b57972a25a2c439b09f3068fc0cf26cebe03f6c940abeb8cec71fe247b4b6f6ecbf9532941c4c76ab2b15bb1eb1b8436bff47e7e WHIRLPOOL 837afe9d8a107be3ed4968ab8936c9200b62409f1d939f79c7793a0fdf5c21f25d93eefea35b569c5c9898b09a827eaa4828a1e6a92173c43e058fc2d10aa767
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_hi.tar.gz 7273499 SHA256 b21506986f9373d4ff94d04de29945220dc525934ca4e58e9dad9573bf200de7 SHA512 42bcb78f06c4a96c1a7487c602535a8ac0a0a73942fb2d43974516845643b8c24e77bf1a006fa05f1417093bbd5c01a7e9d92dffcec80cd70860f83072842843 WHIRLPOOL 54aad646d7a4088b8e8b66fa263bc896dd521092c5546ea27e767a4849f79ecf54410a704dc3355724d399cc595be04a305a94e14ef2d574f4f7c7f5a9441ee8
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_hr.tar.gz 6754188 SHA256 4e61f0f26ea12bd835e56e769f0e3b0c41da6c726db6e21be0bcf2aa563fcf57 SHA512 e4f458d41aa9c49be6339039039d6fbf92a4ed94b89014e01a5326865e47c3b75cf260f146bda680ccafdb712a1d4fe00849184d9240120c0d50683649ecb48a WHIRLPOOL e2e5cf822dad393ac4e638779e17bbe55fcde349fba6f22a87d48082dc88660af823c14075e66aab00bfe11589b4532b3a3360894b1d932e6615dab82b1fd979
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_hu.tar.gz 7926893 SHA256 37398a462005a9a0597292310f8ee41fd42a8af7cadc9c4df84478fef04f79c4 SHA512 b3f12e243b7c4202d57897847bd336170d7a7573abf3e5bf383994a11b9560f3a42ae67630ece32249c752bb399112cd540a0f97ca0173e08b0876df6b5e34db WHIRLPOOL cd1121a7c85162b54e4ad90e7cc17b05dfee4f085dbfe62f186bf80dc5d4c6cb3372aabc63281456763c4cd18e1025ccd350827bb75deac1643ffb2d347b51ae
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_id.tar.gz 6742356 SHA256 8b011d6eea0ac1995cd1e8583c9ecb55af4928b6234858909ae4eb746bac6359 SHA512 7636e0d1c8baec81efd229dce8aa7400436651893294ecee272d8f4c98eed89a3a33fcc06bc0f7de7d754b9640864344a0b81e8f3b1cc1029815d1b96d306167 WHIRLPOOL b9faeea0ce4ca462699b5c69021082269494dbbcb0509a391f421c58fe60acefcfc4e4bbe80bd10b560b418d1a9bb5342a7af2baa5ab4e28358731025c106658
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_is.tar.gz 6863067 SHA256 ddd053bed8dac2aa6344d9a73d68fc759128d52081e93d8f1eefde5d20a031e3 SHA512 8254104ddb5e72671cc4c9fe931cfaf4247f416dafa27ffdc81732333e2a7241c184e47749bef1e4891fbb1d1a5348773c122e7a7140b108de8407803430f099 WHIRLPOOL 2d2b4bd01496b181f2fd13931cb7fb45e085a2694aac9ce5e3c1f977ec37473a895a2311a7180e3ba44efe1d0723469a0a936773b25eb5b0641c0852d66bb330
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_it.tar.gz 7846078 SHA256 08ccd6214b2b56a2653faa8b1a87098f72d2ce8959a75d64d934ebae8f7fedf1 SHA512 88bebbbea85ca39b893cdc3c47b45bb6ed8d33978b2c62f07569879decda13b795161fe2f78f46aaf2b7e5147484b48a1cc9897ef3150ba51df59f57ada8b96f WHIRLPOOL 57e560aa4295d46ed03a8e094678e97a62fd2c4b60ff8047c16eb8e3b87c501d616fb04c246c8c9e77e629d1caefd11d69875b331f94cd1f0249a62962160cac
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ja.tar.gz 13422013 SHA256 dab769b2b1e4a3b3209be878d7ec54160fffc5eacb4f30e191b7a79053af211b SHA512 2059c892cc6fe6d9809c5018c9fc0baa8119e7e6f2f715ef1451628e8a8fe4da015b3309441d668f1e68921f19d23bf5e229a909589e5ea3290e34429e2eb9cd WHIRLPOOL 3035840d80c5578f764560ea7afa306bad1347af50a2b29795dc2123590c83b09012dcf3c842708c65b5f5021f0ee48de524f657da3ee437f99bf3b0bed850c3
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ka.tar.gz 7059280 SHA256 15adbecd4630578b1a53697e84c6456c192424b7f4f71f9ede93040d31275069 SHA512 31076fcd104e9c20a20f2588c6dbf4af97afb46d43f0a85c8297ed52d75c444bc63e2f97453555fbdc9760c6419956ac1bf3a742b22e4883292f9fff80941e42 WHIRLPOOL cc2ed3ee47d1a2ffebcb024af0d4dbd85729fc1c44033e7a08edc92ce783324d39588978b2af18514d64dd2b70ff837ae9e4d0deccb14ba91849deb0bcc599d0
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_km.tar.gz 10320573 SHA256 86143e2edcc3993fa9c20f66a4dbd9d18ba9e4e23b9d4833ff49a2e3492fff64 SHA512 c4ca7a46a3a64231ee5cade4fc6079b3f66b0e94a140f22dc214c9f3a2b87cfdf859e3f736d8edfcfd58dd8399ef88e0c821e0e03059e6958b504f47792350cd WHIRLPOOL 6d99b7546ffe8afd846917fafd70481d25ec617c4317a989e8f53d9446ee9f739ceca6704b5b5b196f627ec9b144d3f35b3fc0b2f69a8e8af0ad00367e2775bc
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ko.tar.gz 9297024 SHA256 8f7a8f022c64f14daa087e882c6c5de8f86f88005ff6ead8ab6f66bb464eb9fe SHA512 fb73ff5594f563caf17dee8307edf98de63f33a204a46719783af67513555b4f6bcdc6cdcce915ddc9beb0335b645eeceb32e9111e30e26f02501ed04fb65e20 WHIRLPOOL 9b587e325a579c281035493bf6c15c89518760f83431424f92bd9a5737d36bfc8c4f05a54a9def4bb7e0404b6326c4723e7b6ace1e56e85405a84201ded7fd9e
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_mk.tar.gz 7295715 SHA256 c10207f847c4f6ca2736a66f1a0ca6fd3089f1fbf67b21322435974faa885909 SHA512 2da164c9d6724321b3142ff9b9a4c9f791890e3bf29e56ade948893d7627eb02a9c0bedb7058340f1d02027bcf38ac9ca66eef75b1f6955e120181eacfe2f8d7 WHIRLPOOL 20e43276c1b531f6c9629855a8c1276ff4bc93876d30f571fcff912873f1e343f107b776b73d3520c7079eb06290610395312f0bccf7b54f736e651e30646d64
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_nb.tar.gz 7596131 SHA256 8a710bf40a508c86eb8395aad61efe2d9c4c7793e8d91bdb2faf110cfafc7761 SHA512 a0762b13a02a66101f30d7bc6864ab5d2f9cacedc3b25cdfe08481661c9e7d9f191d944842abea3ffb7870271418b586b1775cc5b930e1490cc8d7cc906da3d5 WHIRLPOOL cb1858cdc8ad91631f04d79bc734f720293c0692196d88647af90d215f9303ec1dc8cb0cf1a878a284852f2fc00c1b4e9853ab126a65440d788df3bbd9c82f1a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ne.tar.gz 9832366 SHA256 1aff9bf46820f94c248ae4b8532cd2e03241b4cc096a0433f4ecc0b12de1e4d8 SHA512 61cfe1f0de948a7d7ddfcac9831140ad6a24802b0ab95ea064d0e784db59245922d7a0f50145c9308f9de54184e96da04d3788e7b3ff918ce79da57edc722dba WHIRLPOOL cd09c0afb5d4b5518917ad8dc27171185d6299b752dee22749e3fac0d4a3f4cdb2cf6a24aefcf82ab009b3904a16ba3d1a843772dcd7df9f6d08f4629340c0e3
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_nl.tar.gz 7670203 SHA256 62b9340e699fe7365abf4ffff2b025145f364cd759599caa15ccf4d76076bf90 SHA512 efb1089ff24de06f86d3ed56d90ac0cff30026442212be45d073f6dd663234538a3e5ddad8b9921a2d0b191f1208646bdf26aba53b1ef2dc1ee60600bf8ef627 WHIRLPOOL e92032324c8bf3c3bbe9c067780564965e6318ce158e7d3973015dd161ce83ac430756251d5a8251cb5ce5ffd2d6e74ad01a74f48ed0eb61b1c1d9a3ea547c65
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_nn.tar.gz 7550856 SHA256 3f0d2c7ae9c8ad9f4ff53946eaee43592058cc305b5e046ceae094d5213255ca SHA512 ca41ef863b62f3acc12e663634110fd16cfb2f3997a62afc9228e475c4e34f25b70490d6e998973dfcec25d85738e7d8dbdbc5edb10340a6839ca9706b226620 WHIRLPOOL 39e4890a90c05c5bca8e1c3396c27a0f062a6153b6fc0a373e75fdd0a68e438c3a905e962d0725a8e5ab806858e1eb143d5116f242a534ec2b6831ca2e77daf8
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_om.tar.gz 7934810 SHA256 6234d6f6af7177e59fea5bde2fc73af4ade17502c387de8df64a4c77d3741fcf SHA512 ecd039e5cc7d3c9fbb05ef59d0c2eecf1c4bc42cd16d00d6ca2f840bdc3d895820a4415187933b6b55dab0703eb4b864b8cfd7f498b36334262a577c361cf07d WHIRLPOOL a4261cb242e0aba0ae707de74ffb84bee8186487885203762adce592097e2853c65c620009d7ec3504f0d4edafdbf9749edd7661ddbb8e28f8ee8f24018756fd
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_pl.tar.gz 7934381 SHA256 83626a685c3b414c00a9ae6444916cbe0b76103b79c843a0047bd8d476fb9006 SHA512 1648511bca36d95459256a0c61e35698998078d94e9c06963cd9beda7f658c826e0b7bf6f1136318c07bc3a9927a94a5d5929d72a806fc15ca504ccd2479596e WHIRLPOOL 1a2eb5cf472b0dd87ce14b06573617254e7c7d798d43aa486300205d952987ac74afb9f782f72b04d4762fff0f7c2bf0a04a1b0af8a10e60b7654ccc21da4c9a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7681711 SHA256 f9733483dfa0c591af9cf12140e36feafeeb6928d2a186f541189f546751c44e SHA512 cae62a3fbb5a64f579301a7bf2e865caee905fe43de7361b09a41fa09758787e5564823e664c58e808ef8fdc73e78b7011286df65cd803f68cb5552bf189a4d5 WHIRLPOOL a6124ea69780b08ad1c5a73c837d09967b4efdf75a2bf1d8e1479b7a79d6d0f3e38966a67e7edce6db0b16ffb97b22768a3d0836ff3dfbae66337b9016e8873f
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_pt.tar.gz 7613408 SHA256 c85c120b5b047f304e30b5f9269aa11a0a1485b074e17bac33586ab3af26967f SHA512 46f66fc8986b69a891fcbf52b46387d0fd113b8d290a79ad0022a3060630f5daa96248edaa9cc90c111d145ad9cad5e919d6d46c6544048ac10a011935d0d98a WHIRLPOOL e4f6f308a1067ef80e5cb70efc9e41eb7b0a589314d8b655ac708c498ee632c2b600b5d6f17c8fed47d58822c823eaf7a0e6b6e53a3a317af80be128431d5e5a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ru.tar.gz 8348114 SHA256 0ecf48a614beb43f4ee12487defb196dfdc582c4f2e88dd9d8b5b500d78a0a7c SHA512 ed8df42255d3409f0b5c8de76f561f118f50839ebaf50fead03b4f2d0df129ade39457104fa157bb0d12c9f128282375566baa8df3fed4e413affc0d028cf818 WHIRLPOOL 04bef34ddb2a53cda1a5938adfa88d32eb2a8f10d0d1b180658175835583887fe35b55d023ef9141b05f1b3e91e47580ef0e4ccd2aa12b606ad1e6b4539786b7
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_si.tar.gz 7160527 SHA256 2d9cbda3f100180b8a9eb6e01a540eb4ba2e515ec7a5c1516ff77185de439107 SHA512 68263f50c18fc1cf00784076252b68d1bb7882955a34ccc1381afbedc0881cd99d3342170427cb502ad9b653d1f5e164462aa90642e5d7c431de74b5cea7266e WHIRLPOOL 01c35fd963615875673029bc3bddb4f9a8fc54e21d496ab5a1b7c7ccee7211a7285c4e0263c9c2a72750627dae18889f8e5ea1a448925ceade596c2e274daf99
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_sk.tar.gz 7437062 SHA256 2ca6fc26f8550cd1077f4300d50999d9c930732cb3feeaeb42ccd5b9cfdbea0b SHA512 6bfadf7b6967cee2141d9d7d50f00e04ec15384347d9819f5d7d23a244911f05e50574e84d8a59689662e507049db2f491073f65d647033f1f4195d5a98a20bf WHIRLPOOL d256027c9019f45cdeadcfa33d669afbd6c4d74af7418b04bf8b8c36186ab0d545fb6ed85acbe1f63420938d011c622dac307023b6e58593095e5b3adcbd19f2
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_sl.tar.gz 7675202 SHA256 84b5f2f3cc6b248a9d83b6eb407467297f3cdd1de57761bcfa02ed21e891fd15 SHA512 bfc2d18d2f8bfbb7dbace97fe102477f82148e562075f0e25c3aa548589729f03b4f9f5c2050933a1a2c4df2fc5ae566f9b66c4850d1c3ae4d33e6c04e6e8593 WHIRLPOOL e004191c4c427ca4376ff6ae8a3c206d9231be90c9b88781ba5a2c7ca2b171e96096b95a6bc32d2e3d0c110129cd32457475b0737ac8b51f38d684441f57f5e2
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_sq.tar.gz 6792560 SHA256 5a321fe62f216b37b1ab83358f49872de95958377017f9f817c89e4e8dec3e90 SHA512 dcf86142f9a8143e545e93cc881dea11c8d7ad5e7b1b192f82f892ee164a8b1bc2472f045d7027ec58b22f74affa83f95b0bac180b3510d1e2d5a5cc049c4090 WHIRLPOOL d4c58b7544aa943db7b509d2bba06548b02d36cfa1916cedaa32c1f1178bece47e87f54c61892eba59b2f6258b93811648bbbbc9cc4bce09ff5b88062ba823f2
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_sv.tar.gz 7594685 SHA256 f3e9afeba97becb40abed103a3fc848a253d2b3bbc5bb18d27c1ddea84811499 SHA512 b969562f2e8589cdd9f24fc07424bb7228ca8d13c1cc1e20beeaa94a802613b0c27214b22607a8b1c9edcbfbac342877ed0ffaa405d721e4c044ac8d40029d08 WHIRLPOOL 284d28c874dc20e18aef9736967b18ebed06214594a10d98fcd7942cfbf3710f5d1335420d1c3f613d6c1aa916cb67828c44e0821f21638756fef7653f034882
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_tg.tar.gz 7121829 SHA256 b729168d21ec72d41aa702ad708a786c9a3bd95781d0acc2100eb4ee8553f785 SHA512 ea8a7949bb2b3e48cc84edcb92473d721cc8cb5112af7bd5caea72c10482ce6fe4177fc47b1974b8accf146ed7fe5c7ea56ed6eecfa74b8b402483c9ea10bbb3 WHIRLPOOL 30f458efd61cddf228c46c09d944eeea6c8db9310f4e01fe9d1e3155f0c412fd8e269326fb94ce161ca39ccb6e1bdea64bddc3de405eb3349c50198cbca0ce2b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_tr.tar.gz 7831978 SHA256 1f840a634d5046297e5e3d88a6374fc372674e7033fa70bcd9b8d32a2d456a2e SHA512 a4f66033aceaef41405a1a633fc3d418ce5978ef6d254bdeda05b3d2bc003c0ed1f4e19caed54faa7ee71800462816c5d821193b5f43eb81574b8f827a21829d WHIRLPOOL 9a41191400def650a9b00ae45259d74e45699fecd05a68ec9f7829dcbc5dd4ff14cc4935a792c45084677ccf18cb66b7bbae1c3aac967069cbc17596c0a6cd5e
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_ug.tar.gz 6782233 SHA256 8bf4e70f09ee18adcc52d43b0ded553b128841b64941774b80e507dd5296ed52 SHA512 9a37b80030ea0cab8fb1ba28f2e52e407b8a7f58339766b1ca4dabd6c51d2d6d67ec6316a82f45447d78d0988ea932ea45dfe238cd5a1e84bb6de4eb8862c1ed WHIRLPOOL b9a8c1a4e566cac71ee1d6077ada6684512c37ad5c10c3df66e0c73e43835c4a614a24e589a971bd9e55828d97584dce7d460b71a3e0a977fc3428bc8420bb15
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_uk.tar.gz 7233239 SHA256 e57feabd64ff27b706e4ab979eb705f36787888a32313f8efc8919d19c80f2ec SHA512 c86324c530c6039c8c1ae2027f837398c497a860bddd70de5497a2889b5c416b2c170388bd6defb1d4b967c73def684de3ffac359dc76618884c09e9981b8fd8 WHIRLPOOL 976ed6fcca67dfa91f2a4c287452b0a39b3a25ea0e60538942b28a62978d199cd3499dfef66692d5c93dbefd2bbb0e10a55c08b06a0282937bbe3dd83dd0ac59
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_vi.tar.gz 8098253 SHA256 3abf0e68804997814bcf155e2d187608b6af2e359af616e8c373151cf14b1d05 SHA512 363eaef324097f12d056c93fa437af1ca068831d40f1117b849fab2eb3045d7f3ddd70210aaab36c7760a1896706883bfdce378270bf0dadd528a4fea7247cc0 WHIRLPOOL 82cfe35b88a3c38669b329fbc9e245ca10eda601bf7d26abaacf5f2e5cb6682ac44a4f92a61e744f28a71e675fa1f32b45976c37160292ca5176a2f1f88f9583
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10642404 SHA256 037bd67ebe0ebbca53a67b5102d3d7afa80c8b8ab29aa6b5c6a26bd8de7c5e0d SHA512 becd14f3ecd02d7957577cb466d1725fc161ad1af25f158f4fbd48b2246f7c64550c77b482e26c951e649ed8175fde4df4403aae07514529ca1670b241051c36 WHIRLPOOL fe3f1f406dc0772999eafce81c0c3452e14c1d7afb6ff8a2067f0ae767997875ddaf6d681936bbe5d1a8eae73e5c97ceee88a92942cd61b642bb5892ba892b0f
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10698966 SHA256 fac8b61ef1017399b9ed3d0facc1511dcd0ee599f06790c6a2f55f22efa0b62a SHA512 df066f7a0dc73bc4d84ea24518ac2b17f99b182a211f310cfebc9d55de9d418134a4343a998a07d484b94fd6821315e2f3abd23c348489ba4d519905d61c21fd WHIRLPOOL d7f098b478c1336cddec7caadc2a94007f6368ffb3c2d1164ab38205934036001acc44bc0272478d18ec15649d648746f249ead77a06e38b2400740ddd41d0d2
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_af.tar.gz 1113686 SHA256 bf522c942c1010ba03b93b3b120454e2520281e51e2dcea300a48f958323f5be SHA512 360f6ba3b64cdccd40ab38b19b17c1b7df8a815e97ad37057bee0e8809046e9a890b389698460ff4a03b48ef0b462b1e30af989fd202fe45a76363b562609f5e WHIRLPOOL 3f475f0c4bb4c9476df337a6486af411c5fa898e8e0282f2a4fe5c29b494088ccad231d9a1530403a4c1967041d41fa57b0a384441c8059b0d2837855a117608
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_am.tar.gz 519662 SHA256 1a4370e8b6d90b4a57e2c6632a16d86afa4319a286389cc1d74bdf73c4f4a049 SHA512 a0bc62d78e6bfb80df2af176389a7ee2092ad078331274d44eb5d5559db0a1d5976af9b7893f537bcb02f171fe26af04532cf9d2f99b2f8244d880e01eab2061 WHIRLPOOL 17db48d38a8e2964d705ef280ce15d8a016de80f5ce422fe718d39e3d1f6d9bcafcec8bf8bf733ea499e97ade7b4ae5885d9cb30dc9a5a9a9788ad6bd8043f98
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ar.tar.gz 2261055 SHA256 82f9d8bcf8c92d60bcb7bd6821b8ca95a785414994fc4c967c79f7a9202234ad SHA512 3fb62757023831c15645c856456bbc71b41d56656aaa91043581e781d4d22bdf8af613bde44f279ee80e579ad880111151dbad79b307bde2db861fe4c57bc737 WHIRLPOOL 56f301cd202eb5447d90d3aaf96aa90e35b1032b804ef31c7bb787f847f37a34368323d7e86089745ad002f86a8e9cdd7beccb2d41975f302551f5dd42858ab3
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_as.tar.gz 546363 SHA256 2eced7d3d6e4dd193744d1fd9058d4cd21d994423388903cb5b8704594b5cf56 SHA512 4cb4f70d2493af2b5e38a5301b657f6866c23226f83107d259e00c16838f92726bb8c5c43ee54f034f85519bba5277fccfe34d4b7fed279a1ac0e5ecf3052375 WHIRLPOOL 9cb28c3ee8f1ec1c6960125b68a7f6c9d288a6c42aabd755f39f516a03c9e767b01ba23825e7456964345aa5ffdc6a8945550afd007d656266cb201ab084d7f5
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ast.tar.gz 502026 SHA256 3bc63a18cb5a522ffdb07f25414ff27c0eb32dd62f4ef7714027d25b8a24939a SHA512 796a03be71b5fe71bb66fe80c2af957f37355ab386f1defbefc7e3d0cb7f157cba0bfd8e3c27406592191f60051f7b4d61ce6a60a44eb55180af5fd40b61c452 WHIRLPOOL dbb7f701b85f38f1bb9aee5ccd74995cd4e21a6fa957076b7c36bfb7c4165e00485c1b641caa1fe5d26095c278521f31bc6defbbc9cd9986ae07cae822557075
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_be.tar.gz 883046 SHA256 362708d2e4c403b05f5170cd0cc592eb6ba97a80efe42394cc4d68c310075717 SHA512 ff11bdeb4f608697039f5466d7dad6fb2e33bdf493954b38e8e9493e8a33e20c99f05d37bd45d60e33ec69ed55bbde5d38d32405246009373318d274a28ea978 WHIRLPOOL 02f7bb364b926ab7066d67dce34e6c6fa95c230e9dc030596798eef40d755139088664250cb3a017168d36b4c60c5dfdfd7f4c6b5c8bac4a2cceef9b28fdf32e
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_bg.tar.gz 1962429 SHA256 e998049013b45bf6d0cfbbae38d04f218c16cf5de10b967b7f27fceb85bcffc7 SHA512 1a8165335b3971d9f53590f9304cd5c2623fbbcb70bdce33a40773031065fda7d8f28737cc470f1e98e14d1b4e6ce64d7e002c26546b74a25afb8307483eb54f WHIRLPOOL f2e7a58fcb2435aa85d5e4a305e28b12a5a62ca2740169e6e5811877dffc7224054dc860fa0b4b46916cfbc28ba3316928dd04cc38b790ce4a77ef47f6cf0c7a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 552570 SHA256 f240a0959e20db66f0b691f80a14e433b872ddd1988e6dc303275d3b00da2368 SHA512 d092b1d0e0f1fd91a2b7e3e63e2b63db297737eebb93e4efedaedda374f8286a26cdad1372c3612174c37bbbde14564a275b38131fa10bf9647efd5b904fd415 WHIRLPOOL c3d45f5b22f96981ff4e387f28d3ee97a5bd96b84e4c556a7e48130d7f387eb93ac16a166851fb2ea17b0b16cfc34a797201e0bc87331f8bb252ae93b54193ff
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_bn.tar.gz 901004 SHA256 5f86752a1137972df5fc8875d88b4393eda6689673201f0eee496fbe7634d60d SHA512 a880d28f85987b4eee315a9a46c27deb54a0e9d0ab62d249570f3a88f96537bb1dc13aa60e0727e0a10c1ffec57d90fb0d5ae2f9fde140d01328764c568c66f2 WHIRLPOOL e4638683239c12c5fa6915bf398dc6b68d1c52e6c2d32812d0871736b29aecd3a39900fb4af9e8c1f3e1b694c89f954653b715d34874b1a369d8e26140573b7b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_bo.tar.gz 536411 SHA256 22302764d59557c83424fdfd79bef8076bff0021665d58210e19f6f510eccceb SHA512 a03924f4c1b73c1ea4ceca1dc1e9854fae4d76f7905e014f21f9b73249e95bcd9c9f467354ac9f8169b46d3ec10dfe22a40a1900bdd2c297f8fd4722f14ddcc9 WHIRLPOOL ecc6fbe369cee3b87bd3aac2977ff5353688303aa385b9f30fd99506023f21d41b3e05aa37de15951621d18efbbe09e0ee83619ad1ea0249e6e6743e694c2ba9
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_br.tar.gz 1717949 SHA256 0e4be6de5cc0521b33888da48eb413a4bf5ae8faf0c8e710367d622e59a8b23e SHA512 c81b5d5f4a7ef4e157b93361e295ee3a04039ec7e3c183e91c05146b1e132fe8a21882b25639362ef1c0890948d4af6c8161c85189e3a0febc820f4b5544fc28 WHIRLPOOL a258644b32b8eef08708446dfdd4defe354275f6f4e2dbecf76db5ce0d32f6af97feb43c95b15aa9c77b940ff13ce5f7e8a6ea714b8c954329aff5043d9c08ae
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_brx.tar.gz 516318 SHA256 fbe09d609859a51eaaf25c55dfeafb2e173449c8a798431a3e71d2418a26f32c SHA512 b5cb6558abcefed1b0aee3d559e5ecb5eeb3fd46e37328d6d639cbfd607e53d6ad4bb21e7d66f7709f213fa159e4fb569b81eb993bf177c837406ed808b3d4fc WHIRLPOOL 6c65a658b77635c2153b33c162e17643ff66f11a0093299f47c95b9a21a8c53d6d0870634d6c8d3f8ee22a881cf26ffc7848e5b07d0b64755c32503e0d4a6fff
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_bs.tar.gz 616053 SHA256 1a712ebf176963cb702a910d67caf4ba54d1d3959b8d026c0f60b1177bba4285 SHA512 8b765ef8fa944b0b0f2bb3375ae7bd5d12609cfb655029e5363440e54ebc8a1b7d68dbb261d0c7007cb0ae59b0f01719275ca01c240dcd85f696bee1e2f6f571 WHIRLPOOL 59f999238000086545baeb4d0b19bf995040b782a4ffb6bdc7e228b9f7a3c0cf8b5e640533d20b9fc84a31eb05c531ac7ef49f97f0d90b868a3761b15f371624
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1771321 SHA256 4557d543d292b352c7de24496f8342663b650adaed36db00a290d4438dd8ee06 SHA512 a334f1fcafba399545090c8778b02489002ff2a3c279ca78fe60015b4acce5a65ad7bf7d5d22cfaa4deffa8b89fb01a835b190b6a6c827220f9f110a0a4c10c2 WHIRLPOOL a9e1b7a65e93df77463e3a7ed0a8e051f200097e1a96fed7e095afc7e17f0daa3461b19f9ea7f737ab9c49abbb023326e9ebc8ff38eecafa154f13a2c8dd805a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ca.tar.gz 1773390 SHA256 d78bba60fababa6c076fb3254892d2dae760fe61281b04c15e0f6fd9b94cc267 SHA512 58ae7f03f4289a371510eda565ed42f1e2ba4588aefd264cd93875a155f1bbcac8874e588896c35167dd747b51511ec6d4210a5d9186921ad3d25e550be902df WHIRLPOOL ffae5ed9508dba901b0fd578c6859223604d7317b395e9b76ee829ce4ef4e461bca91811a44b567e06888dc0fbbea02f203fa532df91fb2e41b8694f91280ea8
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_cs.tar.gz 1234268 SHA256 eaa3ffc7142f3031d6277a301c1a1dbd9eac72ee4258c4524ff2dca2c43b9535 SHA512 f61c454d94c170f8ad44e8dfac8116588b5425c2dcea7fb7289d4cacee3ec8f1389f941df3bbeb5e60c0edad95c6ee8c51035820a616dbe67dcc0fd0ae61bc8c WHIRLPOOL 45aa62424e210ab87e22dd485478bd791d1f32581a42c075195501dab6794cb8c1687a35202b2526ca17fc0e5200c91fde4750aafa87acbbfddcbac1776d8f2a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_cy.tar.gz 482117 SHA256 796cecc717e55ead621a63fe57cdcdfa8200e7d54a29c6e9117d75dc560a8b85 SHA512 9e5ccc61b09d1e59db1d42357b62c3dbe8af15d2ff0010132c1cf3a951db32293f3a2bd060522b0b9b3dfd0021dea7e23087cf32b31977881717ca6db1238e65 WHIRLPOOL 47c756e4602d93a61eab1b07473a2fc7c9057ec3a705e2b66e321e5b435f0d70ed2c976787eff3b4dbe45d55efccea2055764f3293282fcbfcf0b71a568350ad
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_da.tar.gz 2385861 SHA256 caa459e335bb3beef128dcb7db038b74322d7cfce1a1f5bc27a51151a52a5961 SHA512 952f677c497d8c88937feec865cd9d7431c877a39824bd7ebb35de925c4c97d523b27a061e7972d6ab06bd7b49fe6c82e5280e1a2c269c20228562795204c696 WHIRLPOOL 2e16f1fe542a106969fcb570ab03d6b03a924db15a875f30fe41f1c57fef1754183455de481dfd777273f79b8f96c499616805fd0dafcf502aaddf6cb88e7ad4
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_de.tar.gz 18839795 SHA256 3f42669196a6ef042894bf8774e4f3cc76e62e94cb51c9f33cb151b2eab2af02 SHA512 fce3ed64254dc7b9b4755dfd08ab7a74ce42365ca55f4ed721a34a2c6d9a5dc736db53163058d04ed9976d62845d041ffddbe1efad9492085e61cdba61b11ad8 WHIRLPOOL 3d1a9d1edf3c678c3512b985807f7934938e8bf959774684677eb66a2036ca3fdfad8acd8c005796c602804588634d7edaa4a780233c6cf9a7cfc0bd47b97912
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_dgo.tar.gz 547318 SHA256 fb07d3f94006662c0a1f8730db3ba4f3b6c9e88d4fc45d818959bad980af05fd SHA512 abf32a229326f6868423abb7237995c1f349e90190bff63b68a5294a2b2a5d8289b1e68e7a3d01e926718f012caddd53251be44470ed77d824c054c85be97b46 WHIRLPOOL a98518bfc0526fddf84bbdc6937d2471e2af4f83a5b6bf985f5dba0bdce6dc432781112739a77d9f59744b6cca0d14dff212447df2f2c7db8876f18750cdbfca
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_dz.tar.gz 541643 SHA256 b07bb0cd9211e4155a69c71a5b8c89360aab19e108499e02083b809ec26f172f SHA512 799e2c1c2c276245864fbaeac3b59bc5d4e492dd7bfa0251435e19b8af50a55911088042267c058c8948293e24ae442732336a421ca3b2495571c1337505b9a7 WHIRLPOOL 11d259b5ad954bdb2c0b5a21d8ab99365424c23790092b37cf9a0c0570d892493a292133ff32169d4025bd6c1f1e400cd4edf4d2e53d78fbbeb0bc5ec26907b6
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_el.tar.gz 2578209 SHA256 bce78817f14047c0684a8722df07fc662dbf31dcce58d0501a390aade31a2f2f SHA512 bfc2bd6e938bd27928108f3448545857083628ddd25496976afd82bc6b2f080cd058c56e2a3ceb6150aa61b280be5605a8a25c42fba528184e37f25234e803db WHIRLPOOL 389513845dabc26fef81fcf8bb39c9ee292927b7947744e2185b1484d71b93972c28cab56553a739a08a6350a7b3821f686e53ca218fca7f98f9ca9f0129aa2b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7117255 SHA256 77cf1f0acb9556f45363fe95554adfa1c263b24f8f95e3840f73644225955ba8 SHA512 2733aedabdebc66158dfb49664d44374b6a9260a9c4b0fc549a8f21ae6c02c47d3a0475855970da6adb9c40844e44f360ce009af869fa55ac10cabbe4e95a1ff WHIRLPOOL f7b6026052219d468d758e2b3ee7de148476f1ec33bb9f14d0fc8e15803218974112fff6aac4a612a339996ad09c1330411ca57f77eac50db2395f84b65558a5
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 7035083 SHA256 1e7373c180a37341ab659fd6064f9a8be582ad57b9ca17a79d910164ea17204e SHA512 e7f76513daedbf24c8920718dacf010a272cbdec1a05b0a7b5bb7c76263252372d199ff3af24b8e7a1a62864526030eaa1fd7c2e42d956dc677fbd4fba34bfd5 WHIRLPOOL d8ae2d359e5e7cbdbc0fd3d90598cec71e77233bc5f4bdef28e7cc6dcac416835333c0f48f03817565f1f8754fcc9db494f2e0f1c0ae534fa5a4ca2f86309e34
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_eo.tar.gz 478835 SHA256 667fd3a024f75f0e3ec16866c57f20c2f6232c573d0f230dd895d67d59554990 SHA512 9c79e039cb0f9de00dc7583456e1d5a1062d7916d9a44ea5e5c4721ee5f7a5fe66cc6e461ed5bc0b374cd6bd224ee8c092c2ed196c5e0e85a78cf1d360a25bb4 WHIRLPOOL b8792c402f7d15a6d11d07be9840d3a9799fac621e5db9eab022d9f0655a5d90069f779f057c0a6551a43d35d3a190c28044445ec381515f655f3ad84b82e5c4
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_es.tar.gz 2023785 SHA256 b18d2cea2b82d7db1423c9b905fdf50c07a9d480dad8beea117ff4c070a9eadc SHA512 4f66b7a9a0cde35b3d67b578adbf544d6dc382fb2b588f84739db408e9aad09eb74c5db5ed9fb37b4761872d4e656485c90fceb5a8e7c5f0c2ebde8623cddf9f WHIRLPOOL d9d9f5a8f01a995dd9c55ea286d7104fdb719ed9c7570304911678fd73af091fb7b31008422c321908263e3858fa70caa5deaa9bb124b3a9c4b030e1c709cfd6
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_et.tar.gz 1388054 SHA256 5a379197232ae7362ec2189014435888ab096de43708a2d40b97855366ca514b SHA512 1a905a9cf0f38e9fa5f380876eb13db3ec9a358eca8927d30bacdc77b744fcde944d6a4b1867944997e22dcff9c41eb3a97f29513d8f475682f4f3df3772c627 WHIRLPOOL 303727e5131516aa9ee5193cd8281424f5b3f1f75194581b7bb7e1ca6e419c22835d473a8196555aeb81f8da5da953e184eea5d0ccff1278db17028b289b6f08
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_eu.tar.gz 486834 SHA256 ca84a68b3e18f8e050597b585b0e7c665158d5df4d5f5e3dc7ca39643fd56750 SHA512 ba11413c572bf98400d97d7a800151959b6957a0b90ba71c8f0b8d2dd2059cdb968b561bf0dc198d0ec03342dc472ca35252a458eb07119bb8d854ad72f7a948 WHIRLPOOL 2a35339be2383bc6c4bf9f711bb0af6eaf85649a0f947b315075ba460202f2b21f3030d7d1d85dbe683089e7291f9de88654ab5fabc3322ff770f9ec08570982
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_fa.tar.gz 510132 SHA256 8080ecc44eb903f75435efe1b9cb802b7a68e73e4af9708d1cf165a347f3e0d0 SHA512 a1428a0f3490967b23c2381b22504a4b3fa6b5990c3ee40476d687a7ab43a46be5a5242829ddd084bb9b98fe9e6718ae9da115dd6945147f7abfff96fb6124c2 WHIRLPOOL fba7541fc7e257ad708871d66f16ad0eb4a8e1e5a941d214a22897646ae2e4bd81d74c43500e864b76094ba39545798ff16457d02fd65bd84679b9626fd4dbdb
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_fi.tar.gz 493668 SHA256 dd0e55b9c231b1c792a88b35c00242385a2e05f06e6b3a31c92dd3dcdfb977a6 SHA512 407fae87bd5edbfa61d9ac47d8f1b5cd34bd09428828addb5b6be4110102ee5004c53332d04ff85e6d677033d4f78fd489e2f6558da33a39c1943fe94f312976 WHIRLPOOL 621f030ec9a5eec559d28cce058e42666ab5be19bd0e5834c1dedddda20bd95cb25dace59ca4c97c843790d45d390593054d398e938a0711852ea9d9a44f25de
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_fr.tar.gz 2815404 SHA256 d243c393a5a7816d506d392a739fdd7b50d87adab09785ad25565285be28c7d4 SHA512 9469ddb2340c20cb9aa17ca4b8d30985d569395da6d0fbd32c8ebde34870d52d1f7a2502f4e62e193cba510faf6d724017fad1581d04b1607eed844263f869ea WHIRLPOOL 01925a2a00daabf88aaa0c99d66fb003627e76d86399b6bce3d49bc05404462dc1788f347a67ebd94a113bf69dfeebe457bd2acdf3c00ed34f6012ef9828d744
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ga.tar.gz 503230 SHA256 b74b44116168d9ff13fe2f44ddafb2a3224fedf65ad03c7c2c329d84a65b1bfd SHA512 c3a945007c37c89568b22d6d779f3764f0b668f11e2c6147093022021398d40ad8ca88fe0fd1fa7691fcf08ca33bf83231e75576e22cc17b4c03c82c7395dd1d WHIRLPOOL e09b289053a10f75f564fc046a24ada10084cbeb08e9ab046fa0b75009280d56a9df3deb765efd82fb43089b1892d3da318b1eb76aeb3be4970ace27aa4023a6
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_gd.tar.gz 1083502 SHA256 f2afae0b9d1ea8f9536f8cca0062ee31168e32a774c6094ec5a71220367ee55a SHA512 deb365b11ea8c3e111c6ef2d79310019590cc6b749138dc6e3efedfb7ff3eac8024b9f7378916d582953b0f7ea5620b49317722fa1b800e16baddc28a0b1d23d WHIRLPOOL 6891e3c856a30208444fec5f796a8975c5de48276144b9c1f7a8e36ea372f600e4fab1c7c8731e6a9e28e8c520f39b007d4984631f1f1ec623f335ef25a87273
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_gl.tar.gz 1052826 SHA256 737868a40095d67123f15f03d025cfd18f1bc0d78aa3158ee57507f19767fd55 SHA512 a7eba67f9d4228761394ba0aad8966877de4ff5dd83c08234582038c546cccb296d0d6386d5d5957c11512a6707dab18928a26d2d9a51fb30d8c7a6bd985ab27 WHIRLPOOL 5128416bf4c07b56aac8b9cc736cacc46fcd085bf3cf9de6b8ff89adcb346b84632203998e2081ccc5150362bfc4fcaa779f2da49dc7c78eec68ab19fdd36d9b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_gu.tar.gz 1190056 SHA256 0d038732b79f39f587297797093dd7875d1d577aade2589be5fd1aae70cbf6df SHA512 92e9f60f58308d52a2dd352ebb74dbef8959f87e7a75dd3276e88149a2db0d28c6f399b9a6b7dc3c4427b0301026922e67d8ab053167d8862ce0aeed1b2b2f97 WHIRLPOOL eb84da20164282ce0f1f3e15a77b1b96c7126366786e59a96058a6255dba3bd8c7b84ea037b88389fc5e034f08019b2f78563854d569443b1e3f278dadb580bb
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_gug.tar.gz 501266 SHA256 741e1cb82718e5c1983701ba0103f9a43fc53e5c19484e4de1e8d617cb46d2a5 SHA512 b799914f98f350580e7ccc8db120e69590eca5856d06a940ed23003603bc1f98cf827f9c0130abaf6895e49eb9f36f436b06a22212c4dd805c75784fc4ac1f10 WHIRLPOOL 1e289ad0d2ae7c7a80ba100cabd7c5cc4343934c5142234241215978860edb3550751fe709c33e26e82d93bc4368d864d435dcf1d04645f4dd4293bf2370c7f1
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_he.tar.gz 1581399 SHA256 2955f2497e5887c76164d5f66941132eca5b17bad8f35fa2b972faeb1ff46646 SHA512 023ba5d21bc9c5c7ba6c75e7b09455c1b0038c8c0f0ebc1a8c3e09594dd42296c228bfa28af15a97cb03256e5575af337a9eadd9345dc8b22d84905e047012c2 WHIRLPOOL de9e20ce9f1e1bbeba0432c0db6ae63938c020abb6455b4de8638fbb858057f7c935924ec140d96c3b5492fcb87663069d777b79086a3db3a5d0e1f93c1859c7
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_hi.tar.gz 611145 SHA256 2aa4577b19f2ac6ce9f6d956bca2e4cd51d1baa97df11f1ff668aa0dbd9366d7 SHA512 77412c1b44fc030e3e1f297a49eb636292231b56c851fcb1971f6f84b131c2323bb8f0ecec6a5202d93ef49553a184a68bd4d8acec8aceb8a109fea6d7efba36 WHIRLPOOL 7469fc2bd8d0fee208ed346dcbc0b58f4f79ba8947a47bd74e23f21000f6769efe26411d863281cb3ebdbae576b97f5066263ba960c61247f904656810caee36
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_hr.tar.gz 1256176 SHA256 f80ed2e6c04de399d6fe4dfed962bab1430f575dd00b9286b312e37bc99d9b30 SHA512 91f0abc99e4445b149e0e8bb27cc1200bf2226bef347947772c21f25fb8a78967e492dba5f715b7e415d2d34ff801840b115cf8c34c2409adac24eb63f45900f WHIRLPOOL 11d52be77d70995552011496e6de3a124ec9834b4469536605eeb6a62e54bb60fc06e0c125d55b6b58d4726f91e9cfd409511d260563503d934d39896e471f58
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_hu.tar.gz 2715081 SHA256 54216ae79ee8fbd3d25e544600aaeabb6b48f899f7573f79fff186d8048e792e SHA512 26dbd15c164bd5fae4411951460ff5e32f8d151b7edb61419c4b6bcc9479f0a11b14d9c4e0033b08c45a4f8a18b69ba4244560a569976f0967018460aa9a6f50 WHIRLPOOL f81a0973812164cd55a8b2e775898b7d779ceb659b91de4df47250b9fec27389ad37aa63b46c5522d13649263f3ad4c3b0232673e055a66faa7a97424c7c01bd
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_id.tar.gz 478537 SHA256 877257271093eca91934af2a91a159d1d5f2af856ca9b0b6ab638b154fa000e2 SHA512 29cbdaf659419e040997558e676afd5509e3c0d9af42510dafac0c22d0e5486bfeb5d388499e735704c8c8d12f843f19931413813a4d33c06b62f768d8a7e47f WHIRLPOOL 895f33631f6234e30b02d70e5f972eda636b1b8990a98309d8a9a697d7cb31095dbcd832c4972eb463010a7fb167c1617b85e7f015b612743b4aa085e1984c87
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_is.tar.gz 1193410 SHA256 2c18bbd3da89a8ac28a077191d8331b66285ffd29effb916e1b0988f7c138073 SHA512 4bb5d53c75c231d17531e3ebd93cb4aba1a3895e45bdb3853d6e9ab5c2c2e62e21fd9b3d101ca174bd567dfab8329259379b821417181e958dea9a2e726dba65 WHIRLPOOL e579004926eb01e024b3d7c5de9f734fab382dc6f131f3b9644fa552a0a7a20acea7169c0a505bfdb38573505605219be053bd0f1689663588b86e7177ba0dd3
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_it.tar.gz 1824603 SHA256 3ecf815403eb7a76a04d1e8d2a077fd03d3d2de0f6c29fb6762796180addb8ef SHA512 faa58290eb2fb66340dfbd7330c348f8d319c0ccdcfd584beb36199001955d459b0d76a46cd450ce4878d825c3d22a4ca0ea40ddab7de54d882268bc59070da6 WHIRLPOOL 85e0edeaefb7e0b59746ec1642456df5c7682fba071924a48e098ad0690d7355890490df0d2db017459283103800aceb3fe5808cf30a2f21a99a98d01572c44a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ja.tar.gz 588524 SHA256 7a284fece790108e13cc1bf7251f54ab4eebbc39abca2a05d70d5d031d89f43b SHA512 e5eafe66d0667a2a7682acfb6f1909236556b04889b205fd523bca3564da0d0415dfe38ff7642f81e33966181489b1eaac3318e450228beefe38e2956e9dcc0a WHIRLPOOL ac3f6f97a5070e8b9060198c6950e3c2ad57807a8cc877a102f84fcbb784e4953bbafdec7c7b3371860bb120ef14cb8fa8cf8dbcbbe1311b5e1161db5ce1f06f
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ka.tar.gz 524412 SHA256 6ba48c4e59b657bf1ea3a792b8555695902173a38f36f5c198631290a3d0ddf4 SHA512 f034db095c4cadb61d698fb72a67c6a9300dff6b7319e4abe5cb8756c5dba6ca3ba7012827e8b43358a657e56ccec8c74df9dbfc279a2c4c2759c286f0b0454e WHIRLPOOL 9da08c1e9198d9235e7e8b4dc02489536d1e98a976ca4c36bd7b2d9444bb64da05b961ec1f157bf49845d471ce64a8616ace195f5dcaf6a58b8ddd4a33364246
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_kk.tar.gz 535118 SHA256 4e5cc3fe1289d31664a4c94abb48ab74636d837c2b1b32ee3d86a12a9ae3587d SHA512 76fc67cc8d7b0b2a8406df843602479c373ed4ba9e709fdfdf4ba27598d2f5c89d83f1a500c2bf5f055595a182a9041d2afd56872e9b13ced5235b2548c50be0 WHIRLPOOL b6d0193a0798a06543af5c3369b37ef1d9d4167dd1b098894aab1a0a719e684539c5f5a203719f576c87d4bc840f6efe3f29f3fcf756910451cfa664924866a0
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_km.tar.gz 641461 SHA256 34bb578720ae918940efc594d84d8d1e51a1f250dc806355f30fa9af501d7f3b SHA512 3a7b56eeb5977be96c99f5362603834027344fab42c3ce6f4daa360e4dec4a7967f1047d5527fd80868d7f77e3de1e66ccb14fd308dfcb18451a017eca970a92 WHIRLPOOL a385d5dd8efb3ba1c0f326f9fd9f4ec1912c48b7053dae573f25dac8cbd4816bc88e420fbb0b8719da74df86fe658250c979e5014095c7b3cd78abd2ae8dce54
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 496565 SHA256 11b9f1a6532c1f937ab1efecda7eacd5f1ecdc3f16dc078059de63a38690b92a SHA512 6a9312bc202269c81aa4eb5edd2af5cc4c9d415fd367ec9f1b7d8674d5e08cc7b4ac8f6d55f25a9da3100cc3f742f8e45633f0a97a358f862749acf6d0615079 WHIRLPOOL f552455935c95373074da328e75fda2794e5ac3d9c5228b2897d682022652e7fb8c49001f10cca39b8d029275f53be33f84c292b2685f9f08a216fd678473208
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_kn.tar.gz 553058 SHA256 08061ab8d074928e35b91f6e58eccf3f6d8dee4a99b6cfcdbc70f596935c3410 SHA512 1d2fba04559d043a024bf5e05396dbfeb6d75cb5679de3fd3514f03a86e8a9bc99051260a282f3cfcdb183912ea53e9055dd252dfe299ecb7a919ca183269e33 WHIRLPOOL 5f4370f1b7f6699379f529a7bb8beb03b6803ffd33c5e798078389af403de46618d683d5a6cd746e3b657671479e4073f67c923519c80b427fedc4a0f74e9f86
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ko.tar.gz 582319 SHA256 f1dac00b2b5c876d24030bac756614b666ae1013dc2f4c49f5b58d2a43a59122 SHA512 92e1bb3a09eaf8450a7586ff39538fda66bb46a735429c659963980ddb2cd4a9f5c096510d2f4dc7a655dd508df16b8ade873954a60526401d5e37cce2c61eb3 WHIRLPOOL 5e0249e69a0e2b46d3540cd527193818946ca421d45982cee1ffc3a2ffe6700df1bdc0c1a864a505a04dfb1d2c94e36f17f46524f686a7f2a6f708fa7c0c13fc
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_kok.tar.gz 538156 SHA256 6824b2e64ebad798229e2f3212d89befabca9463cb59f32011507b90f30740b1 SHA512 8d7fe66212bd64ebee0d41f43a9c9f8648c5f8155e0212ce93ba03b990cb0d34a1b8f637035d280ced2b12aa34a4a9d339470554e6d4e2d7fb8d77d435a2aa17 WHIRLPOOL 82edb003c78a1135238a84c57ed4a9e8bc8b4908d4d348e1bc64ba34c5ea86d8f511f384291a1dfe8f41c01f06152f71bb740570a0c63f6c0eaac4d8f98bfd15
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ks.tar.gz 517490 SHA256 26b1f65c72379f7d98ed8f5165491618eba3661188c4d20ddc115f535232f8c0 SHA512 e3a76e2f4a42b4575f466723642e39f22beba1f48d41b5d41cd9367e4304fc264dc1ac1dfe90486b3b6c930a497b4966e197c02e505d075ea074fe25068f6cf3 WHIRLPOOL 1df7ef5772f189f42ae20401f4196fcb1a77bb690591cd3bc43dfa098efe3f34f9daca3e4c0c4bd067c0e1d5a858dd74386e8b486bb6b5bc3c13b9b1122b27b7
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_lb.tar.gz 470344 SHA256 062ea897bd22f28042f32e8c8e24a9cfabc11eab144d013bd64ff946420bc2de SHA512 ebb363179dd97402dcb1453fca485e4a31cce15a4e09ab503c6f943af6b321549a00f04226f1608bb9d7025dfb6d5f2aaa95426b025ccbccbde773795bff9176 WHIRLPOOL 5e577df2172bd2e0d20fc1088e3816516fd5abd2097e41283c4cd40b885d887cb4b5a36a3f8d8b6747d0509ed2c4f6370e3295ddf5dcc74029b6c59bd8c5efd4
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_lo.tar.gz 559912 SHA256 6edc28b73ecd3ae4a8d36d73637d7b81eb31b853e12874a4c1f5355ed56173d6 SHA512 b3c08e61a9925939abbedb3fc201a69a099a8548bc906ed5a44418ed6ba823de88507b2c1eaa4c28b79351b12fbdc3f6cacba3be197c2ebc6ae1ecb59509d4e7 WHIRLPOOL 702b1c868405d392eaa97c96028fcf9a06ac0e4e329e167ecef5140fbdec4851ecdd6db961c0ac123eec66ade5ee383d92803af12982ca5d17a9c40baec2ed55
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_lt.tar.gz 833939 SHA256 ad5a56ef5929f5415f70612a35afc68f253231adfe5470363de77fd6ec3974d7 SHA512 dc693ec910c521b33c02d9e865932db953cbf23041f956abb263f903f2d88bcc649c223fb1f09d094a6d78baa730bef49221a7313a178d7102c6d7cb3d39cdb4 WHIRLPOOL 8997bab139b9822ae78700d219d4c8283f99dcf2543c83d3f9dc26fdab9c0ffad98addbcf5a1df8d715fb5c4870f29f4e623e0bb43795a26704d69d82cf47335
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_lv.tar.gz 1250600 SHA256 ae0bbe2ce482f5cb054ca2d7cbf13dc14d7c6b2571d04d8f07e702d5cd790086 SHA512 b827fdc2889de5df4f8d327b2c2bf31b126e777fa56c40d006eeb1b097d718cd46ff348bf19dca9e7ac0af74219d2a91d332095b4db927dcb06c2e928c851610 WHIRLPOOL bd5d1b1ca3a0966037bf35faf4fff8e5825880b4396b28a0e5edbdad43feeb5d365cd778e5570edbb681d51cad199914ee86ef232f269cc588ebe6580a189d73
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_mai.tar.gz 520034 SHA256 0a9ef167d16420367854b335cc5fa11c40de8e306475fb5a0379970cfc8aeec7 SHA512 9c35f3c46a1bef44f931dc21ae716022208147b3fa519982f2aa6de58b93a2520d9a28b9c9144915fc0a800e9bd5f32e3cf5f3383b9dfa131d598cc75876d840 WHIRLPOOL 1f5e076ddb16939bc03767068af52399ea3ce7f19fbb457f8e01b63aeae2ecfa25a875183833aeb8716f47df11a2875448550cdb80435f61f5f1a835e206923e
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_mk.tar.gz 519776 SHA256 00b331298199e63a62402f999cb22ed961ec5942d99588de6caf97fd383b13be SHA512 1048183b7c4c3e0cd6427220134091684caf352f4742b9795719c2d2b311ce993648c8d1069e511d2b500348694493f35908c0676d2271f7891db22518812dda WHIRLPOOL 99e3249a0efe2993793bc20cf0a6461e992485de843c8f00673a95ce5584fc78b7abefb392ebbdb915c043420963099a288740d35ebc005b11dbe1211de16505
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ml.tar.gz 558567 SHA256 6d9eb0d894b2dc7a67ed3ba891948b358b7370f20ab89ebf1c6a1113e09748cb SHA512 5963804e4944bb0a7e36b672108818b3dab8524d2e3d26e30a7408a747884609b010558b5d8c8c8efa6d3c045c17326f95a24f113fc72bb3be4ae65c3d42547b WHIRLPOOL 1e3263739ae88a494ea3292e39abb2cf3466a60934adeeb8cea36e6b17c8ee4e7e098ac80b5a097f0ae8f32e0393b0c09cb6dcf2cb71d61adc73f16ffbd89d0a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_mn.tar.gz 603386 SHA256 d04f881074aa7e0d5e3a0e04e665edc582c077273ed744f8e185cd4932e086ee SHA512 5a0c5b4351fb635b2bf11570a96e84dcd51e252dab878280a17aa5997d3c247cc8ec1b99588806e0aa68f0359822691a293ec93e4875c3cbd8a9dae8c460835f WHIRLPOOL 29813587af5c3df469efdf2ed0004e423b9318f64f6965e2f039d38b05013bf2eb751af8c65e02cc06634e93e75d9498387f0680d1cc17f7968007bad15880dd
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_mni.tar.gz 531797 SHA256 8b6ea8fdfeca04565bb4c85b15cacc95bc0e56d70e39b4ec6a47b11a003dc835 SHA512 d11ecaa2a666cbd5b586479cd72575f317f42938525ae25fb7b989899b7a22b2800ea30a33626a7773cb6ca52d98e63ddc1babb5a847327142e3e6f93b441c99 WHIRLPOOL 0d7b5a4b385ca08f7e08199f5f6bade55b4bae9eb9198147a22b97cccc6e57c418adcf7c0cbf8672c5dbe0837b902a597610a610bd045bdf5d944813e6173011
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_mr.tar.gz 553571 SHA256 f6897ca59d4060460fc8981a5a98017cc8797f35957d51708c01e82ffbffca80 SHA512 9320bf7b17bdb6914f2ea779dfe88690da204928d5fb69905771b85e2d263ac75d060780a26962c3afce354f3d2b5048234ddd3fb94d641ae453ddec61399d6a WHIRLPOOL 30695a0ecdf4d7bc5425748bc7909e9ada56eb6271d65c72fb164811893777d621a831ca1435d66e4d76b851655c7d5178688868c05bea1a6e46d61fc666edc6
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_my.tar.gz 552727 SHA256 308440b06eb343e26476599f24980529a75dd9855344983a52d75efa7efb1be3 SHA512 be68ec06317c93c58d5f8c3b8c947c82ca9363a2d10fec6c4ec33edaf3b0a240c4e3964fc0c82cb755fe655b77eea8878e0fdb25acefe369ed2706ca59af4b40 WHIRLPOOL 8e0e312b798bfcf1138536a5d4d9cbe7dcfeae885160f27f7920f49ae9a859f7e7e5ec83759516b01c61cb3506826649f99e87237db9b3eb36440235cfb62c29
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_nb.tar.gz 3483370 SHA256 37a5ad210e22cc1f8ae4ab72566d3b49136d948496963087e3a8620eef173af1 SHA512 26ef1ad92a8713927c1d7cbcc534f02eeba27a28f9acadadb582e554e0a92dd593e64900688825af8e9bda7273d3d5df6b6cb9676b2a998e1fa425b67a4daffc WHIRLPOOL 16800838403e9b6d1b5b46a94e06ea30e69f1825843fe37d270d5c649610b2c6b97a34076d64e92f955a85038d68030e1094baf16df44237d16ea25c39578ed0
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ne.tar.gz 921171 SHA256 cce62b2c833acac9a8cc4697c5d32ce1931467a733fc6bfdbe6ac15e9875595c SHA512 f564447ea481930fabfcdc24c8ced2cffe8c166a80969e270c993797c9e31b3238ba7516eb8ac20d0009b7850b31917bf247ad0cff4152c0b74c631a4dd78744 WHIRLPOOL 96cfee910e984d7c4ef902141cc8328b6437664f4b89a9c17370a01dd2df797b7a58b705f4cc70db52fba414e707db5fc3d5ae142920cdd6d7b55a6a09f79f0e
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_nl.tar.gz 1283111 SHA256 f147fa254c9a22bcb604238d26219af8a13b4b91b8b2d89023d4a1b7a6026612 SHA512 93727e315000b1359a64710e382f6340cd041c56471ba9823d1efb37aedb4bcdec4ba5d3b32f3f955589ebcc4595bc5cd463404acd81a5e7042b790d10399cdf WHIRLPOOL dc25f0380d7acc6e9d79bbdc04836e91eb722f5cb1241d0753749fb116424757029c88d883d1f4d1318e54d8de551acc4194c8f4180027fe787836cfefee1ed3
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_nn.tar.gz 3481669 SHA256 ad1eb859211fe7c79f2e9848682b9e8b3b1de2e4550e7e8ee0ee8f0876ed4ce9 SHA512 9239d61590f7f87f05251ac01dcf5d918c28b176344bb627c21e7990a2423e83fe3ee02ff8bb47d2dce9d5d9347b7dc55a9992a2a6c7a048eb2f7e6b7b0e29cb WHIRLPOOL 73507cbad3038de2fd7d1f101343ab0f192f50040b46e773e6bd8aae8a7fb50ad76ffe8d41cbc68dc69efdebaa282b093a65757eeccad9a8e2bb692a5f93850b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_nr.tar.gz 496304 SHA256 24ada9b24377eece8ae419c6a6a8e7d31cd63f2b4362e46ce356b20497981a27 SHA512 fda48039b67b1373fac9bff91eea5c37cd465bd8ff0182ef1b73dadf88b6547ff437623024846bd3534af59f3000a9f3fb23b361468b9f16f6a2ebadd2475572 WHIRLPOOL 30e5e680ed5391cc1d7a3f61dac1bba6af84da23ecb4f1bcefac497f6a1c5498a06bb96bea059d04472ae31236675575133e96744ae14a84cf7a80c5d97e55fa
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_nso.tar.gz 493082 SHA256 d7568ce49896022846a8660d6a32f578daef8f766e6ec7859a83f9efcb91ebf6 SHA512 6fa35a795d1ae585bbbcb7ffd7b5f722a7aeeb555db200218f925d31d73e01d8ed5f99c59e7f797c235fee3978b2887d5104864de3aee8537358c27e8da66f30 WHIRLPOOL 176a797f3c953041626476e6d3456f8449284df899087efece1f0b834e0489c847d9b3bd3f6479bb8ff820b1bd3e707cc24346f76fb4c55febc10859b6a244e9
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_oc.tar.gz 695214 SHA256 8048df1f3e0ac09a223165717f6b3ee0bcd4d795c574d5093cbde3971cb86883 SHA512 bbf23d8288f2097adad5e487f75c4348a91a7529f54ede017708a69fb62c68bcbc3514efefcb23d447e4cae1cd9ea65e4ddf4bd4df596305c1a90db252799f7f WHIRLPOOL dfbf557b3e9355f153631d86a3efde4a25d651a55e2f26f676f66e51a1db7f9e10ecbfc4fe95a6ad29404b779e7ce8af82bf760016604881b9e26de0a11369c2
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_om.tar.gz 484861 SHA256 9c8a39ee07f0da8c2b157eb4f32057f1327d3bc3fd6448e64deb8eb00e368a8a SHA512 4c6aa04cec96f7c6109d3309c6c23971664a2e446d4b4343835b5d03a02c1ede41703b412e97cbb010743028fa96ed252c67e4dedd2943a3c765842ff2b46472 WHIRLPOOL 093ccf56a70bd2e66dd9def88f8e83f83786f5350d82a65e5c8e5ff57412ad2d418663306828b2ef62e6d597d0e6f6eb01784594f0de38d46dc1ba17b8ebb3ae
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_or.tar.gz 550693 SHA256 b5ef64fdc6705703d011851c330a730fa8ebb89c0bd3c720ac1cc2b8116967d0 SHA512 ac153b6e42a2c7e793268b69b2bbc539cd62aaf598b56c2be7af8c527149ba4f5c3d9c10decc088f1e8712afe647d6a91e336deb4984efd50f29f9de04bb7fae WHIRLPOOL b037ac25327b0352d25e632fda9ac1ae7d3e42502fff0f739ce17fbeaecfca985ed5b1e95f7f2c8c809474d2e965717c783b3efadb6c3687bdc6a82390d59005
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 523847 SHA256 5a05861b900c8032a73b4ba022587210dcd5bea632073ab6a8a333a8f93e2b42 SHA512 47823e3dbafccf80ae429565c9063158d468c58e2e9cda32103128b0a1959f111a46f2d8d35cab38298833e1305580c577e31f8f4ecdc492a6dcb9a199acd543 WHIRLPOOL 3fef784f0b30f1df4d535d16fbbd1e7b52e91b4fef20bdbf69c31b718821b5f24a260fb253bcd15634efbe703eb5bd8a10381af64777c3896d6ecda2e36f57ee
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_pl.tar.gz 3277468 SHA256 1302e1dfb491964fc757d209905cd3eef8941110156d28abb3a2829ecca1b48b SHA512 f6ce4d8a1434732115e8233ebaaab00efe92f00e7cd54b0fd4801c97091b91d624a05d00f882330b6b612da77ed563eecb65c26fcb6c415c793b642420c04104 WHIRLPOOL 55751649522cd686ebf9fda35896a342b79ad1efebbed38ea75c72a9de4271f31af2b6b72d52e983b73134cbd2a8e88aea57b89d33a50ad224bb0c004cdd2330
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2574389 SHA256 50a73f9cf558363af3184f5d17488161ea91ed63583f228cb621d4648bdd2b48 SHA512 1fcee18a265dee1b14ef9b92ebf40fce04bdce3e225aba93e09357e3c3e8c9db316ae6ea87c4b7002b3d90313a0f9a56ca7d9b2b4734b2f1ac6cbfa7a619382b WHIRLPOOL 40c27e68182d67c9ec48b0cf844cb59076d267f0d59aba79040850571a0d3d287235752dc74eefc3d6e58dafa3a88984eed4fa4a15e65ac05bff642991679699
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_pt.tar.gz 1127759 SHA256 36805a4ae7ca58e422d5abf6a1cbb1132ef2d3b5a012f178dd4eb855cd8a6210 SHA512 b2b14c42d9aeb448febc0f02de81dfe5f8be11d1060548079d75cd2e2bfc222051bcc8d0e08ce2abf2d4e4779c3793a419f4a31f1e56f91a88c19d01dd318b2a WHIRLPOOL e0e73f43f32e29f363b8ac933a962bf86874748dc42f839d3de20b3a849c342d3ebb981f5c61d198087965601eed2fbfa05e413ed09776972bad9123ca5fadfb
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ro.tar.gz 2361172 SHA256 8fe65db16c9ba72998357d4b3bc411efa3c179c879c04130ed43175717789350 SHA512 7922fab63585a7cd7740e7864d77a6769bdf77e045c1e16cb9635a53a1ac84e2a77c390ec1db9563d91490e9dc205d9625687835d37c9b3be029e75582afc5bd WHIRLPOOL 9db7d27b99d57bfeac75fd0403555afc0003b9917541d5326d17f93e5ea14e750c7dd72c646eb4419da7ce5a98954ce553053bf548c823d872713b8e0646dfd3
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ru.tar.gz 1648407 SHA256 eece68d4c88e9d373758e754bdec6c04fcaeedfde965fd02ebd19b2570e91dcc SHA512 0b9651691398a0ed5b2967edeb8b0c6481cdcd33c65dfab04367e08adcceeda43a2bdba05eee06b6f18b975001cadb9fc2a31004fa73f4e9e37a4d1bbc0c53cf WHIRLPOOL 57ba8e1cd89a5d54bc40f80bf866b9284960947b26b45df9a6be678b94a586923d6ec3399c31670f5eb56c2cad992dae6c093086267741da3f780dea14261f6f
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_rw.tar.gz 488626 SHA256 030a571ceda10f90356c1febfed87ef587ec2e750bac4804f10e633c84ddc424 SHA512 dc4e6e7ef6f6b6cfdefd17bc08655534255400e3a032dec1016fd9c7730da38c4bee82683375c298f46d35ffc868e46f35e6bb7192463f7f02c6bda2bfb6ed7a WHIRLPOOL ad09355e4738dc628cab2d77eac43d32caf2e433496e8dc9eeaa83de8ee939e41284d4951a5567bad19cec7f947afb35b4f6d42e734be01121ffc4a51b5c2377
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 540622 SHA256 7c93fcfe319b641808e7dd24029775522d79d16e5f216428f0c8053416ddd4d1 SHA512 957ef94c6b2b2bc89730030af157f8934506bacb1d98c0b4db13058aafcf69144b8804db3abcb723623402a019845b2095d3ea72f69d1d74c4e82b3ff72f1eba WHIRLPOOL 1d38f3f5a73f05950f48d2143dcdf0f8fe6f306298e2dc87fcd9c1964c2c9e628481471e53acd7545bb4a646fb4957070d3ff01a3a092cdc722d3ba66f6a37ee
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sat.tar.gz 581182 SHA256 c6bb7f5fff6a8b2057c017196152ce2a99b09bc0d123ed46b4eef402d68a6f21 SHA512 1a034a46b2af6d9cad72cff93c88d074705ea1be3aebad8df566041c542a79233d6a7f1dd9365a95aaa291ba0a63d4dd1dabc8d91ef3fadddd22394e8b47b177 WHIRLPOOL 953fe70f8351c39efd6454a3dbf9a7110b8a85d800cbd7b9ec2bc7f1bc0217da4309c5f6c44aa861205d09ef5873383ce12860a6bb57c1c1ef8a8a6328d66b5b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sd.tar.gz 531695 SHA256 8f50e5a8b623fb85fd3af3f8d76d480f079dbad41805f33a888a4e1f765469a3 SHA512 1832fb4ca90b972123183efb1d6910574d7ff81eeac89de9e47c7dedbfc4f29692719d226153049bec12ca6442d52f0711608cc6d5675958b8bbe4146e372634 WHIRLPOOL bca5f7a10ea32b7fde65ef67f90d6a7d681b90ded1f2e736c14092c07bd7c9dd48036f2f1e9771b33c2752a072d1992e2105b26e53678b42b631724e79588527
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_si.tar.gz 822049 SHA256 23b174a4642b2f5fc61d16ae5fee8e54fe751df9d34fedd6e9ac8caac82743a9 SHA512 7f5ad27aada43d8025bca244a15911ea3ef7cb78738d3f2a10e0338b5bf9131e10771a34ad94cab64766bac3a5a67140386388da96ce303a57d926cda021cbd1 WHIRLPOOL 29ffc6687329e443069afccd6cae08fe2f4dc0c0ccbf0d65ba73d3471096c7a272e49c3386bdfe4ed1d7a50b2396d40199fcf6709eddad57c83c6eba692d8401
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sid.tar.gz 492416 SHA256 f84f1b7444ceb62d7ff96b94c021e7ef5e5c5ccc419f61d7b2f269ee1ef7076d SHA512 582f0eed698cab105b55aca2c1b92d31b4e916eba73dc6e33acc8619b664a49005987b9d845b92958fa752abb85d8aecf1ed282c2c8359c5ea56482fee578158 WHIRLPOOL 6fa1e673e1fbbcebb4a88df367af69f0d20d17b6e6b4784d69326338b7d266658e21e0cf825984f5d23185425e5e5db363dcf726a5c7419be3971b7adf4bcd5b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sk.tar.gz 1781797 SHA256 1f340733f019f46ab818816b10d1e8b8489efcf12beff2ba8e864d6e59c2655f SHA512 6ba3642703cb51777f18e9537ef2e8742690558505d87247bb5c73c4f135ad81f3f661e16b14d71cff80a7e22df44ab92ab36f7a13b28c499467aa24a794705e WHIRLPOOL a998eaaea1dd907ba4b7cd994b23e72e95f1d3758b7c11e3414ad2fae8cc4dfe774bdbb31c0cb8ce93df3247255eafe2f84f66fec20c3eb3385b4fb2b48a44f5
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sl.tar.gz 2160330 SHA256 6faf19f6508313e1eff7bd1285659e207912465b3ee378f3867dbd6ab9d1341f SHA512 7e89ff5699515872e62b519e2fc7eb679b08f6541fd625d05757320fc33548518348be0746c5d805ddf19a6b7dac884ba2955b6350bade3c3b34ff7032a536a7 WHIRLPOOL a85cfc94412e6f4a1d336effa02616db911c574d1e5459295f78f1cc901a420148ed759e43ef1a8d7495a3c27fce28c52fb6347ba019e6dd9fe79c9d87a7ef17
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sq.tar.gz 507918 SHA256 12c822c6d1c9cc2b879f9c78ca556317be8b557fa05cdfc92275db24b68f2654 SHA512 e1605e40c73c1594b79a21609ba8d6f76ddf0ffff11a5d4eb619a772eed3ff0dc961a5caeb3a756c8ef0dc9135d4bacc555e7bd1074129bc8eb2cc04aed31e6e WHIRLPOOL d6ef830d86e7b5909154f76debf6cec4d1c1927a8aae221377720ad882c4ed2d360df9940b1789773529bbeaa67107ad70cadb01af44bc7d319b088ae510dbed
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1686743 SHA256 0a84ff058ce158e6d3c23008fb98fa673015bd9881609867f56edf73e711b141 SHA512 6effe427aa4bb0b0e4e7292e87097b2dbce1fe4cef55c690511ac352af4e195e66febcd9ee59c0f6344e74cd84a37d12186dfb6f12691c9666a2d5daabf09e89 WHIRLPOOL 5a1e286209702c05c6187409f2036ad4a7065478c0be76bead2983c66d91fd3d97ce822173b8a472bf0e39af73f855dddaec4b9f7ae8e2ca6b17687ec99c8b4d
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sr.tar.gz 1716850 SHA256 8ea971813e00d001357d23b2711165e38a615c162053a4212e82635b72bca4f7 SHA512 8127829ff8d77d8615562e09873807588bd8757229ab13e6c7615a96041291ccebc1fd4ffae196de5add6eea1eb0fd707639f363331d5fcdcc4edb984e24e53c WHIRLPOOL d9c8f5fa0be9aabe7facfe256757c68b4bb68858cc62a38c915c5a77f7701105039e85d7ab68fdbce4f14e6257d4d766ed89b5c66f5fda33e75a88f2f381a5b6
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ss.tar.gz 493415 SHA256 27811440bb18c2e5127085853252dfad42b27428c65322c06d88fe07a13f625c SHA512 80b0496f00ba502af8ae522e96e38067f0813ab09661248b9e2e10705647b03ff3f9aee14e94622253fd19a2ee0b0033c0de413c5cd07a65c3ec53a4cef23c67 WHIRLPOOL 6480657af5bf3a9bc0e90ed726e8d7e4ca373a4f6ae3e4394a14f2c48017b76672f2dabb646a381bd997dc1733649b9a37f1fc171d72844338d5c7fe5bf05b55
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_st.tar.gz 492290 SHA256 7d42e50cf3e0035878f7b18ed3a36e58b42493c10801992058b9a810d4e6ea2f SHA512 6c436fc9030ea5fc7cf17166650d41b15df3b8698204d1e27d3c28a75009bfcb3585c48006372e3e7e5fb8a8e470758b51c1360c0701e5fc212650cf434f3573 WHIRLPOOL 26a4d1833df9666b2983170e7ccffe8f4226e436bbc85274a2e8cdc812f9e7bb9e4e8ec7e597dbe39b4e34ff6f664f03bef3fd15d099628719263595a3b41208
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sv.tar.gz 2363561 SHA256 d84101a66ff5e1c50bf0e7617fb205ec4e67656e7c621db270226141d911d2ac SHA512 296afec39e14c6b41300b58b1923278ffb2d4893fd72709acc3aac86383c977217631b53308d6763921410fc57b88519c8494c2820505fa4e53253405cae4b85 WHIRLPOOL 6bf529af85d77e2b23190fd18ef5a915e8a23a107748ae35d3807f7160cb4a9d47e3592410acfb328d718cd84b6692a8500ad49a0ad0a1a1184d282052f81b90
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 479462 SHA256 ffda909a3e4e09f3ab708b59f139b8a854da1a6eeeda6e57a69f817c5b002651 SHA512 a4f7fbd5fc65f35384bf1cdffaf10d4aa501a43818b7e317c31ce30ea58ff4529ad7239e0177de725f12fb58fb76b38f7df3f5cd26a257b304d316124b3e404e WHIRLPOOL 290819f3761f27e647ee34350fea9538b102efa0d0da8fafe53af124b511482ca20db1712171bf2f2347393f3b37c0d9d4f883f0c71accb69326683f18deb351
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ta.tar.gz 547842 SHA256 11ca24bfbcd4e324e498a2c699fd6f67005a1ea99568301e9736af92c97463e4 SHA512 147252d137a6a368714d6ccada74c58f101ac9e561380e33411a0ca7cb33aa279a95510262db5f34391f70a5d88a1fc79dfa20d610b34481deae38959a11ff6c WHIRLPOOL 5315abc4d353359d9c5a81821defdcaab8757c6e1ff48661a182beaef89dd115dc8f2bef9f68839be7672fe5987ccfbbfe756d036b9b8bb0520ae6fbeb047bbc
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_te.tar.gz 1105063 SHA256 9b046e0bdea03defc267ac3317a03a0f9d01af0976d489231c6e956cc9c1d81e SHA512 2de2e5d7b32e204b1eb160a5be81aad8d7cbfc778b8113e7e060e2321c37ee9e343b97825b6e7441ead08e7d3f9f9c68caa1cd3583f3e6bf237dbb817b79d36f WHIRLPOOL 632724314fc9799b9fd78b256bff134f30871d7b021490c3fe710e00cc2b6b9c83e180f0ce4b3248ee004aa01c1dbd52cf6e4af6ff1fbf888d3913cbe3409fd5
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_tg.tar.gz 510038 SHA256 6ffc04c8ec4c22ee061ae23acfb1fa64f7a72b1a8e9c75fda105adf128b64f82 SHA512 8c365a96f10496f1ef959406654f2670ceff9b0982c217c886eb1618b84b27c04e0384da351a87f8bf45a6c05029c2a34fe4a5822e7f9d18d7d3848be928960b WHIRLPOOL 14a41f9f490d556d217cf0e63255ecaa2e718b4c669b6424189fed1f3c7015ab5c1ca6febd941a3c13af62f8bae8bccf145981e2a1438b75d03585b5f4b6793c
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_th.tar.gz 691202 SHA256 84a5be14ed4461501ff3ee1e3f93d7bbf634b49dfa47cca14702424ca6bfaf52 SHA512 fca3594b16d31d5a5e823630c7c580a37dca343b8c79179472328fa42efb3caddf58f741de7ba22412dea65a0ab7f7b80e7f2f901fe8b851568f0eab6da6df51 WHIRLPOOL 9874edf8e72acd3f20b31891e0a749495ae504409a7d0bd0ee8589d197936c2f025ced452a977dcf0627f0c055f6693cd5451bc242e3ed4f4cd5bce3ff9952d0
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_tn.tar.gz 485504 SHA256 81e03a209ca55b6900e482a0da2021c69d37016af4459e5bb4a70d810e8154db SHA512 5cefcf689ac8fc5278d96864871f926418cbb9f9e31899d6a15f6c9e7db957542b2f57c6cac1491ab934c6a07a7cc60def01caec99e4879a660597f8dd282aa5 WHIRLPOOL d92bef8cbc5e4f352a1cedf3f3a526a112032e6101c4a799d11290acb4bc679360972a26f0b86b14e6d2bc69c71bc76ea8e57e9aad129f0f2c599a29934123f5
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_tr.tar.gz 532379 SHA256 a985687930f5abd9ad6c7c37be9a52e92b515fc526e1f3b79a2fa7620e49ecd6 SHA512 3f0709e8c12c66a35aa403b2fe9e3dfe6d96dd9ade7a6bab3178b702a89bea01155916e9db4485a250fb6cf4eebeaa4bee076faf5d46af21ac811f95150a0f98 WHIRLPOOL 8191026ebd76c2d10836380c3c946cfe5457ab0c33a444da03071ad8cd66802877d8f7dcb8ef53ccabca9ffe354cbd4cca89e4b775b818970d504d1ad7ca4938
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ts.tar.gz 493818 SHA256 4cee01be4f3a01e16fddfe518b73e55cd76e1bb7bfe9b7bd8cbfb8abad0db98e SHA512 9a94777fb57553a339bc903b2d8f6e3bffc592e7fffd353104393afc6a2cf3c00b5b6ae3083a66eb56a7be10aaf804e5d22827094517cbdd15732597ff810b48 WHIRLPOOL 528383fcc4c1e13dd8688e93b81ca46169aed82a410da10237ac56ef69b8e7084637633858f942cc3d8fb1b70ca089882fb48aef8f534c763f28518776ed43a3
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_tt.tar.gz 490066 SHA256 99c1f18ac7ca505710c4d4adddcc44a4b4b8ab7499f096b59b8791ba9b4a21b9 SHA512 0bd263e8a8b703c671d6f8a108ee05b3aac40e929429128b9872891abf96d327d07ea5db3e774cc8586d969f0058d1b6ebce73a9c02298fba632fff696cdf2e3 WHIRLPOOL 1203519a608cf8c90608edb331c42c3b5a2b9d509bab331c3810c08820f74abf77fa7cfce6015a72ea1616072d8b14d35485577326931b7354313ebdec17490e
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ug.tar.gz 522429 SHA256 ae2a752ab3ccd4977bbd7eaf36da6ddb15147a78cf77ad0cd105dae1bad4c8b0 SHA512 20bc21d7e4dac00a25b9c3497f8beb99bf589ba8b0ad8db535edb7e28fef32fabbc714b000fff5e9e03a5ca3222007262b01a253f35af1823a9501b7acb31d84 WHIRLPOOL 067ac12487220cb39962deaeaeac816bff5826101808272664bc5f957837af87b867638f110a95f020409775ffb40a7dbdabb74933c3947da791d7aebc2b0edc
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_uk.tar.gz 1372035 SHA256 8b17bdfbbfdb5c0390a5cbdec36f3c19589e6d6f55ce1c247c5ca8a35d372d0a SHA512 b77d0ec2decb5060bf0089abb2cf170fa3d02248c9cf26a27dec0818c668f347dc8f4a1cdf88a220f8cb08b98ac13fdf63d96402518df0ee5847674d3c940168 WHIRLPOOL 4388f3ee2046b19dd88a66b46858cb93733823cf383b8b8ceba615e94500cfc818cf31ad74e5fc37f327d30090d57994a77caef25f865722b24b1a15de149307
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_uz.tar.gz 485044 SHA256 991ef4e852894b7a3d8a6849184e3d98832ca2f29ee99bee5aa5b6ff46589488 SHA512 4b244047a575d98d992a204e3db05fc72073529e32a5a808501cac2e39cbef8851823acfa805f6d0b26ab6ad35c432832887a24f263dfbbf986f4dc6cdab6f32 WHIRLPOOL 90f6b949ae0dd8c9c3827a0a6e08c6c6ec86694228dbb5fde9a2749df9f8032a4dfc23445c3dfe0604d7b867c24274ff783a504f052305eaa6201523968e7b1a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_ve.tar.gz 496836 SHA256 f63f04d3dee5d593745140dd453da7bca92c936699c20e486b8559169166dc8a SHA512 68851643199a2ff210337cce39cb8aeb859f8d0f3c062c86c2d1b61c875e851ac5f059e25d5695b0ee0fdc03956809b59fe1d5acdec19af2ae74291507734e67 WHIRLPOOL 269f2a75f364eed90041ac3b29eb2631248d3d1162652bcd28270a6ac04f557b9c6d353d969a4057200e141b8ffbae5c05cc8a532ceb7a0bbb8ff12dc071e06b
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_vi.tar.gz 523858 SHA256 02f8a6a1f73b34f8d6eba5486248919e2743262c51e8fef834b62235eb420211 SHA512 0105db0bcee4283d2da8915606dc4318eb58776ebbcb71fbdaf2c9f099733a237825d63675f4fa0bca8dc93a37886175fcee2ab5be70e88c44ee4f415bc501c5 WHIRLPOOL 4d381d226b29bd4db4f43720d52045375f56066c9f4f0b56ea57c9c409f90d644b62f352ecbdedd1af2e82489c238fcd787ecf1e4227ecda7797f104e6e2b3b2
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_xh.tar.gz 502351 SHA256 093a5272594ed633b5360966b9fb4d59358955b46940a8c55874842bfd4297ad SHA512 4d992317092042a90f2ab4770302cd594c73a0eb893dc4187e418e8fd48815471759cf390cd71f358325306bc03b617ad697b39a9638805a5063fde9c62c63db WHIRLPOOL 7a2c5030e2585c8a860e32f88a271c766d30179655603e2dfad7792591f68fce58b381658928e3c358b64e62a2609a765ea84e09b1cd2dfcf87ff94b568afa8a
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 571770 SHA256 758d94130b5f13d8dfb17546c249c2342b2df4afc2177c03d66ac3a04c702c4c SHA512 ad1fa0519621a62a53f673da2c1b1fb4be385aad6724b363fba26c6fbe92964c3cfde5e193677279f3e7ff7d847ddddf97c2c9433c37636c927431e72ac9deef WHIRLPOOL e03c9fb3cdcfd3b82696d8009dcb5157489cceca84df1c310b345fd2d4f69e27e9848b03655fd0055066bdf4ffcb17cf7cdaf21c0f0fdbd921cf12840ba8b012
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 569096 SHA256 2a3fae756c5317b432eb15fe6315c0157bf3c7ae92aa81909bb86f673b86645c SHA512 fa567788ada4e09685ae8ed705b7a72bd311e54e33ecfac6bbb7f34b385c6cac51e3e620accc4a358a2e0a8b9481e251be7d0a0c143384e569bd984846e680ed WHIRLPOOL da781a4f78436b5bc0bc377eb67d12780eda3ad66561dc1680c5319d64c723880e0e85bd46ba65c700ad2733818c59c7dfe63aa82f62066f6557bc6eb967f48f
+DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_zu.tar.gz 503477 SHA256 5c1ae218ffdbc87d0853243f47addf6383ed81bd4f4cb3da91aac62e73a0d76b SHA512 ddd230db46f086ef134ddeb71316a9cb7b4db4efc269b2da678340a5b19c355a02522f7ae4375844fa23c168e4548b8f0a9c052fbd22d94db923ba5331253438 WHIRLPOOL a3c4c3a4019bda892f6429ba6c9e20b6d20d01a1b41eadbe6793fd0f95c1af5765d67dd63a898249a66a0614eb6246f017addc0c6b7ece1194ab260c5d684559
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_am.tar.gz 7446416 SHA256 14a336e1de4e26a1da31dc1676f406375dc4a6f76d28b76aadc30c74a728777c SHA512 ffec981aaa57dc1ea503f876fc075c75a9470ebd72978fc03a7c76cef9f676d97c727c1dd820e0232e72f32d99c32c680e383097477485a7959b7cb774678af2 WHIRLPOOL 1fbbcf26e5c27aeadd8663b9d92c52082015e5dc779da4171768bf0cf13b27b16d2739b08516f9a97a91beb70b9c978bf565a50496377b493dd1b61ce6259cb3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ast.tar.gz 8092768 SHA256 141c77bf7d8bd8e76ce2afe7560dfb340f2a0765e6635ad2229a1ba12ddba776 SHA512 37495b630a245040983be02b09e87d08bff2346f3dd028f16281d6d63d89c474a7d46a9cf4ffd3c86f0772e850eb09f7e3150e1f044b12347b3fa0fab4828bc6 WHIRLPOOL 5ad3e02a6c84cac04bee4d02d85aaafffc014d5c6c4ad79058a5324182337c523c732e8c13947b610fe896079581da6323b9111f4b21b40320ebf444bb4d8c0e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bg.tar.gz 8326123 SHA256 3a3ceffabf96fea468f4c758a7221839291181814e625fc63b7d2d43d21c64d8 SHA512 303afdc475e91f4e69a4eacce94ef16c4df948c1ff68d2386b33445546066a8dc87d29d345a5cf486322a1a4bbf51d8fffe391f6a582505a55f800d064614914 WHIRLPOOL 4dd845e8aa243678b10a6fc40244714a5cba20f36af40cb5ae54fc1404a7d165d6b533247dc1b210c3117749361aea17cb9a0bc0669b7318802eb055d548ac51
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz 9831903 SHA256 e9188730cd060fc2c7acf6969e9e817b49ae2da0ffd2b52e646a669d07956550 SHA512 f0b812b800e682691ddddab2bc54b297bec547b953297d6a7c28fb8f6fa1d412c5cffa251f9700552deb8966ebebd7b21b2803db52d1d6b8a35251da0b7750d9 WHIRLPOOL c0adb2087fd6909db3bf35f3db8f32ed92486b43a86aa6b1a9a708e773f3ea2a88b51f0db5a6458d222f4c46e5a0e4932f48a85c24d7bf85fe60d0cc186e474e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn.tar.gz 9831977 SHA256 da2ab310ccd497d971d11d2ce1db5c33f5c7effaa3557a8a68a97ebe47660075 SHA512 a59235ac78897456334058686cd7f33b76b0a792b25f926972316a5cb64f71ecffc10e69154a3ca4a68fc821a0b1a433da495fb420b150977e7aff5d0dda8cb8 WHIRLPOOL 2440fee4d11631c7852ff4969cd3f36673b9e00023a0f74b9793294fa935302080b8eec32096e154d3ca08c3156dba8da8378ac66723b0ccd88e156167d4e625
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bo.tar.gz 9494419 SHA256 418ada459d23f737c8126b81e34da1274cf6d602c5ed1a196f336d3947768d9d SHA512 6e82d97973ed128b2e24e2c58b4cc9077b9f2edc39dc334d6d36024b92ac994eca42251ed8c8e99c675a73204f70ba2856e2f27b30c62f994e6373799170519e WHIRLPOOL 51312fcde9e15a9de0464feec3ddb1110d066e73720e71c4ab64f97a3ddce7ef55233db2255d384c2d1c951879db6cc3625941e704256230733cc952b5f1dbe9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bs.tar.gz 7132220 SHA256 f57b5dcc43a4907f0b5393d17928e05ed04f9b3ec7c7e4381a9d9c1369204359 SHA512 d5bd1a360acd88d4171481b51029dc798ba164beb6645f85c17990a477d714e65abe8056b0a15a007d84a2f48eda525f626f7ec9ebe6331097cd8187f8da1334 WHIRLPOOL c04af11850bc0a1de3cfdb67af3be191e32a3832668e4a76269cf22291ac2bd849633c2a384b5a5a2183e046ca7eef9100313d0922862b1eab1f37ff0148c3b5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7965371 SHA256 b14022532cb00350bd295c51a93c3adf311e0fe2b901519d0992bf0bddcefe12 SHA512 f034655de6811983be9a69438f4ccb881fb52d74395167a49225a4fc5ce745b64aaca5a10784868539b5a075a5cef426f2cb176413f2f9ac32c6f368e3aa1857 WHIRLPOOL 9ed1b537ff7c684d95bb977da6d683804115946dd00f08d61b7223e756dea8b81d73df97e21390a7d37a51936d69de20a8f7eddf84e78910dec8c247552ac804
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca.tar.gz 7951561 SHA256 33240b2c20e588275e5b0100b175919ffbc11993280332e6eb54b5d5aefa77fa SHA512 2b406a7f5c595916d2c799893f76e9891a01b8a46bf55436a0f3aeeebe9f68fff2d8238ceeb2e3e8221345a44e786f8f128198cc47bc0a15648be92af457924f WHIRLPOOL e2be9fd5434af7d6465167497cb849e33c805e7ccdbd6e986ae4afb75e731a25fc9f9ea6d64e1353b2811b31235b641bd07cb0f0e8e894a1a87ed6224af003f7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_cs.tar.gz 7583166 SHA256 4290b0e8ca6c5e021df89a914b887780cfc73f7211d144114a10d2f0781c744f SHA512 74a31f59e7bca0b9d5ad9ce5e62948c0edc5cde6dfa8016e6342a9b465d077d92b19bacb9094e61334495888f15685eec4dbd27f89fae58e74f45fe3462334b5 WHIRLPOOL 7abeb59beb5faa755ffccb6518570b41341401f32c515049f293b496816150618e82f85cdcf9a6ae65845b939948ddfa7ca88ac6f38477412dec1882d4e0b0e5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_da.tar.gz 7586801 SHA256 7fe28e97ac9df0edc576101858ce294eb9aaf3b0eccec25eab214d621207255f SHA512 95244940deb2d325d4e9bb66741e19e590e4eeaf8755507450af0edcaf5fb2d0cf0a5f3a673a2fa905da628c1f3d9738a9007f5ae9a6b584f3ad37b94de2b70a WHIRLPOOL a6712c62172504aaebab179714eb8106f64b520e1f7b6b2fbe6f67a1676e7d1aefa8b1ce6187343ffe18a378a94b6f3a3417803c0d99ec3c54741b6d7d633236
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_de.tar.gz 8142664 SHA256 d9f4e7e823eb6b91583e76104a05620ad44136f1c7b6a079d175fd14c2fec688 SHA512 7ddf7bf3ce0c618c518113c9b55defdf9996691ab77ada211ad59e33c49cc44963b2fd272eaa9e387597459dbe9d278f675cc890a7dbc2f36fc8b9fe4ef90f44 WHIRLPOOL d9fe13f76e620f94c0420c04122ab821c8ed64b8adf9cfc9c07b8ded5dbc51ee6c6248ee6558aac35eef06ab1d4b7809134b441ebeab07f4169a03eb606029cf
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_dz.tar.gz 10385545 SHA256 e2e6925dd7e5d13e8a57c79769e3421935c421c3284c1f882b5ba37f71583401 SHA512 ff07dec517683a91abe94aa4ad8c70e890959da129165e26ce3eb346de60cc310b81ee14d3eceb9bedaaadbedb545c71637f9bbb65c2252d958e36e3affed469 WHIRLPOOL 6bd1fd9b29e9929f6093f875315482a4e7626ed70e4be2128bb612552801da5a852a79793ad06d3b60e9703a14679f6a8dc17c10a5d48f47abc0123dc1db0809
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_el.tar.gz 8974451 SHA256 e37365a271f1f6347203bd4bc151cf5ab42d7932812e2373caf9e2705c21f591 SHA512 39051be4918da5c7310079bb0bacd5128c57267993e7e9f6d2ca9629ae40d1d72e6e204eacfae1cf01be01c183c3cbcbad0a4e9c5e44ea08ae66c4276177d40a WHIRLPOOL 16f77b7534c8f2db152aff57c24364a1859875748bc4ee4d967b6d70c7b7faaf700fc1f8ceec449618236a629cb746c9d26633f1f90db0fbe54d65ceb98412e5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz 6442386 SHA256 5632b29840d78a998da0496e98e79f986f6144cd03fa4bd32f29021c1574d311 SHA512 4097e995a44a5b5db7cf78b48fe7f2527aa4f2d3f7862cbaa9b0c57986c8e7b49b7dee4d2521169d18850d2fb7e502ba713a94a39bc7f1c247833b03863a15ea WHIRLPOOL f2c45833f0ae67595369af064573d7cab6ae0efb99046efbb251535b0d1cf22408e4a9c2de47275b38e00f08c4676a02b62e41450755d259af785c092d921c5d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-US.tar.gz 6486346 SHA256 d65e8a48089a44981c362739635bf96eaaf475211a014fb03784dac0ee3c8737 SHA512 5b2ea004cc185f01a4bd7278abcbe2b4c30933bf84a1fa26d4ffa596565c637844582a25124c4d2de2ae6557c7aeaf22bbdb3ceb26140149143b4779e7fbabcd WHIRLPOOL cc2ed9bb104183a020f2f3162633245e66b12f910403c37cbec92e9b4fb44f1d787734d9bab3909ec1f8c775e31b46578602161375014a1aaf1bd2ebaba79ecd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz 6431990 SHA256 2d220a8546415678edb760e56f00855cbb628d715031389ce3e6c08a30cf11df SHA512 12bf6b9ec12c62e054ab83c48de303a95bc041c733e12c3038cc9c612247124fd9f861d8fee70a9d30be0b281060e28de3fb66c0865a717fc78dc54cea8a33de WHIRLPOOL a5538f6098a333ac40f081aa66d3436eacd0528aaff53062413bb29abcff01b4020a0f2f5baa2f2269ccde6c68a1c7ea5850d3a1976672df450d63eb44908931
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eo.tar.gz 7014214 SHA256 666547baa43df35c8590d67b39178e22d2625ddf064f9d7d7cc716c6471b2d41 SHA512 339544575d80f0709792d5a52535ac53b97e00371d128dc8f7edc806f6af86b006c9c38cdb4d3c73e3f56f16f087334c2d2301a0bb6cccd9dc33963544143609 WHIRLPOOL ac44fab0392e0d668ca4f37a406e21ada367a0c078f5027a8326d235204bf0cfad41b27d00828f0aa6cc552afbb15ba6ef36b6275491e05cf336c5d4daaef44a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_es.tar.gz 8000149 SHA256 f3c30cd92a40898bc59d425d8de1820c8dd3aca724e8fa9642a4b61bc6e1a843 SHA512 b911eadec24854f018fff319b7f4143f0f84a0dcf3653193a4e34441ec1df4cc1fd58a934c97a382ebddd8645c0975b1e3761120270dffc63f16fed545825066 WHIRLPOOL 48b6d1b1e60c2ff46afee2f5b1d8f2d7d37d37aac1dbc9690e3eb4ba693b557d968e88a03650a8d85d5f1e40dd994c0103c728add820357619d7a7302d9f25af
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_et.tar.gz 7514323 SHA256 d0d3304d606686cd5bec6f74e012ff66cf5f3b6b931aee38975a1ff5b5ef2ac2 SHA512 e8f72885491726e5d7b3bff65a9666b3f006c0eb7c4da5e90fea82a46bc2c85ce6b4809758007c345352b88ebe832da8ba84be34edfb33274e06fb00f14cd4f3 WHIRLPOOL 19c57f77ee65e453add44410c32b226355bc3baaf2384944b495099f5d0d2121518bbb9d587d41516bf4f7c28249a0e59cb8ebab298281a84293c6f3adfc24f7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eu.tar.gz 7648892 SHA256 2e688a9dea2374a098d4f1f110b968292e16a2e87ff3f6605c529a356e20aa7f SHA512 791f95028c54a3ab19b731b1de4bc91c7dbd82b2138474f6235ffd40f6c68aa455ce9715abf041518a3d8e37a697ba4a1a303404b581e5885d4f07578b079800 WHIRLPOOL c080f8fd5e80dc36c150db35885618ed9a20d3d5c89e2e8d0db051cc2b107d47c93693c7ffa8788ca77a2cced8c75d873c018fc362704832170e234eaace5d22
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fi.tar.gz 7799595 SHA256 fdf099b504ac5402dc49c9ce5ab7c4cfd3a891149f9ef70efc2ba240e7dbef80 SHA512 bcfb33ce842d5ad11756d6839ea9cc3250573d7d82494a356932fbe057e95b35f09544e510f8903aa2bcaee7cd62b2b2ce8e815890a6a73a0f87c55bb55116ca WHIRLPOOL 7ae72427f7cec47eee6e4c2475731fb3a49c273f5e76812bb514751c8e9e067a5c7ff50f53b1e65c82dcf1d572731feb83d3434f1655872d6720dc926a7e5d67
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fr.tar.gz 8182124 SHA256 120e947bc81884c5c550bb6f80af7f426797b82fb8ca0af8ae4c765e2943ed87 SHA512 ec4cb31842a01e731adb43b44d04defd343d8411d1e3d5883960bb8aa99ebe0da7a60d4f1ab06b27ba2f1450809d1fca83e354a8c96abff884c291b7a908d72d WHIRLPOOL 66de18a1ed30b3a88b08a026bd255eae927c4e5f88e6eb2acd03d3a71c4ca0501485b78cbc913a985921d3a81362d3a398fabd5d5a0c4cd94e4aa880d4e5fdd7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gl.tar.gz 7732071 SHA256 5a140c2ee496e25b8b4b809465c69796dd1a553dec9ae307b75882e9d6153831 SHA512 b2806a6b043640a073b44a10a6f098e4969263eb26f95507c9599b24431decbb710a92f3ac294ebe9d70e8e337c916d03eb1a90c738f69d04fe9b25291914900 WHIRLPOOL 88b58c0685d68e2416084fe0431f083de4efdc20dc141ac69c2b9a44843921bd97157f30324cedf18cc601134f0a6f4c42585e12f940a3d94cfb9592bc254215
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gu.tar.gz 6654531 SHA256 ec6379cbb6531fc4da4c531beb0b04aba2d5f95ac4d3afb342e9702fc00f9ca1 SHA512 d2a4d142ae512e66f72f1217c5301441e43bcc3ef584396d06921d23960bf718cfdefd12fabb7dda14e6eadcd09699f8609404260a054eb818afa4ac4d88baad WHIRLPOOL 037ff271ca952b57c11d8e848e37d3c6722cdac03ec9924641b182433341c73f0220bb157bcca298029d6cb15631e4b95aeb3400a800451b32ce22c1dca7447c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_he.tar.gz 6269851 SHA256 24391fa19abd5443ed4c0e5d931f4d681d6c38ef07d008cdd80c1adaacdc1024 SHA512 86512e10fe2e52e121577611137a6c0fa54911a5474133b0575781406cfab316d16453def08995462c1032c4e299da9dbfa558e0700f8038dc45c4deea2c3011 WHIRLPOOL 9c88e5ad3d37f8695968c4d40a460a059e20edea729254c4f7882be492d24929797c384e32fd2ce98636689d8538cbb508f7d3d9fe25a9b19b24635e78bda81d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hi.tar.gz 7334596 SHA256 554db897271abb8ba03712720b12bdb7ee843b605d313811c748e0c6c084a34b SHA512 8c23e41e7017fd00f606d7b840cabaaf9de586a3b467f4453c593334a5ddb617585905e5ba1a9e9f3143c323d5232c4f1f218d931f47319eaa105d7409bac30f WHIRLPOOL c8294f81380280f8e125437be9ebe90696f2b442d89289773864023a46efa3efdfd9378b58c5a641dbb1e304eaa29687aabb14b1c64d4f615ff500e533d60098
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hr.tar.gz 6818624 SHA256 9a7c4ee3b7e2b0f69ccf34acef21862bfe97c2d75ea04557b465e8fc3afa8eae SHA512 1379e843a91f3f91d0cf6a00acadf9a8933e995eb9da91d7072d50ee71e525674981930cb43ede5694cb1cf9d925aea90030c5a384eb2e576310c5896796c109 WHIRLPOOL 9fee9ba233446047f30ba2ae374e58f7a5a1193224b612f84763711bdd01cb71b7141b2d356d9bfd5c5e9d1da5bd8df74e71eaaef3170c7e98c62f2986bc68bd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hu.tar.gz 8010059 SHA256 bf4c8528a4bcb75cedbe75ba63ca5acc143d71388ed97237e5b12b31e86d57cf SHA512 090cae60253dee855c24c2c9330df565430f33a12ddccf8a7fb1e2c75f24fce7a5140f93e0dde7e11b43faf049aba11693afeaac19a7799828e6c3bbe1b1f21e WHIRLPOOL ea3f2435d831f0d7aba064e0ab7f5a70190ebde5018aebd7a1feedba7e101e1333d228b8004f65f1e9d6491d62a9bf730977f201c1184f2633a7f729009e42db
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_id.tar.gz 6814516 SHA256 b5b5a6218c540f1eb7e90ea75adab5ef6558233aa6a8d8e8b1a23468756beaef SHA512 2a222f29712f32bfaf78dc21228a8707166fb0a183a25db01732159cfea391c03a88524b7329e051031db2fcab046824bb187ea4313cd4eb164e74d3e41213b1 WHIRLPOOL cdcb49293a2a48c14a23400b3898c31a1e82cb93f2f4b19309857eec4d822a52ad00ac8e37492b69548e29a0a7858e589e78beb56438f8742d5c6628b13e39e6
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_is.tar.gz 6922757 SHA256 c6d5cfe360cf62f88303771f424cc5c6182383260f06afb475663b3b0f9d48a6 SHA512 4e4254202d18b986826a6c746885ef231c3cea4df15c4c3b20b246c237c070ef2c1a15972df3d57eb4f400aee5c5866a6a3c6893f6d3aff1eb732031926553d4 WHIRLPOOL c1b4965c0cc1931daeeb67795721298233131e1a6b287532621ae97a384c5a9284ec2f4709594337e41b01c7dc7c0e1cb27afa6988c39e0d363d9cc5f93c9472
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_it.tar.gz 7933411 SHA256 668094861e772ef939fa62dc670f3012ec8767271cfeb0235c67245996a96484 SHA512 40d4a3c91bd83e4305084b51a3cd5ebf62c3d3fe2500c60d8f7593ddcbd92c8330e1a423883a1340992e3c5d345d227ec61605e152e1321e7feae6ad0c8c75d2 WHIRLPOOL cba13568933dc82cdbcf3ae576585a94f76fea1d258f2a174a5d8d3fead558280b44e9891b15340659d3655cbe1ccbfd378917e9a481046564cf7f912ed4f6fd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ja.tar.gz 13446190 SHA256 c3ef645f01de9c8376b0653eba46c72b52397cdd917a8229790bb1c6b0751b3d SHA512 29e89bb6255920a39ff2617e622d83df9bac00883a701138073b3f55e8562eca737e28341cc3cc5ae61c1efb55308490bffe20c436f351fbc4e8e837edaeaf9d WHIRLPOOL f43f59461a0c5ce1a76a1be0db9507fbe2b9e45f2439a0f1871686649ec9f6c6985545b912484619b46a3b042813e651dd62de0c126434b9bdd296b70a8a7a2a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ka.tar.gz 7123711 SHA256 bf48cdadd87dd1f1979c3c35368c44dbaf64fda2d2f14dd2b686001386a96d36 SHA512 25f6f43b18ebd69c2e8974051b537b387db0d973bf7a1f9657317f47e7457b1b17e073a8649cd96ff81d4324e1b51fa622511d1087212ce11c59f3f5aeb519bb WHIRLPOOL 148aa1841140eb9cc5083f30df597210d4f1922ec366219e0359ebd5649f96f86ddb02cc4dbd5574238a073fc69cb84c334df84b5bc852f349df60ec068b547a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_km.tar.gz 10372833 SHA256 2b91e44317ecb60c9a1450e6da74e13a3f665a89f74d534178f1d10066f51be3 SHA512 7fa063730646dc925b5e66482b0638902332032d62b01c0a2a37cdae305b8ddaf20368ee4cefa1bc5b765c222f744af593675748febe20ab3e94d314b01e1f62 WHIRLPOOL fb6159bdb1b9379ec42cedabb143a07627f525e2cf022827e905c9cf472c9c8e7f5b3bbd7c04b86a25a97073dab1f39a6eab40ed79d42073643bc9f9e3fa0e17
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ko.tar.gz 9379969 SHA256 4d594752f69e2ecf3769829bcf08c1b7eaa6f4b802d5c81c98bba916f1402270 SHA512 da475c90508f9b36967abb6678e9be4f1366d82a1b59b1484ea5b8c68446539114cb7a1af22e2c8a73608dba723e4dc02984ff6e762f2c5558d861ee8cc7d50f WHIRLPOOL 2e978920eef0101f5de3bda59ada87894da8b5d9bbc0fc4e97531829a98d459e3cb3edb09c1b8eb2bfd7cdca0535dba68728390c2e3745d853322c5bf61f6883
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_mk.tar.gz 7358464 SHA256 536f179944ad6b815b288dd25460d3272f02c2c9a46d8e2a826df5302e019e86 SHA512 a69df9adc066037aeb41d99a8518f0430cd400f216d1d7313c34c52ac6caee1ca508402e7f65a78017e257271e41d320a2b205983ae9f43b5d2c21539378a787 WHIRLPOOL cf740cc7578950da77ae057501e9cfbbded5365ba8ade3b029b8802efe72b089a53ef27e0b50720bc635bd921e8be5e6cfb8b19bb13de161de76a6721b8a8226
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nb.tar.gz 7671175 SHA256 c942572cff98534ccc485ef96600c9bcc00e45ebb387692a60eb94429733698c SHA512 8cc3e5ce21243fa8bb260a26c55f2c59b7f340411f862ac0342ce88ace03961a0ec33eaf5f26229628cecd87bfa5da13f7fceefbf1e0e40f1f4b98d0d093c0e3 WHIRLPOOL f75f4ea03aa69cc8094b9db7e893c9abf2c36a0271763d5355d5cdb4f686b8f635141ddab99bc1026372c29d7c2c4481c7d5f638d8831b8a320c88cbfcb9c628
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ne.tar.gz 9859584 SHA256 5af30a788deb8b84c33bf1e5cf97a99abb9a98efa728ea4c20c068985648b809 SHA512 6480e7bb3a08ffd4059ce3111c66c56e9d254d300a6b7887a61f3d1737edeb1188fa997e469e1caded8800095036c7f4c7b6fb0a41c5f273072eeb9682e5797c WHIRLPOOL 5965af318878b8cba5a3f347633bb15442f134088081d433e1ee2ca9fee2d15781a196fac032d388e9448282b87bdd828eed0c01e311bb0de1ee04c3f08bd3fa
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nl.tar.gz 7752849 SHA256 7f423cbad71209c219041f6e71ed4a54c47a78cdf2dadcb8e9e905a2b6c68a68 SHA512 49c7b56beea3ef54141fed7f2ebf89df73ff6e8eb535c0dee67040e4764175a0d730a33d147e784e7505861178d570e28da5d9e4276f815579a6b01b3af92f9f WHIRLPOOL c74c18f88fdfbadfee1299101e27f494baf13188507e9c62e75c49c18c6aa4b7c412addcc066a713878984ed1a1b4b1939b3f3986163e59d4273f10a29603c37
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nn.tar.gz 7626682 SHA256 5b541569900737097669d9f3c617f287de4a9bf631d2ea817e08628e8235c63b SHA512 820bba43e55b2a9fe1406aefafe550fe2b2e94f1d3e0885acdfe063ead88a68d416990d598f0e01a95b120a106cf5fe79878986b5fe37018694eb4ccbe58fa6a WHIRLPOOL ed0e6ba259486bd9dd829437c662fa927b150e3ac4dd6a863253fe606ae38dfe7d4ddd3fccc6ae623a40c8fc7285e5d55ed8c1b02dae94d6b23c4b64b1ac12bd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_om.tar.gz 8003452 SHA256 1a7d6d291a0ee801c03ada3cf42b1ffc3f2e49485c537c883960eb0f04275091 SHA512 9ba02e8653a5139d2dced9cbe1b36b7646694a7e786662c6501eba94e5523b1ff9e99dd12bba397efdc96c7a0eb9454fac76a177deab8709f33f1a58eed1ffe0 WHIRLPOOL a098d8e6b83eff1748096b4838549d1fb5dfa193fe2a412b9b9c0e0ab793f8b780627e163056d42a26f154eaeb099bce9008ccb2fe06306f9b510214540a46da
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pl.tar.gz 8045607 SHA256 e81e3b929c411d4c5e0e37f8eb48df3994f54892fb6bc61207e7dd1e2035062e SHA512 7358ef52ca81e17297a7aa7dbf7d97016a8bcf54eec6cad0b6f41d303b4d451e737b4ba3c7fa900aa0710bb97f499ed511c2539f338fd50af5c3573d468ec651 WHIRLPOOL dc0f532b4d4b1d65f40f6be39ac63b6a4ff0087b58313a48a03424679df0b7ea307f0c6e3bafd2cd9072fb84ad6da51bd78eb7e49db14d113828bbf05cb7c8b3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz 7760133 SHA256 b0fde34d03222e1470c5fb27353ed5148f486bd7ce0829712e8111a4c9ba4a06 SHA512 1adec195bdb606430976edd26800fc36fa2d9847d92aee5a2e93c38f08ad8fa949ce19febb7786bcf6728a718b7c0ed43b9ccbb1e3828b735af91b6da8c600dd WHIRLPOOL f7c04aaf054a373e55cfb962cd0cda50faac809b58e9292a2d3a8bb501609f6b65dc1710dddfe21edf782c895635295e2ec198278bc727d4dd00ff925e0f804f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt.tar.gz 7688125 SHA256 62892b4b4a706c484fe5e4a75137e81b3ea58ade1fc8185231e1f2ee15c198b1 SHA512 4f0cd56cba5dc7264f3d3ba588d2302f4c89419480da805dab5f273470eb7f04a0f9b71a221530b51f83c280ec25cbe1b79b7a3002a343f0a26c8d7e75b12cab WHIRLPOOL 3d10655a2294ae5d25ed798758d909af96b8901034dcc84ddc2b66b7419e51db8415ce7e42cf74d69611c0f1ed4dd248b267ccb2f5c577341c3abb672b0eb025
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ru.tar.gz 8429254 SHA256 421fbd519bee4fa2ba5537140d513ecce607aa5f0246734546c02e011d8106f3 SHA512 cedcb6629ff6fc60e9f182b213280a4170ac69770eecdf2b99dd57c0960b0ee2c04af9568eb7bf8a6a29f47f9f3852815ab35905fdce5a83d9c8a117adfae3aa WHIRLPOOL c352723aa835fc244c56e8512840afd22c1255f5ba42b0bf6f8ad17af295c76a2faec4c6f74b28dbec4e3a8af95764a1d245d7deaf57097f5dd988b4077493e0
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_si.tar.gz 7210555 SHA256 04eb1887fdab5d19861ab31a47bff4ae9ef3ca5048fb44f14f67e3b053355baf SHA512 4fdc89442c078b4cc506557a6ce0c33d5d6b6ff5538e413d1ec7a55964a5cd486a2ada5b41fa8c82170455fd5a36d282d5a5e25883ead22d21d027d7bc51a5b6 WHIRLPOOL 1e7ff469c202462af05141e3d2d343710274a262cb2907d29da307b7c86a29e9b79f3a014478a7c5d27ab83a894f6423a28494786aec630b5c717c4acd79f8a4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sk.tar.gz 7513241 SHA256 a04a565175394c0a000d58b30c507e1d8acdf94cd15bf9c25a37337d463e2154 SHA512 c76753f74473d9d0060bb12c5cbb01829d423aca0e1e76445bd16a5c427c8709b49174fd32840090fc2428be1ea07d60d578b81da1e8045d71cbc5555f9b03c8 WHIRLPOOL 130803a995fffd8a3e197cb5d5ce9830ea75e33cb7e8fca8353355a28fdadbd54e57407122fbdd1468a1b84f940b8d1f487a10808b5af9f35967b7e590f51649
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sl.tar.gz 7755865 SHA256 b27962eb415e4fecf5f8596fa6f69f4d2fdf3f856dba68cff005204360ed1eec SHA512 2bffbddf445db6f181e4fbf49b33517b38ff3328b871c5469dfea2b938f79bdbc30d48c1ebbee4e7e013d5ff8e5508bf2bb70648980da7860ecac01c3a0c392d WHIRLPOOL f3bd880a0b23d553239bdc13d3eff766f0c190da5e03def1d3ffb2902c3b67493f758b2a518e00a4ab3157b71c1a37b3faa6f5a4a0eff6ec4e0d6eea16d85eee
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sq.tar.gz 6858277 SHA256 1b5113c6e10c7aa28774a99888ccbc82cdefcdfd34cdedc1bc31739798d52f9d SHA512 9bbb91a835fb799d9dde766a361662b502e66dea5a6aad261c34b129cf6d19c1f990ef33f07a26e3af9492b44b888ab23dc0274d7f128b819c55462bfd39fdec WHIRLPOOL b5b0adea781da445407fb2b8c057e4ac2754f6481829593a8b7d5d985c20ee48a2859dc58df39601063caa4672ebe9de9702655221f95913b18ce065d86c4c3a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sv.tar.gz 7691426 SHA256 6f541c145ff40d69760d27b12f28332cbab52ec6ad859d3e80108f35240cc4b1 SHA512 9044860717dd09a75971b3718ddf3514a9d52474b275af551deaa03f5439f93431808470d674a8f86163e69a356825307b7c2f6de67217558c655d5e25e63b6c WHIRLPOOL 9e38b0d635d5148cb608703ffbbfc101b626a6b2ab4c715f0ac5bc3d01b20d7c8061317f8413e562171990e84ede85e80fca54626cd855242869df322477a8ba
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tg.tar.gz 7192914 SHA256 b73bc9eb28833b8cdde3a39758db9ba6153badff5f1d5aa6d3b8d39e7a8fc242 SHA512 e3807993f33446749d748d4a8cc7837d007948afc3f281b4ad6dd69a36876d6561bc2815e23100fbd3aea90131ceae41eeb9d0efe5d47251954c21c811f56214 WHIRLPOOL 97156b16dba1a20531256726392c0492fa8975a201192c7fa833b5b7977d5f14bcf5aa15708a11e3b37a116c4f0caf91aea7cf255db8d4ea1951c2d440d9ee08
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tr.tar.gz 7943448 SHA256 d81718f0e77347d79c18ad16d1f3c630a516fbfcb8341ce571fed8690f1f80fb SHA512 bb4b15a32c68c3eefb93533c2e62e972d77fcb82edf1a05395cf1cfd5644a3258cb309412f20a12c4db753846432cf207abd0fd869d0654a3dccd546adb5d48f WHIRLPOOL f6c7200cb9142d924ea530ae55027885a4c474d1ed8a14fab906bc0091213920d8f046b173a60809ff0edf2ed49bcf492a9859a54cf7e52243b927bce3677215
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ug.tar.gz 6847268 SHA256 c85cbe913b4ff7b8400c58999193724268b87fbfb87c9981a84bd2844fd811a1 SHA512 3d868a72178d4a2e92a83ad6cd323b95b65096d18fdcbf0e3827893022f39056b758aa817398533df8485aaf9b28574ec156ebcb59ee3dc018cf8e6ee963f3fb WHIRLPOOL f0d98de00acf5a7ffe04823a5d5fb010df3134b15d4e9e69d60104479b9a0f2e75c64b0a5d5f68b2448cbdc4327c2d1abfa10d244e619b9508dffd00c4f51c5f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_uk.tar.gz 7331044 SHA256 201a2bd98cbc6c97545e8cfd926e278a7da96ea8f3a8de7e4722c77d8bfb852d SHA512 867e9345fcc680ee3a54b5e168c83f4941788fcdee3045e070e1a629d35cb74807fbf81487e764fcd24139b0b0d2e0943d7d2e7a8e8a04309c483960fa8f39e7 WHIRLPOOL a84530193757606c5e876d66f7af9fa83eea77823c49459e52452a37da91553c8ad6843473f86c363de83c61f36fb24086fdbd25efad98b573f6e4922085cf4c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_vi.tar.gz 8158139 SHA256 1249aa08e17c97f70263c7a4e844ede468364ac264a71c06978d547bccf29d9d SHA512 168509fceb2893f0858dd9c67ef1f795647d44b65373d140616946cd233707651690884a9cd3b426e240e6ad75c0237d5c0953b70f092d361650fd3c4fb2df85 WHIRLPOOL 745ccd0ecbbe81f3bb7cf41ac2ec28addaabe13115e62404c7c441dc4b93a11aee7630419fe6a35bb870c7bf176403f9a8760f097066bb86d20d259b5f225751
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz 10718802 SHA256 5293367d3fe21743b55288b70a2290df9c3f435ce2102fca17bf4c575c620666 SHA512 1a819fab976047e5b509e0688bfc2a7278931a919ce4ed306fae7766956821ca00e68696b84790408c717ada39fb11e91cac815f9055854181e33d164b9e06a4 WHIRLPOOL 9be2358731cc1ace99018f5f7c973b3f03f900a05b8384246ae05ebe67a2406b0e971193f77f74a831b412c87701638135493689ee20e9847b5228596c5783af
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz 10762663 SHA256 12d037256cd6919e27c3314c30120db8a3f305b7f78b2b275f46d23b92d2aca3 SHA512 298510fff2e1b3014c45fb138fd2b28c5b1cc6fbae68c8023c64450727f16dbbe75d1129b34abb31c1734641511bf6bb387467aaf097fa3698b4fb7628fdb5f2 WHIRLPOOL 6b89ab7fd16328dafb338d1bee85d16f1bedfd1965086019a849452a805a408d7ef044e118a34de19a4012aae25baa40737d99bf6bcffd59c1bfb723ed1bfe45
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_af.tar.gz 1117018 SHA256 250327ef5b9835e76ff589320a32dbeb439387ac9fcc6be744975992a524a1f8 SHA512 c1857fa5cebbecf5b3308621bac9363c85090efec6245fe02893bd2f7d6a25fb8ddcfc79523a17a48f0c748029163caffeb27c3cb05bc67c2b0c56411651333f WHIRLPOOL 4a26b47702afc174290b8d9b4c7479c3fdfc2dc141a3e231446980b39aa4f9fd80d159a8c9e93bb811a236be92ca6db0adba740444eb0213a5d3ea0ed45d1a0e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_am.tar.gz 522275 SHA256 4b99874d0d74f33704f1cfa50ae120c2cfdc4432085bf26ff86d39c609459d93 SHA512 ab82f6bc029109b0246dc83a349a5aa687cb978a67d0f14ee7817901f2975087a92395eec5f845d91310231045f840ddad425f3ebbc3b97da83afd1c545b4187 WHIRLPOOL 60e12b1540af14162ff16a0a7a0adff4fa23f8d365acaf99ca44c362a02e63ed64eb2624918040ffe4e81a85fa8d4bd4cd8bd5046c252222f1f6514c0cd0d188
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ar.tar.gz 2264863 SHA256 1639ba18df5f23477d74995e01bd5418a3ce54434d336732a5a3a60f65fff054 SHA512 bc797e1228b4c5483689cc2b14b3875548d43f14957b8962a59459a675ac67b43b4dddb1303182e042ac9d87e04b8aa2361779d263e80c56230bc6b83b68e8b1 WHIRLPOOL eb714c680ba3892cc2e20c9618d5d718f2ebb38eabb789b5f16ed20fb37e8f05248c9d00f575ebe3b51a7c1a1db30caada58a6a477e763ecaea80aaf3b6e72fd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_as.tar.gz 549522 SHA256 ecc0c8b32e7edbb22f38ddff95e544cb3d151cdfa28d7a3d5268dfb347b80f32 SHA512 9bad826cb8862e99665c7b4e81185c5089a26be5a327a5a02693a90370f6b1b7f74070b666f1111776ae3b77233552cbea17fab11e4e6da1a8f8989c8d633597 WHIRLPOOL 5e1d2876412c1e53421ddcc794df992e56db7bed4bcda6c46e5f2a7b35803e5a703e8507eb5336f09225a07912b6f7c5b30992824d012f619bcb9e3f5b01456d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ast.tar.gz 505049 SHA256 3ff7c9b920ddf3cf0683ea25ccdade9df75a745da6b36dd7e696c0d07a45dcf2 SHA512 777e8a1abdf7a35b4786debbe52dec40582f179ae8f79845807d193d2c1789df37398f187abb5d58328b24a8ee295f17edab4e7e64609f66c7539f91bc0b71ea WHIRLPOOL e7f23736ef2d192f82a40c8705c4719365309cdec9ae491dc6a7ecdc254c31f3b1a95bd212d744e4f4e0a0c255cf85ea0ea78d15f8010a2fb20bc3208f8be6d3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_be.tar.gz 884790 SHA256 51102958a59a617cea81491554f0924b84719a7f5c1e70343f9ef3ab7033c635 SHA512 a73f31d00c7ec6094d65e72a56f2d1df8c0d9975032e8442a31d07fafb0b3c96a979c46fc5b4f68b3d774484dcf1abceaed943bb0a9302371fdb7b860293a870 WHIRLPOOL 3ed903bd7b3922bebd7ab5e51d088a5036c58d7e0ccb2fd64ec9e04f1497fa55bf7dbea31037868a4f3dbd27cfa93ceb33c2de4b4e565140ce6e6d20d3c9a90b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bg.tar.gz 1966436 SHA256 c54b8d0261640e21c6d64b979574d460d1815494b501736179a2b0d31e92ce9a SHA512 fc00c5f55055557f8a2693b9a3708daec19490a2f6f5a1dce8e38ab13454257aae2ad30294642a2ded3dd86efa9489cfd8a1e9613a085ba8c142100c750c5d5e WHIRLPOOL 48178df8fd8a2b81d793e755f00ed92e34603ec86a8f27f1280dfaba4342e42070b0cdaf4f88d9395c01755b14313cb1afa1637f64bb39713d2f3c2142e46a65
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz 555922 SHA256 5219e64519b0b9b8c5d749a75457637b1f666c39d859c14ace586dc609a55b32 SHA512 177a54f33cd4cc9f542fe7ac438753a340b79b1d2ecb6923bd654ed879787e9f14dfe21d8ce21850042bf791095543d39f49c5a4e2d6ddb4174863afadcd6ea1 WHIRLPOOL 81eeba991cb0bbe197d363f67777c18166a3ce9a61c6711ee7ea4af947b78a4aad8204bfbb52450cb6ba34e3dfab900406763e31e3eb841cf3d7f8f5ae7adf66
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn.tar.gz 904077 SHA256 6272c6aabd0cacb6dc5f50c0793fda5b189356f5226fcb6c9905cafe05f3e192 SHA512 a2899332f21f5471bae48324b0931ba228bf4b65cb99f183dfe8f5401db816107f8a165b2470f420c6b525589f08a7d5578007d8794087d8ecafadf927ac6789 WHIRLPOOL 705a5973abb95bf95842d1cb31a235369fa722276f737fc02ffe71b9e716b41cab25a429145a03ed4f24744db211c77b1422c415da5032312cfac36785eb2bd3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bo.tar.gz 538748 SHA256 2f6da3fa0a4cf58a7a4c7ebda060da1fdd3384ca102d8ef56b2cd1b6f9058794 SHA512 e2719807ce6beb5ba897c66297ed84897809cf5c64fb74e0f3870d255b11445892446496102beedfc2c6b816530b998f4b0cefcb7eb6778d16c0f4baeab2e252 WHIRLPOOL b59147ce125fdce8da35a76e5b48610f3d9e614ba54fc836d432921f33b8d35898f11f352c35f0291a8a1bf46b99e2b3cfd1b13ed59a6a3c7d4244a9d6844b51
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_br.tar.gz 1721228 SHA256 8f9eed6faba6a3c3c79a7e8f72ee34a5fed429956097d524b106774d705ce94a SHA512 99d97e48cf9c08860d94fdbf13855672644a815c3c03c68c43626138ddf4c8ccb0b5d7721ccc93ef3edca087d998775a57733824c8886d5619ce9214c6718bb4 WHIRLPOOL 2ae3db6abb3f2aec30074b08b4b47afc4e0092463d6851fcc3cd6a34e9d6d365df6198cd0e6a8a923d40ffc22164ab0ec72e61be125762f2374738ee6c65ade9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_brx.tar.gz 517960 SHA256 558ff01b1fd70350b767375f1ae96cefa273dd0cc819f93edac35ab36a2b5eee SHA512 928ef4b2aaeeacb2533ce8c0ae8238cdf10f931931ac4f192cac4df7c99bae228bd74175b4b6dc2ef0f48a1564cdbc84ce8fe8a942d411ba0584dd90ced05515 WHIRLPOOL ae0fd7ec03bddd1161be2fd6cd699071b417ae6f15cdc78faf5d5b669deb140b3403cee4121557ad1c533fc75631c3e45cf55a987ef7d832bf304db79ee1eea8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bs.tar.gz 619892 SHA256 48322785d163a46e9ba50eff75bf774f2414c39d0ae342eed6c3c1b583635ba1 SHA512 721230fb1e4fb8051ba062dce632857ae8f8e6b8c40952f4cd02e3443122001e8b850d02c9c91472153ad7f8775dd6d4437a1a656f3a89778bee387859fb5ede WHIRLPOOL 13ca8b6b0a814913c6d42230d623865015d338866a8cf4640c69b3bc9079f05a56fe88c39f8608f7f0289426be663469e77a056057442c2e50599e159f400031
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1775162 SHA256 7e91baa9fb10e540728c46ab9dc2bcfb105ca4ebf16a521aeaf4d8049607b3d7 SHA512 c3e87d6ce22d214a94980901b39a951281156d23b729d59eff7c2e2d410dec24db0966c5ed2fd716af834e953b30a46d417a4ba5a5801cd9f86eb809b9c4ac43 WHIRLPOOL b813d3a120153a33d08080958e01a4247e4b846a8b9a0b03f1190b7e562f51e5ed84b057e3b6cca937d8e9e46c82720bc29bf335cf8d7f0474f7b4b8ecd11516
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca.tar.gz 1776879 SHA256 682fc00eb03acd1ab13e34456196d30e6a7f999d7e3fdbf50f0943ca6bafbfab SHA512 96eabe30a510fc994badd9990a61205d328f9e0b452266948613e21b6a38da12784b0a4fbad2f6128401647611f12b3459399e06b6e89539cd1c602da328cf1f WHIRLPOOL 6f59334676a5bde16d467a9438a8e77004ca04de66d1ff8d4906c4639c00d28190f0f414d2af09b9390b54c3c4c01f169a54025b34e919f48ce0e3cdc1d933aa
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cs.tar.gz 1238221 SHA256 1439e4f5ddde6ef4c18e2e6d0a7df86a3f513669db6eb7d6484357d9bc55c71a SHA512 888dc3fd0dcc362a6d306be2a6993370fd9278c3a5927e9b28642fd1f570f2e6f8b2ee3b3e63aa56c5065b6d376619221e02cbd4f40f6cb342b1741c21669d67 WHIRLPOOL 892d0d76ca044f5f7afe8f267332f0ab802e7693d47fd44957d4c48594c765730f880af3d69736839042d0ba879b8b80ba38423c5fb4a9841d4ae94b528859b8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cy.tar.gz 484685 SHA256 e475b0be8175304538e20dc11f8a0969a5165611ae6c59dc7b99a4698120733f SHA512 32c3e001905c8f154c1be8ce57d36fc07dd1093d5c689c4a77ad6ac21626c32f60cd1cb407bdb4a9fb1619414421f15f6c075efbd05f24c3c46f7376ed78d03b WHIRLPOOL f76d987170e6ca88cdce0f2081b755704a4800b64545f60f66eba9f87309f43330c516c7d60b627deb389d85a40afc5821d173e71ee539aa003067f104634a52
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_da.tar.gz 2389294 SHA256 2be1f4659a2c58c50cc64712a25a6bccef061e97709821d51f4772f9dd47eae8 SHA512 95338bc5bcc2b3473910db6a3a28a450d26209f70004d4ba2b25e664b8bc3b8ee21176de1b5f9c8d836e7ff4f8030f39b39dae4745743d3e98d5ea31275ade27 WHIRLPOOL 4c62186ccc25296614ec2653ec391aec8216682ea4c4a1ae1a44ba8b400dead1983704aa069b2518f139835f243a646fa4370164bf7057c5f6714c7621928ea9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_de.tar.gz 18842679 SHA256 3f35eeef160e1290648427a35bfa38bc368d147dcd2ad77d34b7f82ccd3926e3 SHA512 98e05165ad49ea86bd1e92b7bf6e45d0c3b4ed6088e33f0d74cb03241ac59cafa5f8268d40941bd750ea21083fa54e7dac9cccf44bfd9b89b50e8be543335e8d WHIRLPOOL 29a78b4dc0383d993e4fde44f4c1492a3567fae8ec4d6a364d70c896b72ce846fcac88499bbb8c68cafeae332f8d2adb57a97603f7e9018ab9ba9b3cf3d1a356
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dgo.tar.gz 548837 SHA256 998f84bec4fa93c674dd5beaff559871a418cca2d41e80f54b3397855d060f4c SHA512 fbd2c54b9ce3f4a48dab3a69c7d58c3083966b46efddefc8c779ec23699bddae9b8fcfde17d7ba70254ccd595f22cb5f934ee7fc2762a091ade8f34cfaec0a15 WHIRLPOOL dc7e5f1c22b100693206d4d2dce0bd87b4f6de0eea2d7d5843fa9587543b92214bed661d2b70912e0a0ab7cdfd693324f7922152f68c43fecc1efa480a42a745
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dz.tar.gz 545051 SHA256 9745d84d8ebdde9244e0b43a4bbdfd48c547366215e5c8ca2484001d39d61ad6 SHA512 ecc4bc78cb2e352d6f56f3d1e20eff36d70cbf65ff073be56c99b426a3f631de3e5dcb9df19d6d5f1414ab1b83a31c80f7744c0e07dea3f729912958ffd8dddc WHIRLPOOL 5f09895b762a5ccec1a0048cd88cc0457498c53ab7aae87f45eae9462d418c1996923df08159d3cc48370866408b4e474be1485592b352d2b19cd2b051b95ecb
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_el.tar.gz 2582571 SHA256 27f111a35f765cfb15cfc44c60fc6c1148986885a32592e589c706b26f709969 SHA512 2bbb331d5248efc47f3fbf1110ec9eb7988fec1ac1249fa2541b29c9651e839b9d46cc947273cfc28177ca0fadc9bd4a1d5cc2d24952268a7e9971237ad384fb WHIRLPOOL 2c17480c69865b8aae8bfdf8d65abd0613989657bf9001798ef8c20820f0d301147d17efa3dc693013aa1555a55f3250f62ad9125dfec2fe00aa2bb747b76c3f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz 7120100 SHA256 8b438c808035aa34883893546b1d6cfa8b8be1e387cff4051acbf697b91ee1b7 SHA512 8edc3313da576122d228a29f41c5b527839dfb0743ff4fe92e437e6410c22eefecc47a3ed0166e585a4ff777d834c509c9e88398c0ffa49524d72c3a4bcc0a37 WHIRLPOOL 9416e40c6c55e5abeb8a01bc9e53fd8ad506c747430ff839db94a4ab5980f26a342a26654e4c3aa8492d97f28493c1377a3ba706c1cd330ae294da66df57b77e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz 7038048 SHA256 a1cf8b209aeb75f8356b38ba019fa19cbfea97a9de199cc7b184f8dfdbe13171 SHA512 ca047084269d03e59241698d424c60356396ce675227fa560c938f8f2200e51193ba05961ce375e7ecff3cd1d46e48306e17e632faa5486a0a994ae5f67b12f6 WHIRLPOOL 39fcfa5fc162510d93d53421913fc9fc3295098a206f9891d427b1503510296e466af28fb9cf59730a86121e448e002de730938d10c312268d3998427a053d7d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eo.tar.gz 481261 SHA256 37b0f2405eaddb59ea082c10216b4a547ebebe2a3188a340bbbeb77d277159b8 SHA512 36b6ee0329c4c3b6572fb72781ef46a9ecf2e43a3197dd36c620503d105e593a55160acd4f79a10a1f8fefbf514323bdd96a343c75c1e3cc5d632949a784a335 WHIRLPOOL b22e42dcdbaabaf67781e50003e6a17a061227f7d13b61e321710d1271cbd75aed759037013d4d950cd7e1a2cf03547f6d50049208de7c3c7eb3bc9d26024a6a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_es.tar.gz 1963621 SHA256 7d4946682e35f88269fe20800da37143b39b673509b7958a6454db3e8347be1f SHA512 6639117748f07f8bdf8bf6290ebe221af183039e359a94e384b90efd24e9d717dedfc2c144c5d5d4d5c73a75a4c93a428b03ee519fb6cbe7e30f8ed8675d9ce1 WHIRLPOOL bb94b8a8d6637185e150efb9438f9b3745761decba790d43a04152f3a3a16f4ad6f5bac5e3da7cec22d4769daecceb5ca822fbcfd91f97695e347c745b0b8e3a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_et.tar.gz 1390747 SHA256 91697fcd02dafa16634611d24e6f402ffb73f8a1b8d4bcfee39d94a8de1c545b SHA512 fdad04686069b08d0692f7cdbb417e417c3913ed88681235acd70b8c8ea036ec3511b3f23569fbbefeff5a9bd3557e54d681e74b259d0e5a3af44722a0859b5c WHIRLPOOL b142569781ec159a2eb63d1b4baa2cfca2800e51434c261a926485c172f8a63847cc3bdf3010fbea78504b57f96ff3a5af55edd76daeb89c452172c3a4182180
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eu.tar.gz 491436 SHA256 be1b25e0a3069a53add4166eee2ef948df0341a30f872a62c5b70c771a9e8b32 SHA512 58e856ebdd79b374adae537d7fec74498cdd2594853260ae7ac3ffccc720b527dab3e6d002868a3dbad7868037be823e8fdb51c7cb1c585f7272b4cf48d6d815 WHIRLPOOL 967a4227009e9cd32b760650a19fb83b63d8db00e11a7b4d2910c7854b9b30b22a8e9fac2a6d7af388c9fac7ecada7958a9920723dfd52cdf579a3eea05b84ad
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fa.tar.gz 513695 SHA256 620d9a240cb89e0a9611a235618c5d2023e43bb214ec245bac5bb142f18e829b SHA512 a5ac8b107e89c6f3071fc8774ab3dc629a2914381f2221a65561ab3125a519cfcbf3415e8aa21956bb52f26bbc41352131a9ec1179ead6f69739f65adf6d4b4d WHIRLPOOL 8328f3d56d8bf15c349b3d889757e40a9205300253cad5a58f09c8157ac17aa6ba8ada1d8e42f71c5d9ce8790f015026dc30dcd135a650351ba4106b7a783f93
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fi.tar.gz 497730 SHA256 be1e9228eed275163848ad6cbc6b346a88c6cfdaa0bee321e19d0c782dc8d9f3 SHA512 85dbb6eae0c2edf266d02e6a27d47fcdc7c39252b93bdcd2001b28907e18520b29e57e4b198e34f873880b9bb0e5ed1155c71b511bb47d7c86783fad9c490e4e WHIRLPOOL c9adcc98f96b091a1fb34cea6d9946a3cfef139a0a95af04e9f844aba48547649f62c0fc42ffa042cb9e419ec055f6a7160262ad522474a780bcb6e56a124a45
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fr.tar.gz 2820836 SHA256 865cac85f474b7ad24832b273f86fec11de0c977a33475c7a9d51bac1233c162 SHA512 3804f3c8d789712d6f4305e8bbea91d1a203e1bce0de6c7e6f5521cbee002636c0d46aec15c714a34d125ca623880e1a99de615496938a1f4302d9585fa211bd WHIRLPOOL e9d2a59e07e86fda5b3191081738191dc75207360ec322a7c40e91360001b475e9c200ef0e35b0f01b62728616a47c3e6141cb11de96825b5e5283c1624a8602
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ga.tar.gz 507369 SHA256 ad8937141f7a0bcbc7d6bdf6746ac7f7a21999513c95400c549e80b17398ed1f SHA512 1ef5563ddf55762920b36396d62ff1615587347e25fbea15681f0eaa42bfd758a67d30282b6d1632dfccbc8f097d3ee48e67becbc0ae993945d452f7d3e9f5e3 WHIRLPOOL 75a35cf9160068c9b55e743f1259c13005c0e05410c8e18e4f5fcc01f30692d77a57b6a22a66b293ec36b8cb35504e76aa6f4533b0ab986e5a4b00237b5c730f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gd.tar.gz 1086184 SHA256 d7781200c174ceec80b5844e1a540b57f827445efb94c3b5c0461bf9399aaedf SHA512 f30dff3919f8ce187efc77533a1d32dc0aa5b704fcf7347d9e3bafc6353ffddceb20c04f9bed1eecb15af1711689187669cea105125269013fa4dee4a7b2ee49 WHIRLPOOL 5a6d967ae3d5f1ec5723a421d2bf4f7f0e0ce1aeace478f331ae0eccac7a4d27e8abb2dd5f46e117d0266a989208cb3b501e31c60dd20fa67383017676465110
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gl.tar.gz 1055680 SHA256 a50ec44b4aa46345a13b665b9d5831a3c41fd9586ae75b54ab8b277d6b362ad7 SHA512 ce03762ff08964294b3b558cc9656b12b3c79eb6b4d3de39b594dd270907003eda6a332e52e642206d0c42f8c56de1bd7b5821108f466cb6c0944718a9e5a46c WHIRLPOOL 91751a9cf17c2245c2d560fc833df46590615f03ded6c080d7dff318152c2d7203d5c0180da83c6ab78c129575b502bf6a4bf896f1f7a7942730644c1e6dc5a5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gu.tar.gz 1192578 SHA256 d112a6f5575c8adfd17e76c9f197d4d37314805cf96e371ea902823cabf6b3ef SHA512 d7430d739cd0cf146e86be9bf76cfd746a6b6def951304ae515d3329388cda6d6693462ecf3016e5206543177029f955029eb5a86c4a4223f0144ded6e5b6ae2 WHIRLPOOL c1dd17a5b62d815821ac8be5cd5156f3ca66f1b0b9484143222073a7b6937b2c70ac7296d5807c8268a4b39feb642b518e72791e4b650fe5c9e8973dba33f75d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gug.tar.gz 504184 SHA256 60f8eefd0908362e6b6b6c3f9902feca5216c2bbf638d32bbc2588fbce7e3904 SHA512 2ea2397d64408a2ad85e5306e4fe26b1b69945295df2d8c9ac3868bbb77755e79764710550a3583caf1104eb92180a6996345b670ec2f53236929a1e306b5b1b WHIRLPOOL bd019d26dbcc36dcaa1aca1eefca1048e8b37fa79c6c87eaea1f6294d32c3cc916a1e1b3231c413a912e086173e6699a14a1b006bb3832f6bc72db581e5c5951
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_he.tar.gz 1584688 SHA256 c75af52c8c6913c2cff8b1baae201c8e66d8511b753eaaaf4fdbdecc1648e75a SHA512 6f754026bdc9caf0a7397eb9192103162986f8c55f7f2265272a1fb6d1e2137ac8fc536dfec73535fa8b5189f53310cd93543e99c004e48fb5543cf0cea56f04 WHIRLPOOL 6b206769276e42eae730d83774de86be5a0159ae533a1510d3576e35a1f22a2cd9c468d4f94dc3ca7d607a000ff549d0721c9362ff02f8fd4b49c40488cbaa1d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hi.tar.gz 613961 SHA256 baf0aa1188ec3024af26b0434d10ab51df6699684c262e0b9673a7bfa0890e01 SHA512 cc44c8d1e1559a8f7bfd3743351df61c5a43b200892dbbaab8b12dc5726f0b864187ef5bab6ef5f4a594b3536fa2bfffe70008721533f16445382c9e03cf730a WHIRLPOOL d98cd23edfb7ddbb16ed9921a1e016c681e28b2e38a4121415739368e1b12e2ae14d1b14f1b2ad3f3a05adf1bcacd41d34fd0c769706f004e91da1b08489cf56
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hr.tar.gz 1259223 SHA256 21fcc79815a3ddf4d2924bd7c7703888e8091116f0e736cc35bae1725257132d SHA512 99be5f528de7d9f7080aa5694a19476e32d917266df0381e2de2a24f873c458d9f321c0b4d93caf835be9764f7d57c6677ff40cc5be344deff75ea79e1e98ea8 WHIRLPOOL 08aa3101b5dcb0df4769e962431fdcf21c6ba202693aa67ca143b860ff22cfbc5dc2ee9ac086d5f329af743abc8734130810b92ff9962a4690638baf0e2119b8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hu.tar.gz 2718133 SHA256 b9a170eb9cb313117eca43aee5e96bf7130852e7039d18afacc669fce1a4a081 SHA512 438c6e77bcf2dbab1bdd1f883477386a6159b5fc0512b0b23bec917a77c0ff0451c4144051a03f7f8303a4562a70d82123e9fa4a0ef79acb778d0f865ef4c242 WHIRLPOOL 52752d22b691eabffab28668efd5d3d09cd32a8addc0724e528e1011cf2bf55338dc0ea61f7baf06f80978edc79a3b9b87d41e02b198186d4f3010cabf0f3728
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_id.tar.gz 482984 SHA256 9ec32ed0e6912a50a545335e49f4300188aa7efb2dfbdaf6eb80e31eb66be4f3 SHA512 88c40b4f0b305f92611d5f401450dce423ce8b4c9313431fd49460651cf042f254651bd0bf937bfc6ce5909dab6bdf04c59f575c0931293ea095678e84929f1f WHIRLPOOL cedb6a69389ba0ccfb73398f3f753bf1a591c9bbbb7f31c0e217e9aeb2250a86e4325621c7c9d5294803b99b39b70881b155200105436f285e9c7b8519c8c7f5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_is.tar.gz 1224502 SHA256 f13eff3a0a8ab8115e81171b9c0fee5e7ac7b8450689491d30929e6356f497bf SHA512 ae260f02defb6fecd585e036285039592216e3462bfd9e03863c8ed8be265f0b2a554ff850f7ecccfe69358dcba912e2be3005701b608a929e3145ab31f29151 WHIRLPOOL 71d600cb66bedd5c1d82c8f55150959a62bf37e6610492238411649d2ebcd884e7f03ecb76d6b94220a9674d26899a5e247f5cce4f795d98fb2401bf31f27954
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_it.tar.gz 1828459 SHA256 7f44a3dfd2ac83caf8700e7ccb54eef61de8c64f5038631d555cfbf2705410d4 SHA512 907eab8d2581d667e3a1a2068303cf5583e6a5fd6b438289543ff1d9ac002a5f7a06e685b3387991fb23f07f00a2726ad36b78e16a812f8a403a1cab7e0f9024 WHIRLPOOL 8a692865150fcc4224fd859d97a7dcf71eae6b572c0d0c981748079aa430216ed98bbd0739078455fc933646e46d1fefae14cb519edb4121d9491d894349be7a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ja.tar.gz 592383 SHA256 aa99677eb671801354973ae78a383fcb4779869f809357c3df043d856203073d SHA512 7e5db096a442e2f15bb4b464f1be183727a4c9c2a59c54f6b3e5644fba1ff5d3fc9b5eac2f18be0ded3fe48d6d5ebd0400886fb5ef483662accbf12a68c25d0d WHIRLPOOL c478c74ae2c7cee9abd062128eb5cfb7a19f5cc619a7c97fb8e68569e9b54abd9fa6b30ca474af95539b6d640de584958e3ed83aef657b59f6afd55d43ce24f9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ka.tar.gz 527111 SHA256 05a9b291abd2328402952b6b8fc1e95320a4805c48c53952de33fd2cbf578e7c SHA512 cf51d61af4ef97ec0d53427140a6decec96671ef36e4e2a3159491e43783f66ead5358e83381b27497e815f09d93767252e6721656fd84e683f2510a6a1c3752 WHIRLPOOL 3da5dd62613aea43488e067bc921d79eaa4e76e615d0d1458f368cd401cf2cdce6fd4254c765a50fe877a587cf16d627b1141b06809efdcc35711eee3b06280f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kk.tar.gz 539045 SHA256 be2410ae1701b8a15b0207972c62ab1e1432547265bfa4fc162428e3f1b7a93a SHA512 9e6207093db0d57dbfc01005787571361d68fce1060c47ebef2aadaf4400e1d4ab32d3fc2cce7b1cb73dc24da22b45e9b992be2a2da8aa690141e49fb97c0d28 WHIRLPOOL ac718ad2817a45fb92978a5eb742e12368319391e67a1ab7ee6ead846f81eddbd45ec8e9f87afbb42495df29cd3d231409a9e1f366576ed695629cdbe7dd90c7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_km.tar.gz 645104 SHA256 4587bf5ce9cc3cdf6edd4f7d1e98bff7c3d7166f8070a6c34488afd0f4026997 SHA512 b3be5c5618bf2f43be00b28eae00a5b8ce3230917557ef8daf590d5cf22f31ab0a5a8d06208de34e09f84682f4ac2fdfa03ceb3d6d79280e22b1dbc3f7e6ae6c WHIRLPOOL fdc16ccbabfab1b1b1d168b670b54b1536e273d5111939e256a3a6105ad421d03a872c9a7831fa9fca2d42f6898db6730a611b4795577f2096a6e38d81ad720d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 500001 SHA256 58d70d0be7e88da8f34b9208f6a42ca119cc49ccac357b57d656248078197e45 SHA512 5d93666d60aa3da0d956f0a77e5cc51a742d1ac418b9ef793cc2a94848e169009b38c5a4deca754cd458204129b9acb594be96048c9544656c0fb52639f92a3c WHIRLPOOL 5655a3edd870d83c9f29bd5290b619f55ec5603d79d7f79d69402c6c865617d57a67cd60eb63ff4085b8b12533747829f4c16b67cff3dc5f94eb6566f3cdd999
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kn.tar.gz 557393 SHA256 b0d2ef7167dca62420f000d68e5e5bb66440fdb1a84121ba4386c6bf82c14693 SHA512 25f98fc252435977b2a0585cc88c0f0957d4c590ef0393975a1910947bec1f38fe409cbe856cd9f37ebc32a97548958fa474337ede49dd013dc85a1c5e945aac WHIRLPOOL ebd6b64da76ba3c28a08cbc68e58bb56ac3cb1f22060b0a06fb0252cdf3a461e8fdee20adc28e0d30d2b681f5a8ee773713fe3e20c7cab1bec42e23356183a2d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ko.tar.gz 585336 SHA256 cb6fb3a544f969b048e50a68eee73e0d6d4a57ff13f92155b3e2ebdb1c6d847b SHA512 098bf43b3a17daa09ca25a38de0a0f90d51b57fa8add3ba18fef60e92d53f2ad4d9412fb49f75240d1f41ea669cdbf078146e9ee46d0d1ef64d6bd0a2abd3efb WHIRLPOOL dee909edd4bf92f0d29b58a21e7eae438fc984e03fc44c77adaf63bdf78d28918558cf5ea48b1869f15c0a356a4c90422ac5a8eeb965f5a6c21df31fc5d76394
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kok.tar.gz 540985 SHA256 e0daf57163ee436c5c7283566f20a1638e59cea336cface4cc389282d7ea659e SHA512 968eb9a554b6778ac71e53199b49539d419101e9cae52933541a0861b0408cfe58ede4dd01feba7df08c458e7743dd145aaad10eafc42c667a43b3af1a566dad WHIRLPOOL 729fcec50308dfd32d38b04b2d823c0c6ce4c063c3a4891a00f606389fd118b464a1dd59bf87031719686df923ce2b18c7483c90b038878834ef953d5d6b5df4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ks.tar.gz 518903 SHA256 35110b8904b769100c0bb40502918130dfdf566d6079714153a2cd4187ec8348 SHA512 573c0661e67a55db686314948d2337138641bd3d6e1c19c45130150451dd3624cf49ce3d1dd4d92de049f14bec5e77790424f758f23dfb5efd3d6ab9908a905e WHIRLPOOL a887c31ad9ad68caef1dd201404a9f8665946c42d6e3c93d8e187231a907296483c3ba18aaaaae442b1e85c58f6c469ccaed5f7aa45a762c9a8328b1a82817bf
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lb.tar.gz 469552 SHA256 31489844ca1da95d5da39fcb4502d7fe148cbdb8b8f0e64eb1031626c1a9a30d SHA512 51295d72239a9f481bae45ec08f00b5114e978cd734de5458adadba9c704307168f772e06e5446613565aeab3bebfa32203be70ebf4b26d2696e7f59cb9b339b WHIRLPOOL 4d44a6550ebe90b7eb352e3465bd6813a06683bd5fa0cde4801633e0aa5707f8a357b94733b367392715f6ef94a1eb616464def32459159d8e887eef74d0e2a9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lo.tar.gz 563761 SHA256 22d9e33c37a4ba9aed7c35a85ed18788705240ea7c99cbfc9487aec9c07ef6b8 SHA512 10bddd799c16595d1c9634daa6dc5d2673d74ebae9e32976f029bc40c8c9b0c2b87674d1a4772b4700804f48e7b277cb6b7767d6bd1a7c35a3f283ecb183c080 WHIRLPOOL e621bccf62799d4350990eab11397c9733067828d7e6c3e5db1e7c762ffa090a47d00e8ffc008c5e852a99801194cf9388a59e299479c2365c99915c261fb8c6
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lt.tar.gz 838122 SHA256 a2c8bd1eeb2573147e90605708b6899a7920463e8c603fa28252743188bc2e7f SHA512 42c1a15745c036629e93faf19bf84afbaffcb1bc3811ff8e63861ab0e79dd4ac1d98733cd50369af517451f592d50b2fd29328caebddde5164d01ddc15eea8ad WHIRLPOOL e30037ed75ae432d7737b57655539a67ff4dd65449d8d83705ecd1c38b0bcbc73cd568b9d21d494f5e7d01867debf68afa7f36a386f0f051dbca923386d5cd3f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lv.tar.gz 1253902 SHA256 9dda3e517db4eac7018379f959678af9ca3900fa319b47c3b2fb664361235a37 SHA512 2a15c0e6dceb1cc31be4861c7f017d1516c2e1a65bb11552c3432676b6a268fc7e0c84e598e742a13f8dadbcac78d4d5ffd3e0b2c67b6fbd0fcc0ca9ea9237d9 WHIRLPOOL bb6e41672d3f53793499b0a404430304cbb5af24160d39074f0b9fef60953fb902f9a3e2339a6f16247f84d2e9a62f4a91fd7e854faf1c21158fc93202e01f0c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mai.tar.gz 522419 SHA256 9fed724573f9aaadd6f4e98760b319ffc4f6c29a5d652ab3b350f8115c072689 SHA512 edd5e071f743f7720e32861c172865b92ffe4d74285703287759830ed9ad11d2070f81bec31dbcedfb115f3a2353ff627b22214d7c6a4ab1c41f5a15b4d7c39a WHIRLPOOL 6f7c55782b27957ae66f6e8d6152d951f9cf735224eec1456a9582bcd7ccf2c6eeeb499f0ab4bfd6f50b46611b824452a199e7bb2d2e2f813ccc13aa72755b9e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mk.tar.gz 521964 SHA256 1351cc30b42c9007e8a03466a25539b3c8c24cfd7c0549c23d65e8923cf24eb1 SHA512 a9264743a11e8b424b4b0ee40c4629bba6850574a9dcbd359c8eb9b143121ec8954548fc1d6051eba11a62f6cc8747a9bb6cdd58691738fceded04ae5586a0e0 WHIRLPOOL 7c780d97438793a4e71edb55e918f2303188ae9bba8751de500733b664ac26ee97303d8768f9c6d1c215fbdd89f5451cea04c1799a78ac36f4c19648962460df
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ml.tar.gz 563814 SHA256 5fa512b8f65890f75124e6fe3fc63a5d26c69a771b6fd3733aa9fc35d7ed4a61 SHA512 f9ff203bc99ddd72e6e74a11c68bc98a6c31e5af1ad68aa89f7318eb6c24b0b9c9a3f888245c17800ab4f28190ea0bae307f197c78097ce74d95ec52a3dbdbc9 WHIRLPOOL 6b47e3a91f2dd57c4acb7b0faa1b712c28265e892f53a7ca034aaaabb666c5c085a8eae4fe1c9ab5da4ca7c7ead083ce4f29cfee14b9a2843c5fe9f790b1c425
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mn.tar.gz 606882 SHA256 f41e61faec80b822ce89c2da3b75c814eb5796468f355403e5d09c027c9a9102 SHA512 9eea4f333b9ac60e304653866f6a923d127f26537dcfe1c42ac14c8bb7bcb19b05ecbe569c7aab7585801f8e9cc4c6a9145746136024992ce3b3b2c4425f7fee WHIRLPOOL 5e6984ad89c2109054d4b2a9c4c02a7ab6d78c324b0fd39ed865e02cfdb7b1f9dc97af4f04bee29e8da9dea4dd46e4f6d1423a05ce839b27a3e59e7c238025b2
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mni.tar.gz 534938 SHA256 d0aa58ea4c48770709d8e34e84982bea08419f18aeaae64437593a55ac692473 SHA512 21ac19a699d2f1ca91b6fffa756e961a61bbb34aaf40a138bd6cf4cd433bd82490a5dd8a67ecfa525cb3b7a76447fd8032da55346c83aa6408fe614a659cf6c5 WHIRLPOOL e8b2f70b1af1e162bc263c7ff57d478fb91af49338a5f65d76dbd366591f832111092b9d67762d6e8054e3d73b3389686f3a11677356a8c9f5244ab8f7771575
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mr.tar.gz 556989 SHA256 9157b1c2f2fe52fa8ffbd2555bfed540021e056acd1f96bdf66bbbae93e49b1f SHA512 714914257c79d39f118fcca19c45afee5df8750fb508f56cb35e2d0c4eb2c7dfd03b3c87f06fc8757e78fa9efebfe689512b545b85dd346992fac46fc2deaeff WHIRLPOOL 870138e910b7b977618433565a5d395e3e7e3f7fca243fd4067589827aed1307fa0f8cad9bc3802a3dbb0a4ea4fca827b4da005699a7ab46066d4c4ff8eebe05
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_my.tar.gz 555786 SHA256 2e957ab1c5f5fb7f1497b20d014df97bff9d98a00856edac954b8a02f22ec852 SHA512 02cb14b76275dd8cd7c3f3103d605ff7d4d9ea40fdf888749c4e08c268e3ee02cab5e8a8fe8428cc575b72212ee95ecc44dcbc69695957ee77ec59c66454ac38 WHIRLPOOL 256ed0a743715934fc48579f02bca608227a20c801340c20d6cf6844bdaddc8bd0ff35463940454dc3a89acaead6e2207bd723467948f94fb9854cd1fda9fc82
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nb.tar.gz 3488573 SHA256 dc8bbeff74f8188d03b230d87b352cf9f2e78f178c8e1b05fa06b0ef57ba8311 SHA512 2c5c88beefaefb5067f6cf0611e5cde9248d41411a42cdd5cc014d14158e9d9b64b33f0bc2355e4ad8b62869bc7aad80103ab34de4231c4f9a804bdce8358586 WHIRLPOOL 6e7ce0aaec8c6f34f5152a116339540d2d1d39b04e93de9b6bec33a7468e942491855e7e8825562ad0c9740df88d1c303ed252ac1ff54d6108d9b5397fe4765c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ne.tar.gz 923636 SHA256 200b27a078514b7f39ca58b0fb86caf461a4bc4b43a45d013bc4e03840e947ab SHA512 1779da7c463ae1c2b8a80cbcceb192a0c96da462d7a05fd60f91e8d68163466597d738a14f63449342e3323a4767efa619ad61ed6751c5b5fcb162cee68bdc7e WHIRLPOOL e6abe3904bab2d8d24beb2c893e893f7334a95bd8a4b9f0e0ccf9e5121ad7556a86b15f4428884dbc9ef297e8ab2142417f4b5d77241194771ded9b8f67c6c15
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nl.tar.gz 1285845 SHA256 1c9c8f71f7e9bf5f4a66b0a623c0a547534460f0d22deaee6b7a439a2e652bbe SHA512 3664d64fda0122e4f50abea76b4efc89c10c4a33cb4d50606e524709332e2f4b587e358089402a4340a99a15c819ba162557053e35e5d8c5733d27c570a520e4 WHIRLPOOL 705fdd435e44b24eaf3caf4c2b15d32d7db0aea30fe5350d83c2ad98663a08f71740062158e7899ef478b1c159fb12f87795fd6f2bb00324521b55e65a8602da
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nn.tar.gz 3484934 SHA256 d067062a888d861f3811b49694e7c0e2697f2e1195b3e4ac40900b9664e64cdf SHA512 8fd19ce07eee4edcea0728b499f056595f96b99a6634fc8cce148acdf237c5fbd25d09c5b20651623ab961b2546979a9dddfaa698ca8c356b41075fb2d266e02 WHIRLPOOL c285e1105df6645aa110a1ba50a187b5a7e5ae4fe5764015780f64e4a1ffc44e88c2758e8b4e110b1994a63b0aa65d5f09264bece3e3427e3ab4032bda6b939f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nr.tar.gz 498632 SHA256 fc1d8024b8738b37b78abb61eeec7e88d8e7fc45f5537982cae8d603dc49a8f3 SHA512 b26e1a101dd370b4281f9235cb60510ea219926bf1a545694e29a450f9d2c3660b00dac26acb34f517bc63f81f88b7651560a3a7bdb2cc4067729b2819bfb04a WHIRLPOOL 81747b45bbed33e46b5a5925871079db61adeb6d404858894086019698346b3d9ab9b27334571c6fd521602d5f91178b04657546a3097e3e732f64e7a9a10c18
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nso.tar.gz 496000 SHA256 808572cd2a942f4e3171fee46ee64463a21b55624fe3ab2465fb1bc253c1189b SHA512 a6a10a04f648ca12ad627772dec2982727732b15ca559e75b361e7a693e66732a719ca3c98d8a11a4cda30d9407099ed99a77ae03fd47f6ef54a2f3f6e758558 WHIRLPOOL 7233abeafa8e6a327cfb66b17847f832916d9cd2e3abc36d236f80369e80b97826a3af6e66762c04a7879105331bf706e0927bfa8c1c503888523d534db34636
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_oc.tar.gz 697444 SHA256 8eeb552beb8b7a386c43df7f5abffc667baed078b0086877fc7308ec0981696d SHA512 7b3983b5b87674922dea63597065817dd8d7724d42d2b52f1d0f036840eaa898bd6cf9059166d29d8d59e3bd86e5fbf21c6b4c991b3792879a9e5a038a18dc6a WHIRLPOOL 2c8dfd0793d00a94021d091e116b46a79837123a6c163056acb752bc609686b189ff48c4d20cae461a29ae988e94d8dee7b92e95c4732fd102fbcb45cdd93b46
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_om.tar.gz 488530 SHA256 cb4c26c5a2ead9acba459b6cf179e9331d098e1bb028c08196c744effc82ccb6 SHA512 ea2c36a99ae647c270f909fbd40bfd97cc8d76b5dae23a63411cb41a69d893ea9ed40811317348bbfd31cfe10cb51db07295e5ad12e00517d221dbd630479076 WHIRLPOOL 30015c1a1028fe613210662d6ff06e34bde0cf1776c76b3ed8933ab128200a55759a5d275e73839e00ae8711747f35002735c6f27fba7f7b048b984efead4da5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_or.tar.gz 556460 SHA256 11c48de161136cfd9b3525f41f1bcc3225c29372663279d8c0125b43f652f604 SHA512 c5ab8eaff9d85324d684e3dbe8deadabc89c661107d64aa1e81f49ef065d540d678463d1085895f258a9760bca9862002c2b344a9d8e4842d5a6a7317b129d5e WHIRLPOOL 04a0ef9a35123fc55a6c820d323ccc81395c49f0391cbe70908c878dc671a29e1aca7fe815c1060689c85a9526820a82400f33ee3a4e48167e60a8e91c243d5b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz 527187 SHA256 48b08efc80f68584750c1fe0a81f1e0235bcba06eb32e81c1cf953be6713dedf SHA512 37cc41a79df0d55b065cc017c8ed8344ce3644af36b6523f932c91692403d40de6adcf7384ecd8ac13f2887bc6292aefd26cb855a9114eb1a51058ec8da494b2 WHIRLPOOL 5980336b45ef07896a7eb94cc00a13d1eea674f480c39d4454847d39d16ab0edb22947a6a01e56e2393b47efd449286fb8b3fa2a47c7cab7f55bfc2b40be0122
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pl.tar.gz 3280606 SHA256 c2a93ffda3ae37bca593bc495f722981c041a435db5649dbf31ea994a4cc2dd7 SHA512 c933df5e436e162b4a4c55f2892a81a9955e192757621bd3281813624c83912ed2f6846fe5017f8c5cf89ec0b62291205e220c1dcf7f1668e46e000fe78f10bf WHIRLPOOL 0dda347e92c03540051420fe59ab73b10f68b36436d6cc0ca6a72d38fc6ea71cabffce9ba891d8cfc6590a456943dd5489996c9d698e18517f0c3ff9fbee0ee8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz 2577865 SHA256 990a5bbca5578e82b712dda0373ae39489b1b76ba3e372d65cfc018ed0cc6c96 SHA512 d8d2d20d5904aaa2ea883aa801381c5a8e5a33fc8bf62f9271e3f5722ba3be8876bf595be0432fe3f4a8f5f5f0cdb86f7e5dc64f73572b1c9ba0559ccfe37807 WHIRLPOOL 797e80ac7bca4c08c4517df655bc7d35c4054d54487d7aa886e4ec0da5ced99a8c52cd554594dd7785ddb97df19c4c72b6efa6a50ddbd1323e5457b1372f154b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt.tar.gz 1130989 SHA256 9dc5c237db7ce753a3535fa370be60aa77512373a71eeecaffb21c14d2ecc765 SHA512 cf0703a021b3ceb978b032f5a39d92638d8478b805fc0fd7cf2e5bd21d25667712d75ef2d40eb2c2a03fa57fe9bc1499a0e585003559566abfd44d0913737774 WHIRLPOOL 175936bd95769e44f777caa2bc5b48e570c68e0987fa34aa42a4eaf6dc3af1eb1a55e196503a98a48514bd7ad77221699807b091e96d70eca47307b4d061771c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ro.tar.gz 2365184 SHA256 5f5118cb686a466386dfa0bfdaef96440065464298a0fccf1fc0b965564f451d SHA512 c21615043eabccaf43bd60e2d06718d0ba275fc433f7829ad1468cf2d33dfd3e780520da2e541ad4be075f394dc0ed56f3040caf4de58e989ff9176e929dd1db WHIRLPOOL 5a7f2f8faf369d71bb3da095b93fd8ed00c02ccd1dd0fc2be97d53f81c0861f9af347dcba0aded3939f8cf8783ec61118cae95c64abe17be21d588654afb97d5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ru.tar.gz 1651712 SHA256 4f3a50d285b547cd9f081426664c39719e2911e8bd8f69be123d2527377080ef SHA512 f6e6eff2545b80dc78473847f4fcaa2f19be5f20afdbbeedd21819c3d7ccdef6b3bb91e2baa8124bd546efb3fdfbdc6c24c73e6309814e949f8aced4840c017b WHIRLPOOL 5c0fac60df1c6502cea7cad1a64704a700681c83d342f41ea91d5003f190af76c08ef05dffdf69b75ea70dd676b37216c59bce11bb12b6c0ed52a78008b44278
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_rw.tar.gz 492403 SHA256 49db4db8ee9c3835c1ad96b0eab4466728ee4a6cf2a3a91cedc7dccd07903e82 SHA512 7fc247061617348114133faeb49cf3a1228c7f4b6475af3d96d9c0e33443d2b056fac9fcdd6310fc267b1de367d3b1912f42f571e3398dd97bf1d6a089a079bc WHIRLPOOL 3a8284d5ab19bffc9a2a11eaf4864d854bcd0b683a0e1b45dc248405b0a7221ccccbe1d728c65ef72aac7e28ef01260bfcfd8d5f0917fc9c103ce86676bba784
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz 542495 SHA256 ec0508fb556a88e15c5b31906c9ca6a7f77afa87b5fe420abe9299f3a7be3d5d SHA512 42c8feb2c6006682fbdaf029b38b45fb2df9b5383de7ba0aff3ce46ff6bcc43d48a6e2538a58238a8894873e12b4ad570dfb31660579ad72d942dd88b3e09098 WHIRLPOOL 0defb0585af73804362fa595dea2700d6eb36828744568a2a0aa76ee84fc5f63f0e3ac8fb2af42b17e8683f8a22830d4084172f82d0c2e1b686d14409bd08c27
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sat.tar.gz 583697 SHA256 4f86d558a8f7bb5218a3abc6198fe69b1b1d1d7a6959f0bede95e29a152dd505 SHA512 003521b4e73dad82cc6efe8d445f63dcd970373d94f6ad0252c39457662f4c9f842cf54c8b07b4a11cc43df2256e8073bb77aa25acf81ecfc6ef1bba8c4d60e8 WHIRLPOOL 8220c1198e62f686747804c93edc1afc4953110face3a54edc2c718484619b6dda4ff323d59075d2f62bc4aad89a9fb04ebc89a777a764232a3ac909733a82e0
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sd.tar.gz 534521 SHA256 349a20043fce58fd4fb64e83e32cf7afcd6518d2cf11778d2e601f6cbb4c27df SHA512 328afcd7c55a5ce67231c33d5064e4750cbd67939261218081075ca1ce9f5f67cf1edabbabbecb0075633c232733a71786aac9bd34a6dc95fe5c198856d74cbd WHIRLPOOL e3bced94488cef580e2133188521176831348b4679158f5a9bbf2109e805b3396cad698f7b43f065f84767dae9ade8bb19f38c6f4c726fc3e3cd4b1aea02da7b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_si.tar.gz 825778 SHA256 6e260a11f59f77aad52b013b8d7992893c72dbe2c170c0b9047af893e45dbfab SHA512 3c722588a24093b8dae85773d0a5a35a4e748b9805b93a31bce36655409ca80bff7f3ee184d2491279dea6e5e2fc9e6e8d7cbe178d16123ac68ced3bd34c8425 WHIRLPOOL 1b431c956d6487d70524f725f853dd2ccf5efeb081cbd236a9fc78ed3343bdd2fc04d71df88fa9c1001408db26199c679ff9878025c010a76d9f26d3b586a329
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sid.tar.gz 495972 SHA256 6d0ca5f5543717631191cc1f387dc5597e4cc7c5f1afa5b44070ecc7d0f39afc SHA512 a76937039b523846ea061dfe16e62f4f407b3db034ba160c43e9a309cb531c921e066a5e1533bc88cacb7fa898aa6da00c49fd2900a1f35234ebdb105b6e0c0c WHIRLPOOL 4fa09128e13de662e59905340f40fc29248fdd2117255ce05dcfd7a87bee49a30e05da6c7a14d59050601a5a631234e083c6dad7733282882711da5b7e9194ff
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sk.tar.gz 1786608 SHA256 10f0da3cc7cfabcc875b80529bcdc9aa71f64c886d6bd6bbcebe21d7fc67f3c8 SHA512 4ca4720dea08529d6b7c7ded7ca3334377c6461e9839f24c993caa424eaf87972b319ba2847547b52752267bf9dd19f3766ea9f51be132fac276c947de27d064 WHIRLPOOL af2db9416ec20677074374544f731183c14d3667b637d89c169c4538942df8eb715c2a55b0ddaf9569d0d621473e64d2b9684bc258fda1719d77bd4df9c5dacd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sl.tar.gz 2163476 SHA256 f73eee35e77c91ee391e0e4b3784617ff40478dff6b218e6232929abd15f4487 SHA512 15ab3ca174dfee73f199442fc6a49ee5624f22df904ca07e6f9d0bb107687de5c05fc54f411b7de2a08c1e1f8e7074c843220c9a0211796e2ce4ac9045d7fc58 WHIRLPOOL b7ecdd6515f57c44e277cad7cf29056984f3798ffcb2dfbb3750ac6994caf34760daa3f575194e5f8b2f3559dc389b919681fb239587d5fd57172d6bf2a98da8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sq.tar.gz 510057 SHA256 6587300237c35f5043791bfc3ca797ee6d26aead20fe24f489279a67ff25f6e3 SHA512 8fee3469e8981763cacc639f74afdd262b172cbbebe4a21ae09cc406c79d62047eaa2be802347aaa3ad20d1c78870133ea51f67b59b7deb48de46f817eb27844 WHIRLPOOL c12a75a61f735c5cedce13dd7476c74df667036bfc89768d31c8ea96a05471088346a7e8915c00bbfb9a23ecd3cfce69fd5164cb864d769c816c7d4f30ef94ff
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1685790 SHA256 ba6b0298443fd84bd4fdf883aff37ee0bc2de9be671eaf0939e1ddbea9015d4a SHA512 4febef561e5e3cda7efbf9c8cfdafbc7824e39deb42c0a8ff6a032d85675f0375c883cc120a9f74f24d166971a63650623bc902b27b5c8f83b7e9f3626ca1f44 WHIRLPOOL 65d0a8e17f1dcd89d7acc322bbf10f93823fe491b17d2fe2122521cdde14b5e8a38bcd397c7f15845151f89bc1cf7c97a4693327b0ce476dafacfba433335c71
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr.tar.gz 1714742 SHA256 333f34cb116369f9b5bbc364d6aa7d92bef990cbf7524f80e0872aadc7c4c96d SHA512 fe78afac40189af57727d9695a643d75bc232343e630a44ab987ecc12f1c938088ba8319190cb25630de89181d051e52d5861945c409b4eceda5d6d02c608fbc WHIRLPOOL e7fea0ace0a1d8c774b740e448cb45e32f83952b456891ef8976930492f225bb3823e5c32d5a70e4ce674d98fbadeb6b8084b009a18e70fe98d00b10fc462aa4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ss.tar.gz 496055 SHA256 bb8ba8e73f717e810237144df1373d090d76b0c8f3882deb7f3d7114223c3639 SHA512 f4cce1d0988aa79da26955ecc8f04055cd1d99267ffdd056ac344a9e1842424bfba82cfca1ee805859bba8622b522b4d3386fa9bae6f0d90d4bd5542e287d3b8 WHIRLPOOL 391c30314a3bec0d2ce7d939e3cdbcb2b6e6adaafba818cc659be8a43261b6a1eebb8943bd0202538f1a8964c6b244a4faf40665063f7342fb224334ae13eebd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_st.tar.gz 495382 SHA256 8b805e37462292207f90518eb42b6155b288b96e6f4ec2ad0d7872beed4f4f07 SHA512 f6b4b5d50e862e152f7d54afc27aab00b6f2f5ab46f601aee475f16bf6f24ac1ca38ee97a4e772013f58c2d2f9e8041139851dc94b24bf80176da52b21e01442 WHIRLPOOL 83875a5daee66a9aae009291731db1907b94a1dfc56b64eeccba2ff26b3e3fad615f918a422bad2dc73be24e9fa040e302a8597c33ddb118fd58d3509f9bcca3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sv.tar.gz 2366289 SHA256 45b60afadd2851b82583f18adf31560f2ece03861beaefd62b137ab7cfb3c3a5 SHA512 a57d3a8ae53585a1f4020ea90f00ca443dfbf8590c5dfe96699e4f81d6d38b4b88ab5b6de8c8189446af9c56ac2485743bdd6f872b6edd56c7475f3e1aa73fae WHIRLPOOL 82db12ac1fdf912697ead4d5b9485ace5342662138550b91810922c39da66e5fd5c0c2ca507b86df3c41d80b3896b0197cdd57cdcaa34751d73af26da2a1e6ab
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz 482428 SHA256 dc47178d0daae35d7618427a4c298c2f788207dfc26062367c39b82415d3bddd SHA512 2983e6813f270097dad3f16a31b06464cacec47ef27854f0352602a4512618bda4da1e7c9f88cb8df05871ef9d70f998ce25b20b7f744d97e484d23dd7ec1abd WHIRLPOOL 019e46cec7c3d589772bf1d2151c4f1f19ed99d96e869d0eed88dfb6d0f6521f1a7d63360cc2cee825f350d2c2df7afe9202d0425e040c12f6e2d7780e3457c8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ta.tar.gz 550735 SHA256 d53402e1d776e7a52454c11d2380ebd733749558537c795dd779007c0c372935 SHA512 5c1da0402ae1f0e8ea88f56851abf401fcc493dbec928a6f52d3ec81cb1b4bdff073adcb91aa3b25880c5d608f0135e582541b88e64400c78d133dfe0e17138e WHIRLPOOL 6e9c34fbbd0c9e7a6d586dede8f61d88e0e9429d7d7444884873be12911da9f1b237f5f136c364a50d844a24bb45b3f980f1abcecb83f6d4882218a4f469a5be
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_te.tar.gz 1107741 SHA256 0932e3d8f1d3d035da67673e1231b7f0856e9de2429275d3c3f4be6aebcae8fb SHA512 5eb29e06c9ca7862c0eea7f849c3a00baded3adf5b1b644404904f2de1db2d10f23274eebcf0863641e5b4923a81045d7cf4e9da12debaaf90a02ad96995b6a2 WHIRLPOOL 568055a70dbeaa45824ebf765f8bb8ae09c88250e3339d92a44d0114a0b3414dec1e4f2d581cc6c5078aa85539224a04de24a404412cb8962de05400961465a0
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tg.tar.gz 513690 SHA256 3b896ce51490c550f0098602b0a579c3aab01421b156f370b5073482f581aa09 SHA512 0f54396c65d7439bf5cfb55397fdac314f0e37181794e4ea4dab07e60e64eafbaf1cd702f1e05e9dec78082674f8832a6f9fc213060895f15c358c6105b33372 WHIRLPOOL 4e7fc2ffa181882071e5783eb30750f33294582cb8042b05c6a61b43e4e12c2f0dee9a6a34abf0a3954710c31d19fec669253ba54c413c5b71d61687897bccb4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_th.tar.gz 693303 SHA256 2f755aa4c384706673a1a72421bb87f28a7e4c418132cf473f44f594cdc81507 SHA512 034b13f6c17bb73edfd8030663d81f29a730c03afcc7228bad0f0d533a153f86aeaebfe03f34a44c36ed249abd26b010ad89e68eb01067eb6d12de0780731fcd WHIRLPOOL 40de556b3754aef7ee50ddf278923265567d266d40c0e1f05fd8c6bb1a303c2d35a718703ad75977e31ff713c3dc0dddf5ec0f303879632548b1b2b6ce769e4f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tn.tar.gz 487316 SHA256 d110b4b085f7d3fe7673111cb9c98a3f8853caeeb28dc820dd4e7348412e052b SHA512 d1b6d32afecba06226b85b41f965bc59fbc9ad6131543b70b8210cf79a2bf60293e74b7da1db6500f8bf553c50097e9fedf68f9a1e1c86ba82eba28e50fc837f WHIRLPOOL 2f3981408bf6428bf5b3e00a06d8189ec380c67c98fe1a8659b035098869ceebe51bc079b07d855d0042c82e27c858cb002ad74374fbd1b04e801aec4579f30a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tr.tar.gz 536148 SHA256 c314662c49c054a91f309c12e57672a68f5845a741b9afc581afb4ab7e787966 SHA512 1cb25fd2f78f1a69255474ff9dde9ae9f28a6deab4dc89d2260712d49c1662b7a1a4680af41833e60c89b45cadafd5721501e2fa6f9b66fe77d5b9199cc3c79d WHIRLPOOL 6fef8090708f2b417bf9e96fbb1684af1f1cad624cb26412c27459038266abf925807886543598655212b3410398af1e4f595f3c65055d4d5b7c76c60e449445
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ts.tar.gz 497010 SHA256 76df69714f013a52ead88d3bf762624cca4a041982e994d60709dfaf68517c32 SHA512 11e4688fb654964544c7ac99f388e7183f33b8490f343ebc8932c9294aaeda630317a08f747d13d45128c55fac81e6bcd00464317baa1c88f0e8e9182bfdf3b1 WHIRLPOOL a289de35948807fa73ad47cd8421c4bff55cc5e1371651629a865105bf0a979d006743daeca202352555b62167a164c2e319d030344885087c1bc479b64faa2f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tt.tar.gz 486956 SHA256 a1ebb8e37eea68fbeb01f346c066c317b45a8274d52970be4d166b4dc3516e7d SHA512 f67b9b1beb3955330bb08d846f2a397a22574119e2f26142568fe902aabbfcc24e50125bdafe2cd05c52830085b0449e94e949bad66fce09bd4c7d5309ad4bc1 WHIRLPOOL d4857aaf64cc8e5850d061c840859243bd5b6885d656599e4451209208fc5c560d43441565bca2c112829813d783abb99a17443cc2234078aa6f0e60982bad81
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ug.tar.gz 526409 SHA256 1159034d1f2385b378ae91fee419225f6f296527002a6aba1389f8dfd8c6a951 SHA512 90485b4f2b90f98e322c4d2d9b4ac25bab9a6ee18747814269ddde1115d209f395498b188421da83743d073a2e1c71d817745715d753511fb4afc4849caeae72 WHIRLPOOL b93c68c4ea0a49dbf144267e53fde5e7c3a6c294bb5214250e9d01010c42c6507a3fb33ae9eeee35cf21d5e49d0c3ccdac43df38c0007835f64a010a1c52f57e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uk.tar.gz 1375439 SHA256 bffad6b41ada73dfe7237c1b1cabf4e067383193838cce88492ac451f6834e43 SHA512 3cbd9a8db28bac22f12ff77327947241f04406d3a376046a070458f31d85713f696db6723bc20c7fd7e0c2725cb428bdb142f10163b3abb7806d2a21cbc7fb38 WHIRLPOOL b45bcc10ff984e4c216ba8f5485671b65cbd08f8ee9a541b2c3060dd42333c9b3515dac5d19c29ebfdbe4f9283f73a14f93cd265ff04929de7927388e1f222d1
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uz.tar.gz 487743 SHA256 33e2c14c2cbeec3a7bb9b43fed3ddc19433284e1328b93e7ed3226d1c9435874 SHA512 d9368ce5141e7cb8be68d8747879793750df4970f862f0f61a3f096405c128cfc11f31b462596917d93579b4e8bd540f1b19c6b4bb1b7c4c4fb25bf6d60d8a4e WHIRLPOOL 7ea9d6b0a21ff673f8b7ebb18d6a30f79e47d3f7fc559687e6b1da6d54f459556834a41cd72be8759dec76e02fa0c3d352f804ac7ad6307fbaf7999aa64ebdb5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ve.tar.gz 499443 SHA256 3b0514851f3bc0270fe0333d0c34e5d315a711c0a07b8849099e92cfc1deefc3 SHA512 f26290ef84ed98952a263a27b2674f957c928f790c1a4e3c7e0e8de2c0c8aced59dc970478bbeff5f016bcbba1b6e24e6c6c2eb104ef8e8970722b4626f40fa2 WHIRLPOOL c222edf89dd7b532437cf084cf5944b39c1158fb3297fd61e2ea22b47cc2afac35c0646d46d644b1ff997c96b389805de984f4d66f14dc344e51ffc41c57502e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_vi.tar.gz 527210 SHA256 78d8a8ba19e9813334ee2b136497a939d55e7a9eb6136ee8f97c8924dd105203 SHA512 743c744b24b7f651db2691083b5154bc60a5ec082fb05f20d2be8cee747f2836a8a78865f015838fbc09d4c27f5dc294b82672f78ed9f0f1e9cdd3f26ca1050c WHIRLPOOL db168dc2a54f303b4d04fc715bac6f291712ecb452a046aec7a803e6164d7cfb25787e68d839ea64ec36654f21180bd8d046a264d051f4a1ff3e622756e1e7e5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_xh.tar.gz 504507 SHA256 9461e123978d9bcef32724df7b898ef9ba271cfa137fd8ca1a2d0e2d60c59406 SHA512 9e60351b18e2e7bf648d0325e04df1e5fddf6d96ecb52d7bb87b0512e625da973c65872838cd75210b5060a79c1105b618dfe3e5719d10dc39a9ca0aca7a35d9 WHIRLPOOL 3ad45023c381f851b7d20c3afc22383a4055be131ef9a484140e3c2dee07ebf185d3c850583fd1cd658d966ef09fd7e4be8e0d00da415b5228dde15ac17215f9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 575837 SHA256 80baa0e0c65810d037ec6def3737180e3089602edee768b19ffea45c1e3b1b3f SHA512 90bad9060f3105f770cd79bcf40b54ed59c3d120948572999549e97548c408a3a3b88aaa3f543b0b0b58e83c4dec7e26d20fe712f5bd55d47dc9a5784ae4f96f WHIRLPOOL 7aecfe70f811499f65bc9e79d5880b2af1e05a7b8e1a1ecdb1f5b2f2972b9474a994e30898ef8751ae4cad25656979d16d6713c32a537c52df57777a849021b4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 574284 SHA256 b13dcb164621479acecfa50dadcadd9df4738b959a11f097eda7589e7a5ec630 SHA512 e02eaae2039e5cc7576b674902cc90e28b488ffb27f84c83a03880cc79b950073e488577f2b45e56b87e737bf7714ce225531a4a542fd51d7feabff1264c2efc WHIRLPOOL b162a2259b92e73f44ad7a3723e75b89dd23cbdd7b550f96fd92719c84c69b05a67eb20cda40e6d7135ce8864bb3dad3b3245c91ae09310b0141c4bb0c04ac42
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zu.tar.gz 505667 SHA256 f645c133a2076739388323481bb5ff7bf7a2fa34be9822d92b36c74cefdbe245 SHA512 accb79bf0b890d879966bc5f7c252bd876956ba7851d64e8fdc6546b8ffb5bbf5effa942c8988316d4d61e9d71b555ac7d2ac6c0d9934c638f38ee899efef91f WHIRLPOOL fe56e5a8298610036fb7a57c1736f2b6643328657ec86898fa20017027588848b5ed18d6660363cab6aa27ab3db5588bbf8ee344cdfde5d47d372b04104efd97
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild
new file mode 100644
index 000000000000..3b3c41d7c6d0
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit rpm eutils multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="http://www.libreoffice.org"
+BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack=""
+	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
+	SRC_URI+=" linguas_${lang}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	langpack=""
+	[[ ${lang} == en ]] \
+		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
+	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
+	IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled; paludis support
+		use_if_iuse linguas_${lang} || continue
+
+		dir=${lang/_/-}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			[[ ${lang} == en ]] && dir="en-US"
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
+	# Condition required for people that do not install anything eg no linguas
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.0.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.0.3.ebuild
new file mode 100644
index 000000000000..875cd6b0ad72
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.0.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rpm eutils multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="http://www.libreoffice.org"
+BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack=""
+	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
+	SRC_URI+=" linguas_${lang}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	langpack=""
+	[[ ${lang} == en ]] \
+		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
+	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
+	IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled; paludis support
+		use_if_iuse linguas_${lang} || continue
+
+		dir=${lang/_/-}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			[[ ${lang} == en ]] && dir="en-US"
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
+	# Condition required for people that do not install anything eg no linguas
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8788035bad7c..5364ce9fc54d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,7 +9,11 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
 DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd WHIRLPOOL 9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
 DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
 DIST libreoffice-5.0.4.2.tar.xz 167305516 SHA256 647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8 SHA512 729403edaec752bbb933548e15bf1d417a307e58e0cc6db045bfb97eb99c65b29ae785d207a2611c25b2a55a1fa25e3f0905adbb6500f571fb2f345ccfa53be8 WHIRLPOOL e903d2a218416051002103a7670febca384db8e1e3d6d3e25bbe116629b24534e99d5571ecf4663a8aefe81d3d7211b9f2ec0604fa9c2b861487ed615fc5afc2
+DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
+DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
 DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
 DIST libreoffice-help-5.0.4.2.tar.xz 1882964 SHA256 5d3c20037a8c2abc04aa3d5991a956538a8dad6669ce0ee0de56d78ebce5b200 SHA512 42c6c8361ec2c8b7d1652110818dcf162ad2508e17f8152713fe4a28439a103346144500a569c9b993ad7edab18637006c8787984756931ab8953868fc97cb44 WHIRLPOOL 238511d7a0ef16c22a774bbcb732da180e8d5d56a3d952a30c0da1cb1cf2154ece7efbe993409a9e6bcae8c2e5ebba049dcf68058a8c151a967f0d6df1dce93b
+DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
+DIST libreoffice-help-5.1.0.3.tar.xz 1903996 SHA256 c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447 SHA512 5a7f9b59d14aa8b3f760abc835f7541d2458b6c2239a42653db91681d82a8f90bfc5c593c74ed086a64de8078eea6367ecd27f0ba07ce37fb13f6dd935f5a438 WHIRLPOOL 6d650f0faf230184a2db7e20440e755b0d05bbda1374bb4fc1bb3ed832d89b4f115bda4fad9f0a280d91d12aec1730b5b9dd76ef1d6acb417a03f7d3f6c4f320
diff --git a/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
new file mode 100644
index 000000000000..e06f81f53dce
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
+     exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index 4ff2606..6a05eed 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -16,8 +16,12 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import sys
+ 
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 99d3b03..704edab 100755
+--- a/pyuno/source/officehelper.py
++++ b/pyuno/source/officehelper.py
+@@ -44,7 +44,7 @@ def bootstrap():
+         if "UNO_PATH" in os.environ:
+             sOffice = os.environ["UNO_PATH"]
+         else:
+-            sOffice = "" # lets hope for the best
++            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+         sOffice = os.path.join(sOffice, "soffice")
+         if platform.startswith("win"): 
+             sOffice += ".exe"
diff --git a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
index 863f7c97bb7d..1dad190b5ae1 100644
--- a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.11.2:=
+	>=dev-util/mdds-0.11.2:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 863f7c97bb7d..1dad190b5ae1 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.11.2:=
+	>=dev-util/mdds-0.11.2:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 15d59be51f1f..6b99676cba33 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
index 4cc1a495d37e..1cf15be1f732 100644
--- a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
new file mode 100644
index 000000000000..abeb761c3887
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.2
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.5
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	=app-text/libwps-0.4*
+	>=app-text/poppler-0.16:=[cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.7*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.8:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.12.0:0=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+	local pgslot
+
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+		then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	# FIXME: Hack add missing file
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 4cc1a495d37e..abeb761c3887 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
new file mode 100644
index 000000000000..bc0732794b6b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
@@ -0,0 +1,588 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.4.4
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	>=app-text/poppler-0.16:=[cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.9*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		>=x11-libs/gtk+-3.8:3
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.12.0:0=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	eds? ( gnome )
+	gnome? ( gtk )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+	local pgslot
+
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
+		then
+			eerror "Compilation with gcc older than 4.7 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gio) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	# FIXME: Hack add missing file
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
new file mode 100644
index 000000000000..18d7177985f9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -0,0 +1,587 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.4.4
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	>=app-text/poppler-0.16:=[cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.9*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		>=x11-libs/gtk+-3.8:3
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.12.0:0=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	eds? ( gnome )
+	gnome? ( gtk )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+	local pgslot
+
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
+		then
+			eerror "Compilation with gcc older than 4.7 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gio) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	# FIXME: Hack add missing file
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3907338d0b01..9e2bd12efee3 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -59,7 +59,6 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
-	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
 	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
 	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
 	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
@@ -106,15 +105,15 @@ COMMON_DEPEND="
 	app-text/mythes
 	>=app-text/libabw-0.1.0
 	>=app-text/libexttextcat-3.4.4
-	>=app-text/libebook-0.1.1
-	>=app-text/libetonyek-0.1.2
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
 	app-text/liblangtag
 	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.6
+	>=app-text/libmwaw-0.3.1
 	>=app-text/libodfgen-0.1.0
 	app-text/libwpd:0.10[tools]
 	app-text/libwpg:0.3
-	>=app-text/libwps-0.4.2
+	>=app-text/libwps-0.4
 	>=app-text/poppler-0.16:=[cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	=dev-cpp/libcmis-0.5*
@@ -158,10 +157,12 @@ COMMON_DEPEND="
 	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
 	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
+	eds? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
 	firebird? ( >=dev-db/firebird-2.5 )
 	gltf? ( media-libs/libgltf )
-	gnome? ( dev-libs/glib:2 )
 	gtk? (
 		x11-libs/gdk-pixbuf[X]
 		>=x11-libs/gtk+-2.24:2
@@ -215,9 +216,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	dev-util/mdds:1=
 	media-libs/glm
-	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
 	sys-devel/bison
 	sys-apps/coreutils
@@ -247,7 +247,7 @@ REQUIRED_USE="
 	collada? ( gltf )
 	eds? ( gnome )
 	gnome? ( gtk )
-	telepathy? ( gnome )
+	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -256,7 +256,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
 )
 
 CHECKREQS_MEMORY="512M"
@@ -365,7 +365,6 @@ src_prepare() {
 
 src_configure() {
 	local java_opts
-	local internal_libs
 	local lo_ext
 	local ext_opts
 
@@ -380,16 +379,6 @@ src_configure() {
 		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
 	fi
 
-	# sane: just sane.h header that is used for scan in writer, not
-	#       linked or anything else, worthless to depend on
-	# vigra: just uses templates from there
-	#        it is serious pain in the ass for packaging
-	#        should be replaced by boost::gil if someone interested
-	internal_libs+="
-		--without-system-sane
-		--without-system-vigra
-	"
-
 	# libreoffice extensions handling
 	for lo_xt in ${LO_EXTS}; do
 		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
@@ -427,6 +416,8 @@ src_configure() {
 	# --enable-extension-integration: enable any extension integration support
 	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
 	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
 		--with-system-headers \
@@ -440,7 +431,6 @@ src_configure() {
 		--enable-neon \
 		--enable-python=system \
 		--enable-randr \
-		--enable-randr-link \
 		--enable-release-build \
 		--disable-hardlink-deliver \
 		--disable-ccache \
@@ -469,6 +459,7 @@ src_configure() {
 		--without-help \
 		--with-helppack-integration \
 		--without-sun-templates \
+		--without-system-sane \
 		$(use_enable bluetooth sdremote-bluetooth) \
 		$(use_enable coinmp) \
 		$(use_enable collada) \
@@ -494,7 +485,6 @@ src_configure() {
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with odk doxygen) \
-		${internal_libs} \
 		${java_opts} \
 		${ext_opts}
 }
diff --git a/app-office/openerp/metadata.xml b/app-office/openerp/metadata.xml
index 4012873307cc..82bc112c6d79 100644
--- a/app-office/openerp/metadata.xml
+++ b/app-office/openerp/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 		<description>Co Maintainer</description>
diff --git a/app-office/passepartout/Manifest b/app-office/passepartout/Manifest
deleted file mode 100644
index e6772ed0a03f..000000000000
--- a/app-office/passepartout/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST passepartout-0.7.0.tar.bz2 369232 SHA256 709890fb1530217e2678b710e996e9e3ee41c969088193711f119fc456f67d0b SHA512 41b8ed3905ee5332a89bc8512a5481bc52bdf58871254137e48150ad0d00a561aa9483d2accd41672f34bc37bea645f2a5ad40435cfd45490c3ff5542032ab8f WHIRLPOOL 2da483041be06eb2d8f268bd291d8105a0840c4e73ee61abb36fd4394310657e673979092b155718a8dc48c74b645529774e27a265f683daa73a8fa7752693ec
diff --git a/app-office/passepartout/files/passepartout-0.6-extra_qual.patch b/app-office/passepartout/files/passepartout-0.6-extra_qual.patch
deleted file mode 100644
index a9d33929c1b0..000000000000
--- a/app-office/passepartout/files/passepartout-0.6-extra_qual.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -NurdpB passepartout-0.6/src/pptout/document/group.h passepartout-0.6-patched/src/pptout/document/group.h
---- passepartout-0.6/src/pptout/document/group.h	2004-10-02 16:18:45.000000000 -0500
-+++ passepartout-0.6-patched/src/pptout/document/group.h	2007-03-21 19:00:13.000000000 -0500
-@@ -30,7 +30,7 @@ public:
-   void set_flow_around(bool);
-   bool get_flow_around() const;
-   Boundary get_obstacle_boundary() const;
--  BoundaryVect Group::obstacle_list() const;
-+  BoundaryVect obstacle_list() const;
-   
-   void add(Pagent* obj);
-   Pagent* ungroup(Pagent* obj);
-@@ -55,7 +55,7 @@ public:
-   /** Raised on direct changes to the group (i.e. new / ungrouped member) */
-   SigC::Signal1<void, Pagent*> group_changed_signal; 
- private:
--  Boundary Group::get_untransformed_box() const;
-+  Boundary get_untransformed_box() const;
-   
-   ChildVec childs;
- };
-diff -NurdpB passepartout-0.6/src/pptout/propertiesdialog.h passepartout-0.6-patched/src/pptout/propertiesdialog.h
---- passepartout-0.6/src/pptout/propertiesdialog.h	2004-04-16 14:03:56.000000000 -0500
-+++ passepartout-0.6-patched/src/pptout/propertiesdialog.h	2007-03-21 19:18:26.000000000 -0500
-@@ -39,7 +39,7 @@ private:
-   // no destructor
-   ~PropertiesDialog();
- 
--  void PropertiesDialog::show_page_contents(GtkNotebookPage*, guint index);
-+  void show_page_contents(GtkNotebookPage*, guint index);
- 
-   Gtk::Notebook book;
-   std::vector<PropBase*> pages;
-diff -NurdpB passepartout-0.6/src/xml2ps/canvas.hh passepartout-0.6-patched/src/xml2ps/canvas.hh
---- passepartout-0.6/src/xml2ps/canvas.hh	2004-07-21 17:00:34.000000000 -0500
-+++ passepartout-0.6-patched/src/xml2ps/canvas.hh	2007-03-21 18:47:12.000000000 -0500
-@@ -52,7 +52,7 @@ namespace xml2ps {
-     HBox hbox(bool span, float margin_left, float margin_right, 
- 	      float ascender, float descender);
-     
--    virtual void xml2ps::Canvas::addRelObstacle
-+    virtual void addRelObstacle
-     (const float left, const float bottom, const float right, const float top);
-     
-     // Check where the current column starts.
diff --git a/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch b/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch
deleted file mode 100644
index 4c57a85c79cd..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e59f631..ca329c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- # For automake < 1.6 you need to use this line instead:
- #AM_INIT_AUTOMAKE(Passepartout, 0.7-PRE)
- 
--AM_CONFIG_HEADER(src/defines.h)
-+AC_CONFIG_HEADERS([src/defines.h])
- # AC_CONFIG_HEADER(src/defines.h)
- 
- # We're just a few binaries...not worth doing shared by default?
diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch
deleted file mode 100644
index feda57bf3938..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNad passepartout-0.7.0~/src/ps/misc.cc passepartout-0.7.0/src/ps/misc.cc
---- passepartout-0.7.0~/src/ps/misc.cc	2007-06-13 13:05:07.000000000 +0200
-+++ passepartout-0.7.0/src/ps/misc.cc	2007-09-14 17:49:49.000000000 +0200
-@@ -3,6 +3,8 @@
- ///
- #include "misc.h"
- 
--std::ostream& PS::operator << (std::ostream& out, const PS::Concat& c) {
--  return out << '[' << c.matrix << "] concat\n";
-+namespace PS {
-+  std::ostream& operator << (std::ostream& out, const Concat& c) {
-+    return out << '[' << c.matrix << "] concat\n";
-+  }
- }
diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch
deleted file mode 100644
index 64703e164a47..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/src/fonts/afm.cc
-+++ b/src/fonts/afm.cc
-@@ -10,6 +10,8 @@
- #include "util/warning.h"
- #include "util/stringutil.h"
- 
-+#include <limits>
-+
- using std::string;
- 
- class font::AFMetrics::GlyphData {
---- a/src/fonts/fontmanager.cc
-+++ b/src/fonts/fontmanager.cc
-@@ -14,6 +14,8 @@
- #include "util/filesys.h"
- #include "util/warning.h"
- 
-+#include <memory>
-+
- font::FontManager* font::FontManager::_instance = 0;
- // StaticMutex can, unlike regular Mutex, be created before the call
- // to thread_init
---- a/src/pptout/document/rasterframe.cc
-+++ b/src/pptout/document/rasterframe.cc
-@@ -12,6 +12,8 @@
- #include "ps/misc.h"
- #include "pptout/config.h" // Todo
- 
-+#include <ctime>
-+
- RasterFrame::RasterFrame(const ElementWrap& xml, Group *parent)
-   : BasicFrame(xml, parent),
-     association(xml.get_filename("file")),
---- a/src/ps/encode.h
-+++ b/src/ps/encode.h
-@@ -8,6 +8,7 @@
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <cstring>
- 
- // Standard PostScript encoding filters
- 
---- a/src/ps/examinepdf.cc
-+++ b/src/ps/examinepdf.cc
-@@ -5,6 +5,7 @@
- #include <fstream>
- #include <cassert>		// Todo: other assert!
- #include <iostream>
-+#include <cstdlib>
- 
- void usage() {}
- 
---- a/src/ps/pdf.cc
-+++ b/src/ps/pdf.cc
-@@ -15,6 +15,7 @@
- #include <stdexcept>
- #include <glibmm/convert.h>
- #include <fstream>
-+#include <typeinfo>
- 
- 
- namespace {
---- a/src/util/filesys.cc
-+++ b/src/util/filesys.cc
-@@ -14,6 +14,9 @@
- #include <sys/types.h>
- #endif
- 
-+#include <cstring>
-+#include <stdlib.h>
-+
- using std::string;
- 
- ClibException::ClibException(const string& msg)
---- a/src/util/vector.h
-+++ b/src/util/vector.h
-@@ -5,6 +5,7 @@
- ///
- #include <algorithm> // max
- #include <cmath> // sqrt
-+#include <ostream>
- template<class C> C sqr(const C& c) { return c*c; }
- 
- template <class C>
---- a/src/util/tempfile.cc
-+++ b/src/util/tempfile.cc
-@@ -8,6 +8,9 @@
- #include <stdexcept>
- #include <unistd.h>
- 
-+#include <cstring>
-+#include <stdlib.h>
-+
- namespace {
-   std::string get_tmplate(std::string base) {
-     base += "XXXXXX";
diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch
deleted file mode 100644
index 97c9badfcb20..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From tbm@cyrius.com Sat Nov 08 17:07:16 2008
-Received: (at submit) by bugs.debian.org; 8 Nov 2008 17:07:16 +0000
-X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
-	(2007-08-08) on rietz.debian.org
-X-Spam-Level: 
-X-Spam-Bayes: score:0.0000 Tokens: new, 59; hammy, 151; neutral, 105; spammy,
-	0. spammytokens: hammytokens:0.000-+--libxml2, 0.000-+--amd64,
-	0.000-+--sk:libgnom, 0.000-+--Usertags, 0.000-+--H*r:1000
-X-Spam-Status: No, score�.8 required0 testsL,BAYES_00,HAS_PACKAGE,
-	MURPHY_DRUGS_REL8,WEIRD_PORT autolearn�m
-	version2.3-bugs.debian.org_2005_01_02
-Return-path: <tbm@cyrius.com>
-Received: from sorrow.cyrius.com ([65.19.161.204])
-	by rietz.debian.org with esmtp (Exim 4.63)
-	(envelope-from <tbm@cyrius.com>)
-	id 1KyrHH-0002u6-Vy
-	for submit@bugs.debian.org; Sat, 08 Nov 2008 17:07:16 +0000
-Received: by sorrow.cyrius.com (Postfix, from userid 10)
-	id 564C8D857; Sat,  8 Nov 2008 17:07:15 +0000 (UTC)
-Received: by deprecation.cyrius.com (Postfix, from userid 1000)
-	id 0F2C1150B58; Sat,  8 Nov 2008 18:06:54 +0100 (CET)
-Date: Sat, 8 Nov 2008 18:06:53 +0100
-From: Martin Michlmayr <tbm@cyrius.com>
-To: submit@bugs.debian.org
-Subject: FTBFS with GCC 4.4: missing #include
-Message-ID: <20081108170653.GD27323@deprecation.cyrius.com>
-References: <20081108132249.5332A460DB@em64t.snowman.net>
-MIME-Version: 1.0
-Content-Type: text/plain; charset-ascii
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-In-Reply-To: <20081108132249.5332A460DB@em64t.snowman.net>
-User-Agent: Mutt/1.5.18 (2008-05-17)
-Delivered-To: submit@bugs.debian.org
-
-Package: passepartout
-Version: 0.7.0-1.1
-User: debian-gcc@lists.debian.org
-Usertags: ftbfs-gcc-4.4
-Tags: patch
-
-Your package fails to build with the upcoming GCC 4.4.  Version 4.4
-has not been released yet but I'm building with a snapshot in order
-to find errors and give people an advance warning.
-
-GCC 4.4 cleaned up some more C++ headers.  You always have to #include
-headers directly and cannot rely for things to be included indirectly.
-
-You can reproduce this problem with gcc-snapshot from unstable.
-
-> Automatic build of passepartout_0.7.0-1.1 on em64t by sbuild/amd64 0.53
-...
-> if x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../src     -I/usr/include/libxml++-1.0 -I/usr/lib/libxml++-1.0/include -I/usr/include/libxml2   -D_REENTRANT -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0   -D_REENTRANT -I/usr/include/libgnomecanvasmm-2.6 -I/usr/lib/libgnomecanvasmm-2.6/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/libgnomecanvas-2.0 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0   -MT stringutil.o -MD -MP -MF ".deps/stringutil.Tpo" -c -o stringutil.o stringutil.cc; \
-> 	then mv -f ".deps/stringutil.Tpo" ".deps/stringutil.Po"; else rm -f ".deps/stringutil.Tpo"; exit 1; fi
-> In file included from stringutil.cc:4:
-> stringutil.h: In function 'C to(const std::string&)':
-> stringutil.h:25: error: 'EOF' was not declared in this scope
-> stringutil.cc: In function 'std::string to_roman(int)':
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> make[4]: *** [stringutil.o] Error 1
-> make[4]: Leaving directory `/build/tbm/passepartout-0.7.0/src/util'
-
---- src/util/stringutil.h~	2008-11-08 16:48:10.000000000 +0000
-+++ src/util/stringutil.h	2008-11-08 16:48:25.000000000 +0000
-@@ -4,6 +4,7 @@
- // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
- ///
- #include "typeinfo.h"
-+#include <cstdio>
- #include <string>
- #include <sstream>
- #include <stdexcept>
---- src/util/warning.cc~	2008-11-08 16:48:33.000000000 +0000
-+++ src/util/warning.cc	2008-11-08 16:48:43.000000000 +0000
-@@ -2,6 +2,7 @@
- // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
- ///
- #include "warning.h"
-+#include <cstdio>
- 
- class NullFdBuf : public std::streambuf {
- public:
---- src/util/filedescriptors.cc~	2008-11-08 16:49:15.000000000 +0000
-+++ src/util/filedescriptors.cc	2008-11-08 16:49:23.000000000 +0000
-@@ -5,6 +5,7 @@
- #include "filesys.h"
- #include <fcntl.h>
- #include <unistd.h>
-+#include <cstdio>
- 
- int
- filedesc::move(int to, int from) {
-
--- 
-Martin Michlmayr
-http://www.cyrius.com/
-
-
-
-
diff --git a/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch b/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch
deleted file mode 100644
index ac1b116fbdef..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/fonts/Makefile.am passepartout-0.7.0/src/fonts/Makefile.am
---- passepartout-0.7.0.orig/src/fonts/Makefile.am	2007-06-13 07:05:06.000000000 -0400
-+++ passepartout-0.7.0/src/fonts/Makefile.am	2007-08-07 19:11:04.000000000 -0400
-@@ -5,9 +5,9 @@
- 
- libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
- 
--libfonts_a_CXXFLAGS = -I$(top_srcdir)/src
-+libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
- 
- # for Glib::ustring
--libfonts_a_CXXFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
- 
- #libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
-\ No newline at end of file
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/Makefile.am passepartout-0.7.0/src/pptout/Makefile.am
---- passepartout-0.7.0.orig/src/pptout/Makefile.am	2007-07-26 07:31:05.000000000 -0400
-+++ passepartout-0.7.0/src/pptout/Makefile.am	2007-08-07 19:14:51.000000000 -0400
-@@ -32,10 +32,10 @@
- 		$(BUILT_SOURCES) \
- 		$(NULL)
- 
--passepartout_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
--	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
-+passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
- 
--passepartout_CXXFLAGS += -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
-+passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
-+	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
- 
- passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
- 		$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/document/Makefile.am passepartout-0.7.0/src/pptout/document/Makefile.am
---- passepartout-0.7.0.orig/src/pptout/document/Makefile.am	2007-06-13 07:05:06.000000000 -0400
-+++ passepartout-0.7.0/src/pptout/document/Makefile.am	2007-08-07 19:15:12.000000000 -0400
-@@ -10,6 +10,6 @@
- 	textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc	\
- 	loader.cc typesetterthread.cc
- 
--libdocument_a_CXXFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-+libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
- 
--libdocument_a_CXXFLAGS += -I$(top_srcdir)/src
-+libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/widget/Makefile.am passepartout-0.7.0/src/pptout/widget/Makefile.am
---- passepartout-0.7.0.orig/src/pptout/widget/Makefile.am	2007-06-14 06:17:20.000000000 -0400
-+++ passepartout-0.7.0/src/pptout/widget/Makefile.am	2007-08-07 19:29:32.000000000 -0400
-@@ -8,6 +8,6 @@
- 		dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc	\
- 		usererror.cc programs.cc zoomer.cc
- 
--libwidget_a_CXXFLAGS = $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-+libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
- 
--libwidget_a_CXXFLAGS += -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
-+libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/ps/Makefile.am passepartout-0.7.0/src/ps/Makefile.am
---- passepartout-0.7.0.orig/src/ps/Makefile.am	2007-06-13 07:48:09.000000000 -0400
-+++ passepartout-0.7.0/src/ps/Makefile.am	2007-08-07 19:26:30.000000000 -0400
-@@ -9,12 +9,12 @@
- 
- examinepdf_SOURCES = examinepdf.cc
- 
--# for Glib::ustring
--libps_a_CXXFLAGS = $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libps_a_CPPFLAGS = -I$(top_srcdir)/src
- 
--libps_a_CXXFLAGS += -I$(top_srcdir)/src
-+# for Glib::ustring
-+libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
- 
--examinepdf_CXXFLAGS = $(libps_a_CXXFLAGS)
-+examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
- examinepdf_LDADD = $(GTKMM_LIBS) \
- 	-L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
- examinepdf_DEPENDENCIES = libps.a
-@@ -24,8 +24,8 @@
- TESTS = runtest
- check_PROGRAMS = runtest
- runtest_SOURCES = test_glyphlist.cc
--runtest_CXXFLAGS = -I$(top_srcdir)/src
--runtest_CXXFLAGS += $(GTKMM_CFLAGS)
-+runtest_CPPFLAGS = -I$(top_srcdir)/src
-+runtest_CPPFLAGS += $(GTKMM_CFLAGS)
- runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
- runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
- 		$(GTKMM_LIBS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/testbed/Makefile.am passepartout-0.7.0/src/testbed/Makefile.am
---- passepartout-0.7.0.orig/src/testbed/Makefile.am	2007-06-13 07:05:07.000000000 -0400
-+++ passepartout-0.7.0/src/testbed/Makefile.am	2007-08-07 19:17:57.000000000 -0400
-@@ -4,8 +4,8 @@
- 
- libppttest_a_SOURCES = testbed.cc
- 
--libppttest_a_CXXFLAGS = -I$(top_srcdir)/src
-+libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
- 
- # Just because Glib::Exception is stupid and doesn't inherit the standard
- # exception the testbed has to know about glib!
--libppttest_a_CXXFLAGS += $(GTKMM_CFLAGS)
-+libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/util/Makefile.am passepartout-0.7.0/src/util/Makefile.am
---- passepartout-0.7.0.orig/src/util/Makefile.am	2007-06-14 06:12:42.000000000 -0400
-+++ passepartout-0.7.0/src/util/Makefile.am	2007-08-07 19:18:50.000000000 -0400
-@@ -12,12 +12,12 @@
- 	cmdline.cc xmlwrap.cc
- 
- # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
--CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
-+AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
- 
- TESTS =	runtest
- check_PROGRAMS = runtest
- runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
- 	test_boundary.cc test_procio.cc test_cmdline.cc
--runtest_CXXFLAGS = -I$(top_srcdir)/src
-+runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
- runtest_DEPENDENCIES = $(noinst_LIBRARIES)
- runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/xml2ps/Makefile.am passepartout-0.7.0/src/xml2ps/Makefile.am
---- passepartout-0.7.0.orig/src/xml2ps/Makefile.am	2007-06-22 12:07:26.000000000 -0400
-+++ passepartout-0.7.0/src/xml2ps/Makefile.am	2007-08-07 19:36:26.000000000 -0400
-@@ -13,12 +13,12 @@
- 
- xml2ps_SOURCES = main.cc
- 
--libxml2ps_a_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
--		$(GNOMECANVAS_CFLAGS)
-+libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
- 
--libxml2ps_a_CXXFLAGS += -I$(top_srcdir)/src
-+libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
-+		$(GNOMECANVAS_CFLAGS)
- 
--xml2ps_CXXFLAGS = $(libxml2ps_a_CXXFLAGS)
-+xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
- 
- xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
- 	libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a 
diff --git a/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch b/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch
deleted file mode 100644
index 418362c204e2..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-Index: trunk/src/ps/Makefile.am
-===================================================================
---- trunk/src/ps/Makefile.am	(revision 1530)
-+++ trunk/src/ps/Makefile.am	(working copy)
-@@ -1,31 +1,26 @@
- bin_PROGRAMS = examinepdf
--noinst_LIBRARIES = libps.a
-+noinst_LTLIBRARIES = libps.la
- 
- dist_noinst_HEADERS = encode.h pdf.h unicode.h pfb2pfa.h misc.h wineps.h \
- 		pdfparser.h type42.h
- 
--libps_a_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
-+libps_la_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
- 		wineps.cc pdfparser.cc type42.cc
- 
- examinepdf_SOURCES = examinepdf.cc
- 
--libps_a_CPPFLAGS = -I$(top_srcdir)/src
-+libps_la_LIBADD = ../fonts/libfonts.la
- 
- # for Glib::ustring
--libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libps_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
-+libps_la_LIBADD += $(GTKMM_LIBS)
- 
--examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
--examinepdf_LDADD = $(GTKMM_LIBS) \
--	-L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
--examinepdf_DEPENDENCIES = libps.a
-+examinepdf_CPPFLAGS = $(libps_la_CPPFLAGS)
-+examinepdf_LDADD = libps.la
- 
--#libps_a_LIBADD = $(GTKMM_LIBS)
--
- TESTS = runtest
- check_PROGRAMS = runtest
- runtest_SOURCES = test_glyphlist.cc
--runtest_CPPFLAGS = -I$(top_srcdir)/src
--runtest_CPPFLAGS += $(GTKMM_CFLAGS)
--runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
--runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
-+runtest_CPPFLAGS = $(GTKMM_CFLAGS)
-+runtest_LDADD = ../testbed/libppttest.la libps.la ../util/libpptutil.la \
- 		$(GTKMM_LIBS)
-Index: trunk/src/xml2ps/Makefile.am
-===================================================================
---- trunk/src/xml2ps/Makefile.am	(revision 1530)
-+++ trunk/src/xml2ps/Makefile.am	(working copy)
-@@ -1,28 +1,29 @@
- bin_PROGRAMS = xml2ps
- 
--noinst_LIBRARIES = libxml2ps.a
-+noinst_LTLIBRARIES = libxml2ps.la
- 
- dist_noinst_HEADERS = blockcontainer.hh boundaries.hh canvas.hh		\
- 		line.hh paragraph.hh typesetter.hh pagedstream.hh	\
- 		pdfcanvas.hh pscanvas.hh psstream.hh xly.hh xcanvas.hh
- 
--libxml2ps_a_SOURCES = paragraph.cc xly.cc typesetter.cc			\
-+libxml2ps_la_SOURCES = paragraph.cc xly.cc typesetter.cc			\
- 	  	blockcontainer.cc psstream.cc line.cc canvas.cc		\
- 	  	pagedstream.cc pscanvas.cc boundaries.cc pdfcanvas.cc	\
- 	  	xcanvas.cc
- 
- xml2ps_SOURCES = main.cc
- 
--libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
--
--libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
-+libxml2ps_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
- 		$(GNOMECANVAS_CFLAGS)
- 
--xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
-+libxml2ps_la_LIBADD =../util/libpptutil.la ../fonts/libfonts.la ../ps/libps.la \
-+		$(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
- 
--xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
--	libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a 
-+xml2ps_CPPFLAGS = $(libxml2ps_la_CPPFLAGS)
- 
-+xml2ps_LDADD = libxml2ps.la \
-+		$(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-+
- #install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac)
- dist_xml_DATA = xml2ps.dtd xhtml.xslt docbook.xslt
- 
-Index: trunk/src/fonts/Makefile.am
-===================================================================
---- trunk/src/fonts/Makefile.am	(revision 1530)
-+++ trunk/src/fonts/Makefile.am	(working copy)
-@@ -1,13 +1,15 @@
--noinst_LIBRARIES = libfonts.a
-+noinst_LTLIBRARIES = libfonts.la
- 
- dist_noinst_HEADERS = fontinfo.hh fontmanager.hh fontmetrics.hh afm.hh	\
- 		freetype.hh
- 
--libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
-+libfonts_la_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
- 
--libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
--
- # for Glib::ustring
--libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libfonts_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
- 
--#libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
-\ No newline at end of file
-+libfonts_la_LIBADD = ../util/libpptutil.la $(FREETYPE_LIBS) $(GTKMM_LIBS)
-+
-+# can't have explicit circular dependency, so rely on consumers
-+# to link against them and us
-+#libfonts_la_LIBADD += ../ps/libps.la
-Index: trunk/src/Makefile.am
-===================================================================
---- trunk/src/Makefile.am	(revision 1530)
-+++ trunk/src/Makefile.am	(working copy)
-@@ -1 +1 @@
--SUBDIRS = testbed util fonts ps xml2ps pptout 
-+SUBDIRS = util testbed fonts ps xml2ps pptout 
-Index: trunk/src/testbed/Makefile.am
-===================================================================
---- trunk/src/testbed/Makefile.am	(revision 1530)
-+++ trunk/src/testbed/Makefile.am	(working copy)
-@@ -1,11 +1,18 @@
--noinst_LIBRARIES = libppttest.a
-+noinst_LTLIBRARIES = libppttest.la
- 
- dist_noinst_HEADERS = testbed.hh
- 
--libppttest_a_SOURCES = testbed.cc
-+libppttest_la_SOURCES = testbed.cc
- 
--libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
--
- # Just because Glib::Exception is stupid and doesn't inherit the standard
- # exception the testbed has to know about glib!
--libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
-+libppttest_la_CPPFLAGS = $(GTKMM_CFLAGS)
-+
-+libppttest_la_LIBADD = ../util/libpptutil.la $(GTKMM_LIBS)
-+
-+TESTS =	runtest
-+check_PROGRAMS = runtest
-+runtest_SOURCES = ../util/test_stringutil.cc ../util/test_valuunit.cc ../util/test_matrix.cc \
-+	../util/test_boundary.cc ../util/test_procio.cc ../util/test_cmdline.cc
-+runtest_CPPFLAGS = $(GTKMM_CFLAGS)
-+runtest_LDADD = libppttest.la ../util/libpptutil.la $(GTKMM_LIBS)
-Index: trunk/src/pptout/widget/Makefile.am
-===================================================================
---- trunk/src/pptout/widget/Makefile.am	(revision 1530)
-+++ trunk/src/pptout/widget/Makefile.am	(working copy)
-@@ -1,13 +1,13 @@
--noinst_LIBRARIES = libwidget.a
-+noinst_LTLIBRARIES = libwidget.la
- 
- dist_noinst_HEADERS = spinner.h filesel.h imagefilesel.h dialogwrap.h	\
- 		subpanel.h wmisc.h errordialog.h usererror.h programs.h \
- 		zoomer.h
- 
--libwidget_a_SOURCES = spinner.cc filesel.cc imagefilesel.cc		\
-+libwidget_la_SOURCES = spinner.cc filesel.cc imagefilesel.cc		\
- 		dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc	\
- 		usererror.cc programs.cc zoomer.cc
- 
--libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
--
--libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-+libwidget_la_CPPFLAGS = -DDOCDIR=\"$(docdir)\"
-+libwidget_la_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-+libwidget_la_LIBADD = ../../util/libpptutil.la $(GTKMM_LDFLAGS) $(GNOMEVFS_LDFLAGS) $(GNOME_LDFLAGS)
-Index: trunk/src/pptout/document/Makefile.am
-===================================================================
---- trunk/src/pptout/document/Makefile.am	(revision 1530)
-+++ trunk/src/pptout/document/Makefile.am	(working copy)
-@@ -1,15 +1,18 @@
--noinst_LIBRARIES = libdocument.a
-+noinst_LTLIBRARIES = libdocument.la
- 
- dist_noinst_HEADERS = basicframe.h cachedframe.h document.h group.h	\
- 	imageframe.h page.h pagent.h rasterframe.h textframe.h		\
- 	textstream.h fileerrors.h paper_sizes.h getxsltparams.h		\
- 	loader.h filecontext.h typesetterthread.h
- 
--libdocument_a_SOURCES = basicframe.cc cachedframe.cc document.cc	\
-+libdocument_la_SOURCES = basicframe.cc cachedframe.cc document.cc	\
- 	group.cc imageframe.cc page.cc pagent.cc rasterframe.cc		\
- 	textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc	\
- 	loader.cc typesetterthread.cc
- 
--libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
-+libdocument_la_CPPFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
- 
--libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-+# can't get complete symbol resolution here...rasterframe.cc uses
-+# config() from ../passepartout-config.o but subdirs build before
-+# parent so cannot easily get it
-+libdocument_la_LIBADD = ../../util/libpptutil.la ../../ps/libps.la ../../xml2ps/libxml2ps.la ../widget/libwidget.la $(GTKMM_LIBS) $(XMLPP_LIBS)
-Index: trunk/src/pptout/Makefile.am
-===================================================================
---- trunk/src/pptout/Makefile.am	(revision 1530)
-+++ trunk/src/pptout/Makefile.am	(working copy)
-@@ -1,4 +1,4 @@
--SUBDIRS = document widget icons
-+SUBDIRS = widget document icons
- 
- EXTRA_DIST = NOTES
- 
-@@ -32,19 +32,19 @@
- 		$(BUILT_SOURCES) \
- 		$(NULL)
- 
--passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
-+passepartout_CPPFLAGS = -DXMLPATH=\"$(xmldir)\"
- 
- passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
- 	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
- 
--passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
--		$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
-+pptpartlibs= document/libdocument.la ../xml2ps/libxml2ps.la	\
-+	../fonts/libfonts.la ../ps/libps.la			\
-+	../util/libpptutil.la widget/libwidget.la
- 
--pptpartlibs= document/libdocument.a ../xml2ps/libxml2ps.a	\
--	../fonts/libfonts.a ../ps/libps.a			\
--	../util/libpptutil.a widget/libwidget.a
-+passepartout_LDADD = $(pptpartlibs)
- 
--passepartout_LDADD += $(pptpartlibs)
-+passepartout_LDADD += $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
-+		$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
- 
- # Extra dependencies for builddate, so it is rebuilt every time anything else
- # is rebuilt
-Index: trunk/src/util/Makefile.am
-===================================================================
---- trunk/src/util/Makefile.am	(revision 1530)
-+++ trunk/src/util/Makefile.am	(working copy)
-@@ -1,23 +1,17 @@
--noinst_LIBRARIES = libpptutil.a
-+noinst_LTLIBRARIES = libpptutil.la
- 
- dist_noinst_HEADERS = stringutil.h filesys.h warning.h os.h configfile.h \
- 	valueunit.h units.h refcount.h matrix.h boundary.h		 \
- 	rectboundary.h typeinfo.h barrier.h processman.h tempfile.h	 \
- 	filewatcher.h vector.h filedescriptors.h cmdline.h xmlwrap.h
- 
--libpptutil_a_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
-+libpptutil_la_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
- 	configfile.cc \
- 	matrix.cc boundary.cc rectboundary.cc typeinfo.cc barrier.cc \
- 	processman.cc tempfile.cc filewatcher.cc filedescriptors.cc 	\
- 	cmdline.cc xmlwrap.cc
- 
- # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
--AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
-+libpptutil_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
- 
--TESTS =	runtest
--check_PROGRAMS = runtest
--runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
--	test_boundary.cc test_procio.cc test_cmdline.cc
--runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
--runtest_DEPENDENCIES = $(noinst_LIBRARIES)
--runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-+libpptutil_la_LIBADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-Index: trunk/configure.ac
-===================================================================
---- trunk/configure.ac	(revision 1530)
-+++ trunk/configure.ac	(working copy)
-@@ -9,14 +9,16 @@
- AM_CONFIG_HEADER(src/defines.h)
- # AC_CONFIG_HEADER(src/defines.h)
- 
--# Define global compiler flags:
--MY_CXXFLAGS="-Wall"
--CXXFLAGS="$CXXFLAGS $MY_CXXFLAGS"
-+# We're just a few binaries...not worth doing shared by default?
-+AC_DISABLE_SHARED
- 
- # Checks for programs.
- AC_PROG_CXX
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
-+# Define global compiler flags:
-+CXXFLAGS="$CXXFLAGS -Wall"
-+
- # AC_APPLY_RPATH(LIBS)
- # --------------------
- # Add an -rpath linker option for each -L path in LIBS
diff --git a/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch b/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch
deleted file mode 100644
index 08151e6fe49f..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/configure.ac	2007/08/08 17:47:27	1527
-+++ trunk/configure.ac	2007/08/09 14:55:36	1529
-@@ -30,7 +30,7 @@
- # check for libxml++ 
- AC_SUBST([XMLPP_LIBS])
- AC_SUBST([XMLPP_CFLAGS])
--PKG_CHECK_MODULES([XMLPP], libxml++-1.0 >= 1.0)
-+PKG_CHECK_MODULES([XMLPP], libxml++-2.6 >= 1.0)
- AC_APPLY_RPATH([XMLPP_LIBS])
- 
- AC_SUBST([GTKMM_LIBS])
diff --git a/app-office/passepartout/files/passepartout-0.7.0-safer.patch b/app-office/passepartout/files/passepartout-0.7.0-safer.patch
deleted file mode 100644
index 4d0e48169c0e..000000000000
--- a/app-office/passepartout/files/passepartout-0.7.0-safer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/pptout/postscriptviewent.cc
-===================================================================
---- src/pptout/postscriptviewent.cc	(revision 1517)
-+++ src/pptout/postscriptviewent.cc	(arbetskopia)
-@@ -143,7 +143,7 @@
-     
-     std::ostringstream tmp;
-     tmp << psinterpreter //assuming it is ghostscript
--	<< " -q -dSAFER -dNOPAUSE -dBATCH"
-+	<< " -q -dSAFE -dNOPAUSE -dBATCH"
- 	<< " -sDEVICE=" << preferredDeviceName();
- 
-     // gs doesn't use fontconfig, so give font paths as parameters
diff --git a/app-office/passepartout/metadata.xml b/app-office/passepartout/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/app-office/passepartout/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-office/passepartout/passepartout-0.7.0-r1.ebuild b/app-office/passepartout/passepartout-0.7.0-r1.ebuild
deleted file mode 100644
index 233a8d612375..000000000000
--- a/app-office/passepartout/passepartout-0.7.0-r1.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=5
-inherit autotools base eutils gnome2 libtool
-
-DESCRIPTION="A DTP application for the X Window System"
-HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
-SRC_URI="mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2"
-
-IUSE="gnome"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPS="dev-cpp/libxmlpp:2.6
-	>=dev-libs/libxml2-2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	media-libs/freetype:2
-	virtual/fam
-	gnome? (
-			gnome-base/libgnome
-			gnome-base/gnome-vfs
-	)
-	"
-
-RDEPEND="${COMMON_DEPS}
-	dev-libs/libxslt
-	app-text/ghostscript-gpl"
-
-DEPEND="${COMMON_DEPS}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS BUGS NEWS README"
-
-# GCC-4.2 patch:
-# https://bugzilla.gnome.org/477017
-# GCC-4.3 patch:
-# Snatched from Debian
-# https://bugzilla.gnome.org/565131
-# include-flags:
-# https://bugzilla.gnome.org/464517
-# libtoolization:
-# https://bugzilla.gnome.org/464567
-# libxml-2.6:
-# https://bugzilla.gnome.org/449596
-
-# The include and libtoolization patches are needed for
-# forced as-needed to work.
-
-PATCHES=(
-		"${FILESDIR}/${P}-gcc42.patch"
-		"${FILESDIR}/${P}-gcc43.patch"
-		"${FILESDIR}/${P}-gcc44.patch"
-		"${FILESDIR}/${P}-include-flags.patch"
-		"${FILESDIR}/${P}-libtoolization.patch"
-		"${FILESDIR}/${P}-safer.patch"
-		"${FILESDIR}/${P}-libxmlpp-2.6-depend.patch"
-		"${FILESDIR}/${P}-automake-1.13.patch"
-	)
-
-src_unpack() {
-	base_src_unpack
-}
-
-src_prepare() {
-	gnome2_omf_fix
-	base_src_prepare
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	# Bug 367867: Broken AC_ARG_WITH
-	use gnome && G2CONF="--with-gnome"
-	gnome2_src_configure
-}
-
-src_compile() {
-	base_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	mv "${D}"/usr/share/doc/${PN}/* "${D}/usr/share/doc/${PF}" || die
-	rmdir "${D}"/usr/share/doc/${PN}/ || die
-	make_desktop_entry "/usr/bin/passepartout" "Passepartout DTP" "" "GNOME;Graphics"
-}
diff --git a/app-office/pinpoint/pinpoint-0.1.8.ebuild b/app-office/pinpoint/pinpoint-0.1.8.ebuild
index bb1445508d12..eb203e508a61 100644
--- a/app-office/pinpoint/pinpoint-0.1.8.ebuild
+++ b/app-office/pinpoint/pinpoint-0.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+gstreamer +pdf"
 
 # rsvg is used for svg-in-pdf -- clubbing it under pdf for now
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 70f48094e13e..a05535ccf190 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,3 @@
-DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
 DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
diff --git a/app-office/scribus/scribus-1.4.4-r1.ebuild b/app-office/scribus/scribus-1.4.4-r1.ebuild
deleted file mode 100644
index 0e6c5695d107..000000000000
--- a/app-office/scribus/scribus-1.4.4-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
-IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
-
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost
-	dev-libs/hyphen
-	dev-libs/libxml2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	cairo? ( x11-libs/cairo[X,svg] )
-	!cairo? ( media-libs/libart_lgpl )
-	hunspell? ( app-text/hunspell )
-	pdf? ( app-text/podofo )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-docs.patch
-	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
-	"${FILESDIR}"/${P}-ppc64-fpic.patch
-	)
-
-src_prepare() {
-	cat > cmake/modules/FindZLIB.cmake <<- EOF
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	rm scribus/{ioapi,unzip}.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		if use linguas_${lang}; then
-			langs+=",${lang}"
-		else
-			sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
-		fi
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_NORPATH=ON
-		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
-		-DWANT_GUI_LANG=${langs#,}
-		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want !cairo QTARTHUR)
-		$(cmake-utils_use_want debug DEBUG)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
-		$(cmake-utils_use_want hunspell HUNSPELL)
-		$(cmake-utils_use_want !examples NOEXAMPLES)
-		$(cmake-utils_use_want !templates NOTEMPLATES)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang file
-	for lang in ${IUSE_LINGUAS}; do
-		file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
-		if ! use linguas_${lang} && [[ -f "${file}" ]]; then
-			rm "${file}" || die
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	python_fix_shebang "${ED}"/usr/share/scribus/scripts
-	python_optimize "${ED}"/usr/share/scribus/scripts
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-	cat >> "${T}"/COPYING <<- EOF
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	doicon resources/icons/scribus.png
-	domenu scribus.desktop
-}
-
-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/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index e41e96c9ffc4..85396dc3a360 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
 IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 7498d2fd0fbd..e2b5bfcb729c 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,4 +1,2 @@
-DIST skrooge-1.10.0.tar.bz2 12813255 SHA256 aae15e7abf91a7fc217247d3ae5e672f4215a9090f12389cddab68fe5a175c67 SHA512 ff6137208aaacd01ee4f5a9897f69da1c40b168e9711479d0cc06c8e2f0880b5345d5f452ed5aaf53034bf773d06b7d8810166d751f10e9e90a1204429e0369a WHIRLPOOL 4f10e1f6825325f37e8154fb940df2cbea4b813c2c85a11520778b73d8d44435ccb87687139daa85a2a9d2df56c4beee777404f786df5815eef6ac6e0ed46598
 DIST skrooge-1.12.5.tar.xz 11727312 SHA256 8050f8aa767743edf6aad3b4c39bfd8962412e10d9c5578c02d0ce6306a8d3d6 SHA512 5612378a57872065c4ebfff0fabca74a9a0df116fc493643bc01a08c2627a8fb45025221ce5b2123b49d2daffa57ea543312192ecfe96aa3189db7ea4c07fe90 WHIRLPOOL ce99a61896d28699d66f9a17e3ccbccfde0d58cb9106b3919a219dd07a4d5650009e75a965600ec2444e51df43e0d918f1badf484d63b2353838fa490a98be52
-DIST skrooge-2.1.1.tar.xz 16928564 SHA256 4c7b82991b56d28274b7e00c2909009c858b43f489c401a46a2dca637caccd12 SHA512 97640b09d2f745dbd18cc6213b17216e63f783876fa480a0cd7f6a1062145b6a701d301d607d108caea4ae2475ed174f06f8552617b961e9985d2a268d47df7c WHIRLPOOL 2ed6d5810513bad8eac4ff6e7b7310d16f8d60b1eecbaa2f3098290cd8aeb3847a0c7e63baaf847adcce438623958a5ee8922264996da019822a106eb4014bf0
 DIST skrooge-2.2.0.tar.xz 16936804 SHA256 c711a63cff0874fdb0c9a1be954d6013dc77cafc30e779252fc50533ebae7eef SHA512 cf341b7d1e2302fbf8da569da42d9f26e0e5c8ce492ba41ffda27593a235d3e15037af9683b506450ebab12ab3129f83ddb4ac58d69b295e54ccb5eada3dfb1b WHIRLPOOL 881dfb2d7a987f51cd7d0819807de6380793f06a2a20e64da3e4e667410bde10c6d25fe53360d13fe03b297b30015dd2ac868af00a8132ed044c283a4a4566e2
diff --git a/app-office/skrooge/skrooge-1.10.0.ebuild b/app-office/skrooge/skrooge-1.10.0.ebuild
deleted file mode 100644
index 357111b2bb45..000000000000
--- a/app-office/skrooge/skrooge-1.10.0.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
-
-KDE_LINGUAS="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.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_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/skrooge/skrooge-1.12.5.ebuild b/app-office/skrooge/skrooge-1.12.5.ebuild
index a7199a3db227..a25ff172ca8a 100644
--- a/app-office/skrooge/skrooge-1.12.5.ebuild
+++ b/app-office/skrooge/skrooge-1.12.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-office/skrooge/skrooge-2.1.1.ebuild b/app-office/skrooge/skrooge-2.1.1.ebuild
deleted file mode 100644
index 491a4f542800..000000000000
--- a/app-office/skrooge/skrooge-2.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_GCC_MINIMAL="4.9"
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-IUSE="activities crypt ofx"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	app-crypt/qca:2[qt5]
-	dev-libs/grantlee:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( dev-db/sqlcipher )
-	!crypt? ( dev-db/sqlite:3 )
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/boost
-	dev-libs/libxslt
-	dev-libs/qjson
-	dev-qt/designer:5
-	dev-qt/qtnetwork:5
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-# upstream does not ship tests in releases
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	RESTRICT="test"
-fi
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_CIPHER=$(usex crypt)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 34710ee32896..f98ad53723f3 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,2 +1,3 @@
 DIST OOoFBTools-2.38.zip 4833754 SHA256 ee039cf7ae2767916cc79b25d5b852a54089773db458aa695b064e3d803da757 SHA512 2ff6bb251b5913cb7ceb430aba6ee47a5b2e2c7b78be8b291d67410903d3679ef8e01554f504cd86993fb717173d2a9c4080b5059f3e1064be075e67766c07d5 WHIRLPOOL 52fcd3bc82eab952080c6e1b18ed12b1568e4dd7299b55b2433efc8f5420f304ae32bbc3a9fe191c9a614f42aa5e04da976758cf9262e94adc238b887d6ecb9e
 DIST OOoFBTools-2.39.zip 4835702 SHA256 cff2a0ab17e4c77a7f3411007a5adf43144088e576f06ac49910419b2ca8e3c0 SHA512 95e66ba9f788902fa54e1c11d867c5e71b0280442fd5f1b75d1b524f24cf34fa2a270b68ebe30676fe5c4edb02033c7de59810ee96d4682bf68d231e8b277117 WHIRLPOOL 14d44d11806b3c717f1fa4e8d2d7fd319cd0fdbe2c2f5cbffdfbe5ef4fbe73e6fdea903a9e4428b3f02ef7b56d9f7b218ab830aecc5ae0f15a18b6898c0cec6c
+DIST OOoFBTools-2.42.zip 4837516 SHA256 c31a73a862734395a4c6ad45e3ff5aa36d0ec5acfd26d6d3e1c27de4ce7c24fc SHA512 a6945dd003c1b6a5be77c224e47d7b30b54ce28ea4a1aeada71ed401a0a6e9afacc08394da908d1f2765e8f4766e55479ed51a98067829bde950732ab27df302 WHIRLPOOL 5f9744331dd0d269b3ac1b6cce29316b7623fe719bd2d685ca75d2a021930d1fdd6c2b657597b69ead86814372da3f74ff342a19f2d0803e2af3acce93c9f872
diff --git a/app-officeext/ooofbtools/ooofbtools-2.42.ebuild b/app-officeext/ooofbtools/ooofbtools-2.42.ebuild
new file mode 100644
index 000000000000..c76b234fb329
--- /dev/null
+++ b/app-officeext/ooofbtools/ooofbtools-2.42.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="OOoFBTools"
+
+OFFICE_EXTENSIONS=(
+	"${MY_PN}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
+HOMEPAGE="https://sourceforge.net/projects/fbtools/"
+SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libxml2"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+OFFICE_EXTENSIONS_LOCATION="${S}"
+
+src_prepare() {
+	# Remove Windows cruft
+	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null || die
+	rm -r win32 || die
+	popd 2>/dev/null || die
+}
+
+src_install() {
+	office-ext-r1_src_install
+	dodoc ChangeLog*
+}
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild
index 09e88fbcdc64..0e72f701fc46 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit bash-completion-r1 eutils gnome2-utils udev
+inherit bash-completion-r1 eutils flag-o-matic gnome2-utils udev
 
 DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices"
 HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch
+
+	append-cxxflags -std=c++11
+
 	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
 	sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die
 }
diff --git a/app-pda/barry/files/barry-0.18.4-shared_ptr.patch b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch
new file mode 100644
index 000000000000..dbccfe66ea21
--- /dev/null
+++ b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch
@@ -0,0 +1,25 @@
+With -std=c++-11 shared_ptr is available in the standard library so pulling in
+the std::tr1 namespace creates an ambiguous reference.  Simple fix is to stop
+doing that but isn't backwards compatible.  We don't care in Gentoo since we'll
+always be building barry with -std=c++11 due to libsigc++ abi compatibility.
+
+--- a/tools/bio.cc
++++ b/tools/bio.cc
+@@ -42,7 +42,6 @@
+ #include "i18n.h"
+ 
+ using namespace std;
+-using namespace std::tr1;
+ using namespace Barry;
+ 
+ // keeping a record of all the -i device / -o device pin numbers, so
+--- a/tools/btool.cc
++++ b/tools/btool.cc
+@@ -59,7 +59,6 @@
+ #include "barrygetopt.h"
+ 
+ using namespace std;
+-using namespace std::tr1;
+ using namespace Barry;
+ 
+ std::map<std::string, std::string> SortKeys;
diff --git a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
index 821c39cbdb00..996c6c8f05ba 100644
--- a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
+++ b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="colordiff libressl"
 
 RDEPEND=">=dev-libs/glib-2.6
 		sys-libs/ncurses:0
-		libressl? ( dev-libs/openssl:0 )
+		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
 		colordiff? ( app-misc/colordiff )"
 DEPEND="virtual/pkgconfig
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
index cc21a73933a2..78dd0a62661c 100644
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.awk
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
@@ -379,9 +379,9 @@ function handle_footer() {
 #
 BEGIN {
 	state = "header"
-	if (PORTDIR == "")
-		PORTDIR = "/usr/portage"
-	eclassdir = PORTDIR "/eclass"
+	if (ECLASSDIR == "")
+		ECLASSDIR = "/usr/portage/eclass"
+	eclassdir = ECLASSDIR
 	reporting_bugs = "Please report bugs via http://bugs.gentoo.org/"
 	vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@"
 }
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
index d41de426debd..7706afa7ae67 100755
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.sh
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
@@ -26,6 +26,7 @@ ret=0
 for e in "$@" ; do
 	set -- \
 	${AWK} \
+		-vECLASSDIR="${ECLASSDIR}" \
 		-vPORTDIR="${PORTDIR}" \
 		-f "${FILESDIR}"/eclass-to-manpage.awk \
 		${e}
diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml
index 40f2050c6fc0..5b81642e9ecb 100644
--- a/app-portage/eclass-manpages/metadata.xml
+++ b/app-portage/eclass-manpages/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="person">
 		<email>vapier@gentoo.org</email>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
diff --git a/app-portage/eix/eix-0.31.7-r1.ebuild b/app-portage/eix/eix-0.31.7-r1.ebuild
new file mode 100644
index 000000000000..1a2a236e9aab
--- /dev/null
+++ b/app-portage/eix/eix-0.31.7-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit bash-completion-r1 l10n systemd
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools"
+
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${BOTHDEPEND}
+	app-shells/push"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	case " ${REPLACING_VERSIONS}" in
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+		local eixcache="${EROOT}/var/cache/${PN}"
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
+	esac
+}
+
+src_prepare() {
+	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-security) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_enable swap-remote) \
+		$(use_with prefix always-accept-keywords) \
+		$(use_with dep dep-default) \
+		$(use_with required-use required-use-default) \
+		--with-zsh-completion \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+}
+
+pkg_postinst() {
+	test -d "${EROOT}var/cache/${PN}" || {
+		mkdir "${EROOT}var/cache/${PN}"
+		use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+	}
+	local obs="${EROOT}var/cache/eix.previous"
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
+
+pkg_postrm() {
+	[ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
+}
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index d8a04e9dd9d5..922154261b94 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="dep">Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory.</flag>
     <flag name="doc">Create description of the eix cache file additionally in html format</flag>
     <flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
+    <flag name="required-use">Make REQUIRED_USE=true the default which enables support for REQUIRED_USE but requires more disk and memory.</flag>
     <flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.</flag>
     <flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
     <flag name="strong-security">Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.</flag>
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index bb8a945d0763..1cf13f987eb6 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,2 +1,3 @@
 DIST grs-0.3.tar.gz 34173 SHA256 445af2f267df936b4a06fdcb17e2a28dafd6eed8d52a8ff69ada622cedd8699d SHA512 710ea986ab55eabed5b774e850854ee36e600d378dd17a2d62cce67132695ecadea01b15ffaed750bb33a6f31e49989952425b7602808f65574ac506da1773fa WHIRLPOOL f5632d5562d6cb66b8111c35c5d5b57e0710d01d679d9c802182d18e2ddee0af7fe058a1275ca45c097fefdb1419943c638fdfe93110639cf299fd1c0df5b83d
 DIST grs-0.4.tar.gz 34212 SHA256 a069b51258fa9dbe8158ebe7339967c588360037a405bb9600ca69f3f18bb0d2 SHA512 e24879aabf7d9d029f584693dcb5e6578d5e14ab9e2588143883b7a27174184a2e2c30d08bf140a1bb45b7ab80c10e73f5ccf96de0bea8185d326ce0ce83fa11 WHIRLPOOL 4a6389efeec00a71f457a5d1087758ebd590aa4546a1c36e37de33a0aae34c7e42cd591795ad3b4a232c5e85511f4d42173fdcb6dbbc7fbb55a89490632e0f30
+DIST grs-0.5.tar.gz 34213 SHA256 8442d68d680665fcf3700add714503929d04cd435ebd487529a2555518bc8825 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f WHIRLPOOL e99c2278a71f8285028699c7e961f27f94bf52189a2de3ea38d07514101fdc45be4b6261c5ea35429afd5acf9e06c4bd7a910df72c82b877e7d324cdb27c7d47
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
new file mode 100644
index 000000000000..901f63a735d6
--- /dev/null
+++ b/app-portage/grs/grs-0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit linux-info
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-arch/tar[xattr]
+	app-crypt/md5deep
+	dev-libs/libcgroup
+	dev-vcs/git
+	net-misc/rsync
+	sys-apps/portage
+	sys-fs/squashfs-tools
+	virtual/cdrtools
+	|| (
+		sys-kernel/genkernel
+		sys-kernel/genkernel-next
+	)"
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+	linux-info_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
+	doenvd "${T}"/20grs
+}
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 7eb8426470ad..901f63a735d6 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
+inherit linux-info
+
 PYTHON_COMPAT=( python3_4 )
 
 inherit distutils-r1
@@ -38,6 +40,12 @@ RDEPEND="
 		sys-kernel/genkernel-next
 	)"
 
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+	linux-info_pkg_setup
+}
+
 src_install() {
 	distutils-r1_src_install
 	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
diff --git a/app-portage/maintainer-helper/Manifest b/app-portage/maintainer-helper/Manifest
deleted file mode 100644
index 0d310dea00a6..000000000000
--- a/app-portage/maintainer-helper/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maintainer-helper-0.1.2.tar.bz2 99698 SHA256 820213b6699f5c19df8a0e69537e9197947021c55f9843e3061322e27a678b97 SHA512 a33418ff84290d1d7deed789f3a45c8d9d635f06a69257713b37983158c363c631002d85a68dbfccf94df400cf04059eba670e115aa474ee8ec0474627a58343 WHIRLPOOL 46438c70f0a1d595188a0643b5eac9e6c7af390b013058f5fd6e3f12ade8cdf62c6b67cb6688736162af88370f18701a80661d0bf638c3cd6f665a94cc8588ee
diff --git a/app-portage/maintainer-helper/maintainer-helper-0.1.2-r1.ebuild b/app-portage/maintainer-helper/maintainer-helper-0.1.2-r1.ebuild
deleted file mode 100644
index ea049277e3d9..000000000000
--- a/app-portage/maintainer-helper/maintainer-helper-0.1.2-r1.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"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An application to help with ebuild maintenance"
-HOMEPAGE="https://dev.gentoo.org/~jokey/maintainer-helper"
-SRC_URI="https://dev.gentoo.org/~jokey/maintainer-helper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-qt/qtgui:4
-	>=dev-python/PyQt4-4.2[X,${PYTHON_USEDEP}]
-	>=sys-apps/pkgcore-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.1_rc2[${PYTHON_USEDEP}]"
-
-python_postinst() {
-	elog "Currently gvim is hardcoded as editor, to change it, edit"
-	elog "$(python_get_sitedir)/maintainer_helper/backend/tasks.py"
-	elog "It will be a real setting in the next version"
-}
-
-pkg_postinst() { python_foreach_impl python_postinst; }
diff --git a/app-portage/maintainer-helper/maintainer-helper-0.1.2.ebuild b/app-portage/maintainer-helper/maintainer-helper-0.1.2.ebuild
deleted file mode 100644
index 048c1e452e3d..000000000000
--- a/app-portage/maintainer-helper/maintainer-helper-0.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="An application to help with ebuild maintenance"
-HOMEPAGE="https://dev.gentoo.org/~jokey/maintainer-helper"
-SRC_URI="https://dev.gentoo.org/~jokey/maintainer-helper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-qt/qtgui:4
-	>=dev-python/PyQt4-4.2[X]
-	>=sys-apps/pkgcore-0.3.1
-	>=dev-python/snakeoil-0.1_rc2"
-
-PYTHON_MODNAME="maintainer_helper"
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	elog "Currently gvim is hardcoded as editor, to change it, edit"
-	elog "${EROOT}$(python_get_sitedir -b -f)/maintainer_helper/backend/tasks.py"
-	elog "It will be a real setting in the next version"
-}
diff --git a/app-portage/maintainer-helper/metadata.xml b/app-portage/maintainer-helper/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/app-portage/maintainer-helper/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 59601888da74..44c61e61d4c5 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,2 +1,3 @@
 DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c
 DIST metagen-0.6.3.tar.bz2 6118 SHA256 655253786c3dafe2426a61d8585acfbbd4a560e0a2609331e230c72699b10494 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd WHIRLPOOL 5e0c594ad728b6646a324d7c8115ad19f15304baad1922fb45e96a771355092e43ba3ae98f0f44e87f2c8e9d74af5ee75c09e86472329e1497dd81959467f927
+DIST metagen-0.6.4.2.tar.bz2 6837 SHA256 b048deace35579b7cc2d7c6eb39aa869369e932220c2a3d3d01ca378b4baa18c SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c WHIRLPOOL 6d5d99a75300858f8ddf947c698109f98355a34db805395bad4211212ef11ce40455ab45174d3adc8faafe18374ac71fe6ff8c43f6db94c75c0ec353df6e44ac
diff --git a/app-portage/metagen/metagen-0.6.4.2.ebuild b/app-portage/metagen/metagen-0.6.4.2.ebuild
new file mode 100644
index 000000000000..a799b6a289c8
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 12cb639bb987..142629cd68c6 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,4 @@
 DIST portage-utils-0.56.tar.xz 513832 SHA256 4df7323fb2667dd9bcee0f2d169c01ed8600aa6196118e6cd3a10cfe99852bbf SHA512 f2136a7df4cd91499b135fbf000f81a71177d5a39b4da2db484ab0f9492d152eaa72a5fee0e56d4b58611462e251905e554f5e41890a749f05d19e50c16c77b6 WHIRLPOOL af0a96ca3bf2dd39335317829aa8aff110a63042c415368400977e974cc21163da7eb76f7d53fcd05e133fd8a8568255ba022a32f1b174bda0dcb15b5f1476b9
 DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d
 DIST portage-utils-0.61.tar.xz 526588 SHA256 9c8942529dcfd9ee5798ab6a61fd0e8d1cc42645cbf4aeeefdb2d18a13076787 SHA512 0d09901f9d0213ef4d3d1b8961185d5f748d46a06663312f382f33e39fd9d94adc97660a11f482f3c9eb771e0f4e6bfc877390e002e7c0455c9e5ad8ebf1a7a2 WHIRLPOOL 0dcce5a46bd53b39c49edecdc35b64d79d83f06a136d773808270d685895e6bcb0669ce2689c39eeccb3f3f97cb7723b58317c34865aa80605af8b88f1d44280
+DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891
diff --git a/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch b/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
new file mode 100644
index 000000000000..8bcc9c1b0bad
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
@@ -0,0 +1,27 @@
+qcache: work around missing d_type/DT_DIR
+
+--- qcache.c
++++ qcache.c
+@@ -750,13 +750,21 @@
+ 
+ 		xasprintf(&catpath, "%s/dep/%s", portedb, data->overlay);
+ 		dir = opendir(catpath);
+-		while ((de = readdir(dir)))
++		while ((de = readdir(dir))) {
++#ifndef DT_DIR
++			struct stat s;
++			if (stat(de->d_name, &s))
++				continue;
++			if (S_ISDIR(s.st_mode) && de->d_name[0] != '.') {
++#else
+ 			if (de->d_type == DT_DIR && de->d_name[0] != '.') {
++#endif
+ 				bool ok;
+ 				allcats = add_set_unique(de->d_name, allcats, &ok);
+ 				if (ok)
+ 					++numcat;
+ 			}
++		}
+ 		closedir(dir);
+ 		free(catpath);
+ 
diff --git a/app-portage/portage-utils/portage-utils-0.61.ebuild b/app-portage/portage-utils/portage-utils-0.61.ebuild
index 205874bdf8b9..1b2667911661 100644
--- a/app-portage/portage-utils/portage-utils-0.61.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.61.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	static? ( dev-libs/iniparser:0[static-libs] )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-solaris.patch
 	epatch_user
 }
 
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
new file mode 100644
index 000000000000..205874bdf8b9
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.62.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf --with-eprefix="${EPREFIX}"
+	else
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake NLS=$(usex nls)
+}
+
+src_install() {
+	default
+
+	exeinto /etc/portage/bin
+	doexe "${FILESDIR}"/post_sync
+	insinto /etc/portage/postsync.d
+	doins "${FILESDIR}"/q-reinitialize
+
+	# Portage fixes shebangs, we just need to fix the paths in the files
+	sed -i \
+		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
+		"${ED}"/etc/portage/bin/post_sync \
+		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
+}
+
+pkg_preinst() {
+	# preserve +x bit on postsync files #301721
+	local x
+	pushd "${ED}" >/dev/null
+	for x in etc/portage/postsync.d/* ; do
+		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
+	done
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
+		elog "If you wish for it to be automatically run at the end of every --sync:"
+		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
+		elog "Normally this should only take a few seconds to run but file systems"
+		elog "such as ext3 can take a lot longer.  To disable, simply do:"
+		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
+	fi
+}
diff --git a/app-shells/autojump/autojump-22.2.4-r3.ebuild b/app-shells/autojump/autojump-22.2.4-r3.ebuild
deleted file mode 100644
index 4b774f949857..000000000000
--- a/app-shells/autojump/autojump-22.2.4-r3.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
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 python-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="python test"
-
-# Not all tests pass. Need investigation.
-RESTRICT="test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="test? ( dev-python/flake8 dev-python/tox )"
-
-src_prepare() {
-	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
-		-e "s:/usr/local/share:/usr/share:" \
-		-i bin/autojump.sh || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin bin/autojump
-
-	insinto /etc/profile.d
-	doins bin/"${PN}".sh
-
-	insinto /usr/share/"${PN}"/
-	doins bin/"${PN}.bash"
-	doins bin/"${PN}.zsh"
-	insinto /usr/share/zsh/site-functions
-	doins bin/_j
-
-	python_foreach_impl python_domodule bin/autojump_argparse.py bin/autojump_data.py bin/autojump_utils.py
-	if use python; then
-		python_foreach_impl python_domodule tools/autojump_ipython.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/autojump/autojump-22.2.4-r4.ebuild b/app-shells/autojump/autojump-22.2.4-r4.ebuild
index 84bf29112be3..8ba85aaf46a4 100644
--- a/app-shells/autojump/autojump-22.2.4-r4.ebuild
+++ b/app-shells/autojump/autojump-22.2.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> $
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="ipython test"
 
 # Not all tests pass. Need investigation.
@@ -22,6 +22,11 @@ RESTRICT="test"
 RDEPEND="ipython? ( ${PYTHON_DEPS} )"
 DEPEND="test? ( dev-python/flake8 dev-python/tox )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-autojump.fish-bugs.patch"
+	"${FILESDIR}/${P}-fix-__aj_error-typo.patch"
+)
+
 src_prepare() {
 	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
 		-e "s:/usr/local/share:/usr/share:" \
@@ -33,8 +38,7 @@ src_prepare() {
 
 	# upstream fixes to the autojump.fish script; the first patch is needed for
 	# the second patch to apply
-	epatch "${FILESDIR}/autojump-22.4.4-fix-autojump.fish-bugs.patch"
-	epatch "${FILESDIR}/autojump-22.4.4-fix-__aj_error-typo.patch"
+	epatch "${PATCHES[@]}"
 }
 
 src_compile() {
@@ -42,8 +46,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin bin/autojump
-	python_replicate_script "${ED}"/usr/bin/autojump
+	dobin bin/"${PN}"
+	python_replicate_script "${ED}"/usr/bin/"${PN}"
 
 	insinto /etc/profile.d
 	doins bin/"${PN}".sh
diff --git a/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch b/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch
deleted file mode 100644
index a16fc2d4dcf2..000000000000
--- a/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- autojump-21.3.0/bin/autojump.sh
-+++ autojump-21.3.0/bin/autojump.sh
-@@ -1,17 +1,17 @@
- # source autojump on BASH or ZSH depending on the shell
- 
- shell=`echo ${SHELL} | awk -F/ '{ print $NF }'`
--
--# check local install
--if [ -s ~/.autojump/etc/profile.d/autojump.${shell} ]; then
--	source ~/.autojump/etc/profile.d/autojump.${shell}
--
--# check global install
--elif [ -s /etc/profile.d/autojump.${shell} ]; then
--	source /etc/profile.d/autojump.${shell}
--
--# check custom install locations (modified by Homebrew or using --destdir option)
--elif [ -s custom_install/autojump.${shell} ]; then
--	source custom_install/autojump.${shell}
--
--fi
-+case ${shell} in
-+	bash|zsh)
-+		# check local install
-+		if [ -s ~/.autojump/etc/profile.d/autojump.${shell} ]; then
-+			source ~/.autojump/etc/profile.d/autojump.${shell}
-+		# check global install
-+		elif [ -s "${EPREFIX}"/etc/profile.d/autojump.${shell} ]; then
-+			source "${EPREFIX}"/etc/profile.d/autojump.${shell}
-+		fi
-+		;;
-+	*)
-+		echo "Your shell ${shell} (from SHELL=${SHELL}) is unkown."
-+		;;
-+esac
diff --git a/app-shells/autojump/files/autojump-22.4.4-fix-__aj_error-typo.patch b/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch
index 6a9ac3c83c8e..6a9ac3c83c8e 100644
--- a/app-shells/autojump/files/autojump-22.4.4-fix-__aj_error-typo.patch
+++ b/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch
diff --git a/app-shells/autojump/files/autojump-22.4.4-fix-autojump.fish-bugs.patch b/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch
index 6048ca989376..6048ca989376 100644
--- a/app-shells/autojump/files/autojump-22.4.4-fix-autojump.fish-bugs.patch
+++ b/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 122e9b0264e7..517a2b342068 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,4 +2,5 @@ DIST bash-completion-1.3.tar.bz2 211899 SHA256 8ebe30579f0f3e1a521013bcdd1831936
 DIST bash-completion-2.1.tar.bz2 265329 SHA256 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f SHA512 0bc71039ef136b1ccb72527eb40f2ed4068a58dc31b1ac1ee52a40e7c950ea4cfbb4f1bee2f0da6774e56062578fa3653096e6d306eea7f028dd55ff737e92fe WHIRLPOOL 0275d8ac99a0ac5b12637bf2b13561d656b239ba7c166071cb283a481df2fdd904ad1c18608ea35b9af4f0f4db3b034f833f0fd586a0096626d1b268bcd8fc00
 DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba
 DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250
+DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585
 DIST bashcomp2-pre1.tar.gz 3732 SHA256 fd201638bae06f134c243887cafe402ef0a21f9e62cca3966f405c249abc9eec SHA512 745801fe20c846cb0cdb044d712caacd75a2902c9dddc2261bdb179dcd826e5d1032d6b1f73340abe74dbb82d29b4386897291ccdf45d9bbd1fdb80a5f79fa45 WHIRLPOOL eb529c7263653b3e3e36c0cf29d44c57ce64bb2144f06ff7f2df569dd2ae66eb135b2ace5542c37cb100da8b3562b32ab61bcd9f5fd3cfbf67febf5e5086e04a
diff --git a/app-shells/bash-completion/bash-completion-2.1_p20141224-r2.ebuild b/app-shells/bash-completion/bash-completion-2.1_p20141224-r2.ebuild
new file mode 100644
index 000000000000..846afc842d65
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.1_p20141224-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BASHCOMP_P=bashcomp-2.0.2
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="http://bash-completion.alioth.debian.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz
+	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp"
+DEPEND="app-arch/xz-utils"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Slackware package stuff, quite generic names cause collisions
+	# (e.g. with sys-apps/pacman)
+	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+	# Debian/Red Hat network stuff
+	ifdown ifup ifstatus
+
+	# Installed in app-editors/vim-core
+	xxd
+
+	# Now-dead symlinks to deprecated completions
+	hd ncal
+)
+
+src_prepare() {
+	epatch "${WORKDIR}/${BASHCOMP_P}/${P}"-*.patch
+	# Bug 543100
+	epatch "${FILESDIR}/${PN}-2.1-escape-characters.patch"
+}
+
+src_test() { :; } # Skip testsuite because of interactive shell wrt #477066
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+	dodoc AUTHORS CHANGES README
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.1-r90 ${v}; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 0e220a7b6667..87ebc09ca674 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -6,7 +6,7 @@ DIST bash-4.0.tar.gz 6230779 SHA256 9793d394f640a95030c77d5ac989724afe196921956d
 DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f
 DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a
 DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
-DIST bash-4.4-beta.tar.gz 8568112 SHA256 8273c415b70260baaf7a9fdc9632451cd3987718fd054ee7ee13d7613808d231 SHA512 b08f56cae711490fa306edeae1043c168a09bf7ff53b7f86c22b426d4dd4498599e8739a999efb5782dccf2fa7d0d38030707e0b67f7cb6135893d77c54a2c87 WHIRLPOOL 23de236064b3691d94370ad8ff70a80b2648ba16d89a79cf224291425b83246fd0edd122e51ccf158ffa7e78738fe0df0894a906106dd59137bdfa28a79d4816
+DIST bash-4.4-rc1.tar.gz 8856234 SHA256 54838ce0e9db6a8920d4c9f6563fd74dac45d3d3c14c8df4cf7ceb68a91e244b SHA512 14862599fc5cdfae00ba9e5a047bf9321e89276a1879a6334fd9c9bd43597ecb48b568f1bd17f3be8bef0a0f572fc63edddec31b106e81c0552127970a069a7b WHIRLPOOL 3623014c39333d12a61e0d32e42ef246b4869b72ad3d6bfb9dd523832a3578056376ce37c795a71bb5bb8e9999aab59773b74a109163f0e1876daf61e3d15363
 DIST bash205b-001 1132 SHA256 bf7a055e0916b7899e7429e36e35d009db445b942b34520a601ea5a8fa634fdd SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071 WHIRLPOOL 90ba36843bbf2e0b7279d3bd197ddaa04e03e113be32051e5a77280cda6d43dcbf339780c57322fc0835a54c82e0095f0d3f2a13f13fec8c0b8da38e7e9b253a
 DIST bash205b-002 755 SHA256 affdd1808a6262fbfe291ebffa2133b05e4bb46067a90e3329d5741e10f0587b SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883 WHIRLPOOL 7333910e98e517306077937881d4c5569ddd85552203b3ec833f0fda13822e388ce85f007d60e4ab4b1ef15abb66fa40dc4356ca01367463d179a6a23bcff8e7
 DIST bash205b-003 2356 SHA256 604972eaafe69f44413d429e0a826b0eae209ca74b14eeeccdf0d502bbabb340 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399 WHIRLPOOL 7ce09fb66d32f3aebda7fb2be66179daab033b4c08ea51c744148051b47e7effc2451971efeb14d6a403c48c5c46c2ac0a4585159f8115ec40b2bfa89f98317f
diff --git a/app-shells/bash/bash-4.4_beta.ebuild b/app-shells/bash/bash-4.4_beta.ebuild
deleted file mode 100644
index 402869406034..000000000000
--- a/app-shells/bash/bash-4.4_beta.ebuild
+++ /dev/null
@@ -1,245 +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 toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="7.0_beta"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-case ${PV} in
-*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
-*) SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" ;;
-esac
-
-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="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0=
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if [[ ${PV} != *_rc* ]] ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "${FILESDIR}"/bashrc
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-4.4_rc1.ebuild b/app-shells/bash/bash-4.4_rc1.ebuild
new file mode 100644
index 000000000000..556e9dd24a8c
--- /dev/null
+++ b/app-shells/bash/bash-4.4_rc1.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="7.0_beta"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+case ${PV} in
+*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
+*) SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" ;;
+esac
+
+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="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2:0=
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5"
+# we only need yacc when the .y files get patched (bash42-005)
+DEPEND+=" virtual/yacc"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if [[ ${PV} != *_rc* ]] ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if [[ ${PV} != *_rc* ]] ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--htmldir='$(docdir)/html' \
+		--with-curses \
+		$(use_with afs) \
+		$(use_enable net net-redirections) \
+		--disable-profiling \
+		$(use_enable mem-scramble) \
+		$(use_with mem-scramble bash-malloc) \
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "${FILESDIR}"/bashrc
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index c9413d579a6f..1cd9f2f3ccf5 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1 +1,2 @@
+DIST posh_0.12.6.tar.xz 268872 SHA256 32d00153b448df535fd095d768db2771794bfc54002efd711abc48a40481170d SHA512 2b862264dd13c840facb158f1e2731dd1f11c7a567308feb6bd80fd5a7ea4d8e383cc13a0819f90da5fdad70d0adcc81e5adf2bd69a7a171e2e874f82509123c WHIRLPOOL 201e99e5ba990fa800c3c141872b3a332ff67051abd2f64e8b693b894050780d9cb196804678dd73896585f170b28147092a2bbd85a2028a6a6044ef9a140130
 DIST posh_0.12.tar.gz 469680 SHA256 9206b67005cf357404b3f3021c2d7c7bbd50756050512dececb9ed836435b048 SHA512 bb98d2fa009b5ccd666103378dd30da5649baf830d4e3124575f813b98b13275bde46e03bb737c75b37c82f655b3f17e9a5decd29b75d20678e78a4d7e3abf00 WHIRLPOOL ffd03e1537aa8e68545c532fb8c27fc9702ab16157efce7ef5c83b6f70fbe1a807e4759b85525036ae0c26f56b595ccf95d9cffb8a96b4ef8e5a8ec4b50c60e6
diff --git a/app-shells/posh/posh-0.12.6.ebuild b/app-shells/posh/posh-0.12.6.ebuild
new file mode 100644
index 000000000000..511eff566c91
--- /dev/null
+++ b/app-shells/posh/posh-0.12.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
+HOMEPAGE="http://packages.debian.org/posh"
+SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+S=${WORKDIR}/posh
+
+src_configure() {
+	local myconf=(
+		--exec-prefix=/
+	)
+	econf "${myconf[@]}"
+}
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 036503c4e42f..f14f84c10a42 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,2 +1,2 @@
-DIST zsh-completions-0.12.0.tar.gz 193410 SHA256 770d92749b11b22192595b207208508f8bfa319d5d03210a71bc44c8b9cfa0d5 SHA512 3c6b19f10d9598f40cf37ca5c5828e5652b0cad144d48ca681f5a16c1921c308f8cd3d9b8a2dd1c50ddbf167d4bb2e2e5299d1e30591971f4c7d9b28c2250feb WHIRLPOOL 7c5a1cb45d2e045fb0f8eb64deb8d87cab506f11b94996b9ff6cb169fd20672040bdc624de78a58ab5908d2222130de93a179a8e00d5aa75365af0ab0566852a
 DIST zsh-completions-0.14.0.tar.gz 199317 SHA256 54e4f5aad66acd729c46f589dc0b9f2a518b453892e4c21e495f33bb959c7eef SHA512 fd2fa683c5990fba9dfa12e839d70c24b7821b487175f5c51d603d21a494f7e9e921628fdd8fff1c02f8c2f52ac1fba1f48638da6a356240e0b7806c1b747ec2 WHIRLPOOL 28df4d93c0bf80bd5c3bb2c189897042e0cfd99fef77492adfe410dca96e140a8e654c0a896b45991f3605822a209d6561f7b196344b704ccd718f0a284f3e28
+DIST zsh-completions-0.15.0.tar.gz 217047 SHA256 358c576a44247959966d65f673d2861f232dbef04457954d9ac06e1f5315ca51 SHA512 d4670eb960bf620d627e57ec8dfd92bfba004ccffbbbc3f5e1209fe1569f99477cdd7105837fc6052c7b017c8d0216a44505f60c69abf00031927e6f457c931d WHIRLPOOL b0ceed917498dd3ef843fcca73b6fc730055df3996e0dd19317c0591817662e9b4cf7a69d87dacddf3efd5e484e2d807b65bb4beec84fadc57b5f1b2864fc54c
diff --git a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild b/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
deleted file mode 100644
index 3c772cbf82da..000000000000
--- a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
+++ /dev/null
@@ -1,41 +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
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
-else
-	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Additional completion definitions for Zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-completions"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-shells/zsh"
-
-src_prepare() {
-	# File collision with dev-python/pip
-	rm src/_pip || die
-	# File collision with app-emulation/docker
-	rm src/_docker || die
-}
-
-src_install() {
-	insinto /usr/share/zsh/site-functions
-	doins src/_*
-}
-
-pkg_postinst() {
-	elog
-	elog "If you happen to compile your functions, you may need to delete"
-	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
-	elog "to your shell."
-	elog
-}
diff --git a/app-shells/zsh-completions/zsh-completions-0.15.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.15.0.ebuild
new file mode 100644
index 000000000000..e5b1d5f40bc0
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.15.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
+else
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-completions"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins src/_*
+}
+
+pkg_postinst() {
+	elog
+	elog "If you happen to compile your functions, you may need to delete"
+	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
+	elog "to your shell."
+	elog
+}
diff --git a/app-text/agrep/agrep-2.04-r1.ebuild b/app-text/agrep/agrep-2.04-r1.ebuild
index dee0d55744c2..f9d48da3943a 100644
--- a/app-text/agrep/agrep-2.04-r1.ebuild
+++ b/app-text/agrep/agrep-2.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.cs.arizona.edu/agrep/${P}.tar.Z"
 
 LICENSE="AGREP"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 ~sparc x86 ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index bd530582b72f..6f56d1b133e1 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.7.2.tar.xz 262996 SHA256 1d271eb9f3ad07bd847bebb3ca32687e9c896e669411178c628d8d735df58480 SHA512 a7ac5ae78789d977f1fae7c0fb0f3eee2d882cd672e7f801ebf52729f5b76cabddbaf0ec9698ee29c369fa3bb56b25bd2edeb07047af7b4ef8848c41647c02ba WHIRLPOOL f7ad9f3028d59e095309a93badfbcc30be2555304b2db4e05178b9f414b1f4800b9ab5ad5ed882fed2267d04a49afaa8c475a9585625734fa00564095d5e463d
+DIST blogc-0.7.5.tar.xz 265468 SHA256 22b66fd38c70ec094bc77bd7a04a0ce2bc1bb2177d3d8cb705baf4ec79283d69 SHA512 75ad54c65fff927117a9135bf606357e52eb91d2c448bf8cac2676e519ab58f919447057e031ebfa90cb033728fa49f5bafb8c94678fe142e1856082870690fb WHIRLPOOL 92f4aec3864e80d57e17ed8b2bef6bdb3e7f12c8f32fc0c42bfb653ce2fcbaf3ee6ab5aebaf9aece79cbb75515d07d28068f83f98cf847c54fd68e7ef6668a7f
diff --git a/app-text/blogc/blogc-0.7.2.ebuild b/app-text/blogc/blogc-0.7.2.ebuild
deleted file mode 100644
index ecc0d6aecdcd..000000000000
--- a/app-text/blogc/blogc-0.7.2.ebuild
+++ /dev/null
@@ -1,62 +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="git://github.com/blogc/blogc.git
-		https://github.com/blogc/blogc.git"
-	inherit git-r3 autotools
-fi
-
-inherit eutils
-
-DESCRIPTION="A blog compiler"
-HOMEPAGE="http://blogc.org/"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/beta/beta.}"
-
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-	DEPEND="app-text/ronn"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=""
-
-# pkg-config is used only to find cmocka libraries
-DEPEND="${DEPEND}
-	test? (
-		virtual/pkgconfig
-		dev-util/cmocka )"
-
-src_prepare() {
-	[[ ${PV} = *9999* ]] && eautoreconf
-	epatch_user
-	default
-}
-
-src_configure() {
-	local myconf=""
-	if [[ ${PV} = *9999* ]]; then
-		myconf+="--enable-ronn"
-	else
-		myconf+="--disable-ronn"
-	fi
-	econf \
-		$(use_enable test tests) \
-		--disable-valgrind \
-		${myconf}
-}
diff --git a/app-text/blogc/blogc-0.7.5.ebuild b/app-text/blogc/blogc-0.7.5.ebuild
new file mode 100644
index 000000000000..f50ce2b99c03
--- /dev/null
+++ b/app-text/blogc/blogc-0.7.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="
+		git://github.com/blogc/blogc.git
+		https://github.com/blogc/blogc.git"
+	inherit git-r3 autotools
+fi
+
+inherit eutils
+
+DESCRIPTION="A blog compiler"
+HOMEPAGE="http://blogc.org/"
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+	DEPEND="app-text/ronn"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=""
+
+# pkg-config is used only to find cmocka libraries
+DEPEND="${DEPEND}
+	test? (
+		virtual/pkgconfig
+		dev-util/cmocka )"
+
+src_prepare() {
+	[[ ${PV} = *9999* ]] && eautoreconf
+	epatch_user
+	default
+}
+
+src_configure() {
+	local myconf=""
+	if [[ ${PV} = *9999* ]]; then
+		myconf+="--enable-ronn"
+	else
+		myconf+="--disable-ronn"
+	fi
+	econf \
+		$(use_enable test tests) \
+		--disable-valgrind \
+		${myconf}
+}
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index ecc0d6aecdcd..f50ce2b99c03 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/blogc/blogc.git
+	EGIT_REPO_URI="
+		git://github.com/blogc/blogc.git
 		https://github.com/blogc/blogc.git"
 	inherit git-r3 autotools
 fi
@@ -15,19 +16,12 @@ inherit eutils
 DESCRIPTION="A blog compiler"
 HOMEPAGE="http://blogc.org/"
 
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/beta/beta.}"
-
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 	DEPEND="app-text/ronn"
-else
-	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD"
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index b349a7e1a481..905e4db849de 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,3 @@
-DIST dos2unix-7.3.1.tar.gz 552530 SHA256 f4d5df24d181c2efecf7631aab6e894489012396092cf206829f1f9a98556b94 SHA512 8bfe2ed739f5b28ceddbcd33e8a214b1cbc4b02ddab6f0528d050c411754365b6b7314a857a45cefaf13f719ad86a1fe7c18841e63f851f7f4c9e586cfa4f0fd WHIRLPOOL 5eae8985f5aeabe82230cf9451509469323a3c97e9a256bb6a31e82b77e9d2ac74c88d87147e6feeff9f088a48b9df910f900f9f952bf17809f07ee7478ce060
 DIST dos2unix-7.3.2.tar.gz 601642 SHA256 c7e8ee0bb3e001cc25a4a908d9a81ac52d124133d6a524a59f995bc90d438689 SHA512 3d042e720c9854ae42ef72d1acf78ff8ff1cbf3c259d2c8bdba0a0b9cbf754fbe2dee9994cb9513cf1df24f26a857a13e828f0c88dc2e50f91e1c33a122eb385 WHIRLPOOL 48652bae9b247f68d9d246ad6e1c9758c04f61de3816126b89bd928bb1e50435b384d05c63a070b851d02657c698d7fbb6de61c1998a9b3d8ed32e0a3354e7ab
+DIST dos2unix-7.3.3.tar.gz 638368 SHA256 5c910aea2eae96663c67e87627998c4fe3cded403be5819b4c190e56c82ff0fb SHA512 52218ea17cc63a4b41e1bd12f200dda31e2be65167ca9c913391640c118d7122348aa2e5aec934ee17c8ea77a04cb89a1a572865645a77f6875207295c10e7af WHIRLPOOL 749cabc6d2d57caccf183082689a0d677d7d5b7822c8a92a85a5b2d722284542c95dcd46947ea05a1d2cff1d230351cacf1f0667957f18c7c02c12c6c62f2e16
 DIST dos2unix-7.3.tar.gz 497218 SHA256 8175f7552a72edaaa8918fdee68ce2cbc982dc25452f33d4dc611d769f4944d1 SHA512 dc70fc4cf12811794e9b33db7cc44085788450104f7beefacea5ac11af5ca76d909235232be51eb7a32ed5d75a01a86a4c6b064060b945c8a7e7968caeb51cea WHIRLPOOL 55b3990816a122c4bc2219b1f89b5d7f619901693b57349b58222166f5c3e006db08a55a26ce62493009459b9a3c6a091a07ecacabf9450a0a7475fbd9f195ae
diff --git a/app-text/dos2unix/dos2unix-7.3.1.ebuild b/app-text/dos2unix/dos2unix-7.3.1.ebuild
deleted file mode 100644
index d8a8be9c678c..000000000000
--- a/app-text/dos2unix/dos2unix-7.3.1.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 toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls test"
-
-RDEPEND="
-	!app-text/hd2u
-	virtual/libintl"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( virtual/perl-Test-Simple )
-	dev-lang/perl"
-
-src_prepare() {
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/dos2unix/dos2unix-7.3.3.ebuild b/app-text/dos2unix/dos2unix-7.3.3.ebuild
new file mode 100644
index 000000000000..97a70f05776f
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.3.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+src_prepare() {
+	default
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/evince/evince-3.18.2.ebuild b/app-text/evince/evince-3.18.2.ebuild
index 4d2c68d55389..ba71b19c255f 100644
--- a/app-text/evince/evince-3.18.2.ebuild
+++ b/app-text/evince/evince-3.18.2.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 gstreamer gnome gnome-keyring +introspection 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/gspell/gspell-0.1.2.ebuild b/app-text/gspell/gspell-0.1.2.ebuild
index b2ccffcc875f..64742fbd1d90 100644
--- a/app-text/gspell/gspell-0.1.2.ebuild
+++ b/app-text/gspell/gspell-0.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection vala"
 REQUIRED_IUSE="vala? ( introspection )"
 
diff --git a/app-text/gtkspell/gtkspell-3.0.7.ebuild b/app-text/gtkspell/gtkspell-3.0.7.ebuild
index c4cb2b2b396a..2529821d065e 100644
--- a/app-text/gtkspell/gtkspell-3.0.7.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 
 RDEPEND="
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index d290cb6eb5ed..60d6f4616d96 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,3 +1,4 @@
 DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3
 DIST highlight-3.25.tar.bz2 626492 SHA256 d8a9b8989c8b4108de0a76ceb585a5777ab308a339a667a9b05ee3d059dade26 SHA512 c0249283e7c26b565170c4686fb28ddd0565716ddcd38a52cbfde03051558f4c1baf7b2605e33e1799afb7dfb79b053fffa70827d5d8dcaf42a344076d26fb11 WHIRLPOOL d2f8ae06a9b48dd88432d9550d6e456f3a3177194af72ee26023ea110046a55ea9031104e9a397bfd316d3b4c0a1f557cefaa73165bc54308725f71a7e89f1e6
 DIST highlight-3.27.tar.bz2 620054 SHA256 9d0aa72d434fa22acde50ceafb165efcd03799335396b24b134a5632387cf7b0 SHA512 171bf90c07fccfc00c8fac6328c84703642a43e7291d6e32fabd3f6d99793b8cbbe9bbdcbcf3054868725f01fac0ed30902bd30f231bc31a98d56b29f9acefb3 WHIRLPOOL 6d3c93756c78109ffee69080bf4f5e414e1808ad06854f84816352206314df8212c89f5b71234f8f33bf5693ca749c23abad88630e0eda4b63bc25466fc70583
+DIST highlight-3.28.tar.bz2 622161 SHA256 36364b6d906148dac04426a0c892fe2343e5e2c752316666589f8dff741ce7cd SHA512 f0d5d9b4635da5fcf75ba5fd11cbb308c0e8c00b8bdaff5769b7e0c2756d8e0b34b46299eaf4396b99bba69562bec96757342e0187abcf7a52277e37dff9b1fd WHIRLPOOL eb7ed0ff8f29b1fb23b14f1cb5745d562c7778a1bcd69a30e70b9e7c5f2572549d10119d128378107fb12a29803c04c1691b8c690d4ca931817b276125a7b934
diff --git a/app-text/highlight/highlight-3.28.ebuild b/app-text/highlight/highlight-3.28.ebuild
new file mode 100644
index 000000000000..df1763b6c626
--- /dev/null
+++ b/app-text/highlight/highlight-3.28.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	if has_version '<dev-lang/lua-5.2' ; then
+		sed -i 's/-DUSE_LUA52//' src/makefile || die
+	fi
+}
+
+src_compile() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS}"
+		"DESTDIR=${D}"
+		"PREFIX=${EPREFIX}/usr"
+		"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+		"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+		"conf_dir=${EPREFIX}/etc/highlight/"
+	)
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index e68d3d38a6b2..1b3ab858eeae 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,4 +1,4 @@
-DIST iso-codes-3.57.tar.xz 3773756 SHA256 dd6acd92843b69530fce535d3d6fd947ddb3802f0d5fc1bd214d1cb7d2bf5c47 SHA512 a58e48be152960d2391123e88b48f1c43e0bf0ac880a8d6a3ec7c8154e67fd40f264063cdf7106da9d261a5fb82f64d67545a17f69ec81141f10d1eb2d897424 WHIRLPOOL 9b6de080edc6c54071a8b7584de90af3554f91d77973dceb856570b2c1760ad89a807112903cd24697bab672024d319b72ce3141fdd0dc15405bf54bbd9b53ce
 DIST iso-codes-3.61.tar.xz 3772736 SHA256 a79bf119afdc20feef12965f26f9d97868819003a76355a6f027a14a6539167d SHA512 c18f4d9f92266bc590e9eb327edfc769abc384a0ffeb80bcff120cafe664019c747e733aa1b33de4179a6beddaa904bc70e2d35971d9edb6eba51592f5d5d07d WHIRLPOOL 74c620e00bfac3e007f58edd509c3204db162b99e3aba93fb02ab27b435925ac2b2886367f25c1749f3fbaf277a37b64e39a8684d8e6faff59ef9d7739108f3c
 DIST iso-codes-3.63.tar.xz 3773672 SHA256 60600e56952dc92b3a8cd8a7044348f7cfa35be528bab2491c3c18582fb5277f SHA512 31b5142611e2050a9bfb95cd12d962b8cbe01824f1202e70ca40d9cd178a5fd17557eac3fcc59dd0b94baf2656caeef09c50332cd2a8d0e1bb14c82c154e06ae WHIRLPOOL bbe3c5474ba3fc22243a9b6bea9c6b43dccd5a2230ee59b07e4484e06ccba4be977dfa1e16014b18d4cae5393a50099e3a12b13747e9970c4e605df8b4e002be
 DIST iso-codes-3.64.tar.xz 3733868 SHA256 5ef061381e37e9576760df1ad504d4bbc84c270da30512b2891baed9add70729 SHA512 fd0639b7279bd4a87b5fdf055f61d8e44fd1d48907d0eef1824cb68cc1af6108f04f6ab837cef17398b576cef9ff66b09b351eee76e1309270768259810228fb WHIRLPOOL 4f13253571ac16a4ffa68d228c3c9b347742fc2b38ba1f68fc6221826b07f6f108e9897dcd0dab496219b45129c14f96b3496ec5d450e39f7232f16e8b005105
+DIST iso-codes-3.65.tar.xz 3732432 SHA256 834de5193c8489eedeaf6509457a9b13476702386ae1f3ed4f391a349d630320 SHA512 cf88397150b3014a4f5e4d709cbc1e00537c9289ea68d68ec9b24df6c7467fda3fe99fbeacd444837d614ae1df213816a3996a9e86aac400f9d92a0a3090f8ab WHIRLPOOL b506fea95bba3ecf40e9d1e4d5c26d4fd97e88203fdf1e931269642b42daca93b5b479b52a4e2807de4dc80b3233599394dc67f6762bf00caf5689a74fd36e4c
diff --git a/app-text/iso-codes/iso-codes-3.57.ebuild b/app-text/iso-codes/iso-codes-3.57.ebuild
deleted file mode 100644
index 5c8b9c4a1b30..000000000000
--- a/app-text/iso-codes/iso-codes-3.57.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"
-
-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/iso-codes/iso-codes-3.61.ebuild b/app-text/iso-codes/iso-codes-3.61.ebuild
index 18ebdb4228b4..830e656f4aab 100644
--- a/app-text/iso-codes/iso-codes-3.61.ebuild
+++ b/app-text/iso-codes/iso-codes-3.61.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="hppa"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/iso-codes/iso-codes-3.65.ebuild b/app-text/iso-codes/iso-codes-3.65.ebuild
new file mode 100644
index 000000000000..22f4a6b83881
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.65.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/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 5f1822097d6d..e3bcf817f8c6 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,3 +1 @@
-DIST kbibtex-0.5.1.tar.xz 250224 SHA256 8e3717721ecf29a864142df302f8c6a029704c10832b3926fd42b19d315b6284 SHA512 e1e36f750a26196f8c0f07b51084afa69080fb57b747a98b0bc4ec16d733603b64dd0cc23b44a470467b0e7f705d7aef4c36c2171ceadaa3afd109fdfab56e55 WHIRLPOOL c0358164611fdf4526148205a9bc69dcc213ff7f6d68a92fa301c3bf934cf89b198f23aa568b956938e04eaaf54e1838cab89e977151043b205b9127da4d5be7
-DIST kbibtex-0.5.2.tar.xz 250092 SHA256 c1577e18e3bbf745cccdace537e84d3e1dc957330affac8b441e6f9cfc120d38 SHA512 1973ba4fe366605db17c01ee8df5c0a79231351fad20e3243cd4040d7499f4f7af43abf60df8f654c91bdf2e2051299f16f40aa90761f5cae8c1e6d97ea90827 WHIRLPOOL e951e5c4eb2f1d7986dfdc7c973f77b75b818d6c8a8fc8590ecedc306263b4b53a18be0203384dda3b18c262d5e43bb3da6f698fa1091b0e80f62d79aa9fff5d
 DIST kbibtex-0.6.tar.xz 2430176 SHA256 fc67a376f05105f14a0bee595bfd073a1ef2c7f9fc6be35dc620bb34f3bd9656 SHA512 a6943271df529c15be8a3112ccbe2c64ccff4cc942c846f00447f7a40bb3e6a6408af12fafe201143a8cf0288ec5ea13da1abab5d870fea6d0516bf5c4543b60 WHIRLPOOL e679f3907fb3041e0680aee1f3f7e0a299fce648c5c1b81663de49ce9d77351dfde8165048cd92c2a5ba7139f8d67d5a9a4eb5f37c393e19006fba4bd5dcd98e
diff --git a/app-text/kbibtex/kbibtex-0.5.1.ebuild b/app-text/kbibtex/kbibtex-0.5.1.ebuild
deleted file mode 100644
index 454833ff6699..000000000000
--- a/app-text/kbibtex/kbibtex-0.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator kde4-base
-
-DESCRIPTION="BibTeX editor for KDE to edit bibliographies used with LaTeX"
-HOMEPAGE="http://home.gna.org/kbibtex/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
-	KEYWORDS="amd64 x86"
-else
-	EGIT_BRANCH="${PN}/$(get_version_component_range 1-2)"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	app-text/poppler[qt4]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	virtual/tex-base
-"
-RDEPEND="${DEPEND}
-	dev-tex/bibtex2html"
-
-S=${WORKDIR}/${P/_/-}
diff --git a/app-text/kbibtex/kbibtex-0.5.2.ebuild b/app-text/kbibtex/kbibtex-0.5.2.ebuild
deleted file mode 100644
index 0725b09635a1..000000000000
--- a/app-text/kbibtex/kbibtex-0.5.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$
-
-EAPI=5
-
-inherit kde4-base versionator
-
-DESCRIPTION="BibTeX editor for KDE to edit bibliographies used with LaTeX"
-HOMEPAGE="http://home.gna.org/kbibtex/"
-SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	app-text/poppler[qt4]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	virtual/tex-base
-"
-RDEPEND="${DEPEND}
-	dev-tex/bibtex2html
-"
diff --git a/app-text/kbibtex/kbibtex-0.6.ebuild b/app-text/kbibtex/kbibtex-0.6.ebuild
index a986290f17ff..9aadacac2003 100644
--- a/app-text/kbibtex/kbibtex-0.6.ebuild
+++ b/app-text/kbibtex/kbibtex-0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 82a3a0376bbb..63ee587ef698 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -2,3 +2,4 @@ DIST libetonyek-0.0.3.tar.xz 341276 SHA256 b5b96cd0857fc9a740d6ec737d613d95e9524
 DIST libetonyek-0.1.1.tar.xz 338396 SHA256 9c6a5a0f15ae6cc6e2dfb2272b664dedda7918ed46f3756f9f29a72589d8c83e SHA512 a75463b1bf41eca19b3d1e9391683a42d2343b23b6bd1d69aa41c10ae0cef4d5794896976ba46ff364e7ead52c556e349c525bb12cea40242542037d60c2a2c4 WHIRLPOOL 373ae59f8cf1f88b37ab7c21ae22e9a6f5d32d23c5dc3b517e101d56c745940ecfc7ba579cd83601390895189271fa9ecc846460c8d570616a5274a634f91dac
 DIST libetonyek-0.1.2.tar.xz 346248 SHA256 58d078a76c3fd839c282244a1a7dabca81cef64be086a5c7d8470bb64208da39 SHA512 9d1ca586c313f93b31a19a47e9a050bbc5be8cac385d16f3060353b26de86ddb35a2d72694ec6d0ad043a108a7fe5d451dcd205db96822a0c0ce32a101b20e80 WHIRLPOOL aaba195fa0f7811a8ef05e64720cb37ca6a06534bcb7f6f0d75a9d35d3ca6fedc27783eb5e13607273e219c70bd4439561081702e80dc549c646a01dd58a595c
 DIST libetonyek-0.1.3.tar.xz 372884 SHA256 fe12276a62bd5f5ca4f5bfbd4938a74d097084e1f9fe173e521f63203f56f055 SHA512 912cb94e6cd63a162a8831368f953c4e6fb14b582a13a7ce93c0bcbb63b688fcbe4733dbb883d6a9faee2011ca5e888d00adda075c2a58d00858770ed68d6844 WHIRLPOOL 5fe864e37f6611c8cda92243a13e08e38ce1fd6f9544ddee7d3392fa9bfe573cd9af6ddd0ff03c7a0cee19b63c46b96398d985eaeb7367cd06aac8796d3655b8
+DIST libetonyek-0.1.6.tar.xz 1243364 SHA256 df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078 SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e WHIRLPOOL 932704f1d8bb1269e6be8e3fd7bd64af01ba0f098272befc747da9a4bd225bb201542bebf31d6e6338e613835fca4d7c6e2c1454df4ed764af30459393b6d73b
diff --git a/app-text/libetonyek/libetonyek-0.1.3.ebuild b/app-text/libetonyek/libetonyek-0.1.3.ebuild
index b28954866d73..295a5d8ed2c2 100644
--- a/app-text/libetonyek/libetonyek-0.1.3.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.46
-	>=dev-util/mdds-0.12.1
+	>=dev-util/mdds-0.12.1:0
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -33,6 +33,15 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
 src_prepare() {
 	[[ -d m4 ]] || mkdir "m4"
 	base_src_prepare
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
new file mode 100644
index 000000000000..71de2347d2ef
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-util/mdds:1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
+src_prepare() {
+	eapply_user
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_enable test tests) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 649d81202695..71de2347d2ef 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -19,13 +19,14 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
+	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	>=dev-util/mdds-0.12.1
+	dev-libs/boost
+	dev-util/mdds:1
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -33,9 +34,18 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
 src_prepare() {
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
index 9d67a9d55246..13ce236ee519 100644
--- a/app-text/libetonyek/metadata.xml
+++ b/app-text/libetonyek/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>office@gentoo.org</email>
-	<name>Gentoo Office project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index 3843ee5114af..61c249411796 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,3 +1,4 @@
 DIST libodfgen-0.0.4.tar.xz 296224 SHA256 8f7a46f05417afbe957d0c3f88e375631b8651ea99bb2c231595408bc4224099 SHA512 5d637139c30ce24e11f4ae102b3374c95afb66e6300ef6f45dd4c2957b36bc3c56da53d49b2b6c8ba9bbadc118dffeab11421b85a9ba47e1ccf101bc1cd75e1d WHIRLPOOL 3382383a1a6edbdc183fe649812ee0285294845fdc5c47a8329cadf2fe0374f20189a9e6db0fc166d096c85400466ed56dcc1709e6728fe6b0e1e5b4c3f8c468
 DIST libodfgen-0.1.3.tar.xz 334744 SHA256 d3a09d987e9c0955846cad1e8a885a9c7a76bfaff75d4c1b5626844c62808eba SHA512 c93abc1ce100c38876b70c1458515086f93b1c376df905fd05d428f69e3f7c709a26c38b18583f878a7f2850b069b99917aeb44426d6decb3be3081bec039c86 WHIRLPOOL 74d17ed0320807cf4ddbd92452a59205b0195694c26692fda8c201964df3f56a38c27b65b9bcdaee58469bbf1e91c4a901903de9bb9e6c6050854678f611d2e7
 DIST libodfgen-0.1.4.tar.xz 356480 SHA256 249b5ed8e1acc0fee32b4381b31b4ad9453b674d4f13886bda5e9dd2b4a5f1e1 SHA512 b9229a6aea7dab1de2315a3632a3494bb785fafa8035e8f323176e76553f05cef8fc7b3e0b5fe6c154b4d8bd7ef69526703c580629dcac63adfd552539fcad69 WHIRLPOOL de779e605c2f15b95108df405a860a9285d756c374681df416c26dcd77f5b893c07a3e89ae6d2a62275b518c921f8a4930ff29886607aada8d6bcf0d055c9462
+DIST libodfgen-0.1.6.tar.xz 359988 SHA256 03b210ab44f05e38091508cdca6ba0ff73de3ea8a168f849b8f1c5059c20b9e9 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5 WHIRLPOOL 2c71505c0189a59bb893c7edfd8e4050c7a60f6193e2a77ed63090d8f80618332b0f0c2020d1fc1f319b5635386381b6fea6d3d5117678d9c425d7661a70ddf1
diff --git a/app-text/libodfgen/libodfgen-0.1.6.ebuild b/app-text/libodfgen/libodfgen-0.1.6.ebuild
new file mode 100644
index 000000000000..80975a99492f
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=boost \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index d9557712f6c2..80975a99492f 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
 inherit eutils
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 2321bf51ba62..f2378c9412d0 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,4 +1,4 @@
 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.1.tar.xz 476732 SHA256 bf915125d647aec18f63d593eb9385bce1e3cdb48649c1c90782d0e0ff5e976a SHA512 675b1d54436d568a990a305267daf33ebfb064e54b7b220f1ada850db85d1780590e161d27a68aa3b33807fab20a73e862f3dfffb62a8a5ff20192ed6f85063f WHIRLPOOL 56d849615588d2a6e33f1f20367b8ce5685bcc1cac6651fd1f48cda238c851fdaa81658d73557ae5f2e4d4f0ca690517543cbeb0a940bbdca2f3347b938d7d7b
 DIST libwps-0.4.2.tar.xz 543052 SHA256 e4fa907dd2b49b309fb4a860332bc44158570e02cb4ec07d4c8577b374b9f935 SHA512 6e91a4dbb26335b6d4db47daec70d4f50313a8101de1dccce592cec49e00aaf50256580b3ea0c37f24b7ad1cc065a82e0a71deb0cfcd23dabf0a2627d915f48f WHIRLPOOL 137f54be1a0d342205275891008a8de32ae3ee6ba6c2cdafccd61112e4e99e82039a471ef2aa98f0a935a470f48cc59690e8e783e676cde50a78ff1e56558e6c
+DIST libwps-0.4.3.tar.xz 539624 SHA256 617d448a6c9bf935fc77a766e0b45d26f0886663d90b9bb00cfed9c28fbf13da SHA512 b05375a956871386fe4e4448407868cdc6f09a8ff5c6329450396529bf148222a17dd9e82f92f443d5d86030e4ef10d18fc89363b91d1dd36f14d4c24d8645d9 WHIRLPOOL 807d0800f17ec0fb9fc82828b1b9f434c06f61a3d2acfdb23c8b2bb5d1989c8a94091fd508ab0a2d5b17a5ece89c03258ecf85d875b348039caea488b75c4d35
diff --git a/app-text/libwps/libwps-0.4.1.ebuild b/app-text/libwps/libwps-0.4.1.ebuild
deleted file mode 100644
index 5ac9cb1b6c11..000000000000
--- a/app-text/libwps/libwps-0.4.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
-
-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.3.ebuild b/app-text/libwps/libwps-0.4.3.ebuild
new file mode 100644
index 000000000000..d2d292fa37bc
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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/paperwork/Manifest b/app-text/paperwork/Manifest
index 31e07d5e4c70..d935852c43ce 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,3 +1,2 @@
-DIST paperwork-0.2.3.tar.gz 164350 SHA256 92f7ef27d26b9b4d3e1d4f87b2788e47cfef0fb386ca813daf02e486e791ccf6 SHA512 e9b423dc35b1c952eca93a891b94b1d25d1af612c22671ccae0b37a32bc29ceb800d0ab9a300d12d0eb4dceb45843ef4123c1796f94a82a40292ad3848ba7d12 WHIRLPOOL 3d1f07a89e9a3177fc4c10d699328ce91e27e76fcb2b6ae704e7f12e11bcbd48fafc88ef07cf6c4903d9c8d7774e7daa47b8ce5bd7fb694ab303cbff8c6c6f94
-DIST paperwork-0.2.4.tar.gz 164449 SHA256 361970a69995ead1a07a9fe63dde1055110194e447bbfb357b95ac45918ce23c SHA512 a21875f78e38ef77c05f21b57491fa89b7bb9ceeda5d577cd1082825b7df7e56ce9a7a2f7477b066b81a8858183607a25e999e0f851848393c155c9f8588b634 WHIRLPOOL f9b02780437feb0fb0eba2a2a436cf855d0efde85877f8d6533fb613110171e2ec9bf1dff31ffab5e5e21c1d7ac180f42eb5eed38a0416e6cba41cc36fadefa2
 DIST paperwork-0.2.5.tar.gz 165234 SHA256 98969bef91b51c72dfd493862c3f62a88c0a26a0654a4bdc9156d8b0d3993a20 SHA512 6f541ebf6cfe02868f568a488754e48f1dcca2d239986e175ee76f6d14495f45a6ab746e2bd29dcf05204c7d1f8a71eb4e91cb3f8a8fd5710b6d2ef1c24637bf WHIRLPOOL ce631670f8c61d2a959243db73c179e5a605ebf9f4f91a0fa62ef8dc7ec8e6f09aeb35a749da2bcfba357f031eb39fdba2c1d77e24018770e08315e04aeb3b3a
+DIST paperwork-0.3.0.1.tar.gz 175755 SHA256 3019264cbbfb449c1b7d9c04537e4aff72f17da4a59db3538b34cf7ee7ae5775 SHA512 b167cc8b907cc40e98b019b3f51305b4648d5c0afea7481c532bf48d2f4ec3773ba9ec56b63806dba6f20d87d60c7e2d148d85ee4a8b138867003499fc5a9697 WHIRLPOOL b3174f122ee7270d584950f7459b6a3c7e99a82e3d56e2fcbe87c9ce36492e0a70ab8da02c7572158c8e61622ff15a0835d7d8bf9edeffe84d0fec3392d36b25
diff --git a/app-text/paperwork/paperwork-0.2.3.ebuild b/app-text/paperwork/paperwork-0.2.3.ebuild
deleted file mode 100644
index f2e47caf7f89..000000000000
--- a/app-text/paperwork/paperwork-0.2.3.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://github.com/jflesch/paperwork"
-SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyinsane-1.3.8[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	<dev-python/whoosh-2.7.0[${PYTHON_USEDEP}]
-	dev-util/glade[introspection,python]
-	sci-libs/scikits_learn[${PYTHON_USEDEP}]
-	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-0.2.4.ebuild b/app-text/paperwork/paperwork-0.2.4.ebuild
deleted file mode 100644
index 2888a7a284e1..000000000000
--- a/app-text/paperwork/paperwork-0.2.4.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://github.com/jflesch/paperwork"
-SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyinsane-1.3.8[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]
-	dev-util/glade[introspection,python]
-	sci-libs/scikits_learn[${PYTHON_USEDEP}]
-	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-0.3.0.1.ebuild b/app-text/paperwork/paperwork-0.3.0.1.ebuild
new file mode 100644
index 000000000000..a604cdefedca
--- /dev/null
+++ b/app-text/paperwork/paperwork-0.3.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://github.com/jflesch/paperwork"
+SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyinsane-1.3.8[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-util/glade[introspection,python]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ec8bfff28761..4b382af1161d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,4 +1,4 @@
 DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22
 DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5
-DIST poppler-0.39.0.tar.xz 1641156 SHA256 afd75befa9c3a41e1d7755c4e43dea70cfd8f1a4dac118e83032cbb41ce17bb9 SHA512 046a80d5cbbdf1dda57ebcd09a77eb80239a85b0d8250d89174e5a69ce171000c4ab624f6c00b599b30d4ed2559976c8e527b3ed65f04c6d3f582c3e2b75e522 WHIRLPOOL 5722c48d0d2278134f7fa353d327a6fed0ae63b96f0f1e8edd2107c9d7012a8e95d2996887e415e4cfe525cf64b7d5630c75620376fc075297397fd57f7f2be7
 DIST poppler-0.40.0.tar.xz 1642708 SHA256 bc0da278d6038ffc9cd2b8c1bba530a6ec7c072a593219a48f0a52a600ee6ead SHA512 0f26f342a4f70ebc65848c61e5eb1a182d539a8e4cdc5fa499c52765d15867e13ee7c595773d2e8d6f2eb3e83e1c19f35cc6bb47f8aeb87a8ad92e45ecff50cd WHIRLPOOL 00d887401f8438718fcee34e326c7a71970ce7e1c3071a142cef365bdd77301d77b1c9488fa80a58a0baca8fb0c8a2fb0a327867b8b8381b8eecb5f14609bec2
+DIST poppler-0.41.0.tar.xz 1655448 SHA256 420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b SHA512 b2b99ac056efaae26f0bffc20756f17524011b7718a554ff48901422e7ab8caa4f879b800eacce1af5ae468346fa0beb569a4378f028a7d7cf0c9cc45f0d2402 WHIRLPOOL 565bc504b5b02ac612b267bb5d5746dc9d90b2c7f8959e2fecc58bdcc4c588f8f234d4bc9cc8086846c23643fa0abc8dba352c8a083056b95d58056281a5bc7a
diff --git a/app-text/poppler/poppler-0.39.0.ebuild b/app-text/poppler/poppler-0.39.0.ebuild
deleted file mode 100644
index c8f78de23c1a..000000000000
--- a/app-text/poppler/poppler-0.39.0.ebuild
+++ /dev/null
@@ -1,122 +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
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/58"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.40.0.ebuild b/app-text/poppler/poppler-0.40.0.ebuild
deleted file mode 100644
index 443a02a3d2ee..000000000000
--- a/app-text/poppler/poppler-0.40.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/58"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.41.0.ebuild b/app-text/poppler/poppler-0.41.0.ebuild
new file mode 100644
index 000000000000..0346703d54ab
--- /dev/null
+++ b/app-text/poppler/poppler-0.41.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/58"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with tiff)
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/sigil/sigil-0.9.3.ebuild b/app-text/sigil/sigil-0.9.3.ebuild
index 98abaadb2971..bc82d766dd54 100644
--- a/app-text/sigil/sigil-0.9.3.ebuild
+++ b/app-text/sigil/sigil-0.9.3.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 CMAKE_MIN_VERSION="3.0"
 
-# Sigil supports Python 3.5 already. Include it when our deps support it.
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_4 python3_5 )
 
 inherit eutils cmake-utils python-single-r1
 
diff --git a/app-text/skribe/Manifest b/app-text/skribe/Manifest
deleted file mode 100644
index 029b9e4cef21..000000000000
--- a/app-text/skribe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skribe1.2l.tar.gz 245007 SHA256 87bc31b7c087070f27be2be816b322993972bbf03fb72cbd0d7603796d5636d0 SHA512 159d824d0f1935b04a6b180b8484fba7f32d3d7579c86aafae681b4f988cc4e765795844828321235f5c6104242d0d2c5a2d4c908ff05b23d26bf74ed6ee14c5 WHIRLPOOL 4bea508c5f86669ae1cabc722b46c56273a647a75839ccf8d815daeb1e30a94584add1d191632fe555e8ba4e5deb18e59abbee1a3503c36e93db9d27053d2491
diff --git a/app-text/skribe/metadata.xml b/app-text/skribe/metadata.xml
deleted file mode 100644
index c61e71b0e004..000000000000
--- a/app-text/skribe/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>
-<maintainer type="project">
-	<email>scheme@gentoo.org</email>
-	<name>Gentoo Scheme Project</name>
-</maintainer>
-<longdescription lang="en">
-	Skribe is a text processor. Even if it is a general purpose tool, it best
-	suits the writing of technical documents such as web pages or technical
-	reports, API documentations, etc. 
-</longdescription>
-</pkgmetadata>
diff --git a/app-text/skribe/skribe-1.2l.ebuild b/app-text/skribe/skribe-1.2l.ebuild
deleted file mode 100644
index c50d79e1810d..000000000000
--- a/app-text/skribe/skribe-1.2l.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit multilib
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Skribe is a text processor for technical documents written in scheme"
-HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Skribe/"
-SRC_URI="ftp://ftp-sop.inria.fr/mimosa/fp/Skribe/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-scheme/bigloo"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# falsify bigloo auto-strip feature to prevent pre-stripped QA errors
-	sed -r 's/^blinkflags="(.*)"$/blinkflags="\1 -eval '\''(set! *strip* \\#f)'\''"/gi' \
-		-i ./etc/bigloo/configure || die "sed failed"
-}
-
-src_configure() {
-	./configure \
-		--with-bigloo \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index 010b2099dfbf..283515d83de1 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1 +1,2 @@
 DIST trang-20091111.zip 1079534 SHA256 d8a3f034f9918ebe5b265aafeadbee6729ddda5732cfc368e2c30b3b8c0ca598 SHA512 c19bf98613097d377ecce347dcab31b458b16d77c320b5d2a6106ff7b06b3aa3c7b87b4c78376b3d4f89be24ecb11fad622aadc0ba9d8d6be716486d7a1ebd7b WHIRLPOOL 6ed18632dfdb7c9661fcb6e1b3a02130ac877fdda3c4cc7779ec61510a7e67e68ab7315ab6f3e5cb8ed2a83447873579791c568f7706eaab29f5e2258fa5bc3b
+DIST trang-20151127.tar.gz 13746141 SHA256 86c810a42d974665d12db5213943cd72fcb6912d80b5a2853e083bc454ca6b75 SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26 WHIRLPOOL c11781da0cf8d5deada8c59dcfbc13dffd78e045c97b4b27768d8772563b989e9c6434fa4be13ea3c53574ad59baf0eb3a150bc3d77edc7336315f6961fb0b6c
diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml
index 4c52b3e0f776..04751195a354 100644
--- a/app-text/trang/metadata.xml
+++ b/app-text/trang/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">relaxng/jing-trang</remote-id>
 		<remote-id type="google-code">jing-trang</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/trang/trang-20091111-r1.ebuild b/app-text/trang/trang-20091111-r1.ebuild
deleted file mode 100644
index 30542e0d6cef..000000000000
--- a/app-text/trang/trang-20091111-r1.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
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Multi-format schema converter based on RELAX NG"
-HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
-SRC_URI="https://jing-trang.googlecode.com/files/${P}.zip"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/xerces:2
-	dev-java/xml-commons-resolver:0"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-java_prepare() {
-	# need resource files in jar archive so can't remove, see build.xml
-	# rm -v *.jar || die "Failed to remove jar archives"
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die
-}
-
-EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
-
-src_test() {
-	java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.xsd"
-	java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.dtd"
-	java -jar "dist/${PN}.jar" "test/test.dtd" "test/test.dtd.xsd"
-
-	md5sum -c <<MD5SUMS_END || die "Failed to verify md5sum"
-4bcb454ade46c0188f809d2e8ce15315  "${FILESDIR}"/test.xml
-d096c1fb462902e10a3440a604a21664  test/test.xsd
-3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
-fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
-MD5SUMS_END
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-	java-pkg_dolauncher trang \
-		--main com.thaiopensource.relaxng.translate.Driver
-	dohtml *.html || die
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/{org,com}
-}
diff --git a/app-text/trang/trang-20151127.ebuild b/app-text/trang/trang-20151127.ebuild
new file mode 100644
index 000000000000..40174cd70de5
--- /dev/null
+++ b/app-text/trang/trang-20151127.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+COMMIT="1e74846999bbd14ce5248acbd2be9f1e624a9846"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="https://github.com/relaxng/jing-trang/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	${COMMON_DEP}"
+
+DEPEND="
+	>=virtual/jdk-1.7
+	dev-java/javacc:0
+	dev-java/saxon:6.5
+	dev-java/testng:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jing-${PN}-${COMMIT}"
+
+EANT_ANT_TASKS="testng"
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_PKG_BSFIX_NAME="build.xsl"
+
+java_prepare() {
+	java-pkg_clean
+	echo "<version>${PV}</version>" > version.xml || die
+}
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# Because this crazy package uses XSLT, we need to escape this.
+	sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
+
+	EANT_EXTRA_ARGS="-Djavacc.dir=${EROOT}usr/share/javacc/lib"
+	export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
+	EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_dolauncher ${PN} \
+		--main com.thaiopensource.relaxng.translate.Driver
+
+	docinto html
+	dodoc build/*.html
+}
+
+src_test() {
+	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd
+	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd
+	java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd
+
+	md5sum -c <<EOF || die "Failed to verify md5sum"
+4bcb454ade46c0188f809d2e8ce15315  ${FILESDIR}/test.xml
+d096c1fb462902e10a3440a604a21664  test/test.xsd
+3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
+fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
+EOF
+}
diff --git a/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch
new file mode 100644
index 000000000000..e8126baf0d51
--- /dev/null
+++ b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch
@@ -0,0 +1,20 @@
+commit 755169cc3b0991bb783ade963da3a473db147067
+Author: Olly Betts <olly@survex.com>
+Date:   Tue Jan 12 17:24:11 2016 +1300
+
+    Need to AC_SUBST probed value of ZLIB_LIBS
+    
+    Noted by Paul Wise
+
+diff --git a/xapian-applications/omega/configure.ac b/xapian-applications/omega/configure.ac
+index db56262..36d894e 100644
+--- a/xapian-applications/omega/configure.ac
++++ b/xapian-applications/omega/configure.ac
+@@ -120,6 +120,7 @@ AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [
+   AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll (you  may need to install the zlib1g-dev or zlib-devel package)])
+   ])
+ ZLIB_LIBS=$LIBS
++AC_SUBST([ZLIB_LIBS])
+ LIBS=$SAVE_LIBS
+ 
+ dnl libmagic used to detect MIME types for files we don't detect by extension.
diff --git a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
index bb10d8472309..3fed4e155fde 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/1.2.22
diff --git a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild
index d38795598d69..a48191a465ce 100644
--- a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild
@@ -4,6 +4,8 @@
 
 EAPI="5"
 
+inherit autotools eutils
+
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
 HOMEPAGE="http://www.xapian.org/"
@@ -20,6 +22,12 @@ DEPEND="dev-libs/xapian:0/1.3.5
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	# Bug #574666
+	epatch "${FILESDIR}"/${P}-fix-lz.patch
+	eautoreconf
+}
+
 src_install () {
 	emake DESTDIR="${D}" install
 
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
index 3d86e6edefba..dbc535b5a348 100644
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 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/dev-ada/adadoc/Manifest b/dev-ada/adadoc/Manifest
deleted file mode 100644
index dfd990ba9a3e..000000000000
--- a/dev-ada/adadoc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HowToWriteModule.pdf 80918 SHA256 5d29471dbcedf6c0e6a54bb1e970b79fb1f93cfab0ecc6dc4caa1d1a510e892a SHA512 a7285e7f434b1615ee07e368827727b98e8d43e9d74da855f6fab65feb4bd8ff08f7af120a4032eab43ed9fb34d72646086f9fbfd65a5c1e4f83fc932c640d62 WHIRLPOOL a2b27f9e31c1b95468983bf6874db2cee0ed569c79d809a1742491cab4bc60dca5d09deebc40c6b5b4670390cebb75dfb5407931a59a60c3334c8355fb4f202f
-DIST UserGuide.pdf 96439 SHA256 28b378b05c2c937c4f2f0d1bf7c42347eef80b03c3febd0d1dfce9a2390b5758 SHA512 c1369d4b61dedfc199fce57b874cacecb82fa37cc4bb2d3dfaf3021e878f66f20913f5642f2b31f80588d1507b4a34e2ab58c4d78ded317d5385e1897b52ece8 WHIRLPOOL 405ec06cbde2cfd11c83ab6fe3a4e270bca9a84b7b11bdfb3c1714276b49ff45d68eba273cb90d555bba29dffdba47cecd3c89ae72a30d946e4f40cc1f15dfb6
-DIST adadoc-v2.1.src.tar.bz2 1063387 SHA256 dc98335baf354c3e6b41ebd62c3baa508ef5cad5674e6a1a36f4af809d73fed7 SHA512 948f53d6c33bad540d75227a3b620badc81fa6c2a8f8e4a57c7bf42809b8adfa198b9b2e5fdbbbbe8ce5a3979f721e371189517135a218005c7fa16dffdf4ecd WHIRLPOOL e79a445b598b653dd3aa2b19750253ba03f0608d63c3390ccccc058fd64a2086b280d45e1aa5dc2bdfc8d4901526df586034c7cad09d81dc818b6266bd962434
diff --git a/dev-ada/adadoc/adadoc-2.1.ebuild b/dev-ada/adadoc/adadoc-2.1.ebuild
deleted file mode 100644
index 9350510fabfd..000000000000
--- a/dev-ada/adadoc/adadoc-2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils gnat
-
-DESCRIPTION="A tool for Ada95 to create documentation from specification packages"
-
-HOMEPAGE="http://adadoc.sourceforge.net"
-
-SRC_URI="mirror://sourceforge/adadoc/${PN}-v${PV}.src.tar.bz2
-	mirror://sourceforge/adadoc/UserGuide.pdf
-	mirror://sourceforge/adadoc/HowToWriteModule.pdf"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE=""
-
-DEPEND="virtual/ada
-	>=dev-ada/xmlada-1.0-r2"
-
-RDEPEND=""
-
-S=${WORKDIR}/dev
-
-lib_compile() {
-	${ADAMAKE} adadoc -Itools -Iparser -Imodules -cargs ${ADACFLAGS} -bargs -shared \
-		`xmlada-config` ||  die
-}
-
-lib_install() {
-	cp adadoc ${DL}
-}
-
-src_install() {
-	#set up environment
-	echo "PATH=%DL%" > ${LibEnv}
-	echo "LDPATH=%DL%" >> ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=/usr/include/ada/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	insinto /usr/share/doc/adadoc-${PV}
-	doins "${DISTDIR}"/UserGuide.pdf
-	doins "${DISTDIR}"/HowToWriteModule.pdf
-	insinto /usr/share/adadoc
-	doins adadoc_tags.cfg
-}
-
-pkg_postinst() {
-	eselect gnat update
-	elog "The environment has been set up to make gnat automatically find files for"
-	elog "${PN}. In order to immediately activate these settings please do:"
-	elog "env-update && source /etc/profile"
-	elog "Otherwise the settings will become active next time you login"
-}
diff --git a/dev-ada/adadoc/metadata.xml b/dev-ada/adadoc/metadata.xml
deleted file mode 100644
index 278afb287b05..000000000000
--- a/dev-ada/adadoc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-		<name>Gentoo Resources for Ada</name>
-	</maintainer>
-	<longdescription>AdaDoc is a tool for developers using the Ada95 programming language. It's goal is to create documentation in different format from a specification package.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">adadoc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ada/adasockets/Manifest b/dev-ada/adasockets/Manifest
deleted file mode 100644
index e21bd9598d09..000000000000
--- a/dev-ada/adasockets/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST adasockets-1.8.4.7.tar.gz 621945 SHA256 496591ab6eb97597088554492c91500a464afe774a9c56dffc1ba048016e8a3e SHA512 d8aa68f1296f538fb38c49f99f9ff63d204e94c64c46c39cf2d337095e73fe43394e9087d4163ee29af1061bd46e00f41a847c82fdbb203e35bdb89e5635ce6f WHIRLPOOL bfaa138278ca225a38edebb680538564bcd0f3940164d6605c2442b2798a5d1daa6d640eb9bd90fa87518f75a8dc9ce042faca0610e006a6d04f22db18eba169
diff --git a/dev-ada/adasockets/adasockets-1.8.4.7.ebuild b/dev-ada/adasockets/adasockets-1.8.4.7.ebuild
deleted file mode 100644
index f9e7fe6f9730..000000000000
--- a/dev-ada/adasockets/adasockets-1.8.4.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-WANT_AUTOCONF="2.1"
-
-inherit gnat
-
-DESCRIPTION="An Interface to BSD sockets from Ada (TCP, UDP and multicast)"
-SRC_URI="http://www.rfc1149.net/download/adasockets/${P}.tar.gz"
-HOMEPAGE="http://www.rfc1149.net/devel/adasockets/"
-LICENSE="GMGPL"
-
-DEPEND="virtual/ada"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-
-# a location to temporarily keep common stuff installed by make install
-CommonInst="${WORKDIR}/common-install"
-
-lib_compile() {
-	econf || die "./configure failed"
-	emake || die
-}
-
-lib_install() {
-	mv ${SL}/src/sockets*.ali ${DL}
-	mv src/.libs/libadasockets.a ${DL}
-	mv src/.libs/libadasockets.so* ${DL}
-
-	# move common stuff out of $DL
-	if [[ ! -d "${CommonInst}" ]] ; then
-		# we need only one copy, its all identical
-		mkdir "${CommonInst}"
-		mv ${SL}/src/*.ad? "${CommonInst}"
-	fi
-}
-
-src_install() {
-	# sources
-	dodir   "${AdalibSpecsDir}/${PN}"
-	insinto "${AdalibSpecsDir}/${PN}"
-	doins "${CommonInst}"/sockets*.ad?
-
-	# environment
-	echo "ADA_OBJECTS_PATH=%DL%" > ${LibEnv}
-	echo "ADA_INCLUDE_PATH=${AdalibSpecsDir}/${PN}" >> ${LibEnv}
-	echo "LDPATH=%DL%" >> ${LibEnv}
-
-	gnat_src_install
-
-	# and docs
-	dodoc AUTHORS INSTALL NEWS README doc/adasockets.ps
-	doinfo doc/adasockets.info
-	insinto /usr/share/doc/${PF}
-	doins doc/adasockets.pdf
-}
diff --git a/dev-ada/adasockets/metadata.xml b/dev-ada/adasockets/metadata.xml
deleted file mode 100644
index 54d526bb5fd0..000000000000
--- a/dev-ada/adasockets/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ada@gentoo.org</email>
-	<name>Gentoo Resources for Ada</name>
-</maintainer>
-<longdescription>AdaSockets is a set of free software Ada packages allowing Ada programmers to use the so-called BSD sockets from their favourite programming language. AdaSockets has been designed and tested with the GNAT free software Ada compiler, but should be portable to other compilers quite easily. AdaSockets philosophy is to help the Ada programmer by providing easy-to-use objects. Special care has been taken to ensure that performances do however remain good.</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
deleted file mode 100644
index 6cfe5d69f1e6..000000000000
--- a/dev-ada/aunit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aunit-1.05.tar.bz2 109000 SHA256 76a7240203ab708743bc40fe29209e04b3edbe429a4dfb35be580fc80d490b09 SHA512 3a51f3d614061bed124636852b3677f95a739b0ffc748d2f6570cd2bfcf73db36364504b07e4169e268861bdce5a22e2d3a467d809a8776a8e407e83a7364a77 WHIRLPOOL eb403e4e30887ae202302d8b26ba3909190bd05d721688cde685b98539eb37c4db52f9a07e9547be380d735593dfd349a2e4d1f55153d5b2cdb38d3caa0403fe
-DIST aunit-2.01.tar.bz2 186622 SHA256 fca41d07a7e5a7f82e8f53fb8d579c250ae5436adf9f677dfa2d3f657453b8f9 SHA512 6a07745cc6d4027b48064240d9511634725201ed3f59f3adb6907ec3b58409cca472cd0790c364ceb412c14fec7633d62277cdaf94c66458fab5c11c8fe058bf WHIRLPOOL fea15eeece2023f6388e7ad9dafcdd93c1d263b8a356549d85189ab137868b7e7d7641cf72440dfb39c4ebba37bd19dd665e6d434b506b84882955aa04bd46a7
-DIST aunit-2.03.tar.bz2 218201 SHA256 b57862b01094e9db2d564aeb25377cf91a678802f4124e455a432e1ec8fb8367 SHA512 f3afb4ae05e493eb598368f223dc8dc1740ee11b58f00394b6bececba4a2c7409ed2b48bbc7104a4099ac919e51e741ebe2738133410274240ccecd23fb2ad7d WHIRLPOOL 4e3b46b8156fc25fb2f1270cb08273b81ed5e054c196453745a77a1e99302857b7ecd36a6c071981e7e09f1efc7cb5d1dac933053f60dd5828bb0aa62fc7570a
diff --git a/dev-ada/aunit/aunit-1.05.ebuild b/dev-ada/aunit/aunit-1.05.ebuild
deleted file mode 100644
index cf7eacee4d89..000000000000
--- a/dev-ada/aunit/aunit-1.05.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat
-
-IUSE=""
-
-DESCRIPTION="Aunit, Ada unit testing framework"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="https://libre.adacore.com/aunit/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-
-DEPEND="virtual/ada"
-RDEPEND="${DEPEND}"
-
-lib_compile() {
-	gnatmake -Paunit
-	gnatmake -Paunit_dyn
-}
-
-lib_install() {
-	mv aunit/lib/* ${DL}
-	chmod 0444 ${DL}/*.ali
-}
-
-src_install () {
-	dodir ${AdalibSpecsDir}/${PN}
-	insinto ${AdalibSpecsDir}/${PN}
-	doins aunit/*/*.ad?
-
-	dodir ${AdalibDataDir}/${PN}
-	insinto ${AdalibDataDir}/${PN}
-	doins -r support/aunit.xml template/
-
-	#set up environment
-	echo "LDPATH=%DL%" > ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=/usr/include/ada/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc README docs/aunit.txt
-	dohtml docs/aunit.{html,css}
-	doinfo docs/aunit.info
-	cp -dPr test/ docs/aunit.pdf "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-ada/aunit/aunit-2.01.ebuild b/dev-ada/aunit/aunit-2.01.ebuild
deleted file mode 100644
index 14a7c20a5e27..000000000000
--- a/dev-ada/aunit/aunit-2.01.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat
-
-IUSE=""
-
-DESCRIPTION="Aunit, Ada unit testing framework"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="https://libre.adacore.com/aunit/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-
-DEPEND="virtual/ada"
-RDEPEND="${DEPEND}"
-
-lib_compile() {
-	cd aunit
-	SUPPORT_EXCEPTION=yes SUPPORT_CALENDAR=yes gnatmake -Paunit_build
-	SUPPORT_EXCEPTION=yes SUPPORT_CALENDAR=yes gnatmake -Paunit_build_dyn
-}
-
-lib_install() {
-	mv aunit/lib/* ${DL}
-	chmod 0444 ${DL}/*.ali
-}
-
-src_install () {
-	dodir ${AdalibSpecsDir}/${PN}
-	insinto ${AdalibSpecsDir}/${PN}
-	doins aunit/*/*.ad? aunit/framework/*/*.ad?
-
-	dodir ${AdalibDataDir}/${PN}
-	insinto ${AdalibDataDir}/${PN}
-	doins -r support/aunit.xml template/
-
-	#set up environment
-	echo "LDPATH=%DL%" > ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=/usr/include/ada/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc README docs/aunit.txt
-	dohtml docs/aunit.{html,css}
-	doinfo docs/aunit.info
-	cp -dPr test/ docs/aunit.pdf "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-ada/aunit/aunit-2.03.ebuild b/dev-ada/aunit/aunit-2.03.ebuild
deleted file mode 100644
index 4df95e2f9b10..000000000000
--- a/dev-ada/aunit/aunit-2.03.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat
-
-IUSE=""
-
-DESCRIPTION="Aunit, Ada unit testing framework"
-SRC_URI="https://dev.gentoo.org/~george/src/${P}.tar.bz2"
-HOMEPAGE="https://libre.adacore.com/aunit/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-
-DEPEND="virtual/ada"
-RDEPEND="${DEPEND}"
-
-lib_compile() {
-	cd aunit
-	SUPPORT_EXCEPTION=yes SUPPORT_CALENDAR=yes gnatmake -Paunit_build
-	SUPPORT_EXCEPTION=yes SUPPORT_CALENDAR=yes gnatmake -Paunit_build_dyn
-}
-
-lib_install() {
-	mv aunit/lib/* ${DL}
-	chmod 0444 ${DL}/*.ali
-}
-
-src_install () {
-	dodir ${AdalibSpecsDir}/${PN}
-	insinto ${AdalibSpecsDir}/${PN}
-	doins aunit/*/*.ad? aunit/framework/*/*.ad?
-
-	dodir ${AdalibDataDir}/${PN}
-	insinto ${AdalibDataDir}/${PN}
-	doins -r support/aunit.xml template/
-
-	#set up environment
-	echo "LDPATH=%DL%" > ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=/usr/include/ada/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc README docs/aunit.txt
-	dohtml docs/aunit.{html,css}
-	doinfo docs/aunit.info
-	cp -dPr test/ docs/aunit.pdf "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-ada/aunit/metadata.xml b/dev-ada/aunit/metadata.xml
deleted file mode 100644
index 2c93d7be153e..000000000000
--- a/dev-ada/aunit/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ada@gentoo.org</email>
-	<name>Gentoo Resources for Ada</name>
-</maintainer>
-<longdescription>AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It's intended as a developer's tool to facilitate confident writing and evolution of Ada software. It is purposely lightweight, as one of its main goals is to make it easy to develop and run unit tests, rather than to generate artifacts for process management. The framework supports easy composition of sets of unit tests to provide flexibility in determining what tests to run for a given purpose.</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/booch_components/Manifest b/dev-ada/booch_components/Manifest
deleted file mode 100644
index b26b4c2fbbc9..000000000000
--- a/dev-ada/booch_components/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bc-20051222.tgz 181962 SHA256 b9ea09a084fcfd3cab04951b6ad3b882b8bec41c05203986004c46ad60d4d27f SHA512 3d7f39255d832d82f8bf3ab9e68343c69d7c20757f84cd12708cde62f1e8a94764b7966bddd0727c7c0c6c25249911d7e17ba5e0024c6f22cecccd6b2229fee0 WHIRLPOOL fe25da0388fb2f683d775dd86de40b2dd342364d93f26b82e7f3a4c07020b252b903ccdb5890b1253c3595447df01711f75bead53dd4b2b281955bcf68ce7b9c
-DIST bc-20070420.tgz 183645 SHA256 09eb43fa318c354ef5dc57c25faaa0d472fedc7b26215e14914e611a483686bb SHA512 7af86db3b7c7543b6fcbe9f7154ece69a1e4219d5da9a9652cc75f76b2968ccb4682792f4f3041addec7d56a0ebed6e532cdac05da6461c6510f256cd4ae34aa WHIRLPOOL e3772fddbebc719b2865686c6890d456eb29f9274df25c1eed2e353aca417efbe757582dac776743fafd19d088329af20cff58719f3e882e1b53fe0ff8d1d1c3
-DIST bc-html-20051222.zip 59373 SHA256 1f92a74fb2427af92c28a4dacc5d02b515a6ae1a783a354efb8b9b2f11b85dd4 SHA512 14667e14f7075311720356931352ad261bf544928a10e60ab414fac45349a5833b94facf939b6ec4c48e7238c8952607de9e8d85cbc291250ed2d4eda23c5310 WHIRLPOOL 3a7ff4fb9bfd55baead14d32ac29240ddfbe29856d070e269f2c49394c61cb1249bff880a39659cd005772a3203e1d0c16f6e680bee241f68dd3f2a7bfe87af6
-DIST bc-html-20070420.zip 60500 SHA256 049c5edbe8c54cb632807488deb5d2782923b934afde16b565dcb7bab79629da SHA512 d5d70d73c2a6850f00912d2f2c92a5ce16f9fb72c1c0c1399095686c7c77250f40d56586c75a6ac14ecd19ed9a35b3852ef8c97f5fd52639c4d949a0c1568219 WHIRLPOOL b6c851cf19b743caea964862487b540430c594b1c416e36ae9e2ac295274f8ee2ddda7232d964d5e96311a8871b06a35ddd79b023c0eaf7b1e9a8507bd2cbe22
diff --git a/dev-ada/booch_components/booch_components-20051222-r1.ebuild b/dev-ada/booch_components/booch_components-20051222-r1.ebuild
deleted file mode 100644
index 31d25b88cc58..000000000000
--- a/dev-ada/booch_components/booch_components-20051222-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-IUSE="doc"
-
-inherit gnat
-
-My_PN="bc"
-S="${WORKDIR}/${My_PN}-${PV}"
-DESCRIPTION="Booch Components for Ada"
-SRC_URI="mirror://sourceforge/booch95/${My_PN}-${PV}.tgz
-	mirror://sourceforge/booch95/${My_PN}-html-${PV}.zip"
-
-HOMEPAGE="http://booch95.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-
-RDEPEND="virtual/ada
-	>=app-eselect/eselect-gnat-0.7"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-lib_compile() {
-	cd ${SL}/GNAT
-	make
-}
-
-lib_install() {
-	# new style booch components install Debug and Release versions, we only
-	# need the lib subdir of either
-	mkdir -p "${DL}"/Debug
-	# both $SL and $DL are under ${WORKDIR}, so no dodir, doins...
-	# (as lib_install is  called from src_compile it is not safe to have $DL
-	# under $D)
-	mv "${SL}"/GNAT/*-Release/lib/* "${DL}"
-	mv "${SL}"/GNAT/*-Debug/lib/* "${DL}"/Debug
-}
-
-src_install () {
-	dodir "${AdalibSpecsDir}/${PN}"
-	cd "${S}"
-	insinto "${AdalibSpecsDir}/${PN}"
-	doins *.ad?
-
-	#set up environment
-	echo "LDPATH=%DL%" > ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=${AdalibSpecsDir}/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	# Install documentation.
-	dodoc README
-	if use doc ; then
-		einfo "installing docs"
-		cd "${WORKDIR}"
-		dohtml *.html *.gif *.jpg
-		cp coldframe-hash.* x.ada "${D}"/usr/share/doc/${PF}/html
-
-		cd "${S}"
-		dodir /usr/share/doc/${PF}/demo
-		insinto /usr/share/doc/${PF}/demo
-		doins demo/*
-
-		dodir /usr/share/doc/${PF}/test
-		insinto /usr/share/doc/${PF}/test
-		doins test/*
-	fi
-}
-
-pkg_postinst(){
-	einfo "Updating gnat configuration to pick up ${PN} library..."
-	eselect gnat update
-	elog "The environment has been set up to make gnat automatically find files in"
-	elog "Booch components. In order to immediately activate these settings please do"
-	elog "env-update"
-	elog "source /etc/profile"
-	elog "Otherwise the settings will become active next time you login"
-}
diff --git a/dev-ada/booch_components/booch_components-20070420.ebuild b/dev-ada/booch_components/booch_components-20070420.ebuild
deleted file mode 100644
index 4d668809228b..000000000000
--- a/dev-ada/booch_components/booch_components-20070420.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-IUSE="doc"
-
-inherit gnat
-
-My_PN="bc"
-S="${WORKDIR}/${My_PN}-${PV}"
-DESCRIPTION="Booch Components for Ada"
-SRC_URI="mirror://sourceforge/booch95/${My_PN}-${PV}.tgz
-	mirror://sourceforge/booch95/${My_PN}-html-${PV}.zip"
-
-HOMEPAGE="http://booch95.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-
-RDEPEND="virtual/ada"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-lib_compile() {
-	cd "${SL}"/GNAT
-	make
-}
-
-lib_install() {
-	mkdir -p "${DL}"/Debug
-	mv "${SL}"/GNAT/*-Release/lib/* "${DL}"
-	mv "${SL}"/GNAT/*-Debug/lib/* "${DL}"/Debug
-	chmod 0444 "${DL}"/*.ali "${DL}"/Debug/*.ali
-}
-
-src_install () {
-	dodir "${AdalibSpecsDir}/${PN}"
-	insinto "${AdalibSpecsDir}/${PN}"
-	doins *.ad?
-
-	#set up environment
-	echo "LDPATH=%DL%" > ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=${AdalibSpecsDir}/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	# Install documentation.
-	dodoc README
-	if use doc ; then
-		einfo "installing docs"
-		cd "${WORKDIR}"
-		dohtml *.html *.gif *.jpg
-		cp coldframe-hash.* x.ada "${D}"/usr/share/doc/${PF}/html
-
-		cd "${S}"
-		dodir /usr/share/doc/${PF}/demo
-		insinto /usr/share/doc/${PF}/demo
-		doins demo/*
-
-		dodir /usr/share/doc/${PF}/test
-		insinto /usr/share/doc/${PF}/test
-		doins test/*
-	fi
-}
diff --git a/dev-ada/booch_components/metadata.xml b/dev-ada/booch_components/metadata.xml
deleted file mode 100644
index 96004220d5a5..000000000000
--- a/dev-ada/booch_components/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-		<name>Gentoo Resources for Ada</name>
-	</maintainer>
-	<longdescription>The booch components provide a set of reusable components used in an efficient and appropriate manner, with the overall goal of balancing usability and extensibility. The BCs cover several issues: Time and Space semantics, Storage Management policies, Exception and Idioms for iteration.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">booch95</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ada/florist/Manifest b/dev-ada/florist/Manifest
deleted file mode 100644
index 231bf25ce6cf..000000000000
--- a/dev-ada/florist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST florist-2007.0.tar.bz2 167089 SHA256 e6047390bba1fc70feeafd2009a7a00b6bb6126bb64520e0c0f973aa6ced838a SHA512 b04f947e08c48364fd339cf0e6437c2f5d869f2195d9b364ddd95b364b481d525a6784f39d55b9f0d495b3a0e8966b2a4821e086e79901ffcd330da42395beca WHIRLPOOL f2b170f78a982bfeb629b2ceb69b476ff0fa50476ddc8688b9b13dd401205866f9d2c21c9c5d79cce2db3c527a15eca93ed70630f1ab16cad5e59dd2f37774a9
diff --git a/dev-ada/florist/florist-2007.0.ebuild b/dev-ada/florist/florist-2007.0.ebuild
deleted file mode 100644
index 774ca57310d1..000000000000
--- a/dev-ada/florist/florist-2007.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat libtool
-
-IUSE=""
-
-DESCRIPTION="Posix bindings for Ada"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=virtual/ada-2005"
-
-lib_compile()
-{
-	elibtoolize
-	econf || die "econf failed"
-	emake || die "make failed"
-	make floristlib || die "building library failed"
-	einfo "lib_compile completed"
-}
-
-# NOTE: we are using $1 - the passed gnat profile name
-lib_install()
-{
-	# install goal is just (access violating) mkdir and 2 cp's
-	# instead move stuff properly here
-	cp -rp "${SL}"/floristlib/{libflorist.a,*.ali} "${DL}"
-	chmod 0444 "${DL}"/*.ali
-}
-
-src_install ()
-{
-	# install sources
-	dodir "${AdalibSpecsDir}/${PN}"
-	insinto "${AdalibSpecsDir}/${PN}"
-	doins -r *.ad{b,s} *.c *.gpb gnatsocks/
-
-	#set up environment
-	echo "LDPATH=%DL%" >> ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=${AdalibSpecsDir}/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc README
-}
diff --git a/dev-ada/florist/metadata.xml b/dev-ada/florist/metadata.xml
deleted file mode 100644
index b50272fb977c..000000000000
--- a/dev-ada/florist/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-		<name>Gentoo Resources for Ada</name>
-	</maintainer>
-	<longdescription>
-		Florist is the (F)lorida (S)tate (U)niversity open-source implementaton 
-		of IEEE Standard 1003.5b-1996, the POSIX Ada binding, including real-time 
-		extensions. This software provides access to the UNIX operating system services 
-		for application programs written in the Ada programming language. It is 
-		designed to be self-configuring for a POSIX-compliant system. A suite of 
-		test programs is included.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
deleted file mode 100644
index 89aa53a3a38c..000000000000
--- a/dev-ada/gtkada/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GtkAda-gpl-2.10.0.tgz 5519438 SHA256 f5a1a4efecaf99ce7cdaecfa4df7b6935be03692c9b68d8c746a58cca1137a30 SHA512 5162a5c75d5bf9e6f7f6d5f9b54680d7b4fb1265010630d96e9054b9d1993b8f06c63533f6fdbdc6f7b2137c3d88fb7fec06d0ca1460014e701a2469b280d173 WHIRLPOOL 4454e4824b036f6e5072b5d6b042213bbca5ffd27e4c7a6e903f41e0806bc8b232b439fc7480c533c10bab0ac65c40513364c4f266c8f367eda5cdcd76bcefe8
diff --git a/dev-ada/gtkada/files/gtkada-2.4.0.patch b/dev-ada/gtkada/files/gtkada-2.4.0.patch
deleted file mode 100644
index 063507f4a09b..000000000000
--- a/dev-ada/gtkada/files/gtkada-2.4.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru GtkAda-2.4.0-orig/src/gtkada-mdi.adb GtkAda-2.4.0/src/gtkada-mdi.adb
---- GtkAda-2.4.0-orig/src/gtkada-mdi.adb	2004-11-09 09:35:57.000000000 +0100
-+++ GtkAda-2.4.0/src/gtkada-mdi.adb	2006-05-18 23:15:13.917488750 +0200
-@@ -4778,6 +4778,7 @@
-             when Top | Bottom =>
-                Widths (Side)  := 0;
-                Heights (Side) := Get_Allocation_Height (MDI.Docks (Side));
-+            when None => Null;
-          end case;
- 
-          --  If not allocated yet
diff --git a/dev-ada/gtkada/gtkada-2.10.0.ebuild b/dev-ada/gtkada/gtkada-2.10.0.ebuild
deleted file mode 100644
index 3688bf2b66a5..000000000000
--- a/dev-ada/gtkada/gtkada-2.10.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils gnat versionator
-
-Name="GtkAda-gpl"
-MajorPV=$(get_version_component_range 1-2)
-DESCRIPTION="Gtk+ bindings to the Ada language"
-HOMEPAGE="https://libre.adacore.com/GtkAda/"
-SRC_URI="mirror://gentoo/${Name}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="nls opengl"
-
-DEPEND="virtual/ada
-	>=x11-libs/cairo-1.2.6
-	>=dev-libs/glib-2.12.4
-	>=x11-libs/pango-1.14.9
-	>=dev-libs/atk-1.12.1
-	>=x11-libs/gtk+-2.10.9
-	>=sys-apps/sed-4"
-RDEPEND=""
-
-S="${WORKDIR}/${Name}-${PV}"
-
-# only needed for gcc-3.x based gnat profiles, but matching them individually
-# would be insane
-QA_EXECSTACK="${AdalibLibTop:1}/*/gtkada/libgtkada-${MajorPV}.so.0"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e "s:-aI\$prefix/include/gtkada:-aI${AdalibSpecsDir}/gtkada:" \
-		src/tools/gtkada-config.in
-
-	# disable building tests to avoid waisting time while building for every
-	# profile. The tests are nonetheless installed under doc dir.
-	sed -i -e "/testgtk_dir/d" Makefile.in
-
-	# remove lib stripping
-	sed -i -e "s: strip \$(LIBNAME)::" src/Makefile.common.in
-}
-
-lib_compile() {
-	# some profile specific fixes first
-	sed -i -e "s:\$prefix/lib\(/gtkada\)*:${AdalibLibTop}/$1/gtkada:" \
-		src/tools/gtkada-config.in
-
-	local myconf
-	use opengl && myconf="--with-GL=auto" || myconf="--with-GL=no"
-
-	econf ${myconf} $(use_enable nls) || die "./configure failed"
-
-	# bug #279962
-	emake -j1 GNATFLAGS="${ADACFLAGS}" || die
-}
-
-lib_install() {
-	# make install misses all the .so and .a files and otherwise creates more
-	# problems than it's worth. Will do everything manually
-	mkdir -p "${DL}"
-	mv src/lib-obj/* src/*/obj/* src/tools/gtkada-config "${DL}"
-	rm "${DL}"/*.o
-	chmod 0444 "${DL}"/*.ali
-	chmod 0755 "${DL}"/gtkada-config
-}
-
-src_install() {
-	#set up environment
-	echo "PATH=%DL%" > ${LibEnv}
-	echo "LDPATH=%DL%" >> ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=${AdalibSpecsDir}/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	#specs
-	cd "${S}"/src
-	dodir "${AdalibSpecsDir}/${PN}"
-	insinto "${AdalibSpecsDir}/${PN}"
-	doins *.ad? glade/*.ad? gnome/*.ad? opengl/*.{ad?,c,h}
-
-	#docs
-	cd "${S}"
-	dodoc ANNOUNCE AUTHORS README
-	cp -dPr examples/ testgtk/ "${D}/usr/share/doc/${PF}"
-	cd "${S}"/docs
-	doinfo gtkada_ug/gtkada_ug.info
-	ps2pdf gtkada_ug/gtkada_ug.ps
-	ps2pdf gtkada_rm/gtkada_rm.ps
-	cp gtkada_ug.pdf gtkada_rm.pdf "${D}/usr/share/doc/${PF}"
-	dohtml -r gtkada_ug/{gtkada_ug.html,boxes.gif,hierarchy.jpg}
-	cp -dPr gtkada_rm/gtkada_rm/ "${D}/usr/share/doc/${PF}/html"
-
-	# utility stuff
-	cd "${S}"
-	dodir "${AdalibDataDir}/${PN}"
-	insinto "${AdalibDataDir}/${PN}"
-	doins -r xml/gtkada.xml projects/
-}
-
-pkg_postinst() {
-	eselect gnat update
-	einfo "The environment has been set up to make gnat automatically find files for"
-	einfo "GtkAda. In order to immediately activate these settings please do:"
-	einfo "   env-update && source /etc/profile"
-	einfo "Otherwise the settings will become active next time you login"
-}
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
deleted file mode 100644
index 4a0a87eec833..000000000000
--- a/dev-ada/gtkada/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ada@gentoo.org</email>
-	<name>Gentoo Resources for Ada</name>
-</maintainer>
-<longdescription>GtkAda is the technology that lets you implement the next generation of Ada 95 GUIs in an efficient and platform-independent manner. In addition to providing over 100 widgets and allowing you to use portable low-level drawing primitives, GtkAda has a pluggable look-and-feel and comes with a high-level GUI builder that allows round-trip GUI generation and update.</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
deleted file mode 100644
index 04ee3943bc02..000000000000
--- a/dev-ada/xmlada/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST XmlAda-1.0.tgz 322079 SHA256 e86ccd448574ff1ec2205f9bfbfa5812023dc4ce5d4b1c2e2c8b1ffbd29ce917 SHA512 2b692d5bf1e1c28a303cee42fa43d9f5dc578aa5c93134ae25f3abe04ab3b6c3d5744ea0aa28d1dff0fc82fb190d1e60a1c8d6cd2866989b0cd63c2af438126b WHIRLPOOL 21db8cdb9432848a69b8abe2ebcc152be37876b28387e4922fc56f72190fcc9da791a9b87f1736aaaec9b4962aa28df46614ef3731eec8711d418583ff383a00
-DIST xmlada-2.2.0.tar.bz2 591666 SHA256 3935a1a158a120bb53d5417a518b7283b5d97f478cf3af0f5e02222ae3b5c7b4 SHA512 dc8e1c963f4d40518be1058972697ea629a065e709704b05d501e62be77733f00419d9578fcc1305d3fbc5b90dae1742e7c2ae2ae0e3803c47e767e57770872a WHIRLPOOL c3cd616301b8be9f126f55f3a069a34974a80d3753839b8c8745edfb96b86ef3d77ae009689e881f56c9f938fa1c62f3d86a6d9a4222a661e3f43c9077911af4
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
deleted file mode 100644
index 5de3dc8b6f0f..000000000000
--- a/dev-ada/xmlada/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ada@gentoo.org</email>
-	<name>Gentoo Resources for Ada</name>
-</maintainer>
-<longdescription>XML/Ada includes a complete XML parser that fully supports the XML 1.0 specifications, including DTDs, entity resolution, external entities,attribute normalization, and conditional sections. XML/Ada also supports the SAX 2.0 standard. Through an object-oriented Ada interface, the XML/Ada SAX implementation provides an extremely efficient way to convert XML streams to application-specific data representations. XML/Ada includes full support for the core part of DOM 2.0. In addition to this XML support, XML/Ada includes an extensive set of packages to read, manipulate and write Unicode streams, in various encodings like UTF-8, UTF-16 and UTF-32. It provides a conversion mechanism between Unicode and encodings such as Latin-1, Latin-2, etc.</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/xmlada/xmlada-1.0-r4.ebuild b/dev-ada/xmlada/xmlada-1.0-r4.ebuild
deleted file mode 100644
index 592676f940e4..000000000000
--- a/dev-ada/xmlada/xmlada-1.0-r4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat versionator
-
-IUSE=""
-
-Name="XmlAda"
-
-DESCRIPTION="XML library for Ada"
-HOMEPAGE="http://libre2.adacore.com/xmlada/"
-SRC_URI="https://libre2.adacore.com/xmlada/${Name}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="virtual/gnat
-	>=sys-apps/sed-4"
-RDEPEND=""
-
-src_unpack()
-{
-	unpack ${A}
-
-	cd "${S}"
-	#making .dvi docs is problemmatic. Skip that for now
-	sed -i -e "s/all: obj test docs/all: obj test/" Makefile.in
-	#increase stack size
-	cd sax
-	sed -i -e "s/Stack_Size : constant Natural := 64;/Stack_Size : constant Natural := 128;/" sax-readers.adb
-}
-
-lib_compile()
-{
-	# for some reason shared libs are assigned version numbers from some
-	# pre-release (possibly when upstream stopped to care about them?)
-	local MAJOR=$(get_major_version)
-	local MINOR=$(get_version_component_range 2-)
-	# force building shared libs and fix broken shared lib versioning
-	sed -i -e "s:BUILD_SHARED=FALSE:BUILD_SHARED=TRUE:" \
-		-e "s:libxmlada_\${@\:%_install=%}-\${MAJOR}.\${MINOR}.so:libxmlada_\${@\:%_inst=%}.so.${MAJOR}.${MINOR}:" \
-		-e "s:libxmlada_\${@\:%_inst=%}-\${MAJOR}.\${MINOR}.so:libxmlada_\${@\:%_inst=%}.so.${MAJOR}.${MINOR}:" \
-		-e "s:FPIC=:FPIC=-fPIC:" Makefile.in
-
-	export CFLAGS=$ADACFLAGS
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--with-system-zlib || die
-
-	export COMPILER=gnatmake
-	make || die "make failed"
-}
-
-# here we need to use the $1 - passed gnat profile name
-lib_install() {
-	make PREFIX="${DL}" install || die "install failed"
-
-	# fix xmlada-config hardsets locations
-	sed -i -e "s:\${prefix}/include/xmlada:${AdalibSpecsDir}/${PN}:" \
-		-e "s:\${prefix}/lib:${AdalibLibTop}/$1/${PN}:g" \
-		"${DL}"/bin/xmlada-config
-
-	# now move stuff to proper location and delete extras
-	mv "${DL}"/bin/xmlada-config "${DL}"/lib/* "${DL}"/include/${PN}/*.ali "${DL}"
-	rm -rf "${DL}"/bin "${DL}"/include "${DL}"/lib
-}
-
-src_install ()
-{
-	cd "${S}"
-	dodir ${AdalibSpecsDir}/${PN}
-	insinto ${AdalibSpecsDir}/${PN}
-	doins dom/*.ad? input_sources/*.ad? sax/*.ad? unicode/*.ad?
-
-	#set up environment
-	echo "PATH=%DL%" > ${LibEnv}
-	echo "LDPATH=%DL%" >> ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=/usr/include/ada/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc AUTHORS README docs/xml.ps
-	dohtml docs/*.html
-	doinfo docs/*.info
-	#need to give a proper name to the info file
-	cd "${D}"/usr/share/info
-	mv xml.info.gz ${PN}.info.gz
-
-}
diff --git a/dev-ada/xmlada/xmlada-2.2.0-r1.ebuild b/dev-ada/xmlada/xmlada-2.2.0-r1.ebuild
deleted file mode 100644
index 3ab0747376b4..000000000000
--- a/dev-ada/xmlada/xmlada-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat versionator
-
-IUSE=""
-
-DESCRIPTION="XML library for Ada"
-HOMEPAGE="http://libre.adacore.com/xmlada/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="virtual/ada
-	virtual/latex-base
-	sys-apps/texinfo
-	>=sys-apps/sed-4"
-RDEPEND=""
-
-src_unpack()
-{
-	unpack ${A}
-	cd "${S}"
-
-	# adjusting profile independent stuff in project files
-#	for fn in distrib/*/xmlada*.gpr; do
-#		sed -i -e "s:../../include/xmlada:${AdalibSpecsDir}/${PN}:" ${fn}
-#	done
-	sed -i -e "s:\.\./\.\./include/xmlada:${AdalibSpecsDir}/${PN}:" \
-		distrib/*/xmlada*.gpr || die "failed to adjust project files"
-
-	# fix profile independent stuff in xmlada-config
-	sed -i -e "s:\${prefix}/include/xmlada:${AdalibSpecsDir}/${PN}:" \
-		xmlada-config.in || die "failed to adjust xmlada-config"
-
-	# doinfo changed from gzipping stuff to bzipping, so we better rename the
-	# file before calling it to guard against other possible changes
-	mv docs/xml.info docs/${PN}.info
-}
-
-lib_compile()
-{
-	econf
-	emake
-}
-
-# NOTE: we are using $1 - the passed gnat profile name
-lib_install() {
-	# bug #283160
-	emake -j1 PREFIX="${DL}" install || die "install failed"
-
-	pushd "${DL}"
-		# fix xmlada-config hardsets locations and move it to proper location
-		sed -i -e "s:\${prefix}/lib/xmlada:${AdalibLibTop}/$1/${PN}:" \
-			-e "s:\${prefix}/lib:${AdalibLibTop}/$1/${PN}:g" \
-			bin/xmlada-config
-		mv bin/xmlada-config "${DLbin}"
-
-		# sed and organize gpr files
-		sed -i -e "s:\.\./xmlada:${AdalibLibTop}/$1/${PN}:" "${DL}"/lib/gnat/*.gpr
-		mv lib/gnat/* "${DLgpr}"
-
-		# the library and *.ali
-		mv lib/${PN}/* .
-		rm -rf bin include share lib
-
-		# fix the .so links
-		rm *.so
-		for fn in *.so.* ; do
-			ln -s ${fn} ${fn%so*}so
-		done
-	popd
-}
-
-src_install ()
-{
-	cd "${S}"
-	dodir ${AdalibSpecsDir}/${PN}
-	insinto ${AdalibSpecsDir}/${PN}
-	doins dom/*.ad? input_sources/*.ad? sax/*.ad? unicode/*.ad? schema/*.ad?
-
-	#set up environment
-	echo "PATH=%DLbin%" > ${LibEnv}
-	echo "LDPATH=%DL%" >> ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=${AdalibSpecsDir}/${PN}" >> ${LibEnv}
-	echo "ADA_PROJECT_PATH=%DLgpr%" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc AUTHORS README TODO features
-	dohtml docs/*.html
-	doinfo docs/*.info
-	insinto /usr/share/doc/${PF}
-	doins docs/*.pdf distrib/xmlada_gps.py
-
-	dodir /usr/share/doc/${PF}/examples
-	insinto /usr/share/doc/${PF}/examples
-	doins -r docs/{dom,sax,schema}
-}
diff --git a/dev-ada/xmlada/xmlada-2.2.0.ebuild b/dev-ada/xmlada/xmlada-2.2.0.ebuild
deleted file mode 100644
index 77705b4f55e9..000000000000
--- a/dev-ada/xmlada/xmlada-2.2.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat versionator
-
-IUSE=""
-
-DESCRIPTION="XML library for Ada"
-HOMEPAGE="http://libre.adacore.com/xmlada/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="virtual/ada
-	virtual/latex-base
-	sys-apps/texinfo
-	>=sys-apps/sed-4"
-RDEPEND=""
-
-lib_compile()
-{
-	econf || die "econf failed"
-	emake || die "make failed"
-}
-
-# NOTE: we are using $1 - the passed gnat profile name
-lib_install() {
-	make PREFIX="${DL}" install || die "install failed"
-
-	# fix xmlada-config hardsets locations
-	sed -i -e "s:\${prefix}/include/xmlada:${AdalibSpecsDir}/${PN}:" \
-		-e "s:\${prefix}/lib/xmlada:${AdalibLibTop}/$1/${PN}/lib:" \
-		-e "s:\${prefix}/lib:${AdalibLibTop}/$1/${PN}/lib:g" \
-		"${DL}"/bin/xmlada-config
-
-	# now move stuff to proper location and delete extras
-#	mv "${DL}"/bin/xmlada-config "${DL}"/lib/* "${DL}"/include/${PN}/*.ali "${DL}"
-	rm -rf "${DL}"/include "${DL}"/share
-}
-
-src_install ()
-{
-	cd "${S}"
-	dodir ${AdalibSpecsDir}/${PN}
-	insinto ${AdalibSpecsDir}/${PN}
-	doins dom/*.ad? input_sources/*.ad? sax/*.ad? unicode/*.ad? schema/*.ad?
-
-	#set up environment
-	echo "PATH=%DL%/bin" > ${LibEnv}
-	echo "LDPATH=%DL%/lib" >> ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%/lib" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=/usr/include/ada/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc AUTHORS README TODO features
-	dohtml docs/*.html
-	doinfo docs/*.info
-	# give a proper name to the info file
-	mv "${D}"/usr/share/info/xml.info.gz "${D}"/usr/share/info/${PN}.info.gz
-	insinto /usr/share/doc/${PF}
-	doins docs/*.pdf distrib/xmlada_gps.py
-
-	dodir /usr/share/doc/${PF}/examples
-	insinto /usr/share/doc/${PF}/examples
-	doins -r docs/{dom,sax,schema}
-}
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
index ae27eb2c84bd..afd6d3e3107c 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
@@ -20,12 +20,12 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz"
 LICENSE="public-domain"
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="doc examples static-libs"
 RESTRICT="test" # No tests but test target blows up!
 
 DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="!!dev-java/antlr:0[cxx]"
+RDEPEND="!dev-java/antlr:0[cxx]"
 
 S="${WORKDIR}/${MY_P}"
 DOCS=( lib/cpp/AUTHORS lib/cpp/ChangeLog lib/cpp/README lib/cpp/TODO )
diff --git a/dev-cpp/atkmm/atkmm-2.24.2.ebuild b/dev-cpp/atkmm/atkmm-2.24.2.ebuild
index 56fc5dc1c67f..5b0311da2590 100644
--- a/dev-cpp/atkmm/atkmm-2.24.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.24.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-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"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
index cc7d1f01fb32..eeb2476e7d83 100644
--- a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://cairographics.org/cairomm"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="aqua doc +svg X"
 
 RDEPEND="
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 72f81b1625b4..3f1c5ee545c9 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -3,3 +3,4 @@ DIST eigen-3.1.3.tar.bz2 1052724 SHA256 1a443145f321dd47a5ca11f176e7319056198a61
 DIST eigen-3.2.5.tar.bz2 1151510 SHA256 5f6e6cb88188e34185f43cb819d7dab9b48ef493774ff834e568f4805d3dc2f9 SHA512 5a90a312c3503bb91293aa9ed69258f36c6a3a06a64ff851c8b57a4df01bd467e22e5ba95221bce97a8cf2d3fb9f0ad1c1c40116a3c9c9b1f80d7fc7b0a96c7a WHIRLPOOL 21333e30f77b4712d21eb4bed6159c0e0bfb769ed65d01d4cf5cfeb1a9105f2a3c2ccbc41d251fc09399ee8ad8a50d2eb9d1ea5d38d98ca1df12f8972b24a630
 DIST eigen-3.2.6.tar.bz2 1152805 SHA256 8a3352f9a5361fe90e451a7305fb1896fc7f771dc16cc0edd8e6b157f52c343e SHA512 a1abcef36d774ab29418961143174e460e11c05f40d493844e4d4e8024e0b60c453cb007e96ed05d786eec3214d72f15ead0ac49ed84762d3037db90f11c935a WHIRLPOOL e15f917ad6b8aeda2e11c6af186073921d78c3b96c922f1068989b64a2ec7c3d58df280ce809be877b6e93a691c0d511afa601cb806bf4d9f29e9133c62e280c
 DIST eigen-3.2.7.tar.bz2 1155162 SHA256 e58e1a11b23cf2754e32b3c5990f318a8461a3613c7acbf6035870daa45c2f3e SHA512 6e9beb4fdd69d96a1bb305ea9463547c19cac0072ce908c19bf952d2b7a254c0d674d19a7797a3ba5e8617e1c1bca74dfb7c01971301cb152e467f13eaaed6cc WHIRLPOOL ff42ff72757736dceab759e6d12a6430e5d41b8119890eaf0f1158af1f6f5f25267e830e8cd5c7dbc71f5e1c27b0a9880420c1a3acd9369387489183b199d9ce
+DIST eigen-3.2.8.tar.bz2 1161201 SHA256 722a63d672b70f39c271c5e2a4a43ba14d12015674331790414fcb167c357e55 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100 WHIRLPOOL 75e54f5620299f49a540483b0b4163e3cf6c48695f30f5e258343925cb488c3915588862a3fbe2341b5dbe17ea20756409265000f19ea2f45e7706837cb2488a
diff --git a/dev-cpp/eigen/eigen-3.2.7.ebuild b/dev-cpp/eigen/eigen-3.2.7.ebuild
index be503c9b36e3..f0cc3dd00abc 100644
--- a/dev-cpp/eigen/eigen-3.2.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.7.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils
+FORTRAN_NEEDED="test"
+
+inherit cmake-utils fortran-2
 
 DESCRIPTION="C++ template library for linear algebra"
 HOMEPAGE="http://eigen.tuxfamily.org/"
@@ -13,10 +15,43 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="LGPL-2 GPL-3"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
+IUSE="altivec debug doc openmp test"
+IUSE+=" cpu_flags_x86_sse2"
+IUSE+=" cpu_flags_x86_sse3"
+IUSE+=" cpu_flags_x86_sse4_1"
+IUSE+=" cpu_flags_x86_sse4_2"
+IUSE+=" cpu_flags_x86_ssse3"
+#IUSE+=" cpu_flags_x86_x87"
 
-DEPEND="doc? ( app-doc/doxygen[dot,latex] )"
 RDEPEND="!dev-cpp/eigen:0"
+DEPEND="
+	doc? ( app-doc/doxygen[dot,latex] )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/umfpack
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		dev-qt/qtcore:4
+		virtual/opengl
+		virtual/pkgconfig
+	)
+	"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pastix-5.2-backport.patch
+	"${FILESDIR}"/${P}-adaolc-backport.patch
+)
 
 src_unpack() {
 	default
@@ -24,12 +59,21 @@ src_unpack() {
 }
 
 src_prepare() {
+	sed \
+		-e 's:-g2::g' \
+		-i cmake/EigenConfigureTesting.cmake || die
+
 	sed -i CMakeLists.txt \
 		-e "/add_subdirectory(demos/d" \
-		-e "/add_subdirectory(blas/d" \
-		-e "/add_subdirectory(lapack/d" \
 		|| die "sed disable unused bundles failed"
 
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/add_subdirectory(blas/d" \
+			-e "/add_subdirectory(lapack/d" \
+			|| die "sed disable unused bundles failed"
+	fi
+
 	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
 
 	sed \
@@ -47,10 +91,17 @@ src_compile() {
 src_test() {
 	local mycmakeargs=(
 		-DEIGEN_BUILD_TESTS=ON
-		-DEIGEN_TEST_NO_FORTRAN=ON
-		-DEIGEN_TEST_NO_OPENGL=ON
+		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+		-DEIGEN_TEST_OPENMP="$(usex openmp)"
+		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
+		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
+		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
+		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
+		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
+#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
 	)
 	cmake-utils_src_configure
+	cmake-utils_src_compile blas
 	cmake-utils_src_compile buildtests
 	cmake-utils_src_test
 }
diff --git a/dev-cpp/eigen/eigen-3.2.8-r1.ebuild b/dev-cpp/eigen/eigen-3.2.8-r1.ebuild
new file mode 100644
index 000000000000..d79230b4ae7e
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.2.8-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED="test"
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="altivec debug doc openmp test"
+IUSE+=" cpu_flags_x86_sse2"
+IUSE+=" cpu_flags_x86_sse3"
+IUSE+=" cpu_flags_x86_sse4_1"
+IUSE+=" cpu_flags_x86_sse4_2"
+IUSE+=" cpu_flags_x86_ssse3"
+#IUSE+=" cpu_flags_x86_x87"
+
+RDEPEND="!dev-cpp/eigen:0"
+DEPEND="
+	doc? ( app-doc/doxygen[dot,latex] )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/umfpack
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		dev-qt/qtcore:4
+		virtual/opengl
+		virtual/pkgconfig
+	)
+	"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.7-pastix-5.2-backport.patch
+	"${FILESDIR}"/${PN}-3.2.7-adaolc-backport.patch
+)
+
+src_unpack() {
+	default
+	mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+	sed \
+		-e 's:-g2::g' \
+		-i cmake/EigenConfigureTesting.cmake || die
+
+	sed -i CMakeLists.txt \
+		-e "/add_subdirectory(demos/d" \
+		|| die "sed disable unused bundles failed"
+
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/add_subdirectory(blas/d" \
+			-e "/add_subdirectory(lapack/d" \
+			|| die "sed disable unused bundles failed"
+	fi
+
+	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
+
+	sed \
+		-e '/Cflags/s|:.*|: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}|g' \
+		-i eigen3.pc.in || die
+
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DEIGEN_BUILD_TESTS=ON
+		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+		-DEIGEN_TEST_OPENMP="$(usex openmp)"
+		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
+		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
+		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
+		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
+		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
+#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
+	)
+	cmake-utils_src_configure
+	cmake-utils_src_compile blas
+	cmake-utils_src_compile buildtests
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+
+	# Debian installs it and some projects started using it.
+	insinto /usr/share/cmake/Modules/
+	doins "${S}/cmake/FindEigen3.cmake"
+}
diff --git a/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch
new file mode 100644
index 000000000000..82547e11951a
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Gael Guennebaud <g.gael@free.fr>
+# Date 1448895622 -3600
+# Node ID e515e2706d00294a5749db7832d10ea366b9389f
+# Parent  eb4bf011a2ea5fc4ddb0aa5332d6e616198ed886
+Update ADOL-C support.
+
+diff --git a/unsupported/Eigen/AdolcForward b/unsupported/Eigen/AdolcForward
+--- a/unsupported/Eigen/AdolcForward
++++ b/unsupported/Eigen/AdolcForward
+@@ -25,7 +25,7 @@
+ #ifndef NUMBER_DIRECTIONS
+ # define NUMBER_DIRECTIONS 2
+ #endif
+-#include <adolc/adouble.h>
++#include <adolc/adtl.h>
+ 
+ // adolc defines some very stupid macros:
+ #if defined(malloc)
+diff --git a/unsupported/test/forward_adolc.cpp b/unsupported/test/forward_adolc.cpp
+--- a/unsupported/test/forward_adolc.cpp
++++ b/unsupported/test/forward_adolc.cpp
+@@ -13,8 +13,6 @@
+ #define NUMBER_DIRECTIONS 16
+ #include <unsupported/Eigen/AdolcForward>
+ 
+-int adtl::ADOLC_numDir;
+-
+ template<typename Vector>
+ EIGEN_DONT_INLINE typename Vector::Scalar foo(const Vector& p)
+ {
+@@ -123,7 +121,7 @@
+ 
+ void test_forward_adolc()
+ {
+-  adtl::ADOLC_numDir = NUMBER_DIRECTIONS;
++  adtl::setNumDir(NUMBER_DIRECTIONS);
+ 
+   for(int i = 0; i < g_repeat; i++) {
+     CALL_SUBTEST(( adolc_forward_jacobian(TestFunc1<double,2,2>()) ));
diff --git a/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch
new file mode 100644
index 000000000000..fafaf3a68629
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User Gael Guennebaud <g.gael@free.fr>
+# Date 1393589499 -3600
+# Node ID b88efb384b160880131ad17e39bb690719112bfa
+# Parent  576120ad694efe29b70999576964d3816288fb4e
+Fix PaStiX support for Pastix 5.2
+
+diff --git a/Eigen/src/PaStiXSupport/PaStiXSupport.h b/Eigen/src/PaStiXSupport/PaStiXSupport.h
+--- a/Eigen/src/PaStiXSupport/PaStiXSupport.h
++++ b/Eigen/src/PaStiXSupport/PaStiXSupport.h
+@@ -12,6 +12,14 @@
+ 
+ namespace Eigen { 
+ 
++#if defined(DCOMPLEX)
++  #define PASTIX_COMPLEX  COMPLEX
++  #define PASTIX_DCOMPLEX DCOMPLEX
++#else
++  #define PASTIX_COMPLEX  std::complex<float>
++  #define PASTIX_DCOMPLEX std::complex<double>
++#endif
++
+ /** \ingroup PaStiXSupport_Module
+   * \brief Interface to the PaStix solver
+   * 
+@@ -74,14 +82,14 @@
+   {
+     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
+     if (nbrhs == 0) {x = NULL; nbrhs=1;}
+-    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<COMPLEX*>(vals), perm, invp, reinterpret_cast<COMPLEX*>(x), nbrhs, iparm, dparm); 
++    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_COMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_COMPLEX*>(x), nbrhs, iparm, dparm); 
+   }
+   
+   void eigen_pastix(pastix_data_t **pastix_data, int pastix_comm, int n, int *ptr, int *idx, std::complex<double> *vals, int *perm, int * invp, std::complex<double> *x, int nbrhs, int *iparm, double *dparm)
+   {
+     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
+     if (nbrhs == 0) {x = NULL; nbrhs=1;}
+-    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<DCOMPLEX*>(vals), perm, invp, reinterpret_cast<DCOMPLEX*>(x), nbrhs, iparm, dparm); 
++    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_DCOMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_DCOMPLEX*>(x), nbrhs, iparm, dparm); 
+   }
+ 
+   // Convert the matrix  to Fortran-style Numbering
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
index b490b1a48a30..13d0755d25f3 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 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="doc"
 
 RDEPEND="
diff --git a/dev-cpp/glibmm/glibmm-2.46.3.ebuild b/dev-cpp/glibmm/glibmm-2.46.3.ebuild
index 0c95ad38ccae..2a1607a08532 100644
--- a/dev-cpp/glibmm/glibmm-2.46.3.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.46.3.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"
 
 RDEPEND="
diff --git a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
index 0738d02bd5a6..3732877093e9 100644
--- a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
+++ b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-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="doc examples"
 
 # glibmm dep is because build fails with older versions...
diff --git a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
index 6353a7818121..e800ea91b8a2 100644
--- a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
+++ b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="C++ bindings for gtkglext"
 HOMEPAGE="https://projects.gnome.org/gtkglext/"
 SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 SLOT="1.0"
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
index 167b787a6ee8..bd2c9af819fb 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.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.18.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
index 401ce9966c41..42d8488883f6 100644
--- a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.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/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
index 062ecefd5b67..a05188b9bd89 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit flag-o-matic gnome2
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 SLOT="2.0"
 LICENSE="LGPL-2.1"
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
index e1903c904c82..c598ac4ee496 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 SLOT="3.0"
 LICENSE="LGPL-2.1"
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch
new file mode 100644
index 000000000000..348a590f4c30
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch
@@ -0,0 +1,21 @@
+From b572b60a5fdc630f7f3b31dfd5dbdd1ed48659ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@free.fr>
+Date: Thu, 16 Jul 2015 16:22:11 +0200
+Subject: [PATCH] Fix linking error when building with --with-boot
+
+---
+ src/libcmis/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libcmis/Makefile.am b/src/libcmis/Makefile.am
+index 3915d45..1955ea6 100644
+--- a/src/libcmis/Makefile.am
++++ b/src/libcmis/Makefile.am
+@@ -144,6 +144,7 @@ libcmis_@LIBCMIS_API_VERSION@_la_LIBADD = \
+ 	$(XML2_LIBS) \
+ 	$(CURL_LIBS) \
+ 	$(BOOST_SMART_PTR_LIBS) \
++	$(BOOST_DATE_TIME_LDFLAGS) \
+ 	$(BOOST_DATE_TIME_LIBS)
+ 
+ libcmis_@LIBCMIS_API_VERSION@_la_includedir = $(includedir)/libcmis-@LIBCMIS_API_VERSION@/libcmis
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch
new file mode 100644
index 000000000000..8c89ab8bfe33
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch
@@ -0,0 +1,44 @@
+From 0ad3ec084d918be503a8ce971af1b54887d7726f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@free.fr>
+Date: Thu, 16 Jul 2015 16:23:06 +0200
+Subject: [PATCH] Getting cppcheck-test to pass again
+
+---
+ Makefile.am         | 1 +
+ cppcheck-suppress   | 3 +++
+ cppcheck-test.sh.in | 4 +++-
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 cppcheck-suppress
+
+diff --git a/Makefile.am b/Makefile.am
+index ebf1f3b..9263497 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,6 +35,7 @@ EXTRA_DIST = \
+ 	COPYING.LGPL \
+ 	doc/cmis-client.xml \
+ 	cppcheck-test.sh \
++	cppcheck-suppress \
+ 	qa/libcmis/data
+ 
+ if ENABLE_CPPCHECK
+diff --git a/cppcheck-suppress b/cppcheck-suppress
+new file mode 100644
+index 0000000..9ef8482
+--- /dev/null
++++ b/cppcheck-suppress
+@@ -0,0 +1,3 @@
++publicAllocationError:qa/libcmis/test-decoder.cxx
++noExplicitConstructor
++noExplicitCopyMoveConstructor
+diff --git a/cppcheck-test.sh.in b/cppcheck-test.sh.in
+index 20a73f8..175e0f5 100755
+--- a/cppcheck-test.sh.in
++++ b/cppcheck-test.sh.in
+@@ -1,3 +1,5 @@
+ #!/bin/sh
+-@CPPCHECK@ -q --enable=style,performance,portability,information --error-exitcode=1 @SRCDIR@
++@CPPCHECK@ -q --enable=style,performance,portability,information \
++           --suppressions-list=./cppcheck-suppress \
++           --error-exitcode=1 @SRCDIR@
+ exit $?
diff --git a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
index 96b3308f908d..38a6a64c74aa 100644
--- a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,16 +22,12 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 IUSE="static-libs man test"
 
-RDEPEND="
-	!dev-cpp/libcmis:0
-	!dev-cpp/libcmis:0.2
-	!dev-cpp/libcmis:0.3
-	!dev-cpp/libcmis:0.4
+COMMON_DEPEND="
 	dev-libs/boost:=
 	dev-libs/libxml2
 	net-misc/curl
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	man? (
 		app-text/docbook2X
@@ -42,9 +38,17 @@ DEPEND="${RDEPEND}
 		dev-util/cppunit
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	!dev-cpp/libcmis:0
+	!dev-cpp/libcmis:0.2
+	!dev-cpp/libcmis:0.3
+	!dev-cpp/libcmis:0.4
+"
 
 src_prepare() {
 	epatch "${WORKDIR}/${P}-gcc5.patch"
+	epatch "${FILESDIR}/${P}-boost-linking.patch" \
+		"${FILESDIR}/${P}-cppcheck.patch"
 	eautoreconf
 }
 
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index dfc690240e01..c2086115172d 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code"
 [[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
@@ -22,16 +22,12 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="static-libs man test"
 
-RDEPEND="
-	!dev-cpp/libcmis:0
-	!dev-cpp/libcmis:0.2
-	!dev-cpp/libcmis:0.3
-	!dev-cpp/libcmis:0.4
+COMMON_DEPEND="
 	dev-libs/boost:=
 	dev-libs/libxml2
 	net-misc/curl
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	man? (
 		app-text/docbook2X
@@ -42,8 +38,15 @@ DEPEND="${RDEPEND}
 		dev-util/cppunit
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	!dev-cpp/libcmis:0
+	!dev-cpp/libcmis:0.2
+	!dev-cpp/libcmis:0.3
+	!dev-cpp/libcmis:0.4
+"
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
index 96f1165b9485..48e7ffcec8f9 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -13,7 +13,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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild b/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
index 4e681b7e87d5..0dd40e4c0586 100644
--- a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
+++ b/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-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="
diff --git a/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild b/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
index 57c819423e08..55a444152de5 100644
--- a/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
+++ b/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-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="
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
index 52c813635f37..64c1d3452c29 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 8630ff70b652..1ef123372d4d 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,2 +1,3 @@
+DIST mm-common-0.9.10.tar.xz 266372 SHA256 16c0e2bc196b67fbc145edaecb5dbe5818386504fe5703de27002d77140fa217 SHA512 77d6836ceb806aec49a4f97bc4a037558f9fccdd8aae88b7650cd050bf7661d597b6b4dec4a64e819652961e759b132c64887a1d9bf774d9be156d1fc00b8ad3 WHIRLPOOL 2dd096ca47f2236387170c991b0b9bdbfe3fb22aeca5e54248c12a5a40e106bef5563e6ad5d77036c7ca1afad7bf5de2550d7e3e05b7c546b9a5cfca76cadc4e
 DIST mm-common-0.9.8.tar.xz 263200 SHA256 c9ab5fd3872fbe245fbc35347acf4a95063111f81d54c43df3af662dad0a03d5 SHA512 b3aafe566b4d276bac41570a1b8243efa4b2d96711a410c3e9fe19f1725d248c5ea3bd4de602ee5504346100672d81e5e571ba430fed4ca938af032ce4ee54c1 WHIRLPOOL 6348781087fb91983aad449eb40ca49c8d6e71a464c9e587ff4f11ec801f9a2be772a3d4d15b635e59e2d127b318ff130a5b71c0993ad8edd0c7b15abf8fdf42
 DIST mm-common-0.9.9.tar.xz 264156 SHA256 9d00bc77e77794e0bd2ae68132c4b4136aa115d255e34b310f7449b29db50b7a SHA512 59927506cae42f79d40d9524e477d655e7b137822fa0ca6cb5ec255b42c2e2c658c48f7c1dd735b9781e223ee48d1f36de5aba52247ee6ef042048eb054fe8e6 WHIRLPOOL 819f4d8ce10390ad5c011b680316e24c561dd27fd7af78a09cb0af84ca49b9f47335fa69ce3475af093ab532c8a9df8f210760851e0af8f7f09f3f9e7fa72bcb
diff --git a/dev-cpp/mm-common/mm-common-0.9.10.ebuild b/dev-cpp/mm-common/mm-common-0.9.10.ebuild
new file mode 100644
index 000000000000..15139f67b02b
--- /dev/null
+++ b/dev-cpp/mm-common/mm-common-0.9.10.ebuild
@@ -0,0 +1,19 @@
+# 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="Build infrastructure and utilities for GNOME C++ bindings"
+HOMEPAGE="http://www.gtkmm.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index f94ac2b7549a..cb7dc48f97b9 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,2 +1 @@
-DIST muparser_v2_2_2.zip 1508675 SHA256 a9c3d50c1092279d2be0d4ba275ff222979da83eb960cbef6b8af1f5bfdccc5e SHA512 e4abe1ba108e928340054834e8efd101b6d0feef672df6ec04cdf27862bc4fea7c3443f0e02dc6dd8cb813e66157879ca1ce1755cecae7d81ac89eccaec29b1d WHIRLPOOL 50d33276f7db353fc0595d095a62b696a1c8d93f813034e2f6ba9ea1a9fa26d836b6637581b3164277d5e10dbc00be87015bb5e4ce8cf52237ccd37cf21dddaf
 DIST muparser_v2_2_3.zip 1481359 SHA256 dfe831b69392ab0b1eb59d3601b7b1575554a85057cf2f234f64f930c4148902 SHA512 86d140c07161757e2f0de516a4c2922ce5b135d06b01466bc15ad90833bd3e9f99b9b9c528617262597a7a5a6b09bff5ae8ced5d51c413ea611059e0bdb22e6d WHIRLPOOL 3a53d04382feec889c4a54fe2edf762d9cf8629f4ec0543cfde12b6848e3594391a778c54747d6b4cf7608fcc0ac557f71132741935716704b160601057ff312
diff --git a/dev-cpp/muParser/files/muParser-1.32-build.patch b/dev-cpp/muParser/files/muParser-1.32-build.patch
deleted file mode 100644
index 84875e0a1a51..000000000000
--- a/dev-cpp/muParser/files/muParser-1.32-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure	2008-06-09 22:51:39.000000000 +0100
-+++ configure	2009-03-09 16:12:02.335504093 +0000
-@@ -1927,10 +1927,6 @@
-     NONENONEs,x,x, &&
-   program_prefix=${target_alias}-
- 
--CFLAGS=
--CXXFLAGS=
--CPPFLAGS=
--
- for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/dev-cpp/muParser/muParser-2.2.2.ebuild b/dev-cpp/muParser/muParser-2.2.2.ebuild
deleted file mode 100644
index 271a98134228..000000000000
--- a/dev-cpp/muParser/muParser-2.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-MY_PN=${PN/P/p}
-MY_P=${MY_PN}_v${PV/./}
-
-DESCRIPTION="Library for parsing mathematical expressions"
-HOMEPAGE="http://muparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/P/p}/${PN/P/p}/Version%20${PV}/${PN/P/p}_v${PV//./_}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"/${PN/P/p}_v${PV//./_}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.32-build.patch \
-		"${FILESDIR}"/${PN}-1.32-parallel-build.patch
-	sed -i \
-		-e 's:-O2::g' \
-		configure || die
-}
-
-src_configure() {
-	chmod +x configure || die
-	econf $(use_enable test samples)
-}
-
-src_test() {
-	cat > test.sh <<- EOFTEST
-	LD_LIBRARY_PATH=${S}/lib samples/example1/example1 <<- EOF
-	quit
-	EOF
-	EOFTEST
-	sh ./test.sh || die "test failed"
-}
-
-src_install() {
-	default
-	dodoc Changes.txt
-	use doc && dohtml -r docs/html/*
-}
diff --git a/dev-cpp/muParser/muParser-2.2.3.ebuild b/dev-cpp/muParser/muParser-2.2.3.ebuild
index 73449d5e9914..84ec1578c582 100644
--- a/dev-cpp/muParser/muParser-2.2.3.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${MYPN}/${MYP}.zip"
 
 LICENSE="MIT"
 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 test"
 
 RDEPEND=""
diff --git a/dev-cpp/pangomm/pangomm-2.38.1.ebuild b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
index 38969e92770c..bb8158bf5980 100644
--- a/dev-cpp/pangomm/pangomm-2.38.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.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"
 
 COMMON_DEPEND="
diff --git a/dev-db/4store/4store-1.1.5-r1.ebuild b/dev-db/4store/4store-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..a55defb8f631
--- /dev/null
+++ b/dev-db/4store/4store-1.1.5-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+DESCRIPTION="4store is an efficient, scalable and stable RDF database"
+HOMEPAGE="http://4store.org/"
+# http://4store.org/download/4store-v1.0.4.tar.gz
+MY_P="${PN}-v${PV}"
+SRC_URI="http://4store.org/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# < http://4store.org/trac/wiki/Dependencies
+DEPEND="media-libs/raptor
+		>=dev-libs/rasqal-0.9.18
+		dev-libs/glib
+		dev-libs/libxml2
+		dev-libs/libpcre
+		sys-libs/readline
+		sys-libs/ncurses
+		dev-libs/expat
+		sys-libs/zlib"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup fourstore
+	enewuser  fourstore -1 -1 /var/lib/4store fourstore
+}
+
+src_install() {
+
+	# patch the Makefiles to use /usr/ instead of /usr/local/
+	find . -name "Makefile" -execdir sed -e "s#/usr/local/#/usr/#" -i {} \;
+
+	MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodir /var/log/4store
+	fowners fourstore:fourstore \
+		/var/lib/4store \
+		/var/log/4store
+
+	# fix 1777
+	fperms 755 /var/lib/4store
+
+	# fix 755
+	fperms 644 \
+		/usr/share/man/man1/4s-query.1 \
+		/usr/share/man/man1/4s-backend-setup.1 \
+		/usr/share/man/man1/4s-import.1 \
+		/usr/share/man/man1/4s-cluster-info.1 \
+		/usr/share/man/man1/4s-cluster-start.1 \
+		/usr/share/man/man1/4s-cluster-create.1 \
+		/usr/share/man/man1/4s-cluster-stop.1 \
+		/usr/share/man/man1/4s-cluster-destroy.1
+}
diff --git a/dev-db/4store/4store-1.1.5.ebuild b/dev-db/4store/4store-1.1.5.ebuild
deleted file mode 100644
index 51f47be8b999..000000000000
--- a/dev-db/4store/4store-1.1.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils user
-
-DESCRIPTION="4store is an efficient, scalable and stable RDF database"
-HOMEPAGE="http://4store.org/"
-# http://4store.org/download/4store-v1.0.4.tar.gz
-MY_P="${PN}-v${PV}"
-SRC_URI="http://4store.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# < http://4store.org/trac/wiki/Dependencies
-DEPEND="media-libs/raptor
-		>=dev-libs/rasqal-0.9.18
-		dev-libs/libxml2
-		dev-libs/libpcre
-		sys-libs/readline
-		sys-libs/ncurses
-		dev-libs/expat
-		sys-libs/zlib"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup fourstore
-	enewuser  fourstore -1 -1 /var/lib/4store fourstore
-}
-
-src_install() {
-
-	# patch the Makefiles to use /usr/ instead of /usr/local/
-	find . -name "Makefile" -execdir sed -e "s#/usr/local/#/usr/#" -i {} \;
-
-	MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodir /var/log/4store
-	fowners fourstore:fourstore \
-		/var/lib/4store \
-		/var/log/4store
-
-	# fix 1777
-	fperms 755 /var/lib/4store
-
-	# fix 755
-	fperms 644 \
-		/usr/share/man/man1/4s-query.1 \
-		/usr/share/man/man1/4s-backend-setup.1 \
-		/usr/share/man/man1/4s-import.1 \
-		/usr/share/man/man1/4s-cluster-info.1 \
-		/usr/share/man/man1/4s-cluster-start.1 \
-		/usr/share/man/man1/4s-cluster-create.1 \
-		/usr/share/man/man1/4s-cluster-stop.1 \
-		/usr/share/man/man1/4s-cluster-destroy.1
-}
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index c606fecbcc2c..73d13e65de4f 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
 HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest
deleted file mode 100644
index 684b6fc0ca74..000000000000
--- a/dev-db/drizzle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST drizzle-7.2.4-alpha.tar.gz 20075673 SHA256 dddc58949c28ccbdd8351b25540858235a7d98efb634e7bc98abd4f5ab034677 SHA512 1053c9b73588542b32398168fc4aae96a19479222571fb4ba35feb1fa6e99961366fc63a4141bf86bdba7f5db1960ed895b3a688789d05ee8d4bd46d0ab681cd WHIRLPOOL 4b2e97f7276eb447f27bc5b0244e31d47cba2acc0fde16d6e10dc0d47ba680885e035b9cf9dda8dff171279a76fbd24f34d2754ac1342b203d56316bb4d34233
diff --git a/dev-db/drizzle/drizzle-7.2.4.ebuild b/dev-db/drizzle/drizzle-7.2.4.ebuild
deleted file mode 100644
index c066b0e0f587..000000000000
--- a/dev-db/drizzle/drizzle-7.2.4.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
-
-inherit python flag-o-matic libtool autotools eutils pam user versionator
-
-MY_P="${P}-alpha"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Database optimized for Cloud and Net applications"
-HOMEPAGE="http://drizzle.org"
-SRC_URI="https://launchpad.net/drizzle/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap v8"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-		sys-libs/readline
-		sys-apps/util-linux
-		dev-libs/libpcre
-		dev-libs/openssl
-		>=dev-libs/libevent-1.4
-		>=dev-libs/protobuf-2.1.0
-		dev-libs/libaio
-		>=dev-libs/boost-1.52.0-r1:=[threads]
-		gearman? ( >=sys-cluster/gearmand-0.12 )
-		pam? ( sys-libs/pam )
-		curl? ( net-misc/curl )
-		memcache? ( >=dev-libs/libmemcached-0.39 )
-		md5? ( >=dev-libs/libgcrypt-1.4.2:0 )
-		ldap? ( net-nds/openldap )
-		v8? ( dev-lang/v8 )
-		!dev-db/libdrizzle"
-
-DEPEND="${RDEPEND}
-		=dev-lang/python-2*
-		sys-devel/gettext
-		dev-util/intltool
-		dev-util/gperf
-		sys-devel/flex
-		dev-python/sphinx
-		doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	enewuser drizzle -1 -1 /dev/null nogroup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-7.2.3-libtool.patch" \
-		"${FILESDIR}/${PN}-7.2.3+automake-1.12.patch" \
-		"${FILESDIR}/${PN}-7.2.4+boost-1.50.patch" \
-		"${FILESDIR}/${P}-fix-boost_thread-detection.patch"
-
-	python_convert_shebangs -r 2 .
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use debug; then
-		append-cppflags -DDEBUG
-	fi
-
-	# while I applaud upstreams goal of 0 compiler warnings
-	# the 1412 release didn't achieve it.
-	append-flags -Wno-error
-
-	# NOTE disable-all and without-all no longer recognized options
-	# NOTE using --enable on some plugins can cause test failures.
-	# --with should be used instead. A discussion about this here:
-	# https://bugs.launchpad.net/drizzle/+bug/598659
-	# TODO (upstream)
-	# $(use_with memcache memcached-stats-plugin) \
-	# $(use_with memcache memcached-functions-plugin) \
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		--without-hello-world-plugin \
-		--disable-rabbitmq-plugin --without-rabbitmq-plugin \
-		--disable-zeromq-plugin --without-zeromq-plugin \
-		--with-auth-test-plugin \
-		--with-auth-file-plugin \
-		--with-simple-user-policy-plugin \
-		--enable-logging-stats-plugin \
-		--with-logging-stats-plugin \
-		--enable-console-plugin \
-		$(use_enable gearman libgearman) \
-		$(use_enable ldap libldap) \
-		$(use_enable memcache libmemcached) \
-		$(use_enable tcmalloc) \
-		$(use_with curl auth-http-plugin) \
-		$(use_with gearman gearman-udf-plugin) \
-		$(use_with gearman logging-gearman-plugin) \
-		$(use_with ldap auth-ldap-plugin) \
-		$(use_with md5 md5-plugin) \
-		$(use_with pam auth-pam-plugin) \
-		$(use_with v8 js-plugin) \
-		${myconf}
-}
-
-src_compile() {
-	emake V=1 all $(use doc && echo doxygen)
-}
-
-# currently not working as of 7.2.3
-RESTRICT=test
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	default
-}
-
-DOCS=( AUTHORS NEWS README )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use doc; then
-		docinto apidoc
-		pushd docs/html
-		dohtml -r .
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/drizzle.init.d.2 drizzled
-	newconfd "${FILESDIR}"/drizzle.conf.d drizzled
-
-	if ! use gearman; then
-		sed -i -e '/need gearmand/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (gearman)"
-	fi
-
-	if ! use memcache; then
-		sed -i -e '/need memcached/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (memcache)"
-	fi
-
-	keepdir /var/log/drizzle
-	keepdir /var/lib/drizzle/drizzled
-	keepdir /etc/drizzle
-
-	fperms 0755 /var/log/drizzle
-	fperms -R 0700 /var/lib/drizzle
-
-	fowners drizzle:nogroup /var/log/drizzle
-	fowners -R drizzle:nogroup /var/lib/drizzle
-
-	pamd_mimic system-auth drizzle auth account session
-}
diff --git a/dev-db/drizzle/files/drizzle-7.2.3+automake-1.12.patch b/dev-db/drizzle/files/drizzle-7.2.3+automake-1.12.patch
deleted file mode 100644
index 4f33dc557a5a..000000000000
--- a/dev-db/drizzle/files/drizzle-7.2.3+automake-1.12.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: drizzle-7.2.3/m4/pandora_canonical.m4
-===================================================================
---- drizzle-7.2.3.orig/m4/pandora_canonical.m4
-+++ drizzle-7.2.3/m4/pandora_canonical.m4
-@@ -98,9 +98,9 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
-   AC_CANONICAL_TARGET
-   
-   m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[
--    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar)
-+    AM_INIT_AUTOMAKE(-Wall -Wno-portability subdir-objects foreign tar-ustar)
-   ],[
--    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign tar-ustar)
-+    AM_INIT_AUTOMAKE(-Wall -Wno-portability nostdinc subdir-objects foreign tar-ustar)
-   ])
- 
-   m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-Index: drizzle-7.2.3/tests/include.am
-===================================================================
---- drizzle-7.2.3.orig/tests/include.am
-+++ drizzle-7.2.3/tests/include.am
-@@ -101,10 +101,10 @@ EXTRA_DIST += \
- check-local: tests/var/drizzle test-drizzle
- 
- tests/var:
--	$(mkdir_p) tests/var
-+	$(MKDIR_P) tests/var
- 
- tests/var/drizzle: tests/var
--	$(mkdir_p) tests/var/drizzle
-+	$(MKDIR_P) tests/var/drizzle
- 
- 
- # dtr - a shortcut for executing test-run.pl
diff --git a/dev-db/drizzle/files/drizzle-7.2.3-libtool.patch b/dev-db/drizzle/files/drizzle-7.2.3-libtool.patch
deleted file mode 100644
index 609b8adfd67e..000000000000
--- a/dev-db/drizzle/files/drizzle-7.2.3-libtool.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: drizzle-7.2.3/libdrizzle-1.0/include.am
-===================================================================
---- drizzle-7.2.3.orig/libdrizzle-1.0/include.am
-+++ drizzle-7.2.3/libdrizzle-1.0/include.am
-@@ -48,7 +48,7 @@ libdrizzle_1_0_libdrizzle_la_LDFLAGS= \
- 				      -version-info \
- 				      $(LIBDRIZZLE_LIBRARY_VERSION)
- 
--libdrizzle_1_0_libdrizzle_la_LIBADD= $(LIBSSL)
-+libdrizzle_1_0_libdrizzle_la_LIBADD= $(LTLIBSSL)
- 
- libdrizzle_1_0_libdrizzle_la_SOURCES= \
- 				      libdrizzle/column.cc \
diff --git a/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch b/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch
deleted file mode 100644
index 0b10d74020cd..000000000000
--- a/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: drizzle-7.2.4-alpha/client/drizzleslap.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/client/drizzleslap.cc
-+++ drizzle-7.2.4-alpha/client/drizzleslap.cc
-@@ -1934,7 +1934,7 @@ static void timer_thread()
-     boost::mutex::scoped_lock scopedLock(timer_alarm_mutex);
- 
-     boost::xtime xt; 
--    xtime_get(&xt, boost::TIME_UTC); 
-+    xtime_get(&xt, boost::TIME_UTC_); 
-     xt.sec += opt_timer_length; 
- 
-     (void)timer_alarm_threshold.timed_wait(scopedLock, xt);
-Index: drizzle-7.2.4-alpha/configure.ac
-===================================================================
---- drizzle-7.2.4-alpha.orig/configure.ac
-+++ drizzle-7.2.4-alpha/configure.ac
-@@ -111,7 +111,6 @@ PANDORA_DRIZZLE_BUILD
- PANDORA_HAVE_BOOST_TEST
- PANDORA_HAVE_LIBSQLITE3
- 
--
- #########################################################################
- 
- 
-Index: drizzle-7.2.4-alpha/drizzled/drizzled.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/drizzled.cc
-+++ drizzle-7.2.4-alpha/drizzled/drizzled.cc
-@@ -460,7 +460,7 @@ void close_connections()
-     while (select_thread_in_use)
-     {
-       boost::xtime xt;
--      xtime_get(&xt, boost::TIME_UTC);
-+      xtime_get(&xt, boost::TIME_UTC_);
-       xt.sec += 2;
- 
-       for (uint32_t tmp=0 ; tmp < 10 && select_thread_in_use; tmp++)
-Index: drizzle-7.2.4-alpha/drizzled/table/cache.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/table/cache.cc
-+++ drizzle-7.2.4-alpha/drizzled/table/cache.cc
-@@ -263,7 +263,7 @@ bool Cache::removeTable(Session& session
-             table::Cache::removeTable routine.
-           */
-           boost::xtime xt;
--          xtime_get(&xt, boost::TIME_UTC);
-+          xtime_get(&xt, boost::TIME_UTC_);
-           xt.sec += 10;
-           boost::mutex::scoped_lock scoped(table::Cache::mutex(), boost::adopt_lock_t());
-           COND_refresh.timed_wait(scoped, xt);
-Index: drizzle-7.2.4-alpha/drizzled/thr_lock.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/thr_lock.cc
-+++ drizzle-7.2.4-alpha/drizzled/thr_lock.cc
-@@ -170,7 +170,7 @@ static enum enum_thr_lock_result wait_fo
-     if (can_deadlock)
-     {
-       boost::xtime xt; 
--      xtime_get(&xt, boost::TIME_UTC); 
-+      xtime_get(&xt, boost::TIME_UTC_); 
-       xt.sec += table_lock_wait_timeout; 
-       if (not cond->timed_wait(scoped, xt))
-       {
-Index: drizzle-7.2.4-alpha/plugin/sleep/sleep.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/plugin/sleep/sleep.cc
-+++ drizzle-7.2.4-alpha/plugin/sleep/sleep.cc
-@@ -98,7 +98,7 @@ int64_t Item_func_sleep::val_int()
- 
-     try {
-       boost::xtime xt; 
--      xtime_get(&xt, boost::TIME_UTC); 
-+      xtime_get(&xt, boost::TIME_UTC_); 
-       xt.nsec += (uint64_t)(dtime * 1000000000ULL); 
-       session.getThread()->sleep(xt);
-     }
-Index: drizzle-7.2.4-alpha/drizzled/message/include.am
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/message/include.am
-+++ drizzle-7.2.4-alpha/drizzled/message/include.am
-@@ -40,7 +40,7 @@ lib_LTLIBRARIES += drizzled/message/libd
- drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
- 
- drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc
--drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la
-+drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) $(BOOST_LIBS) drizzled/libcharset.la
- 
- nobase_dist_pkginclude_HEADERS+= \
- 			      drizzled/message/statement_transform.h
diff --git a/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch b/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch
deleted file mode 100644
index e33e6e59afd1..000000000000
--- a/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- m4/pandora_have_libboost_thread.m4.orig	2014-02-12 13:52:43.580001598 +0400
-+++ m4/pandora_have_libboost_thread.m4	2014-02-12 13:53:24.288002974 +0400
-@@ -17,13 +17,13 @@
-   CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}"
- 
-   AC_LANG_PUSH(C++)
--  AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[
-+  AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,boost_system-mt,[
-     #include <boost/thread.hpp>
-   ],[
-     boost::thread id;
-   ])
-   AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[
--    AC_LIB_HAVE_LINKFLAGS(boost_thread,,[
-+    AC_LIB_HAVE_LINKFLAGS(boost_thread,boost_system,[
-       #include <boost/thread.hpp>
-     ],[
-       boost::thread id;
diff --git a/dev-db/drizzle/files/drizzle.conf.d b/dev-db/drizzle/files/drizzle.conf.d
deleted file mode 100644
index c8a797897a56..000000000000
--- a/dev-db/drizzle/files/drizzle.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-DRIZZLE_EXTRA=""
diff --git a/dev-db/drizzle/files/drizzle.init.d b/dev-db/drizzle/files/drizzle.init.d
deleted file mode 100644
index e3185ae0863b..000000000000
--- a/dev-db/drizzle/files/drizzle.init.d
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Pavel Stratil, senbonzakura.eu
-# Some functions were taken from debian init script. Licensed under GPL-2
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#########################
-### Construct vars ######
-#########################
-
-
-SUFFIX=".${SVCNAME#*.}"
-[ "${SUFFIX}" == ".drizzled" ] && SUFFIX=''
-
-BASE_CNF="/etc/drizzle/drizzled"
-BASE_PID="/var/run/drizzle/drizzled"
-BASE_LOG="/var/log/drizzle/drizzled"
-BASE_DIR="/var/lib/drizzle/drizzled"
-
-PIDFILE="${BASE_PID}${SUFFIX}.pid"
-CNFFILE="${BASE_CNF}${SUFFIX}.cnf"
-LOGFILE="${BASE_LOG}${SUFFIX}.log"
-DATADIR="${BASE_DIR}${SUFFIX}"
-DRIZZLE="/usr/bin/drizzle"
-DRIZZLE_USER="drizzle"
-DRIZZLE_DAEMON="/usr/sbin/drizzled"
-DRIZZLE_EXTRA=""
-
-#########################
-### Helper functions ####
-#########################
-
-
-#
-# drizzle_status() checks if there is a server running and if it is accessible.
-# "check_alive" insists on a pingable server, "check_dead" also fails
-# if there is a lost drizzled in the process list
-# Usage: boolean drizzle_status [check_alive|check_dead] [warn|nowarn]
-#
-drizzle_status() {
-	ping_output=`$DRIZZLE --ping 2>&1`; ping_alive=$(( ! $? ))
-	ps_alive=0
-	if [ -f "$PIDFILE" ] && ps `cat $PIDFILE` >/dev/null 2>&1; then ps_alive=1; fi
-
-	if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
-	   [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
-	   return 0 # EXIT_SUCCESS
-	else
-	if [ "$2" = "warn" ]; then
-		echo -e "$ps_alive processes alive and '$DRIZZLE --ping' resulted in\n$ping_output\n"
-	fi
-	return 1 # EXIT_FAILURE
-	fi
-}
-
-#########################
-### Main ################
-#########################
-
-checkconfig() {
-	# TODO: --print-defaults no longer a valid option. Needs to be rewritten.
-	#CNFDATADIR=`drizzle_get_param datadir`
-		#if [ -z "${CNFDATADIR}" ] ; then
-	#   ewarn "Datadir not set in ${CNFFILE}."
-	#   ewarn "Trying to use ${DATADIR}"
-	#else
-	   DATADIR="${CNFDATADIR}"
-	#fi
-
-	if [[ ! -d "${DATADIR}" ]] ; then
-		eerror "Drizzle datadir is empty or invalid."
-		eerror "Please check your configuration ${CNFFILE} and DRIZZLE_EXTRA"
-		return 1
-	fi
-
-	if [ ! -f "${CNFFILE}" ]; then
-		eerror "The configuration file $CNFFILE was not found!"
-	fi
-}
-
-depend() {
-	use localmount
-	use gearmand
-	use memcached
-
-	# TODO use drizzle_get_param() to decide if gearmand and memcached
-	#      are needed. Then the useflag based sed-ing of this script
-	#      can be removed from the ebuild.
-}
-
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --pidfile ${PIDFILE} --stop \
-		--exec ${DRIZZLE_DAEMON}
-	eend $?
-	drizzle_status check_dead warn
-}
-
-start() {
-	#checkconfig
-	ebegin "Starting ${SVCNAME}"
-	# Test if ${BASE_PID}, ${BASE_LOG} and ${LOG_FILE} exist, create if not.
-	[ ! -e ${BASE_PID} ] && mkdir -p ${BASE_PID} && chown ${DRIZZLE_USER}:nogroup ${BASE_PID}
-	[ ! -e ${BASE_LOG} ] && mkdir -p ${BASE_LOG} && chown ${DRIZZLE_USER}:nogroup ${BASE_LOG}
-	[ ! -e ${LOGFILE} ]  && touch ${LOGFILE} && chown ${DRIZZLE_USER}:nogroup ${LOGFILE}
-	start-stop-daemon --background --pidfile ${PIDFILE} --stderr ${LOGFILE} \
-		--user ${DRIZZLE_USER} --start --exec ${DRIZZLE_DAEMON} -- \
-		--datadir=${DATADIR} --pid-file=${PIDFILE} --user=${DRIZZLE_USER} \
-		${DRIZZLE_EXTRA}
-	eend $?
-
-		# TODO in order to have replication always working we should add the
-		#      --server-id=# option. AFAIK only integers are allowed, though
-		#      ${HOSTNAME}${SVCNAME}${SUFFIX} whould be much easier to handle.
-
-	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
-		sleep 1
-		if drizzle_status check_alive nowarn ; then break ; fi
-	done
-	if drizzle_status check_alive warn ; then
-		einfo "${SVCNAME} is alive!"
-	else
-		eerror "${SVCNAME} died!"
-	fi
-}
-
-status() {
-	if drizzle_status check_alive nowarn; then
-		einfo "status: started"
-	else
-		einfo "status: stopped"
-	fi
-}
diff --git a/dev-db/drizzle/files/drizzle.init.d.2 b/dev-db/drizzle/files/drizzle.init.d.2
deleted file mode 100644
index 4b44ec0d51e9..000000000000
--- a/dev-db/drizzle/files/drizzle.init.d.2
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Pavel Stratil, senbonzakura.eu
-# Some functions were taken from debian init script. Licensed under GPL-2
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#########################
-### Construct vars ######
-#########################
-
-
-SUFFIX=".${SVCNAME#*.}"
-[ "${SUFFIX}" == ".drizzled" ] && SUFFIX=''
-
-DIR_PID="/run/drizzle"
-DIR_LOG="/var/log/drizzle"
-
-BASE_CNF="/etc/drizzle/drizzled"
-BASE_PID="${DIR_PID}/drizzled"
-BASE_LOG="${DIR_LOG}/drizzled"
-BASE_DIR="/var/lib/drizzle/drizzled"
-
-CNFFILE="${BASE_CNF}${SUFFIX}.cnf"
-LOGFILE="${BASE_LOG}${SUFFIX}.log"
-DATADIR="${BASE_DIR}${SUFFIX}"
-DRIZZLE="/usr/bin/drizzle"
-DRIZZLE_USER="drizzle"
-
-pidfile="${BASE_PID}${SUFFIX}.pid"
-command="/usr/sbin/drizzled"
-command_args="--daemon --datadir=${DATADIR} --pid-file=${pidfile} --user=${DRIZZLE_USER} --syslog.errmsg-enable ${DRIZZLE_EXTRA}"
-
-start_stop_daemon_args="--user ${DRIZZLE_USER} --wait 5000"
-
-#########################
-### Helper functions ####
-#########################
-
-
-#
-# drizzle_status() checks if there is a server running and if it is accessible.
-# "check_alive" insists on a pingable server, "check_dead" also fails
-# if there is a lost drizzled in the process list
-# Usage: boolean drizzle_status [check_alive|check_dead] [warn|nowarn]
-#
-drizzle_status() {
-	ping_output=`$DRIZZLE --ping 2>&1`; ping_alive=$(( ! $? ))
-	ps_alive=0
-	if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
-
-	if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
-	   [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
-	   return 0 # EXIT_SUCCESS
-	else
-	if [ "$2" = "warn" ]; then
-		echo -e "$ps_alive processes alive and '$DRIZZLE --ping' resulted in\n$ping_output\n"
-	fi
-	return 1 # EXIT_FAILURE
-	fi
-}
-
-#########################
-### Main ################
-#########################
-
-checkconfig() {
-	# TODO: --print-defaults no longer a valid option. Needs to be rewritten.
-	#CNFDATADIR=`drizzle_get_param datadir`
-		#if [ -z "${CNFDATADIR}" ] ; then
-	#   ewarn "Datadir not set in ${CNFFILE}."
-	#   ewarn "Trying to use ${DATADIR}"
-	#else
-	   DATADIR="${CNFDATADIR}"
-	#fi
-
-	if [[ ! -d "${DATADIR}" ]] ; then
-		eerror "Drizzle datadir is empty or invalid."
-		eerror "Please check your configuration ${CNFFILE} and DRIZZLE_EXTRA"
-		return 1
-	fi
-
-	if [ ! -f "${CNFFILE}" ]; then
-		eerror "The configuration file $CNFFILE was not found!"
-	fi
-}
-
-depend() {
-	use localmount
-	use logger
-	use gearmand
-	use memcached
-
-	# TODO use drizzle_get_param() to decide if gearmand and memcached
-	#      are needed. Then the useflag based sed-ing of this script
-	#      can be removed from the ebuild.
-}
-
-start_pre() {
-    checkpath -d -o ${DRIZZLE_USER}:nogroup ${DIR_PID} ${DIR_LOG}
-    checkpath -f -o ${DRIZZLE_USER}:nogroup ${LOGFILE}
-}
-
-start_post() {
-    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
-	sleep 1
-	if drizzle_status check_alive nowarn ; then break ; fi
-    done
-    if drizzle_status check_alive warn ; then
-	einfo "${SVCNAME} is alive!"
-    else
-	eerror "${SVCNAME} died!"
-    fi
-}
-
-stop_post() {
-	drizzle_status check_dead warn
-}
-
-status() {
-    if drizzle_status check_alive nowarn; then
-	mark_service_started drizzled
-	einfo "status: started"
-    else
-	mark_service_stopped drizzled
-	einfo "status: stopped"
-    fi
-}
diff --git a/dev-db/drizzle/metadata.xml b/dev-db/drizzle/metadata.xml
deleted file mode 100644
index e3f1ada9f01b..000000000000
--- a/dev-db/drizzle/metadata.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pavel.stratil-jun@fenix.cz</email>
-		<description>Proxied co-maintainer, assign bugs to him</description>
-	</maintainer>
-	<maintainer type="person">
-		<email>flameeyes@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="doc">
-      Build the API documentation for the package, using
-      <pkg>app-doc/doxygen</pkg>. Warning, this might take over an
-      hour on slower machines.
-    </flag>
-		<flag name="memcache">
-      Enable the memcache plugin for user-defined functions and
-      statistics in I_S tables (using
-      <pkg>dev-libs/libmemcached</pkg>).
-
-      Currently restricts tests because of an upstream testsuite bug.
-    </flag>
-		<flag name="gearman">
-      Enable the gearman plugins for user-defined functions and
-      logging (using <pkg>sys-cluster/gearman</pkg>).
-    </flag>
-		<flag name="curl">
-      Enable the HTTP authentication plugin (using
-      <pkg>net-misc/curl</pkg>). This is needed for the tests to apply
-      properly.
-    </flag>
-		<flag name="pam">
-      Enable the PAM authentication plugin (using
-      <pkg>sys-libs/pam</pkg>). The configuration file created will be
-      /etc/pam.d/drizzle.
-    </flag>
-		<flag name="md5">
-      Enable the MD5 plugin, using <pkg>dev-libs/libgcrypt</pkg>; this
-      replaces the older openssl and gnutls USE flags.
-    </flag>
-		<flag name="v8">
-      Use <pkg>dev-lang/v8</pkg>.
-    </flag>
-	</use>
-	<upstream>
-		<remote-id type="launchpad">drizzle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index e5e094dc2a48..eaaa219de627 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -1,2 +1,3 @@
 DIST etcd-2.0.10.tar.gz 450581 SHA256 6029113d9870e5c6f0d10adbd2b6670958a46575114a094b86b607771a0e5ff3 SHA512 825524ee4c435b8f369970cfe39158443b8e29f6fba5ab86ae8be2d91f6faa0674d15f311bc863092fb6c77b054b8f3b69e163610b546e3c5cf59a111b38a3ed WHIRLPOOL a2b4c160cbc9cde5ebf64fa2fe41f6bc6ac5dc851551778b681d658e511f0dbc7241a4c74a6b520d43fe8e9cee65fa28f94655d64caf6f3c99cbd4ba84a57b65
 DIST etcd-2.2.1.tar.gz 1844265 SHA256 1c0ce63812ef951f79c0a544c91f9f1ba3c6b50cb3e8197de555732454864d05 SHA512 4a96ed12c1f23ac4c9ea7ffeb17853f10a5eb04365b0fdfa765fa9f3acf12d32f7b4bfaa05de78bc17620808ae97f61425d2956a0d1cd817e501106e39498950 WHIRLPOOL edcb6f837b83f83a658717ceaf79c7304f5d4df34d2a15bbf9d82d370612f31ee8e5e248e9b143ff15df666ce25ab8c47d7dc5c62a3d7365a8bde0153d5e79a7
+DIST etcd-2.2.5.tar.gz 2151517 SHA256 a7fb7998ada620fda74e517c100891d25a15a6fa20b627df52da7cd29328e6d5 SHA512 4436180c564ba2122cb346033ccf3de90e1f9cf17c12f62635c41cd0617c16e1a5705bbcfce64d74702ee378e89bc6663f208a99d64e819ddf449c3f442a38e0 WHIRLPOOL f5706c1eb25750fea89556d803bf8a9915569a197bf676c06c016652905d559e3ec60e7bcf682a341aa36115b91b892529a035f96b4a63e0403ee13e492c55a3
diff --git a/dev-db/etcd/etcd-2.2.5.ebuild b/dev-db/etcd/etcd-2.2.5.ebuild
new file mode 100644
index 000000000000..2f47765d75b1
--- /dev/null
+++ b/dev-db/etcd/etcd-2.2.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+KEYWORDS="~amd64"
+DESCRIPTION="A highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd/"
+SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND="!dev-db/etcdctl"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-e 's|-ldflags "-s.*"|-v -x|' \
+		-e 's|-ldflags "-s|-v -x "|' \
+		-i build || die
+	sed -e 's|go test|\0 -v|'\
+		-i test || die
+}
+
+src_compile() {
+	./build || die
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 755 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+}
+
+src_test() {
+	./test || die
+}
diff --git a/dev-db/flamerobin/Manifest b/dev-db/flamerobin/Manifest
deleted file mode 100644
index 83abf8e284c3..000000000000
--- a/dev-db/flamerobin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST flamerobin-0.9.2-src.tar.gz 901908 SHA256 b674a1de1c632c834e904a17e576498850e7b81cc5c4d42e8cafd8a6dd020c90 SHA512 76eeecae759ab7aec817a4775fe185f982f6f50f5dec850b1fbb00b56239807867fe36568592e313315c0f02364c1986d9691e84d5fced2aedd85571d239f2be WHIRLPOOL 224481502e893be06236f685c71f15848f9aab372a6adbb91db9f95fc5978f76fe2879c823b3f6ff64cea4bff5269df34475978a7602a47a43bb5146f5182b9a
diff --git a/dev-db/flamerobin/files/flamerobin-0.9.2-gcc46.patch b/dev-db/flamerobin/files/flamerobin-0.9.2-gcc46.patch
deleted file mode 100644
index 0701a0fa5906..000000000000
--- a/dev-db/flamerobin/files/flamerobin-0.9.2-gcc46.patch
+++ /dev/null
@@ -1,503 +0,0 @@
-Index: src/databasehandler.cpp
-===================================================================
---- src/databasehandler.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/databasehandler.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -46,6 +46,7 @@
- class DatabaseInfoHandler: public URIHandler
- {
- public:
-+    DatabaseInfoHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-Index: src/gui/RestoreFrame.cpp
-===================================================================
---- src/gui/RestoreFrame.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/RestoreFrame.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -258,7 +258,7 @@
-     sizerFilename->Add(styleguide().getBrowseButtonMargin(), 0);
-     sizerFilename->Add(button_browse, 0, wxALIGN_CENTER_VERTICAL);
- 
--    wxGridSizer* sizerChecks = new wxGridSizer(2, 2,
-+    wxGridSizer* sizerChecks = new wxGridSizer(3, 2,
-         styleguide().getCheckboxSpacing(),
-         styleguide().getUnrelatedControlMargin(wxHORIZONTAL));
-     sizerChecks->Add(checkbox_replace, 0, wxEXPAND);
-Index: src/gui/ReorderFieldsDialog.cpp
-===================================================================
---- src/gui/ReorderFieldsDialog.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/ReorderFieldsDialog.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -215,6 +215,7 @@
- class ReorderFieldsHandler: public URIHandler
- {
- public:
-+    ReorderFieldsHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-Index: src/gui/FieldPropertiesDialog.cpp
-===================================================================
---- src/gui/FieldPropertiesDialog.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/FieldPropertiesDialog.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -690,7 +690,7 @@
-             + wxT("  IF (NEW.") + fNameSql + wxT(" IS NULL) THEN\n")
-             + wxT("    NEW.") + fNameSql + wxT(" = GEN_ID(")
-             + generator.getQuoted() + wxT(", 1);\n")
--            + wxT("  ELSE\n  BEGIN\n    tmp = GEN_ID(") +
-+            + wxT("  ELSE\n  BEGIN\n    tmp = GEN_ID(")
-             + generator.getQuoted() + wxT(", 0);\n    if (tmp < new.")
-             + fNameSql + wxT(") then\n      tmp = GEN_ID(")
-             + generator.getQuoted() + wxT(", new.") + fNameSql
-@@ -816,6 +816,7 @@
- class ColumnPropertiesHandler: public URIHandler
- {
- public:
-+    ColumnPropertiesHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-Index: src/gui/controls/DBHTreeControl.cpp
-===================================================================
---- src/gui/controls/DBHTreeControl.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/controls/DBHTreeControl.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -261,6 +261,8 @@
-             id = ART_View; break;
-         case ntViews:
-             id = ART_Views; break;
-+        default:
-+            break;
-     }
-     return getImageIndex(id);
- }
-Index: src/gui/controls/TextControl.cpp
-===================================================================
---- src/gui/controls/TextControl.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/controls/TextControl.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -40,8 +40,8 @@
- 
- #include "gui/controls/TextControl.h"
- //-----------------------------------------------------------------------------
--TextControl::TextControl(wxWindow *parent, wxWindowID id, long style)
--    : wxStyledTextCtrl(parent, id, wxDefaultPosition, wxDefaultSize, style)
-+TextControl::TextControl(wxWindow *parent, wxWindowID id)
-+    : wxStyledTextCtrl(parent, id)
- {
-     SetWrapMode(wxSTC_WRAP_WORD);
-     // wxStyledTextCtrl uses black on white initially -> use system defaults
-Index: src/gui/controls/LogTextControl.cpp
-===================================================================
---- src/gui/controls/LogTextControl.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/controls/LogTextControl.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -40,8 +40,8 @@
- 
- #include "gui/controls/LogTextControl.h"
- //-----------------------------------------------------------------------------
--LogTextControl::LogTextControl(wxWindow *parent, wxWindowID id, long style)
--    : TextControl(parent, id, style)
-+LogTextControl::LogTextControl(wxWindow *parent, wxWindowID id)
-+    : TextControl(parent, id)
- {
-     setDefaultStyles();
- }
-Index: src/gui/controls/TextControl.h
-===================================================================
---- src/gui/controls/TextControl.h	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/controls/TextControl.h	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -61,8 +61,7 @@
- 
-     DECLARE_EVENT_TABLE()
- public:
--    TextControl(wxWindow *parent, wxWindowID id = wxID_ANY,
--        long style = wxSUNKEN_BORDER);
-+    TextControl(wxWindow *parent, wxWindowID id = wxID_ANY);
- };
- //-----------------------------------------------------------------------------
- #endif
-Index: src/gui/controls/LogTextControl.h
-===================================================================
---- src/gui/controls/LogTextControl.h	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/controls/LogTextControl.h	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -38,8 +38,7 @@
-     enum LogStyle { logStyleDefault, logStyleImportant, logStyleError };
-     void addStyledText(const wxString& message, LogStyle style);
- public:
--    LogTextControl(wxWindow *parent, wxWindowID id = wxID_ANY,
--        long style = wxSUNKEN_BORDER);
-+    LogTextControl(wxWindow *parent, wxWindowID id = wxID_ANY);
- 
-     void logErrorMsg(const wxString& message);
-     void logImportantMsg(const wxString& message);
-Index: src/gui/UserDialog.cpp
-===================================================================
---- src/gui/UserDialog.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/UserDialog.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -222,6 +222,7 @@
- class UserPropertiesHandler: public URIHandler
- {
- public:
-+    UserPropertiesHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-@@ -300,6 +301,7 @@
- class DropUserHandler: public URIHandler
- {
- public:
-+    DropUserHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-Index: src/gui/CreateIndexDialog.cpp
-===================================================================
---- src/gui/CreateIndexDialog.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/CreateIndexDialog.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -209,6 +209,7 @@
- class TableIndicesHandler: public URIHandler
- {
- public:
-+    TableIndicesHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-Index: src/gui/BackupFrame.cpp
-===================================================================
---- src/gui/BackupFrame.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/BackupFrame.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -241,7 +241,7 @@
-     sizerFilename->Add(styleguide().getBrowseButtonMargin(), 0);
-     sizerFilename->Add(button_browse, 0, wxALIGN_CENTER_VERTICAL);
- 
--    wxGridSizer* sizerChecks = new wxGridSizer(2, 2,
-+    wxGridSizer* sizerChecks = new wxGridSizer(3, 2,
-         styleguide().getCheckboxSpacing(),
-         styleguide().getUnrelatedControlMargin(wxHORIZONTAL));
-     sizerChecks->Add(checkbox_checksum, 0, wxEXPAND);
-Index: src/gui/PrivilegesDialog.cpp
-===================================================================
---- src/gui/PrivilegesDialog.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/PrivilegesDialog.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -583,6 +583,7 @@
- class ManagePrivilegesHandler: public URIHandler
- {
- public:
-+    ManagePrivilegesHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-Index: src/gui/MainFrame.cpp
-===================================================================
---- src/gui/MainFrame.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/MainFrame.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -380,6 +380,7 @@
-     EVT_MENU(Cmds::Menu_Reconnect, MainFrame::OnMenuReconnect)
-     EVT_UPDATE_UI(Cmds::Menu_Reconnect, MainFrame::OnMenuUpdateIfDatabaseConnected)
-     EVT_MENU(Cmds::Menu_RecreateDatabase, MainFrame::OnMenuRecreateDatabase)
-+    EVT_UPDATE_UI(Cmds::Menu_RecreateDatabase, MainFrame::OnMenuUpdateIfDatabaseConnected)
-     EVT_MENU(Cmds::Menu_DropDatabase, MainFrame::OnMenuDropDatabase)
-     EVT_UPDATE_UI(Cmds::Menu_DropDatabase, MainFrame::OnMenuUpdateIfDatabaseConnected)
-     EVT_MENU(Cmds::Menu_Query, MainFrame::OnMenuQuery)
-@@ -540,8 +541,10 @@
- }
- //-----------------------------------------------------------------------------
- //! handle double-click on item (or press Enter)
--void MainFrame::OnTreeItemActivate(wxTreeEvent& WXUNUSED(event))
-+void MainFrame::OnTreeItemActivate(wxTreeEvent& event)
- {
-+    event.Skip();
-+
-     wxTreeItemId item = treeMainM->GetSelection();
-     if (!item.IsOk())
-         return;
-Index: src/gui/TriggerWizardDialog.cpp
-===================================================================
---- src/gui/TriggerWizardDialog.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/TriggerWizardDialog.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -178,6 +178,7 @@
- class CreateTriggerHandler: public URIHandler
- {
- public:
-+    CreateTriggerHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const CreateTriggerHandler handlerInstance;
-Index: src/gui/EventWatcherFrame.cpp
-===================================================================
---- src/gui/EventWatcherFrame.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/EventWatcherFrame.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -55,15 +55,13 @@
- class EventLogControl: public LogTextControl
- {
- public:
--    EventLogControl(wxWindow* parent, wxWindowID id = wxID_ANY,
--        long style = wxSUNKEN_BORDER);
-+    EventLogControl(wxWindow* parent, wxWindowID id = wxID_ANY);
-     void logAction(const wxString& action);
-     void logEvent(const wxString& name, int count);
- };
- //-----------------------------------------------------------------------------
--EventLogControl::EventLogControl(wxWindow* parent, wxWindowID id,
--        long style)
--    : LogTextControl(parent, id, style)
-+EventLogControl::EventLogControl(wxWindow* parent, wxWindowID id)
-+    : LogTextControl(parent, id)
- {
- }
- //-----------------------------------------------------------------------------
-Index: src/gui/MetadataItemPropertiesFrame.cpp
-===================================================================
---- src/gui/MetadataItemPropertiesFrame.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/MetadataItemPropertiesFrame.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -360,6 +360,8 @@
-             case ntDatabase:
-             case ntRole:
-                 pages.push_back(wxT("DDL"));
-+            default:
-+                break;
-         };
-         wxString page = loadEntireFile(config().getHtmlTemplatesPath()
-             + wxT("header.html"));
-@@ -1290,6 +1292,7 @@
- class PageHandler: public URIHandler
- {
- public:
-+    PageHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const PageHandler handlerInstance;   // singleton; registers itself on creation.
-@@ -1327,6 +1330,7 @@
- class PropertiesHandler: public URIHandler
- {
- public:
-+    PropertiesHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const PropertiesHandler handlerInstance; // singleton; registers itself on creation.
-Index: src/gui/ExecuteSqlFrame.cpp
-===================================================================
---- src/gui/ExecuteSqlFrame.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/gui/ExecuteSqlFrame.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -2749,6 +2749,7 @@
- class DropColumnHandler: public URIHandler
- {
- public:
-+    DropColumnHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const DropColumnHandler handlerInstance;
-@@ -2806,6 +2807,7 @@
- class DropColumnsHandler: public URIHandler
- {
- public:
-+    DropColumnsHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const DropColumnsHandler handlerInstance;
-@@ -2842,6 +2844,7 @@
- class DropObjectHandler: public URIHandler
- {
- public:
-+    DropObjectHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const DropObjectHandler handlerInstance;
-@@ -2878,6 +2881,7 @@
- class EditDDLHandler: public URIHandler
- {
- public:
-+    EditDDLHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const EditDDLHandler handlerInstance;
-@@ -2919,6 +2923,7 @@
- class EditProcedureHandler: public URIHandler
- {
- public:
-+    EditProcedureHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-@@ -2947,6 +2952,7 @@
- class AlterViewHandler: public URIHandler
- {
- public:
-+    AlterViewHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-@@ -2973,6 +2979,7 @@
- class EditTriggerHandler: public URIHandler
- {
- public:
-+    EditTriggerHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-@@ -2999,6 +3006,7 @@
- class EditGeneratorValueHandler: public URIHandler
- {
- public:
-+    EditGeneratorValueHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-@@ -3041,6 +3049,7 @@
- class EditExceptionHandler: public URIHandler
- {
- public:
-+    EditExceptionHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-@@ -3067,6 +3076,7 @@
- class IndexActionHandler: public URIHandler
- {
- public:
-+    IndexActionHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-@@ -3113,6 +3123,7 @@
- class ActivateTriggersHandler: public URIHandler
- {
- public:
-+    ActivateTriggersHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const ActivateTriggersHandler handlerInstance;
-@@ -3160,6 +3171,7 @@
- class ActivateTriggerHandler: public URIHandler
- {
- public:
-+    ActivateTriggerHandler() {};
-     bool handleURI(URI& uri);
- private:
-     static const ActivateTriggerHandler handlerInstance;
-Index: src/images.cpp
-===================================================================
---- src/images.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/images.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -68,6 +68,8 @@
-             return wxArtProvider::GetIcon(ART_Trigger, wxART_OTHER, sz);
-         case ntView:
-             return wxArtProvider::GetIcon(ART_View, wxART_OTHER, sz);
-+        default:
-+            break;
-     }
-     return wxArtProvider::GetIcon(ART_FlameRobin, wxART_OTHER, sz);
- }
-Index: src/objectdescriptionhandler.cpp
-===================================================================
---- src/objectdescriptionhandler.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/objectdescriptionhandler.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -46,6 +46,7 @@
- class ObjectDescriptionHandler: public URIHandler
- {
- public:
-+    ObjectDescriptionHandler() {};
-     bool handleURI(URI& uri);
- private:
-     // singleton; registers itself on creation.
-Index: src/addconstrainthandler.cpp
-===================================================================
---- src/addconstrainthandler.cpp	(.../rel_0_9_2/src)	(révision 2085)
-+++ src/addconstrainthandler.cpp	(.../rel_0_9_2-1/src)	(révision 2085)
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 2004-2009 The FlameRobin Development Team
-+  Copyright (c) 2004-2011 The FlameRobin Development Team
- 
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-@@ -51,6 +51,8 @@
- class AddConstraintHandler: public URIHandler
- {
- public:
-+    AddConstraintHandler() {};
-+
-     bool handleURI(URI& uri);
- private:
-     static const AddConstraintHandler handlerInstance;    // singleton; registers itself on creation.
diff --git a/dev-db/flamerobin/flamerobin-0.9.2.ebuild b/dev-db/flamerobin/flamerobin-0.9.2.ebuild
deleted file mode 100644
index 7e92ac8b3949..000000000000
--- a/dev-db/flamerobin/flamerobin-0.9.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-inherit eutils wxwidgets
-
-DESCRIPTION="A database administration tool for Firebird DBMS"
-HOMEPAGE="http://www.flamerobin.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT IBPP-1.1 LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="x11-libs/wxGTK:2.8[X]
-	 dev-db/firebird"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-}
-
-src_configure() {
-	# temp hack since configure is not executable
-	chmod +x configure
-
-	local myconf
-	myconf="${myconf} \
-		--disable-shared \
-		--disable-debug \
-		--with-wx=yes \
-		--with-wx-config=${WX_CONFIG}"
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc devdocs/* docs/* docs-src/*
-}
diff --git a/dev-db/flamerobin/metadata.xml b/dev-db/flamerobin/metadata.xml
deleted file mode 100644
index 6b8b207f2403..000000000000
--- a/dev-db/flamerobin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-	FlameRobin is a database administration tool for Firebird DBMS.
-	FlameRobin is lightweight (small footprint, fast execution) and
-	dependent only on other Open Source software
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">flamerobin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1955db8822d3..0300737ea976 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,6 @@
 DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
 DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
+DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64
 DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
 DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
 DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
diff --git a/dev-db/mariadb/mariadb-10.0.24.ebuild b/dev-db/mariadb/mariadb-10.0.24.ebuild
new file mode 100644
index 000000000000..7ee3980439b5
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.24.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151223-1501Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist odbc oqgraph pam sphinx tokudb xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
+
+# 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"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+COMMON_DEPEND="
+	!bindist? ( >=sys-libs/readline-4.1:0=	)
+	server? (
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+"
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DWITHOUT_FEDERATED=1
+				-DWITHOUT_FEDERATEDX=1 )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
+			-DWITHOUT_CASSANDRA=0
+			$(mysql-cmake_use_plugin extraengine SEQUENCE)
+			$(mysql-cmake_use_plugin extraengine SPIDER)
+			$(mysql-cmake_use_plugin extraengine CONNECT)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DWITHOUT_MROONGA=1
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help main.bootstrap \
+			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}" || die
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd || die
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 75a57b3c8867..2739d17f7c4f 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -3,4 +3,4 @@ DIST mongodb-src-r2.6.11.tar.gz 16461163 SHA256 e1a64a1ef7114f3e8ed3c7acaa4e97ff
 DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
 DIST mongodb-src-r3.0.8.tar.gz 26245612 SHA256 3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5 SHA512 3b8578ed2a6196cda0867d219214e1dc9fe95ecaa8320cdee3766c9a8a78e9cf66013769a3fbbf03ccf9a35d97e02a1eaa5fe8fc7429a0d76dd78486db7520ac WHIRLPOOL ded0b84b940c66b8a7ef6b363f179a4b2c1ddc23a3077b9cadb01f76c2a90956f0a720e713d4806db6132ac96b1026b82c2bf966ec3869af095e12590ea04d0e
 DIST mongodb-src-r3.0.9.tar.gz 26249669 SHA256 5b6f189458739a327a2ad4a5ecab4f733c6a6751ccb067ec8879a0f98f2b97c3 SHA512 4ebcd89394ea0ccbd84adde1a6ce1776d86873bea13520c31bf3a783a922598cadd9ce1c11998f028e5e1affe6cb6639d1a4ff9c0e5771ff88bed873ddf7dc97 WHIRLPOOL a7d6cb51ee62717bcc2e612ae8e72ea43be7c9867c0de3fa2afc1d5c731bc3b1ca04ac70a351feaba71c27e00cf6cbf9b9997c4276362f98a725350aff37b750
-DIST mongodb-src-r3.2.1.tar.gz 26397562 SHA256 50431a3ba5ab68bd0bed4a157a8528ca27753a63cf101f13135255e4e9d42f15 SHA512 5ce0af3e70010e3602dd2f7c49c80feee1c89903a694db038543a7f399f4296f2c04bf3aee7089da0b24aa9239aa79823e6f5408bf0f3c6fade6166e94070309 WHIRLPOOL de59175ad56577ffc5a90358e2f387c901a8353bb3b98ef6861d917480d853f926de7645ee4a2d8a704824609f251c82ead6e6cd95e982be18271677cfd6e2b3
+DIST mongodb-src-r3.2.3.tar.gz 29607224 SHA256 82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa SHA512 43b652da8fb461c36be1566965985aed036d53a8f4ed2a5f4a67e08571697c4030eb682a2a14ebc41991757d7083a268c5161b536d20dc1b3de13dac8df1da53 WHIRLPOOL 2e262616f0f317185330c8386ea31f81af9d7713dd02e70a4292d2ace17b22fadaead8666840679aa3eedccb624a48817cf68d1d29af3840e4af10aa77d434a5
diff --git a/dev-db/mongodb/mongodb-3.2.1.ebuild b/dev-db/mongodb/mongodb-3.2.3.ebuild
index e1e5a32be806..e1e5a32be806 100644
--- a/dev-db/mongodb/mongodb-3.2.1.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.3.ebuild
diff --git a/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild
index 90bf84d6ae9e..8d989c63ab3b 100644
--- a/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 SLOT="0"
 IUSE="debug +databasedesigner"
 
diff --git a/dev-db/postgresql/postgresql-9.0.23-r1.ebuild b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
index ac1b4fe859aa..25e7948cd781 100644
--- a/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
@@ -219,7 +219,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.1.19-r1.ebuild b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
index 817622c4a539..3ad70613b443 100644
--- a/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
@@ -223,7 +223,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.1.20.ebuild b/dev-db/postgresql/postgresql-9.1.20.ebuild
index 2409a1e446f5..b8227f2117d4 100644
--- a/dev-db/postgresql/postgresql-9.1.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.20.ebuild
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,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"
+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)"
 
@@ -223,7 +223,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.2.14-r1.ebuild b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
index 83a2fa7543ce..1889593643b3 100644
--- a/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
@@ -217,7 +217,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.2.15.ebuild b/dev-db/postgresql/postgresql-9.2.15.ebuild
index 4a1af030f41c..49e7f99fed25 100644
--- a/dev-db/postgresql/postgresql-9.2.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.15.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,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"
+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)"
 
@@ -217,7 +217,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.3.10-r1.ebuild b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
index 2367c975064a..69bce41c3fb4 100644
--- a/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
@@ -217,7 +217,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
index 7bbba3eefff5..b49eb23321d3 100644
--- a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
@@ -222,7 +222,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.3.11.ebuild b/dev-db/postgresql/postgresql-9.3.11.ebuild
index b84d9281d8ce..ef0898e6fff5 100644
--- a/dev-db/postgresql/postgresql-9.3.11.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.11.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,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"
+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)"
 
@@ -222,7 +222,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.4.5-r1.ebuild b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
index d705b1003811..2cacd75aff9a 100644
--- a/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
@@ -249,7 +249,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
index 1cffab75197b..36a8b40b203a 100644
--- a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
@@ -254,7 +254,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.4.6.ebuild b/dev-db/postgresql/postgresql-9.4.6.ebuild
index 486c94461e56..8a77d200ca82 100644
--- a/dev-db/postgresql/postgresql-9.4.6.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.6.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,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"
+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)"
 
@@ -254,7 +254,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9.5.1.ebuild b/dev-db/postgresql/postgresql-9.5.1.ebuild
index 486c94461e56..8a77d200ca82 100644
--- a/dev-db/postgresql/postgresql-9.5.1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,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"
+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)"
 
@@ -254,7 +254,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index addb7aa53fc9..0f52d99f9e53 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -211,7 +211,7 @@ pkg_postinst() {
 		elog
 		elog "It looks like this is your first time installing PostgreSQL. Run the"
 		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
+		elog "environment:"
 		elog "    source /etc/profile"
 	fi
 
diff --git a/dev-db/rqlite/rqlite-1.0.ebuild b/dev-db/rqlite/rqlite-1.0.ebuild
index 0f178d7b6b0d..053d71253fb1 100644
--- a/dev-db/rqlite/rqlite-1.0.ebuild
+++ b/dev-db/rqlite/rqlite-1.0.ebuild
@@ -58,6 +58,17 @@ src_unpack() {
 	unpack_go_packages
 }
 
+src_compile() {
+	# Omit $(get_golibdir_gopath) from GOPATH, in order to avoid
+	# interference from installed rqlite sources.
+	GOPATH="${WORKDIR}/${P}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	golang_install_pkgs
+}
+
 golang_install_pkgs() {
 	dobin bin/${PN}
 	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 8d3eb638d6a0..c1e7536fd81b 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,4 +1,3 @@
-DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff
 DIST sqlite-autoconf-3081001.tar.gz 2049377 SHA256 5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca SHA512 8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30 WHIRLPOOL 83fd822bd9eb6fedea29d968381726be24153375c06ad8c39d4ef34fd3d2e1001c8d5440880d6a880ba24242cd87782afa445ce145cdf7e75843419275136da5
 DIST sqlite-autoconf-3081002.tar.gz 2049387 SHA256 8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626 SHA512 afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65 WHIRLPOOL f3c7b1a11d63213a29f9dc6c04c02db9900b25dd0a8c0551bbf6d220493e7cc420d5775d99147d92c781b7f0068889e6dbeb32a10f447009341827908eee4ad8
 DIST sqlite-autoconf-3081101.tar.gz 2101885 SHA256 fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6 SHA512 b87e3a94462c26e875833c7f83dcc453146377a403d173169e2db7198bede2467f8c480645141da678e0fd3071764558f2dd2630086964431ead25ac43212ee6 WHIRLPOOL 2045496055b02151211080110dc8fc2c474337788704a0e4db8841a1928b82d6490afa682c8d8b1bb6b9e98808d7eabf0f763a41e4768b1c21629107895bb66b
diff --git a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch b/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
deleted file mode 100644
index 7081ffd00323..000000000000
--- a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr sqlite.orig/src/vdbeInt.h sqlite/src/vdbeInt.h
---- sqlite.orig/src/vdbeInt.h	2004-10-16 01:33:02.779442000 +0200
-+++ sqlite/src/vdbeInt.h	2004-10-16 01:35:01.139442000 +0200
-@@ -115,7 +115,7 @@
-   int flags;          /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */
-   double r;           /* Real value */
-   char *z;            /* String value */
--  char zShort[NBFS];  /* Space for short strings */
-+  char zShort[NBFS] __attribute__ ((__aligned__(16))); /* Space for short strings */
- };
- typedef struct Mem Mem;
- 
diff --git a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch b/dev-db/sqlite/files/sqlite-2.8.16-exit.patch
deleted file mode 100644
index aaccb575e0a9..000000000000
--- a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-temp.c:4:1: warning: incompatible implicit declaration of built-in function ‘exit’
-
---- Makefile.in
-+++ Makefile.in
-@@ -269,6 +269,7 @@
- #
- config.h:	
- 	echo '#include <stdio.h>' >temp.c
-+	echo '#include <stdlib.h>' >>temp.c
- 	echo 'int main(){printf(' >>temp.c
- 	echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c
- 	echo 'exit(0);}' >>temp.c
diff --git a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch b/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch
deleted file mode 100644
index 32111877c1b6..000000000000
--- a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -Naurp sqlite-2.8.16.orig/Makefile.in sqlite-2.8.16/Makefile.in
---- sqlite-2.8.16.orig/Makefile.in	2005-02-14 00:22:04.000000000 +0000
-+++ sqlite-2.8.16/Makefile.in	2005-02-17 18:22:50.174537727 +0000
-@@ -187,12 +187,12 @@ last_change:	$(SRC)
-           | awk '{print $$5,$$6}' >last_change
- 
- libsqlite.la:	$(LIBOBJ)
--	$(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
-+	$(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @libdir@ \
- 		-version-info "8:6:8"
- 
- libtclsqlite.la:	tclsqlite.lo libsqlite.la
- 	$(LTLINK) -o libtclsqlite.la tclsqlite.lo \
--		libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
-+		libsqlite.la $(LIBTCL) -rpath @libdir@/sqlite \
- 		-version-info "8:6:8"
- 
- sqlite@TARGET_EXEEXT@:	$(TOP)/src/shell.c libsqlite.la sqlite.h
-@@ -465,14 +465,14 @@ doc:	$(DOC)
- 	mv $(DOC) doc
- 
- install:	sqlite libsqlite.la sqlite.h
--	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
--	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(LTINSTALL) libsqlite.la $(DESTDIR)@libdir@
- 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
- 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
--	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
--	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-+	$(INSTALL) -d $(DESTDIR)@libdir@/pkgconfig; 
-+	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)@libdir@/pkgconfig; 
- 
- clean:	
- 	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
-diff -Naurp sqlite-2.8.16.orig/Makefile.linux-gcc sqlite-2.8.16/Makefile.linux-gcc
---- sqlite-2.8.16.orig/Makefile.linux-gcc	2005-02-14 00:22:04.000000000 +0000
-+++ sqlite-2.8.16/Makefile.linux-gcc	2005-02-17 18:21:47.654969648 +0000
-@@ -14,7 +14,7 @@
- #### The toplevel directory of the source tree.  This is the directory
- #    that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = ../sqlite
-+TOP = @@S@@
- 
- #### C Compiler and options for use in building executables that
- #    will run on the platform that is doing the build.
-@@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0
- #### Specify any extra linker options needed to make the library
- #    thread safe
- #
--#THREADLIB = -lpthread
--THREADLIB = 
-+THREADLIB = -lpthread
-+#THREADLIB = 
- 
- #### Leave MEMORY_DEBUG undefined for maximum speed.  Use MEMORY_DEBUG=1
- #    to check for memory leaks.  Use MEMORY_DEBUG=2 to print a log of all
-@@ -64,7 +64,7 @@ EXE =
- #    will run on the target platform.  This is usually the same
- #    as BCC, unless you are cross-compiling.
- #
--TCC = gcc -O6
-+TCC = @@CC@@ @@CFLAGS@@
- #TCC = gcc -g -O0 -Wall
- #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
- #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
-@@ -72,23 +72,23 @@ TCC = gcc -O6
- 
- #### Tools used to build a static library.
- #
--AR = ar cr
-+AR = @@AR@@ cr
- #AR = /opt/mingw/bin/i386-mingw32-ar cr
--RANLIB = ranlib
-+RANLIB = @@RANLIB@@
- #RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
- 
- #### Extra compiler options needed for programs that use the TCL library.
- #
--#TCL_FLAGS =
-+#TCL_FLAGS = @@TCL_FLAGS@@
- #TCL_FLAGS = -DSTATIC_BUILD=1
--TCL_FLAGS = -I/home/drh/tcltk/8.4linux
-+#TCL_FLAGS = -I/home/drh/tcltk/8.4linux
- #TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
- #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
- 
- #### Linker options needed to link against the TCL library.
- #
--#LIBTCL = -ltcl -lm -ldl
--LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
-+LIBTCL = -ltcl -lm -ldl
-+#LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
- #LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
- #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
- 
-@@ -100,7 +100,7 @@ READLINE_FLAGS = -DHAVE_READLINE=1 -I/us
- #### Linker options needed by programs using readline() must link against.
- #
- #LIBREADLINE =
--LIBREADLINE = -static -lreadline -ltermcap
-+LIBREADLINE = -static -lreadline -lncurses
- 
- #### Should the database engine assume text is coded as UTF-8 or iso8859?
- #
diff --git a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
deleted file mode 100644
index 2cb8a32b49a1..000000000000
--- a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils alternatives multilib toolchain-funcs
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="SQLite: an SQL Database Engine in a C Library"
-HOMEPAGE="http://www.sqlite.org/"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="doc nls tcl"
-
-DEPEND="doc? ( dev-lang/tcl )
-		tcl? ( dev-lang/tcl )"
-
-RDEPEND="tcl? ( dev-lang/tcl )"
-
-SOURCE="/usr/bin/lemon"
-ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
-
-RESTRICT="!tcl? ( test )"
-
-src_unpack() {
-	# test
-	if has test ${FEATURES}; then
-		if ! has userpriv ${FEATURES}; then
-			ewarn "The userpriv feature must be enabled to run tests."
-			eerror "Testsuite will not be run."
-		fi
-		if ! use tcl; then
-			ewarn "You must enable the tcl use flag if you want to run the test"
-			ewarn "suite."
-			eerror "Testsuite will not be run."
-		fi
-	fi
-
-	unpack ${A}
-	cd "${S}"
-
-	use hppa && epatch "${FILESDIR}"/${PN}-2.8.15-alignement-fix.patch
-
-	epatch \
-		"${FILESDIR}"/${P}-multilib.patch \
-		"${FILESDIR}"/${P}-exit.patch
-
-	epunt_cxx
-
-	if use nls ; then
-		ENCODING=${ENCODING-"UTF8"}
-	else
-		ENCODING="ISO8859"
-	fi
-
-	sed -i -e "s:@@S@@:${S}:g" \
-		-e "s:@@CC@@:$(tc-getCC):g" \
-		-e "s:@@CFLAGS@@:${CFLAGS}:g" \
-		-e "s:@@AR@@:$(tc-getAR):g" \
-		-e "s:@@RANLIB@@:$(tc-getRANLIB):g" \
-		-e "s:@@ENCODING@@:${ENCODING}:g" \
-		"${S}"/Makefile.linux-gcc
-
-	sed -i \
-		-e '/^LTLINK/s:$(TCC):& $(LDFLAGS):' \
-		-e '/lemon/s:-o:$(LDFLAGS) &:' \
-		"${S}"/{main.mk,Makefile.in}
-}
-
-src_compile() {
-	local myconf="--enable-incore-db --enable-tempdb-in-ram"
-
-	if ! use tcl ; then
-		myconf="${myconf} --without-tcl"
-	fi
-
-	econf ${myconf} \
-		--disable-static \
-		$(use_enable nls utf8)
-
-	emake all || die "emake all failed"
-
-	if use doc ; then
-		emake doc || die "emake doc failed"
-	fi
-
-	if use tcl ; then
-		cp -P "${FILESDIR}"/maketcllib.sh "${S}"
-		chmod +x ./maketcllib.sh
-		./maketcllib.sh
-	fi
-}
-
-src_test() {
-	if use tcl ; then
-		if has userpriv ${FEATURES} ; then
-			elog "SQLite 2.x is known to have problems on 64 bit architectures."
-			elog "If you observe segmentation faults please use 3.x instead!"
-
-			cd "${S}"
-			emake test || die "some test failed"
-		fi
-	fi
-}
-
-src_install () {
-	dodir /usr/{bin,include,$(get_libdir)}
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-
-	newbin lemon lemon-${SLOT}
-
-	dodoc README VERSION
-	doman sqlite.1
-
-	use doc && dohtml doc/*.html doc/*.txt doc/*.png
-
-	if use tcl ; then
-		mkdir "${D}"/usr/$(get_libdir)/tclsqlite${PV}
-		cp "${S}"/tclsqlite.so "${D}"/usr/$(get_libdir)/tclsqlite${PV}/
-		cp "${S}"/pkgIndex.tcl "${D}"/usr/$(get_libdir)/tclsqlite${PV}/
-	fi
-}
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
new file mode 100644
index 000000000000..7cdd7b7e23ac
--- /dev/null
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools
+
+DESCRIPTION="A library of routines for managing a database"
+HOMEPAGE="http://fallabs.com/tokyocabinet/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="bzip2 debug doc examples threads zlib"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_rpath.patch"
+	sed -i \
+		-e "/ldconfig/d" \
+		-e "/DATADIR/d" Makefile.in || die
+	# cflags fix - remove -O2 at end of line and -fomit-frame-pointer
+	sed -i -e 's/-O3"$/"/' configure.in || die
+	sed -i -e 's/-fomit-frame-pointer//' configure.in || die
+	# flag only works on x86 derivatives, remove everywhere else
+	if ! use x86 && ! use amd64; then sed -i -e 's/ -minline-all-stringops//' configure.in; fi
+	eautoreconf
+}
+
+src_configure() {
+	# we use the "fastest" target without the -O3
+	econf \
+	$(use_enable debug) \
+	$(use_enable bzip2 bzip) \
+	$(use_enable zlib) \
+	$(use_enable threads pthread) \
+	--enable-off64 --enable-fastest
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	if use examples; then
+		insinto /usr/share/${PF}/example
+		doins example/* || die "Install failed"
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/* || die "Install failed"
+	fi
+}
+
+src_test() {
+	emake -j1 check || die "Tests failed"
+}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild
new file mode 100644
index 000000000000..bb2df219221e
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils dotnet
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.mono-project.com"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
+
+IUSE="cairo"
+
+RDEPEND=">=dev-libs/glib-2.2.3:2
+	>=media-libs/freetype-2.3.7
+	>=media-libs/fontconfig-2.6
+	>=media-libs/libpng-1.4:0
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXt
+	>=x11-libs/cairo-1.8.4[X]
+	media-libs/libexif
+	>=media-libs/giflib-5.1.2
+	virtual/jpeg:0
+	media-libs/tiff:0
+	!cairo? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(usex cairo "" "--with-pango")
+}
+
+src_install () {
+	default
+
+	dotnet_multilib_comply
+	local commondoc=( AUTHORS ChangeLog README TODO )
+	for docfile in "${commondoc[@]}"; do
+		[[ -e "${docfile}" ]] && dodoc "${docfile}"
+	done
+	[[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
+	prune_libtool_files
+}
diff --git a/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild b/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
index 1818a176fd2b..9cf26f8d6da8 100644
--- a/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
+++ b/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 	doc? ( https://launchpad.net/zeitgeist-sharp/${DIR_PV}/${DIR_PV2}/+download/${PN}-docs-${DIR_PV2}.tar.gz )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 IUSE="doc"
 
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index df7d42c1d160..a9e5a714f32f 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
+DIST simgear-2016.1.1.tar.bz2 1065810 SHA256 dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d SHA512 ccc3384beef2e2ff3819928f22289a774da28c1df11f42ddc58ad4913c2c329a2cc14ca0359a312b9684ae31e598dda8a7a49e27c9148d079858dc0bf8e6ae63 WHIRLPOOL 2cf05f28c3318ea678f728c87e447c73934348b8862c97602b264f63bbecca82fd7e6db17affe84c78e1a9c42e31ad64aca243e97723e3e54ffca8481609ba50
 DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
diff --git a/dev-games/simgear/simgear-2016.1.1.ebuild b/dev-games/simgear/simgear-2016.1.1.ebuild
new file mode 100644
index 000000000000..899b65f0dd0d
--- /dev/null
+++ b/dev-games/simgear/simgear-2016.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=1
+inherit eutils cmake-utils
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="curl debug subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	curl? ( net-misc/curl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-games/simgear/simgear-3.4.0.ebuild b/dev-games/simgear/simgear-3.4.0.ebuild
index 49fdf6ffbdd8..d2a2f4b4d3bd 100644
--- a/dev-games/simgear/simgear-3.4.0.ebuild
+++ b/dev-games/simgear/simgear-3.4.0.ebuild
@@ -35,7 +35,7 @@ PATCHES=( "${FILESDIR}/${P}-osg340_fixes.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-ENABLE_PKGUTIL=OFF
+		-DENABLE_PKGUTIL=ON
 		-DENABLE_RTI=OFF
 		-DENABLE_SOUND=ON
 		-DSIMGEAR_HEADLESS=OFF
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
new file mode 100644
index 000000000000..f1512179d7a9
--- /dev/null
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=1
+inherit eutils cmake-utils git-r3
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/${PN}
+	git://mapserver.flightgear.org/${PN}"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE="curl debug subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	curl? ( net-misc/curl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-go/beego/beego-1.6.0_p20160126.ebuild b/dev-go/beego/beego-1.6.0_p20160126.ebuild
index 267573ba633f..7a695db73f91 100644
--- a/dev-go/beego/beego-1.6.0_p20160126.ebuild
+++ b/dev-go/beego/beego-1.6.0_p20160126.ebuild
@@ -73,7 +73,7 @@ src_unpack() {
 golang_install_pkgs() {
 	insopts -m0644 -p # preserve timestamps for bug 551486
 	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
-	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}
+	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
 	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
 	doins -r "${S}"/src/${EGO_PN%/*}
 }
diff --git a/dev-go/go-crypto/Manifest b/dev-go/go-crypto/Manifest
index 8aeae64ec6d6..174c962f732e 100644
--- a/dev-go/go-crypto/Manifest
+++ b/dev-go/go-crypto/Manifest
@@ -1 +1,2 @@
 DIST go-crypto-0_pre20150808.tar.gz 876947 SHA256 9ff25a17515c6c7ff0d13fb076ba7a1df868ce30fca105277b3f0356ce801518 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519 WHIRLPOOL 5e1a0372d0a2f493e68c213ce866237cab316c1bf712f2c58a95c16c6864c48ea795e5a6e1346aad7459f666802170aeb0db8f781423fb1d8e252e5bced2e435
+DIST go-crypto-0_pre20160126.tar.gz 902001 SHA256 c1efa4d05d59ef64db60e872fd80afe4e0060cf4cd6924bb51940ef98b45e4ff SHA512 168129ab9581b7348fb3285e045d99a0a837ac7bd65bf9f5e7a220fffbb9e2abf76da5f521c66eea7179eba0ad8da68d6f41cd9624ea40a9da25a18838427846 WHIRLPOOL dbe3067085b5a08c4dd2e13385691aadeda35336c479140684fdb2b08de27ab9447b63cf404c14b9a69520c585a09051f21374c81101599671be091b24fc92d5
diff --git a/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild b/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild
new file mode 100644
index 000000000000..79bc5a25836a
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=golang.org/x/crypto/...
+EGO_SRC=golang.org/x/crypto
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="1f22c0103821b9390939b6776727195525381532"
+	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary cryptography libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/crypto"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestAgentForward(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
+	sed -e 's:TestRunCommandSuccess(:_\0:' \
+		-e 's:TestRunCommandStdin(:_\0:' \
+		-e 's:TestRunCommandStdinError(:_\0:' \
+		-e 's:TestRunCommandWeClosed(:_\0:' \
+		-e 's:TestFuncLargeRead(:_\0:' \
+		-e 's:TestKeyChange(:_\0:' \
+		-e 's:TestValidTerminalMode(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/session_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-net/Manifest b/dev-go/go-net/Manifest
index cba60dd35103..ca4e44b08117 100644
--- a/dev-go/go-net/Manifest
+++ b/dev-go/go-net/Manifest
@@ -1 +1,2 @@
 DIST go-net-0_pre20150804.tar.gz 539435 SHA256 77fb87becd3ddb68ff06acd3a1bf1246b390e7489b3e25a9ee9314f7457ccf60 SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3 WHIRLPOOL a63befad593737449f393d7f4490b1680d8cba808f6163b9723b0d1d228480cdcbf9e2fb091ffc96f9121aabde1e24b06f3ddcb7b30e4bffa6e39dece5a8b3e0
+DIST go-net-0_pre20160216.tar.gz 741192 SHA256 482a17771601dc706945eee7e0c3a339d57a140dc3cb8adaa86e99ef28a8ea71 SHA512 75db9098b33ede5621fce36645ebe946fad911c815dae219d74242b15714d1b9a3d8544f5f8c90b58989cea3a46b5688d20f705cb24a7d31f201ec218e69e78f WHIRLPOOL 2a7dca88766e6ba010ed6b274a48e7db5cfc9084cbc16f46e2806d59519f91b296d64dead8485f191aff50168bad5b4f62ac670d17b30b90850a9906d85c6708
diff --git a/dev-go/go-net/go-net-0_pre20160216.ebuild b/dev-go/go-net/go-net-0_pre20160216.ebuild
new file mode 100644
index 000000000000..f978ad47fc58
--- /dev/null
+++ b/dev-go/go-net/go-net-0_pre20160216.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=golang.org/x/net/...
+EGO_SRC=golang.org/x/net
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed"
+	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary network libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/net"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-crypto:=
+	dev-go/go-text:="
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestReadProppatch(:_\0:' \
+		-i src/${EGO_SRC}/webdav/xml_test.go || die
+	sed -e 's:TestPingGoogle(:_\0:' \
+		-e 's:TestNonPrivilegedPing(:_\0:' \
+		-i src/${EGO_SRC}/icmp/ping_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-oauth2/Manifest b/dev-go/go-oauth2/Manifest
index f388e04d1624..d7aa3d45af55 100644
--- a/dev-go/go-oauth2/Manifest
+++ b/dev-go/go-oauth2/Manifest
@@ -1,2 +1,4 @@
+DIST gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz 217728 SHA256 d4dc2064cc999c9c527fe50a05c44357d3471379bea3f82a95bfebbaa5373552 SHA512 45f0533c842a59dfee3b6d3f1facb9535466119601644a9a2c8c8b4f573889713b1d82d0acdeef96ea246d47d79402d09592b25da3ffbf73953bd28bf5b92ed9 WHIRLPOOL fadd0c32fbfcca9c01ad0a11f64ea4625cda858e4d241bcad35cdc1292bf258a370f4fdd73ecb7bb613fc1f0e8a52154dc3582dbcd776517713468cb2ab7c18a
 DIST gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz 168358 SHA256 817456c3b49ff6917604d201041d4f555e7f42328d5df036c68c26bf50c7455c SHA512 135124280cdbf0a9e62f811164b4b97f0ee5142736cc4a06efafd48162a89dd1a6f186264c925da27adc970c964ab0af75423025fd125b772ddb99320b816219 WHIRLPOOL 66a445585c17d0331b0ce24d9bde8c8942ba39d1d404e1b3b73cbaf173327ab0c43af5b7e980accf697100b12e3a544334a07f43f9f17ebac93ee7907b92b7ac
 DIST go-oauth2-0_pre20150701.tar.gz 32040 SHA256 ce9b602dd7f05c819002d6400585c2f09e8e1880a0fe358a4d4f56a6594ccedd SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a WHIRLPOOL 984438676de52f635206a3bb19b77e7f05c9c78a2ce6beabbe82cc22fb28fa0c7e3717a596a9b0c967615574ad6e53da0510bc1ecd0a38edd23680622320d6a0
+DIST go-oauth2-0_pre20160220.tar.gz 32040 SHA256 ce9b602dd7f05c819002d6400585c2f09e8e1880a0fe358a4d4f56a6594ccedd SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a WHIRLPOOL 984438676de52f635206a3bb19b77e7f05c9c78a2ce6beabbe82cc22fb28fa0c7e3717a596a9b0c967615574ad6e53da0510bc1ecd0a38edd23680622320d6a0
diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild
new file mode 100644
index 000000000000..a2e4436f7c1e
--- /dev/null
+++ b/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils golang-base
+
+MY_PN=${PN##*-}
+GO_PN=golang.org/x/${MY_PN}
+EGIT_COMMIT="8914e5017ca260f2a3a1575b1e6868874050d95e"
+
+HOMEPAGE="https://godoc.org/${GO_PN}"
+DESCRIPTION="Go client implementation for OAuth 2.0 spec"
+SRC_URI="
+	https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz"
+
+SLOT="0/${PVR}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-go/go-net:=
+	dev-go/go-tools"
+RDEPEND=""
+
+S="${WORKDIR}/src/${GO_PN}"
+
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_unpack() {
+	default
+	mkdir -p src/${GO_PN%/*} || die
+	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	export GOROOT="${WORKDIR}/goroot" GOPATH="${WORKDIR}/:$(get_golibdir_gopath)"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}/src/${GO_PN}" || die
+
+	mkdir -p "${GOROOT}/src/google.golang.org" || die
+	rm -rf "${GOROOT}/src/google.golang.org"/* || die
+	rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die
+	mv gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf "${GOROOT}/src/google.golang.org/cloud" || die
+}
+
+src_compile() {
+	go install -v -x -work google.golang.org/cloud/compute/metadata || die
+	go install -v -x -work ${GO_PN}/... || die
+}
+
+src_test() {
+	# google/example_test.go imports appengine, introducing a circular dep
+	mv google/example_test.go{,_}
+	go test -x -v ${GO_PN}/... || die $?
+	mv google/example_test.go{_,}
+}
+
+src_install() {
+	insinto /usr/lib/go
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-protobuf/Manifest b/dev-go/go-protobuf/Manifest
index fe2000ee0b00..c6d537fdb2ce 100644
--- a/dev-go/go-protobuf/Manifest
+++ b/dev-go/go-protobuf/Manifest
@@ -1 +1,2 @@
 DIST go-protobuf-0_pre20150809.tar.gz 151982 SHA256 160ad98eb1477492476ba566d218262fe6d326410d5a030c6a00433eaf7f9006 SHA512 04802b8d74ccaa17f9fc030badd0e74b6e47233ca5f1faab7c49f25bef2f06efd97aa4bf3f4783a7815958354744ddb9fee96d183aebbb03864069b0cc569564 WHIRLPOOL f49157a4a1a48c67b72ed38121ba28aec3f9b3405a3388097caba36643715c14b6915f9bcbd04f974fa98e9f2c4c4a4e313480ef307701c0ace734e9c214c010
+DIST go-protobuf-0_pre20160216.tar.gz 198638 SHA256 c6435eb03e34de0c35577e68fac76ce942785551ac4d3c0f7a7b0fdb8e9285f5 SHA512 d7f446ce7b3f78d646abccdbcb92c423fcca99a51275b55f2a357b5e44c2a6b6d7ea59a39b654daa36e59aa39d3b094ed3fb3d6f53c789a4396fceaecbd5ace5 WHIRLPOOL 900d1aef9a9ef3960732d2ca5b16e4e524964355a91bd283ccb2550c3e84da58b03da6bf2f45ff1e00efddc5d2add71d76829502cdaf4c807f63166f731151f2
diff --git a/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild b/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild
new file mode 100644
index 000000000000..12a260858c9a
--- /dev/null
+++ b/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_SRC=github.com/golang/protobuf
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="127091107ff5f822298f1faa7487ffcf578adcf6"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go support for Google's protocol buffers"
+HOMEPAGE="https://${EGO_SRC}"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	rm -rf src/${EGO_SRC}/.git* || die
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-snappy/Manifest b/dev-go/go-snappy/Manifest
index 9e68da2ff822..48ca6c0d2743 100644
--- a/dev-go/go-snappy/Manifest
+++ b/dev-go/go-snappy/Manifest
@@ -1 +1,2 @@
 DIST go-snappy-0_pre20150729.tar.gz 10085 SHA256 7df12835634e18e96cb3239f870404d5c5a6a20ad3706534a43418c23f5c107e SHA512 84f285f34f547f1da6b0fc87b61a699ac3e8b8d762c0aaa3d71b22869c51d76eb5a5fc3d9b8d3571591eb955fdde9a7a293935e1d40f76c5dd01cc02710b209a WHIRLPOOL 74940645fb51ffb3bedae94dd513b3a153f8cf91285a09eca52d1e0861af20872834ea24034c7fb6de1e13169b566ae155f6937cc0b22fba86bfc02dafa2e3c5
+DIST go-snappy-0_pre20160213.tar.gz 14160 SHA256 1278f837a74d4cb9f6679ba6bb66d0e8cf96469efe0c4df15449a85844042dca SHA512 182cb6626c49ebe1c310ff7531aa7d5b2576926f17f379ecbe0149d970c0fa1dfd6c8dc24e0a7513005a50a452e492da4ed27db4aa66f762e0489b9486f92bb9 WHIRLPOOL 93289e9ccb525e337e33f487ec6c947ae13af59e839c9efff2fd9028a5f30e942685540f1f4c869d1aa8f472eb612d9307a3cf4fb5edd1b70b0f08d3ffd96fde
diff --git a/dev-go/go-snappy/go-snappy-0_pre20160213.ebuild b/dev-go/go-snappy/go-snappy-0_pre20160213.ebuild
new file mode 100644
index 000000000000..546d81090674
--- /dev/null
+++ b/dev-go/go-snappy/go-snappy-0_pre20160213.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_SRC=github.com/golang/snappy
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="d1d908a252c22fd7afd36190d5cffb144aa8f777"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="The Snappy compression format in the Go programming language."
+HOMEPAGE="https://${EGO_SRC}"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-sys/Manifest b/dev-go/go-sys/Manifest
index c535cd48c758..acd75d8d07f4 100644
--- a/dev-go/go-sys/Manifest
+++ b/dev-go/go-sys/Manifest
@@ -1 +1,2 @@
 DIST go-sys-0_pre20150729.tar.gz 529002 SHA256 9f9e4a2bca96d9f9708770607e21395c3f4f873f9b6266cae1ba1da526729528 SHA512 f80afa938977f3945ab3f08462eaf5d8db430013240a11b1f8a43911948fd2a8a390192ea9ebf79434b348b2ca520267a0441b922110e70603fff4849e57c487 WHIRLPOOL 0b269666650f285521c9fd3486959957ad9279544baac7ab5caa21158fb10ed4de2b2e7c080ffca9aa352c8e5685f2035612d40a04c8f6c5f7093daf1a020029
+DIST go-sys-0_pre20160204.tar.gz 542894 SHA256 0085192c44a60949a8c0c96f8d454d9d6fa1c06447a430ae38d965cc239dc720 SHA512 59db0ba47447869f2339ea60b8766e1464f48e22a619da2aecc07977b146a54feb4e3fa4e6076b8d1c2deb11ffab3c820e4a61602f2ce3121df7cb08e0267569 WHIRLPOOL f87756878ef6f8e4155f58941925e5c2bd7bc351d1a251161bff8a285d03bb21b842a55e4ffad91f4aa9726344d01279ab32a72b26829f151e610df8537aefd9
diff --git a/dev-go/go-sys/go-sys-0_pre20160204.ebuild b/dev-go/go-sys/go-sys-0_pre20160204.ebuild
new file mode 100644
index 000000000000..1bbddb0b7914
--- /dev/null
+++ b/dev-go/go-sys/go-sys-0_pre20160204.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=golang.org/x/sys/...
+EGO_SRC=golang.org/x/sys
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="50c6bc5e4292a1d4e65c6e9be5f53be28bcbe28e"
+	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go packages for low-level interaction with the operating system"
+HOMEPAGE="https://godoc.org/golang.org/x/sys"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest
index 522235cf6e3f..e3623f1fab6f 100644
--- a/dev-go/go-text/Manifest
+++ b/dev-go/go-text/Manifest
@@ -1 +1,2 @@
 DIST go-text-0_pre20150806.tar.gz 3736536 SHA256 377d3a95ffb01cf301e1b6050b1437f576f6bbfe32b6d97afc343bb0570b141f SHA512 dd0fc8b5abdfa6f005316bb7828c03a081485e0bd33cbf86c0b83f8bf9240973a7b0a2e6f52ef75f48ec00fc922be21a6c65ff9eb4080f28cb3f280bd4c4f5c6 WHIRLPOOL 79b6233c99984b98b5e74915029117e1f920e17789033ce2656d1590fbeafd4c69d145adeff7c57b1c7f8836397466461744959557877d27fc831da97a62b6ff
+DIST go-text-0_pre20160211.tar.gz 4015547 SHA256 a134ac828ec5cfda4fa8306077dd945f8717d2189f019c24d0d104cc5e6159ec SHA512 066e53f6e094a6cf3effe1a9376f7bde41c3059099381bb5adf8c84589de4dab9115ce3c8cb7f89f90e2601422f79e3906f8f498d66e364da9f830ede1f7f05f WHIRLPOOL 1952326c7b47e1adf270e74be9817cbc2a2e1c1e4a69426378d515c73264f961bb249ced3363c56a57eba1dbab64151ca86a35a77bc26c7cf33fb71b5aff95a6
diff --git a/dev-go/go-text/go-text-0_pre20160211.ebuild b/dev-go/go-text/go-text-0_pre20160211.ebuild
new file mode 100644
index 000000000000..151ca4b91e45
--- /dev/null
+++ b/dev-go/go-text/go-text-0_pre20160211.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN=golang.org/x/text/...
+EGO_SRC=golang.org/x/text
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="07b9a78963006a15c538ec5175243979025fa7a8"
+	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go text processing support"
+HOMEPAGE="https://godoc.org/golang.org/x/text"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
+
+src_install() {
+	golang-build_src_install
+	export -n GOROOT
+	exeopts -m0755 -p # preserve timestamps for bug 551486
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+}
+
+src_test() {
+	# omit $(get_golibdir_gopath) from GOPATH:
+	#package golang.org/x/text/display (test)
+	#	imports golang.org/x/text/internal/testtext: use of internal package not allowed
+	#FAIL	golang.org/x/text/display [setup failed]
+	GOPATH="${WORKDIR}/${P}" go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 54368816ba40..84354ec9d2d3 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -2,3 +2,4 @@ DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316
 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
 DIST go-tools-0_pre20160121.tar.gz 1768660 SHA256 4f1d444643e06bc9da47655e6532d71cdd4dfe3167352d93fd48a8e31bec5a60 SHA512 ca4b213a6f398f9bb61a81784fb6dcb4a82994e2d7a95134fc5203ce0f65848d192b2d7c8975a59199db873942c23562866a5607347e060ac0af370d72e067e2 WHIRLPOOL fa4f0006211cb52eca9cba015235a07d7d640681864a62ed065454efceb789694ea3a6d0099adec910bee075153e56e1323cb7e6f4d9a7426d2b8e40474a715e
+DIST go-tools-0_pre20160220.tar.gz 1827046 SHA256 395190b159e918204f67dee0b8f08f55d14cf59b83aa79cdb69c75de71c8d99a SHA512 95c9deb9b01b2f294818fcc847e457ab313d5831a839bf9cfeb1a00a0efd833de3fdfd3ecfe7ecfa2dd236ffcf963e73205d7b5b25fa41ab51c7601dc632bce1 WHIRLPOOL 48737d871487e693040b448e799d89f8461e6dc60ee12cc21fe874d9897b9721397986aa947af3bcbc2e514422e3c27147a5d2fe21b4fb7593c91e1fb267e424
diff --git a/dev-go/go-tools/go-tools-0_pre20160220.ebuild b/dev-go/go-tools/go-tools-0_pre20160220.ebuild
new file mode 100644
index 000000000000..97123fe0e783
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20160220.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 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="ee8cb08bfe4453a27a4bd7c86a917800d339c5ac"
+	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/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-net:=
+	>=dev-lang/go-1.5"
+RDEPEND="!<dev-lang/go-1.5"
+
+src_prepare() {
+	local go_src="${EGO_PN%/...}"
+	# disable broken tests
+	rm src/${go_src}/cmd/bundle/main_test.go || die
+	sed -e 's:TestWeb(:_\0:' \
+		-e 's:TestWebIndex(:_\0:' \
+		-i src/${go_src}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestGuru(:_\0:' \
+		-i src/${go_src}/cmd/guru/guru_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-e 's:TestDivergentPackagesExamples(:_\0:' \
+		-e 's:TestIncompleteExamples(:_\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/gcimporter15/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
+	sed -e 's:TestFindImportInternal(:_\0:' \
+		-i src/${go_src}/imports/fix_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
+	cp -sR "$(get_golibdir_gopath)" "${T}/gopath" || die
+
+	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:${T}/gopath" go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	golang_install_pkgs
+
+	# 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/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
index 935b98754a8f..31690b1e5126 100644
--- a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
+++ b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.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/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
index 08934f80e8aa..6ecb08ecffb5 100644
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
+++ b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.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="+newbuilder"
 
 RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
index 4150c160d4b9..8e20c67088a8 100644
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.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/bytestring-builder:=[profile?]
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
index a8753f02eb8e..a3eec0a0325c 100644
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
+++ b/dev-haskell/blaze-html/blaze-html-0.8.1.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/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
index e4c72824f307..04479811f701 100644
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
+++ b/dev-haskell/blaze-markup/blaze-markup-0.7.0.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/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
index 70c5d2465740..d5f9d984b3a3 100644
--- a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
+++ b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-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-lang/ghc-6.10.4:=
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
index 84067ab795cd..4199cbc2aa56 100644
--- a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
+++ b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
@@ -45,3 +45,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-haskell/hspec-1.3
 		dev-haskell/quickcheck )
 "
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mt-0.9.3.patch
+}
diff --git a/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
new file mode 100644
index 000000000000..17cddcd3975c
--- /dev/null
+++ b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/575244
+diff --git a/ClassyPrelude.hs b/ClassyPrelude.hs
+index a6c0db4..27173aa 100644
+--- a/ClassyPrelude.hs
++++ b/ClassyPrelude.hs
+@@ -193,3 +193,3 @@ import Data.ChunkedZip
+ import qualified Data.Char as Char
+-import Data.Sequences hiding (elem)
++import Data.Sequences hiding (elem, intercalate)
+ import Data.MonoTraversable
diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
index 948e9d1fa897..288c1c6153d1 100644
--- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild
+++ b/dev-haskell/enumerator/enumerator-0.4.20.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/text-0.7:=[profile?]
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
index 1f9732af5fa9..a0f634a9e852 100644
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fast-bignum libressl"
 
 RESTRICT=test # whoops, not good
diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch
new file mode 100644
index 000000000000..c7c8655e14d8
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch
@@ -0,0 +1,26 @@
+Fails to build with -f-bibutils:
+https://bugs.gentoo.org/516640
+diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs
+index 7006e02..f72fa41 100644
+--- a/pandoc-citeproc.hs
++++ b/pandoc-citeproc.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE CPP #-}
+ module Main where
+@@ -75,2 +76,3 @@ readFormat = go . map toLower
+         go "bibtex"   = Just Bibtex
++#ifdef USE_BIBUTILS
+         go "ris"      = Just Ris
+@@ -87,2 +89,3 @@ readFormat = go . map toLower
+         go "yaml"     = Just Yaml
++#endif
+         go _          = Nothing
+diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs
+index 081fa91..49ddbd0 100644
+--- a/src/Text/CSL/Input/Bibutils.hs
++++ b/src/Text/CSL/Input/Bibutils.hs
+@@ -64,3 +64,3 @@ readBiblioFile f
+ #else
+-        _           -> error $ "citeproc: Bibliography format not supported.\n" ++
++        _           -> error $ "citeproc: Bibliography format not supported.\n"
+ #endif
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
index 7a9af8741aea..d01863694193 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.12
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag bibutils bibutils) \
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
index 3299e181aa30..1bfee4c5a32e 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
@@ -51,6 +51,10 @@ DEPEND="${RDEPEND}
 	embed_data_files? ( dev-haskell/hsb2hs )
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag bibutils bibutils) \
diff --git a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
index cb4661a2f407..66d072337d97 100644
--- a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
+++ b/dev-haskell/snap-core/snap-core-0.9.8.0.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="debug portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
index fd012aa6756b..737ed731a004 100644
--- a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
+++ b/dev-haskell/snap-server/snap-server-0.9.5.1-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="debug openssl portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch b/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
new file mode 100644
index 000000000000..349fd79f8b37
--- /dev/null
+++ b/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
@@ -0,0 +1,78 @@
+https://bugs.gentoo.org/575120
+https://github.com/bos/text/issues/138
+
+commit 6c69034c81974b3fab9dba2993f22cc0a80f1b9e
+Author: Herbert Valerio Riedel <hvr@gnu.org>
+Date:   Sat Feb 13 12:44:20 2016 +0100
+
+    Revert "Rename integer-simple to integer-pure (gh-138)"
+    
+    This basically reverts commit b806d9491c740dfcbf172d2936f1eeb3b72d3492.
+    and therefore resolve #138
+
+diff --git a/Data/Text/Lazy/Builder/Int.hs b/Data/Text/Lazy/Builder/Int.hs
+index 6d26ecd..1cb0651 100644
+--- a/Data/Text/Lazy/Builder/Int.hs
++++ b/Data/Text/Lazy/Builder/Int.hs
+@@ -36,14 +36,14 @@ import Control.Monad.ST
+ #ifdef  __GLASGOW_HASKELL__
+ # if defined(INTEGER_GMP)
+ import GHC.Integer.GMP.Internals (Integer(S#))
+-# elif defined(INTEGER_PURE)
++# elif defined(INTEGER_SIMPLE)
+ import GHC.Integer
+ # else
+-# error "You need to use either GMP or integer-pure."
++# error "You need to use either GMP or integer-simple."
+ # endif
+ #endif
+ 
+-#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
++#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
+ # define PAIR(a,b) (# a,b #)
+ #else
+ # define PAIR(a,b) (a,b)
+diff --git a/text.cabal b/text.cabal
+index ffb92cf..5fa1be0 100644
+--- a/text.cabal
++++ b/text.cabal
+@@ -69,10 +69,10 @@ flag developer
+   default: False
+   manual: True
+ 
+-flag integer-pure
+-  description: Use the pure-Haskell integer library instead of GMP
++flag integer-simple
++  description: Use the simple integer library instead of GMP
+   default: False
+-  manual: True
++  manual: False
+ 
+ library
+   c-sources:    cbits/cbits.c
+@@ -145,9 +145,9 @@ library
+     ghc-options: -Werror
+     cpp-options: -DASSERTS
+ 
+-  if flag(integer-pure)
+-    cpp-options: -DINTEGER_PURE
+-    build-depends: integer-pure >= 1.0
++  if flag(integer-simple)
++    cpp-options: -DINTEGER_SIMPLE
++    build-depends: integer-simple >= 0.1 && < 0.5
+   else
+     cpp-options: -DINTEGER_GMP
+     build-depends: integer-gmp >= 0.2
+@@ -181,9 +181,9 @@ test-suite tests
+     test-framework-hunit >= 0.2,
+     test-framework-quickcheck2 >= 0.2
+ 
+-  if flag(integer-pure)
+-    cpp-options: -DINTEGER_PURE
+-    build-depends: integer-pure >= 0.1 && < 0.5
++  if flag(integer-simple)
++    cpp-options: -DINTEGER_SIMPLE
++    build-depends: integer-simple >= 0.1 && < 0.5
+   else
+     cpp-options: -DINTEGER_GMP
+     build-depends: integer-gmp >= 0.2
diff --git a/dev-haskell/text/text-1.2.2.0.ebuild b/dev-haskell/text/text-1.2.2.0.ebuild
index 42ba63d8d714..7a91a4dc06f0 100644
--- a/dev-haskell/text/text-1.2.2.0.ebuild
+++ b/dev-haskell/text/text-1.2.2.0.ebuild
@@ -35,8 +35,11 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-quickcheck2-0.2 )
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-integer-simple.patch
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
-		--flag=-developer \
-		--flag=-integer-pure
+		--flag=-developer
 }
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
index 51fd04512f0b..f70e861a4bf7 100644
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.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/old-locale:=[profile?]
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
index 5b6b2eed3c1b..a9d7b6f5a318 100644
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
+++ b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
@@ -16,7 +16,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/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r2.ebuild
deleted file mode 100644
index e37bbd6acdab..000000000000
--- a/dev-java/annogen/annogen-0.1.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 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 tool which helps you work with JSR175 annotations"
-HOMEPAGE="https://github.com/codehaus/annogen"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-CDEPEND="
-	dev-java/qdox:1.6
-	dev-java/ant-core:0
-	java-virtuals/jdk-with-com-sun:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jre-1.6"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
-	org/codehaus/annogen/view/MirrorAnnoViewer.java
-	org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-JAVA_GENTOO_CLASSPATH="
-	ant-core
-	qdox-1.6
-"
-
-src_unpack() {
-	default
-	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
-	java-pkg_clean
-	rm -rf examples || die
-}
-
-src_compile() {
-	# Needed for com.sun.* imports
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
-		java-pkg-simple_src_compile
-}
diff --git a/dev-java/annogen/annogen-0.1.0-r3.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
new file mode 100644
index 000000000000..96d70fd8e2e3
--- /dev/null
+++ b/dev-java/annogen/annogen-0.1.0-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 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 tool which helps you work with JSR175 annotations"
+HOMEPAGE="https://github.com/codehaus/annogen"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/qdox:1.6
+	dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+# com.sun.mirror.declaration was removed from JDK 7 onwards.
+# These two files are just interfaces anyway.
+JAVA_RM_FILES=(
+	org/codehaus/annogen/view/MirrorAnnoViewer.java
+	org/codehaus/annogen/override/MirrorElementIdPool.java
+)
+
+JAVA_GENTOO_CLASSPATH="
+	ant-core
+	qdox-1.6
+"
+
+src_unpack() {
+	default
+	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
+}
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf examples || die
+}
+
+src_compile() {
+	# Needed for com.sun.* imports
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
+		java-pkg-simple_src_compile
+}
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 6255e04232f4..f91eafb19083 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
-DIST ecjsrc-3.7.2.jar 1366333 SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32 WHIRLPOOL 399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
 DIST ecjsrc-4.5.1.jar 1809543 SHA256 101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 WHIRLPOOL 739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
deleted file mode 100644
index 752b04a37d6f..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit java-pkg-2
-
-DMF="R-${PV}-201202080800"
-S="${WORKDIR}"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF/.0}/ecjsrc-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="3.7"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-	~dev-java/eclipse-ecj-${PV}
-	>=dev-java/ant-core-1.7"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.4"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p src/org/eclipse/jdt/{core,internal}
-	cp org/eclipse/jdt/core/JDTCompilerAdapter.java \
-		src/org/eclipse/jdt/core || die
-	cp -r org/eclipse/jdt/internal/antadapter \
-		src/org/eclipse/jdt/internal || die
-	rm -fr about* org
-}
-
-src_compile() {
-	cd src
-	java-pkg_filter-compiler jikes
-	ejavac -classpath "$(java-pkg_getjars ant-core,eclipse-ecj-${SLOT})" \
-		$(find org/ -name '*.java') || die "ejavac failed!"
-	find org/ -name '*.class' -o -name '*.properties' | \
-			xargs jar cf "${S}/${PN}.jar" || die "jar failed!"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	insinto /usr/share/java-config-2/compiler
-	doins "${FILESDIR}/ecj-${SLOT}"
-	sed -i "s/^JAVAC=/&${EPREFIX}:" /usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-3.7 b/dev-java/ant-eclipse-ecj/files/ecj-3.7
deleted file mode 100644
index 49b17dc92ac9..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-3.7
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="/usr/bin/ecj-3.7"
-PACKAGE="=dev-java/ant-eclipse-ecj-3.7*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.7,ant-eclipse-ecj-3.7"
-GENERATION="2"
diff --git a/dev-java/asm/asm-5.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
index c15bacc2bb20..e9b62a808956 100644
--- a/dev-java/asm/asm-5.0.3.ebuild
+++ b/dev-java/asm/asm-5.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index d0f694b078b5..721210cfd89c 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,2 +1,3 @@
 DIST beanshell-icon.png 29784 SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 SHA512 731cc0e39e69ef84230e2cea8f9eaf00f80b607c70d83f767d600d8f76fae024516e9b97a988bfcb1ad963da279a6b97ad2559bb8213dc9aaa23c65aa5946d45 WHIRLPOOL 018f8915426bb77bcb62e9f811a51436c6467e01b4d24fc4e2ddb92a3635c18ab1ba7f3154e74fdaccd1621a81b7fc735e53b7cb09caffcd8c103f5462e71e77
 DIST bsh-2.0b4-src.jar 1636723 SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e SHA512 867e960420f8ad0f49ffa1c7cb291ddc64e75dc20f91bd33b91151e9ba96033250b94efbf8e3d4b8d4f8c7193017efcb88840536080809ecb45e2ee0fb8e9040 WHIRLPOOL 1dc8f6d3600ca22fbf993ccb6aafa3954b1d2127f0940cbe84468aa8f323ad69b02c2a3619435ee0e6e1024e1784e57e138f781314ac735f01b909629e074109
+DIST bsh-2.0b6.zip 1994608 SHA256 25e4ca61c198c3268a52d318736ecab9e2d8868c15ba121547df0c39f452bafd SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf WHIRLPOOL 35251126719af7ab6e3aae3a0dc3680221578198ed4b38ee9717a83bd9ef06b11b99d033a47a65feeb00ab1bdeebfe97832e4ec35026f644470114506d6ef177
diff --git a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
index 0952aaef5c98..d299c6041876 100644
--- a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
@@ -54,7 +54,7 @@ src_test() {
 }
 
 src_install() {
-	java-pkg_newjar dist/${P/_beta/b}.jar
+	java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
 
 	java-pkg_dolauncher bsh-console --main bsh.Console
 	java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
new file mode 100644
index 000000000000..ec71d7ad3b89
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 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="beanshell"
+MY_BETA="b6"
+MY_PV="${PV%%_*}"
+MY_P="${PN}-${MY_PV}${MY_BETA}"
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip -> ${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="
+	dev-java/bsf:2.3
+	java-virtuals/servlet-api:3.0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+	)
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jarall"
+EANT_DOC_TARGET="javadoc"
+EANT_GENTOO_CLASSPATH="
+	bsf-2.3
+	servlet-api-3.0
+"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+EANT_TEST_TARGET="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
+
+	java-pkg_dolauncher "${PN}-console" --main bsh.Console
+	java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+
+	use doc && java-pkg_dohtml -r javadoc
+	use source && java-pkg_dosrc src/bsh
+}
diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild
index cbe45605f8d1..7d5a641b32a5 100644
--- a/dev-java/cacao/cacao-0.99.4.ebuild
+++ b/dev-java/cacao/cacao-0.99.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.cacaojvm.org/"
 SRC_URI="http://www.complang.tuwien.ac.at/cacaojvm/download/${P}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 CLASSPATH_SLOT=0.98
 COMMON_DEPEND="
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
index 9a77655db8fa..c08df6a8c20f 100644
--- a/dev-java/cdi-api/Manifest
+++ b/dev-java/cdi-api/Manifest
@@ -1 +1,2 @@
 DIST cdi-api-1.2-sources.jar 139331 SHA256 110dd88693b1745812a3f1c05f78d91aae1efa3cece5a08a5befd9dada51ed8c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a WHIRLPOOL abbf8754528ad7ffe505ae6f25d4920843c2d9bd4c03f7f4424aef35863d8780e6acd7c38e0dc65bad633b8e3f2ec289ba22e417381c1cef90a578a72dd07ef9
+DIST cdi-api-1.2.jar 139331 SHA256 110dd88693b1745812a3f1c05f78d91aae1efa3cece5a08a5befd9dada51ed8c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a WHIRLPOOL abbf8754528ad7ffe505ae6f25d4920843c2d9bd4c03f7f4424aef35863d8780e6acd7c38e0dc65bad633b8e3f2ec289ba22e417381c1cef90a578a72dd07ef9
diff --git a/dev-java/cdi-api/cdi-api-1.2-r1.ebuild b/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
new file mode 100644
index 000000000000..de825b1ad47d
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 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="Contexts and Dependency Injection for the Java EE platform"
+HOMEPAGE="http://www.cdi-spec.org/"
+SRC_URI="https://repo1.maven.org/maven2/javax/enterprise/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/javax-inject:0
+	dev-java/tomcat-servlet-api:3.0
+	dev-java/glassfish-interceptor-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="javax-inject,tomcat-servlet-api-3.0,glassfish-interceptor-api"
+
+JAVA_SRC_DIR="javax"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" . -name "*.xsd"
+}
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
index ebf69947d25a..6c53e31d21cc 100644
--- a/dev-java/classmate/Manifest
+++ b/dev-java/classmate/Manifest
@@ -1 +1,2 @@
 DIST classmate-0.9.0.tar.gz 57752 SHA256 6667a959b282b037aaed328fca3131a89c7649a347a72e1d2d4dd40bc8b393f2 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2 WHIRLPOOL ecfa56a57d07c1486f92c1a635d5b294b9664994504649a5234daff34935c0f42dc590f55ee1fa3a780399a923728a30e083a809871777e68e78deaf3f6dd45c
+DIST classmate-1.0.0.tar.gz 57807 SHA256 eae6fe3a0736d7773856363f2cd176c44cf9bb679974f8fe3add214c16c2f1d3 SHA512 cf721c813674e295fa6c1fe897493d14926d025cab51896ea0cec69ae285a540123060c39e3515daeffa48d6975d060861bf3ca5340bb9273980fee6d92d73b5 WHIRLPOOL ed590fff997700c80c1f4735b809a01599f58112de25248fc626be295e097ac9e1930ce26c140226d3e867733cec58fa7cc7d826e9a57eea351c7dde126902f9
diff --git a/dev-java/classmate/classmate-1.0.0.ebuild b/dev-java/classmate/classmate-1.0.0.ebuild
new file mode 100644
index 000000000000..c67ee19d1b2a
--- /dev/null
+++ b/dev-java/classmate/classmate-1.0.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"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
+HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
+SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/java-${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# This one test is buggy.
+JAVA_RM_FILES=(
+	src/test/java/com/fasterxml/classmate/AnnotationsTest.java
+)
+
+java_prepare() {
+	rm pom.xml || 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")
+
+	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
index 38909305747d..d185210320c6 100644
--- a/dev-java/dnsjava/Manifest
+++ b/dev-java/dnsjava/Manifest
@@ -1 +1,2 @@
 DIST dnsjava-2.1.6.tar.gz 1087908 SHA256 2503f5fb343ebc5b87c4ea3d67070305ff61d8d8c26636f62abb33e507104e76 SHA512 0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497 WHIRLPOOL 60915c62b36a907928696e0afb3529ed46332013f07feea155158075fcc32a3bcfb50ddd3977f876ec7ad3203572ef54ff30f761925b6d96cca6e51fa7939f19
+DIST dnsjava-2.1.7.tar.gz 1078980 SHA256 387e5ccb17fa1c49ff1afbb5c5d61e431fefe07cdf98577c4e9792c2b8435766 SHA512 07b11b94833f4a6f5d9bd8e0265444f15704eeba6420b2fa2c4efef46823c2768e8e691d6b101bb6d1ed9ebda1e55dbf518f447d62eb686fdd583c281313afdd WHIRLPOOL 66b4a37afe5b34bc87d46f3f3c162bdb2f484d8b6b3536f3913d420503067ba179f0467b869f181540050297a3e634a13b259e56a701cdb715c3d47672d42a67
diff --git a/dev-java/dnsjava/dnsjava-2.1.7.ebuild b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
new file mode 100644
index 000000000000..de43db76bc45
--- /dev/null
+++ b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DESCRIPTION="An implementation of DNS in Java"
+HOMEPAGE="http://www.dnsjava.org/"
+SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+		test? (
+			dev-java/junit:0
+			dev-java/ant-junit:0
+		)"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="run_tests"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
+
+java_prepare() {
+	java-pkg_clean
+	#epatch "${FILESDIR}"/*.patch
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+
+	dodoc README USAGE || die
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc org/
+}
+
+src_test() {
+	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
new file mode 100644
index 000000000000..cc6b6662ffe6
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 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
+
+DESCRIPTION="Java library for working with XML"
+HOMEPAGE="http://dom4j.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/dom4j/${P}.tar.gz
+	mirror://gentoo/${P}-java5.patch.bz2"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junitperf:0
+	)
+	>=virtual/jdk-1.6"
+
+PDEPEND="dev-java/jaxen:1.1"
+
+java_prepare() {
+	# Circular deps with jaxen #212993
+	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+	# Add missing methods to compile on Java 5 #137970
+	epatch "${WORKDIR}/${P}-java5.patch"
+}
+
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
+JAVA_RM_FILES=(
+	src/test/org/dom4j/bean/BeansTest.java
+	src/test/org/dom4j/io/StaxTest.java
+	src/test/org/dom4j/rule/RuleTest.java
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
+EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+	java-pkg_register-dependency jaxen-1.1
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 6255e04232f4..f91eafb19083 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
-DIST ecjsrc-3.7.2.jar 1366333 SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32 WHIRLPOOL 399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
 DIST ecjsrc-4.5.1.jar 1809543 SHA256 101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 WHIRLPOOL 739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
deleted file mode 100644
index 3d6a3fcff8c0..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN="ecj"
-DMF="R-${PV}-201202080800"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="3.7"
-IUSE="+ant userland_GNU"
-
-COMMON_DEP="
-	app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	|| ( virtual/jdk:1.7 virtual/jdk:1.6 )
-	app-arch/unzip
-	userland_GNU? ( sys-apps/findutils )"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-S="${WORKDIR}"
-
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-java_prepare() {
-	# These have their own package.
-	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -fr org/eclipse/jdt/internal/antadapter || die
-
-	# upstream build.xml excludes this
-	rm META-INF/eclipse.inf
-}
-
-src_compile() {
-	local javac_opts javac java jar
-
-	javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
-	javac="$(java-config -c)"
-	java="$(java-config -J)"
-	jar="$(java-config -j)"
-
-	find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
-		-path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
-		-print > sources-1.4
-	find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
-
-	mkdir -p bootstrap || die
-	cp -pPR org bootstrap || die
-	cd "${S}/bootstrap" || die
-
-	einfo "bootstrapping ${MY_PN} with ${javac} ..."
-	${javac} ${javac_opts} @../sources-1.4 || die
-	${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die
-
-	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
-		-exec ${jar} cf ${MY_PN}.jar {} + || die
-
-	cd "${S}" || die
-	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
-	${java} -classpath bootstrap/${MY_PN}.jar \
-		org.eclipse.jdt.internal.compiler.batch.Main \
-		${javac_opts} -nowarn @sources-1.4 || die
-	${java} -classpath bootstrap/${MY_PN}.jar \
-		org.eclipse.jdt.internal.compiler.batch.Main \
-		-encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
-
-	find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
-		-exec ${jar} cf ${MY_PN}.jar {} + || die
-}
-
-src_install() {
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-
-	# disable the class version verify, this has intentionally
-	# some classes with 1.6, but most is 1.4
-	JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index fb65326be258..dd30ff28c52b 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,2 +1 @@
-DIST FontBox-0.1.0.zip 6300997 SHA256 83f8d121753589f4b2a558bdb028b3ebbad0a6c07cf1bc0be6d0dd6bf9091aa0 SHA512 56f5c5a86339a9842953cd722f61b1546fd769875f91ce512fdec6d43d145dac63c37d45e2b9466b69bb6ea8f76e12aad25b86db9e3a29560528f16930acd9e1 WHIRLPOOL 70a74788bed28f2386cc66a2d22b9c1cb7cb396a012ae4a2291872e8c6616b9bbb585ccf128f80cb0cb4719979058671d250fdccdf04628dd06d94695075b8fc
 DIST pdfbox-1.7.1-src.zip 9167805 SHA256 805c6b893ff10216cc826aa44e7a2eaf35bb43ca8ed19896c43132d253d3145e SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0 WHIRLPOOL 438fcd6f2d0128b972dfd5be83b2bc455daf9f126ac5b7a6a5de8a41e29f482b462e8e48e07a21ac1e896de4daa5ffed2eee400ec96ac93fbbce25fef99b0ade
diff --git a/dev-java/fontbox/fontbox-0.1.0.ebuild b/dev-java/fontbox/fontbox-0.1.0.ebuild
deleted file mode 100644
index 7b499d934a40..000000000000
--- a/dev-java/fontbox/fontbox-0.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="http://www.fontbox.org/"
-MY_PN=FontBox
-MY_P=${MY_PN}-${PV}
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core
-		app-arch/unzip
-		source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v lib/*.jar
-}
-
-EANT_BUILD_TARGET="package"
-
-#These are not in the zip
-#Probably only in CVS
-#src_test() {
-#	eant junit
-#}
-
-src_install() {
-	java-pkg_newjar ./lib/${MY_P}.jar ${PN}.jar
-	mv docs/javadoc . || die
-	dohtml -r docs/*
-	use doc && java-pkg_dojavadoc javadoc/
-	mv javadoc docs
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/fop/fop-2.0-r1.ebuild b/dev-java/fop/fop-2.0-r1.ebuild
deleted file mode 100644
index 2b2229af27d0..000000000000
--- a/dev-java/fop/fop-2.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
-#       be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="dev-java/batik:1.8
-	dev-java/ant-core:0
-	dev-java/fontbox:1.7
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:3.0
-	dev-java/avalon-framework:4.2
-	dev-java/xmlgraphics-commons:2
-	dev-java/xml-commons-external:1.3
-	dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-#	test? (
-#		dev-java/ant-junit:0
-#		dev-java/junit:4
-#		dev-java/xmlunit:1
-#		dev-java/mockito:0
-#	)"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	batik-1.8
-	fontbox-1.7
-	commons-io-1
-	commons-logging
-	servlet-api-3.0
-	avalon-framework-4.2
-	xmlgraphics-commons-2
-	xml-commons-external-1.3
-"
-
-TARGETS=(
-	resourcegen
-	jar-hyphenation
-	jar-sandbox
-	jar-main
-)
-
-java_prepare() {
-	find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=554386
-	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
-	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
-	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
-	java-pkg_jar-from --into lib commons-logging commons-logging.jar
-	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
-	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
-	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
-
-	for target in ${TARGETS[@]}; do
-		EANT_BUILD_TARGET="${target}" \
-			java-pkg-2_src_compile
-	done
-
-	if use doc; then
-		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
-		EANT_BUILD_TARGET="javadocs" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_install() {
-	java-pkg_dojar \
-		build/${PN}.jar \
-		build/${PN}-sandbox.jar \
-		build/${PN}-hyph.jar
-
-	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
-
-	dodoc NOTICE README
-
-	if use doc; then
-		java-pkg_dojavadoc \
-			build/javadocs
-	fi
-
-	if use examples; then
-		java-pkg_doexamples \
-			examples/* conf
-	fi
-
-	if use source; then
-		java-pkg_dosrc \
-			src/java/org \
-			src/sandbox/org
-	fi
-}
diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
index 3c9485add707..1e5f9fb34f35 100644
--- a/dev-java/fop/fop-2.0-r2.ebuild
+++ b/dev-java/fop/fop-2.0-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
 HOMEPAGE="http://xmlgraphics.apache.org/fop/"
 SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..7d69aae44988
--- /dev/null
+++ b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 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="Java applet to view and display LaTeX mathematical equations"
+HOMEPAGE="http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT=0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_ENCODING="ISO-8859-1"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	rm -v mHotEqn.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" classes/ -name "*.gif"
+}
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
index 9d00dfd58828..0cf9f87085cc 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,14 +19,16 @@ IUSE="test"
 
 CDEPEND="dev-java/jdom:2"
 
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="
+	${CDEPEND}
 	app-arch/unzip
 	dev-java/ant-core:0
-	test? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	test? ( dev-java/junit:4 )
+	>=virtual/jdk-1.5"
 
 JAVA_SRC_DIR="src/main/java"
 JAVA_GENTOO_CLASSPATH="jdom-2"
diff --git a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
index 7cb42e64fea6..5d322936b694 100644
--- a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
+++ b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
@@ -28,21 +28,23 @@ LICENSE="Apache-2.0"
 SLOT="4.4"
 KEYWORDS="amd64 x86"
 
-DEPEND=">=virtual/jdk-1.6
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND="
 	test? (
 		dev-java/commons-logging:0
 		dev-java/ant-junit:0
 		dev-java/mockito:0
-	)"
-RDEPEND=">=virtual/jre-1.6"
+	)
+	>=virtual/jdk-1.6"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_BUILD_TARGET="package"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/${HTTPCORE}/target/${HTTPCORE}-${PV}.jar"
 
 java_prepare() {
-	cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml
-	cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml
+	cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml || die
+	cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml || die
 
 	# Why have these classes been deprecated although other libraries are built
 	# on them (i.e. httpcomponents-client) is mindboggling. See bug 553234.
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
new file mode 100644
index 000000000000..b0dc15d32c78
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2015-09-11 14:02:04.250280108 +0100
++++ configure.ac	2016-02-18 09:36:04.684624293 +0000
+@@ -55,17 +55,6 @@
+ IT_SET_VERSION
+ IT_CHECK_XULRUNNER_VERSION
+ 
+-AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
+-dnl Check for libX11 headers and libraries.
+-PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
+-if test "x${X11_FOUND}" = xno
+-then
+-  AC_MSG_ERROR([Could not find x11 - \
+-  Try installing libX11-devel.])
+-fi
+-AC_SUBST(X11_CFLAGS)
+-AC_SUBST(X11_LIBS)
+-
+ dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
+ dnl IT563 - NetX uses sun.security code
+ dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..4ec469c87440
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+README_GENTOO_SUFFIX="-r1"
+
+inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc javascript nsplugin tagsoup test"
+RESTRICT="test"
+
+CDEPEND="javascript? ( dev-java/rhino:1.6 )
+	nsplugin? ( >=dev-libs/glib-2.16:2= )
+	tagsoup? ( dev-java/tagsoup:0 )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	>=virtual/jdk-1.7
+	virtual/pkgconfig
+	nsplugin? ( net-misc/npapi-sdk )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+RDEPEND="${CDEPEND}
+	>=app-eselect/eselect-java-0.2.0
+	>=virtual/jre-1.7
+	nsplugin? (
+		!dev-java/oracle-jdk-bin[nsplugin]
+		!dev-java/oracle-jre-bin[nsplugin]
+	)"
+
+src_prepare() {
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855
+	epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags,unused-libs}.patch
+
+	if java-pkg_is-vm-version-ge "1.8" ; then
+		sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local tagsoup
+	use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)"
+
+	local config=(
+		# Rename javaws to itweb-javaws as eselect java-vm manages
+		# javaws to prevent a clash with Oracle's implementation.
+		--program-transform-name='s/^javaws$/itweb-javaws/'
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+		--with-java="${EPREFIX}"/usr/bin/java
+		--with-jdk-home="${JAVA_HOME}"
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
+		$(use_with javascript rhino)
+		$(use_with tagsoup tagsoup "${tagsoup}")
+	)
+
+	# See bug #573060.
+	xdg_environment_reset
+
+	# Rely on the --with-jdk-home option given above.
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf "${config[@]}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
deleted file mode 100644
index 651a655b27e6..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-README_GENTOO_SUFFIX="-r1"
-
-inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc javascript nsplugin tagsoup test"
-RESTRICT="test"
-
-CDEPEND="javascript? ( dev-java/rhino:1.6 )
-	nsplugin? ( >=dev-libs/glib-2.16 )
-	tagsoup? ( dev-java/tagsoup:0 )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.7
-	virtual/pkgconfig
-	nsplugin? ( net-misc/npapi-sdk )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-RDEPEND="${CDEPEND}
-	>=app-eselect/eselect-java-0.2.0
-	>=virtual/jre-1.7
-	nsplugin? (
-		!dev-java/oracle-jdk-bin[nsplugin]
-		!dev-java/oracle-jre-bin[nsplugin]
-	)"
-
-src_prepare() {
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780
-	epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags}.patch
-
-	if java-pkg_is-vm-version-ge "1.8" ; then
-		sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local tagsoup
-	use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)"
-
-	local config=(
-		# Rename javaws to itweb-javaws as eselect java-vm manages
-		# javaws to prevent a clash with Oracle's implementation.
-		--program-transform-name='s/^javaws$/itweb-javaws/'
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-		--with-java="${EPREFIX}"/usr/bin/java
-		--with-jdk-home="${JAVA_HOME}"
-		$(use_enable doc docs)
-		$(use_enable nsplugin plugin)
-		$(use_with javascript rhino)
-		$(use_with tagsoup tagsoup "${tagsoup}")
-	)
-
-	# See bug #573060.
-	xdg_environment_reset
-
-	# Rely on the --with-jdk-home option given above.
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf "${config[@]}"
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 7a507b90f5d3..cdb6342f3575 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,13 +1,6 @@
-DIST icu4j-3_8_1-docs.jar 1470606 SHA256 e3acbb4523ebf90288bde1ff4ebe16241ff8d5a3e53ce9e29636f569a42f0b46 SHA512 88f59573d1070f13ebce9116359603e4d0c6f0c1626ab18a2fc6a08ac5831d50341341e33576c52d97b0b763fe8a8babfd35b34d77466bef5da5ab34aec2bb6e WHIRLPOOL 750c067d4df18780612f0d77c6f48c3c16e502d15d3fdf8339a22e4235e74a192ed2ecec80f4ae00f9e4ee8dc6b949a2969c44a7d7bc93538d53b349d5df324e
-DIST icu4j-3_8_1-src.jar 13782832 SHA256 c6b42a4a9fe0d13302897ee0bf2c955b8a7a02af1ee01ad9cdb61a515638ca0f SHA512 4b652886cff0ee490db0e0c0bf9b33828b8f1026ade7a956b86c1839727be04f5bca4783c31539e8cc8e309a7e2127315f84577db0d9b425d878121867d580ee WHIRLPOOL 9936a512d2a1c259d905299e517aa64137c5ee4852a0bc646411aa85d878cdaf00001b6fcbfb459f64764463c30b224924fd711e1e15e2f544edd7505d5572ff
-DIST icu4j-49_1.tgz 18487856 SHA256 40e0c09cb8a12883bd5c06826f6651203baf214919be98f120cd89002362329a SHA512 4287439b1e8bd1ce30e1c64bd97d3f4e6ba97de7b4242ca05cf53ab83ad3a495434d77cc2816224030d4662df2cdfc3afbb4a7ed45fce2ee0c10aa0ce1ec45b2 WHIRLPOOL ef8961afff8f280db6730f0c4d64eabcc8fa8454db6d9ec7eab8d034f25646874edbc6cba5689f1993241bbfae538914ca4d4e6821eb4559e07a1a4e60b0a191
 DIST icu4j-4_0_1_1-docs.jar 1553089 SHA256 44319c329b628c5e14e74eeb285ddb876c34e3529b06c69abd9a54799490cd8e SHA512 15bf1cdb7c040403dcf0b7ebcf5355a192ce1e8841a13392badcce1d56c06a0e41bc8213f071a5530c892e2cc9e975cd9cbde6fa3f61e395cc437966e20733b8 WHIRLPOOL 0bd48dd1dc953f571da012b820b485f841ff3c5939b26e17cc92e872d94a7c122efce58cb0a6ac5479617687a8aa0f525f1650998f9e304d30274073d7c8f9fd
 DIST icu4j-4_0_1_1-src.jar 15138020 SHA256 9d5484ccb3ad6849b6d3986ee2cf146984cbbb8adb2349dc79f6a4e006bc417e SHA512 4eb02b50df0c7a008f6291c636cfc887b61ce503e0bd994d8cd5f3ec955b287e16ea640de98398414e000af8a859a4b087aa711cdaa53c8c17c7fdb760a4ca4e WHIRLPOOL 032412b7a7cb533e1f037c32cfa74db65272ca9c735d412c0f5f4abd1c41d5c4a1db26d0d8339693ff7229a052fd3cf1b8504cc250c17a3a45e7f4d58bb7f279
-DIST icu4j-4_2_1_1-docs.jar 1633918 SHA256 3749ec254d38b6ca2e13ed5cf493ac371ff3c548bf95302af41bb408e0bcbfa8 SHA512 87eeb92f168b28aa4cce3b3547311020e0b052034ef160cb5ba3b8f7fc77829b231680f061686ea87dc388f961c4d1feffcb3fc24fe5df66e51c2983c4a5be30 WHIRLPOOL 2d1a2ad3c54624721c2e7e56bef927486ca82d6f8c7e00ad6b97707ca8b6c42186b5b45babdc73961e8e6b30ed9fc29f923cf580f17bcf974593f090ac3a767b
-DIST icu4j-4_2_1_1-src.jar 16057200 SHA256 61e8d1f7879c580e7304222b80a1bf395455d50fa425a9d7e1b72164776a43fa SHA512 3d61a219a67ff5682a4c1484f7239b60982b8e6c25138ccb15a92cfae18c67592acea0200b2954f7a021b1d3765aabae98d5346f22e134af2ca18514a7925274 WHIRLPOOL cf87a51dd9f18c9f5af0549677fd971dfc9e527ee09c0e39d82fc0fa128eea6222c65d10df722b7d7f451bacaf5d80ce31122112fdcb720a2dcaaae05a61b163
 DIST icu4j-4_4_2-docs.jar 1783887 SHA256 aa364c9e353e05e428112b05f9a9fda8e1c7d2b3404862e6df08a73f7f8b187a SHA512 212d042ca27e442525a1dcd4f69a6668535d57e49a1302b97e32bfc7ed216146eedff52633770bb01f32f560fb6d7c00774b34385a7d87cab9f0b68188a37203 WHIRLPOOL 804ac774e6e9e4b06f1d06795ea70ecb68ee23ed7689d4b603682ca1271c2d18d258faf3c23e99ff8269275774b4ba0e1b605b2b7288b51e9ae5445d25c32d7c
 DIST icu4j-4_4_2-src.jar 14844670 SHA256 c29fbf1464ad7fb88e8651953144884eea37adf36914e38a518774a99cf33b0d SHA512 90949f007e073c0e78510c66c2a1644985367921550f61976af61089ffc8a08e34a51c36c21f241f3073c7b3c5329d1ba7234043790db8dd8eef7eaf3edff79d WHIRLPOOL 82727e4e95ef662f9c6689bf5cd1d5c16f4238b682d2d88689ee561aae9c8ecc846f2bbb0adcfd125c7353b9ba160abc0c76d0d11af78047a59fd4504a39a720
-DIST icu4j-52_1.tgz 22584166 SHA256 0d720ee63ec3976a0280bc5f42ef347a5823c0debe15bd42369316433f32ae05 SHA512 4546daa126410c21ec65acc75581831c139873e2465b9fd898215cc52ebfbd6441c0a260bd449aa3d0753fe0584c02d1bd033de46904aef9e27aaa3266b78738 WHIRLPOOL 9bd5b5085289c776c221a0a85edca11185fed77874e5520627ba60b9f2772c63aa078a765ba5b228570062d063fc3077b2cbe2417d4c241b4f6940f59206bd57
-DIST icu4j-53_1.tgz 21619483 SHA256 dc1e4ab121769ced059b0b79ad1ec607ffe8e4b39950c6de83ea21656df173eb SHA512 0a5689a1f5762130f02e37fd844c9ac2f03d176fa3b49904227e6a38fdc62a6b371d3674b8f06ee2e30589f5d71578841e84d554dadc86ec7b049ff2d39e5250 WHIRLPOOL 030c7378e67017512f4762fd75b9851a62a26b4b954f10b51573ff0d029768b8fe96b159328946609c864ad273c7b7ab6bdd1d694bd4aed37af318e5ccefd558
 DIST icu4j-54_1_1.tgz 23457651 SHA256 1919a355742172dbd18021dfb2fd008f5c73168d2d5a39d705721614029d6704 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf WHIRLPOOL d7c35283547c598694ead10620df1511cbe4602415ca8ee2d32ee3b291d28015db4fcd5fb3f426bf524e449099562545c3bdab81209af244890b53ea091f9f1f
 DIST icu4j-55_1.tgz 23617640 SHA256 da4c91e6b89bef3da22be475e63916c4f4f304b9689d5fdc5b40a52106efc4c3 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054 WHIRLPOOL b6cace3616d6d0b1c185a744cc1f0a3728682557d51f4b6658f174195c1eb369a2a005e2fd9eb4b421de761e47c2424368359a1948594da7b2f8cd6e1b0d2f33
diff --git a/dev-java/icu4j/files/icu4j-3.8.1-manifest b/dev-java/icu4j/files/icu4j-3.8.1-manifest
deleted file mode 100644
index ae7ac129b5b6..000000000000
--- a/dev-java/icu4j/files/icu4j-3.8.1-manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %vendorName
-Bundle-SymbolicName: com.ibm.icu; singleton:=true
-Bundle-Version: 3.8.1.1
-Bundle-Localization: plugin
-Export-Package: com.ibm.icu.lang;version="3.8.1",
- com.ibm.icu.math;version="3.8.1",
- com.ibm.icu.text;version="3.8.1",
- com.ibm.icu.util;version="3.8.1",
- com.ibm.icu.impl;x-internal:=true,
- com.ibm.icu.impl.data;x-internal:=true,
- com.ibm.icu.impl.data.icudt38b;x-internal:=true,
- com.ibm.icu.impl.data.icudt38b.brkitr;x-internal:=true,
- com.ibm.icu.impl.data.icudt38b.coll;x-internal:=true,
- com.ibm.icu.impl.data.icudt38b.rbnf;x-internal:=true,
- com.ibm.icu.impl.data.icudt38b.translit;x-internal:=true
-Eclipse-LazyStart: true
-Bundle-ClassPath: .
-Eclipse-ExtensibleAPI: true
diff --git a/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
deleted file mode 100644
index 64151008822f..000000000000
--- a/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java

-===================================================================

---- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34829)

-+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34830)

-@@ -1,5 +1,5 @@

- /*

-  *******************************************************************************

-- * Copyright (C) 1996-2013, International Business Machines Corporation and    *

-+ * Copyright (C) 1996-2014, International Business Machines Corporation and    *

-  * others. All Rights Reserved.                                                *

-  *******************************************************************************

-@@ -2820,5 +2820,5 @@

-                 if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {

-                     value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;

--                } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar

-+                } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")

-                     && UCharacter.isDigit(text.charAt(start))

-                     && UCharacter.isDigit(text.charAt(start+1)))

diff --git a/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
deleted file mode 100644
index dd47da77ad68..000000000000
--- a/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java

-===================================================================

---- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34867)

-+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34868)

-@@ -2820,5 +2820,5 @@

-                 if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {

-                     value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;

--                } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")

-+                } else if (count == 2 && (pos.getIndex() - start) == 2 && cal.haveDefaultCentury()

-                     && UCharacter.isDigit(text.charAt(start))

-                     && UCharacter.isDigit(text.charAt(start+1)))

-Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java

-===================================================================

---- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java	(revision 34867)

-+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java	(revision 34868)

-@@ -1,5 +1,5 @@

- /*

-  *******************************************************************************

-- * Copyright (C) 1996-2010,2012, International Business Machines Corporation and    *

-+ * Copyright (C) 1996-2014, International Business Machines Corporation and    *

-  * others. All Rights Reserved.                                                *

-  *******************************************************************************

-@@ -639,4 +639,13 @@

-     /**

-      * {@inheritDoc}

-+     * @internal

-+     * @deprecated This API is ICU internal only.

-+     */

-+    public boolean haveDefaultCentury() {

-+        return false;

-+    }

-+

-+    /**

-+     * {@inheritDoc}

-      * @stable ICU 4.0

-      */

-@@ -662,3 +671,4 @@

-         return super.getActualMaximum(field);

-     }

-+

- }

-Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java

-===================================================================

---- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java	(revision 34867)

-+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java	(revision 34868)

-@@ -1,4 +1,4 @@

- /*

--*   Copyright (C) 1996-2013, International Business Machines

-+*   Copyright (C) 1996-2014, International Business Machines

- *   Corporation and others.  All Rights Reserved.

- */

-@@ -6081,4 +6081,19 @@

-     }

- 

-+    /**

-+     * Returns if two digit representation of year in this calendar type

-+     * customarily implies a default century (i.e. 03 -> 2003).

-+     * The default implementation returns <code>true</code>. A subclass may

-+     * return <code>false</code> if such practice is not applicable (for example,

-+     * Chinese calendar and Japanese calendar).

-+     * 

-+     * @return <code>true<code> if this calendar has a default century.

-+     * @internal

-+     * @deprecated This API is ICU internal only.

-+     */

-+    public boolean haveDefaultCentury() {

-+        return true;

-+    }

-+

-     // -------- BEGIN ULocale boilerplate --------

- 

-Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java

-===================================================================

---- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java	(revision 34867)

-+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java	(revision 34868)

-@@ -1,4 +1,4 @@

- /*********************************************************************

-- * Copyright (C) 2000-2012, International Business Machines

-+ * Copyright (C) 2000-2014, International Business Machines

-  * Corporation and others. All Rights Reserved.

-  *********************************************************************

-@@ -1019,4 +1019,13 @@

- 

-     /**

-+     * {@inheritDoc}

-+     * @internal

-+     * @deprecated This API is ICU internal only.

-+     */

-+    public boolean haveDefaultCentury() {

-+        return false;

-+    }

-+

-+    /**

-      * Override readObject.

-      */

diff --git a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
deleted file mode 100644
index 2192b484771f..000000000000
--- a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# We currently download the Javadoc documentation.
-# It could optionally be built using the Ant build file.
-# testdata.jar and icudata.jar do not contain *.class files but *.res files
-# These *.res data files are needed to built the final jar
-# They do not need to be installed however as they will already be present in icu4j.jar
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="ICU4J is a set of Java libraries providing Unicode and Globalization support"
-MY_PV=${PV//./_}
-
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
-	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
-
-HOMEPAGE="http://www.icu-project.org/"
-LICENSE="icu"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.4"
-
-# build.xml does file version detection that fails for 1.7
-# https://bugs.gentoo.org/show_bug.cgi?id=213555
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	app-arch/unzip"
-
-# test curently disabled
-#DEPEND="test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
-#	!test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
-
-IUSE="doc test"
-
-RESTRICT="test"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
-
-	if use doc; then
-		mkdir docs; cd docs
-		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
-	fi
-}
-
-src_compile() {
-	# Classes extending CharsetICU not implementing Comparable
-	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
-	# Restricting to javac (didn't even care to try jikes) is better
-	# than forcing 1.4
-	java-pkg_force-compiler javac
-	eant jar || die "Compile failed"
-}
-
-src_install() {
-	java-osgi_newjar-fromfile --no-auto-version "${PN}.jar" "${FILESDIR}/icu4j-${PV}-manifest" \
-		"International Components for Unicode for Java (ICU4J)"
-	java-pkg_dojar "${PN}-charsets.jar"
-
-	use doc && dohtml -r readme.html docs/*
-	use source && java-pkg_dosrc src/*
-}
-
-# Following tests will fail in Sun JDK 6 (at least):
-# toUnicode: http://bugs.icu-project.org/trac/ticket/5663
-# TimeZoneTransitionAdd: http://bugs.icu-project.org/trac/ticket/5887
-# These are bugs in the tests themselves, not in the library
-
-src_test() {
-	# Tests currently fail, disabled for now. Need to investigate (tests work in icu4j-4.0)
-	#eant check
-	einfo "Tests currently disabled."
-}
diff --git a/dev-java/icu4j/icu4j-4.2.1.1.ebuild b/dev-java/icu4j/icu4j-4.2.1.1.ebuild
deleted file mode 100644
index 6bad6ec71e3d..000000000000
--- a/dev-java/icu4j/icu4j-4.2.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-# We currently download the Javadoc documentation.
-# It could optionally be built using the Ant build file.
-# testdata.jar and icudata.jar do not contain *.class files but *.res files
-# These *.res data files are needed to built the final jar
-# They do not need to be installed however as they will already be present in icu4j.jar
-
-JAVA_PKG_IUSE="doc test source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-MY_PV=${PV//./_}
-
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
-	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
-
-HOMEPAGE="http://www.icu-project.org/"
-LICENSE="icu"
-SLOT="4.2"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-
-# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
-DEPEND="test? ( =virtual/jdk-1.6* )
-	!test? ( >=virtual/jdk-1.4 )
-	app-arch/unzip"
-
-RESTRICT="ia64? ( test )
-	x86-fbsd? ( test )"
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
-
-	if use doc; then
-		mkdir docs; cd docs
-		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
-	fi
-}
-
-src_compile() {
-	# Classes extending CharsetICU not implementing Comparable
-	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
-	# Restricting to javac (didn't even care to try jikes) is better
-	# than forcing 1.4
-	java-pkg_force-compiler javac
-	eant jar || die "Compile failed"
-}
-
-src_install() {
-	java-pkg_dojar "${PN}.jar"
-	java-pkg_dojar "${PN}-charsets.jar"
-
-	use doc && dohtml -r readme.html docs/*
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	# bug #299082 - these tests fail with icedtea, assume too much about double<>string conversions
-	sed -i '/DiagBigDecimal/d' src/com/ibm/icu/dev/test/TestAll.java || die
-	eant check
-}
diff --git a/dev-java/icu4j/icu4j-49.1.ebuild b/dev-java/icu4j/icu4j-49.1.ebuild
deleted file mode 100644
index c294201606bc..000000000000
--- a/dev-java/icu4j/icu4j-49.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-# testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
-# but *.res files. These *.res data files are needed to build the final jar.
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
-
-LICENSE="icu"
-SLOT="49"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# Beware of jdk version dependant code #361593
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
-
-EANT_DOC_TARGET="docs"
-
-EANT_TEST_TARGET="check"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "${PN}.jar"
-	java-pkg_dojar "${PN}-charset.jar"
-	java-pkg_dojar "${PN}-localespi.jar"
-
-	dohtml readme.html
-
-	use doc && java-pkg_dojavadoc doc
-	use examples && java-pkg_doexamples demos samples
-	use source && java-pkg_dosrc main/classes/*/src/com
-}
diff --git a/dev-java/icu4j/icu4j-52.1.ebuild b/dev-java/icu4j/icu4j-52.1.ebuild
deleted file mode 100644
index ecd0d4d48ea1..000000000000
--- a/dev-java/icu4j/icu4j-52.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
-# but *.res files. These *.res data files are needed to build the final jar.
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
-
-LICENSE="icu"
-SLOT="52"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# Beware of jdk version dependant code #361593
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
-
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="check"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
-	epatch "${FILESDIR}"/${P}-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dojar ${PN}-charset.jar
-	java-pkg_dojar ${PN}-localespi.jar
-
-	dohtml readme.html
-
-	use doc && java-pkg_dojavadoc doc
-	use examples && java-pkg_doexamples demos samples
-	use source && java-pkg_dosrc main/classes/*/src/com
-}
diff --git a/dev-java/icu4j/icu4j-53.1.ebuild b/dev-java/icu4j/icu4j-53.1.ebuild
deleted file mode 100644
index 6dea8784419e..000000000000
--- a/dev-java/icu4j/icu4j-53.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
-# but *.res files. These *.res data files are needed to build the final jar.
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
-
-LICENSE="icu"
-SLOT="52"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# Beware of jdk version dependant code #361593
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
-
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="check"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dojar ${PN}-charset.jar
-	java-pkg_dojar ${PN}-localespi.jar
-
-	dohtml readme.html
-
-	use doc && java-pkg_dojavadoc doc
-	use examples && java-pkg_doexamples demos samples
-	use source && java-pkg_dosrc main/classes/*/src/com
-}
diff --git a/dev-java/jacoco/jacoco-0.7.5.ebuild b/dev-java/jacoco/jacoco-0.7.5.ebuild
index c7dc86cb4040..bc66630329ea 100644
--- a/dev-java/jacoco/jacoco-0.7.5.ebuild
+++ b/dev-java/jacoco/jacoco-0.7.5.ebuild
@@ -2,6 +2,7 @@
 # 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
@@ -17,7 +18,7 @@ SRC_URI="
 	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.ant/${PV}.${DATE}/org.${PN}.ant-${PV}.${DATE}-sources.jar -> ${P}-ant.jar"
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
new file mode 100644
index 000000000000..2c856f088439
--- /dev/null
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_J=${PN%%-*}
+MY_O=${PN##*-}
+
+DESCRIPTION="A set of text-processing Java classes"
+HOMEPAGE="http://jakarta.apache.org/oro/index.html"
+SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	mv src/java/examples examples || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
index d116fc596635..ad6b8473cb34 100644
--- a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
+++ b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gentoo/java-apicheck/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r3.ebuild
new file mode 100644
index 000000000000..464984e86a34
--- /dev/null
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	!dev-java/java-config-wrapper
+	sys-apps/baselayout-java
+	sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# This replaces the file installed by java-config-wrapper.
+	dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index d7d7f2ae526a..853c2aac0ada 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,2 +1 @@
-DIST jcommander-1.32.tar.gz 61837 SHA256 21f8dd9aaae91800648a81d44a71b6b7574e828de7faa1667c9c4c64c653f6c5 SHA512 dd23674e5ca91f770ec677579f3c2eb16cbf4f82154f9d1a728debeaef75f0e00e50d58336e7b05b63f601188380d62075df0889b2df8e1fffe48c472cfa5df0 WHIRLPOOL 3971b6c7b2d799f1d1063167d4079365d77086bbf0a76e9f8990febc01e82f78f7c2aa9dc809b04acbf21af5bd8cfb5b5c1de6fd506951e031d5b01e512076b6
 DIST jcommander-1.48.tar.gz 64544 SHA256 dcba3a05e60731c8945166089f7f1a1600150f438e5f23d36e6e766d1a34c5e2 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e WHIRLPOOL 85d1bb10129e93c69932b84d5af7c6084fa089c51a8afdfe980512a52dfe47ec9c678bfc91cfaffa61a13a4dea8953a3df50d96fdbc53ec3e2fd8870dc34afca
diff --git a/dev-java/jcommander/files/jcommander-1.32-build.xml b/dev-java/jcommander/files/jcommander-1.32-build.xml
deleted file mode 100644
index 641cbbf54461..000000000000
--- a/dev-java/jcommander/files/jcommander-1.32-build.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 9/16/13 6:06 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jcommander-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jcommander-1.32"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/testng/testng/6.1.1/testng-6.1.1.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
-    <pathelement location="${maven.repo.local}/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/testng/testng/6.1.1"/>
-    <get src="http://oss.sonatype.org/content/repositories/snapshots/org/testng/testng/6.1.1/testng-6.1.1.jar" 
-         dest="${maven.repo.local}/org/testng/testng/6.1.1/testng-6.1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/testng/testng/6.1.1/testng-6.1.1.jar" 
-         dest="${maven.repo.local}/org/testng/testng/6.1.1/testng-6.1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
-    <get src="http://oss.sonatype.org/content/repositories/snapshots/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/beanshell/bsh/2.0b4"/>
-    <get src="http://oss.sonatype.org/content/repositories/snapshots/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
-         dest="${maven.repo.local}/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
-         dest="${maven.repo.local}/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/yaml/snakeyaml/1.6"/>
-    <get src="http://oss.sonatype.org/content/repositories/snapshots/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
-         dest="${maven.repo.local}/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
-         dest="${maven.repo.local}/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jcommander/files/jcommander-1.48-build.xml b/dev-java/jcommander/files/jcommander-1.48-build.xml
deleted file mode 100644
index f788b920aa34..000000000000
--- a/dev-java/jcommander/files/jcommander-1.48-build.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 10/25/15 2:23 PM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jcommander-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jcommander-1.48"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath"/>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/jcommander/jcommander-1.32.ebuild b/dev-java/jcommander/jcommander-1.32.ebuild
deleted file mode 100644
index 8c593f557f07..000000000000
--- a/dev-java/jcommander/jcommander-1.32.ebuild
+++ /dev/null
@@ -1,41 +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 test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Command line parsing framework for Java"
-HOMEPAGE="https://github.com/cbeust/jcommander"
-SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-# Depends on itself through dev-java/testng (BGO) for building tests, bad idea.
-RESTRICT="test"
-
-# EANT_GENTOO_CLASSPATH_REWRITE="true"
-# EANT_TEST_GENTOO_CLASSPATH="..."
-
-src_test() {
-	EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc README.markdown CHANGELOG
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
index c87bd7692bb7..96a5bab5fea1 100644
--- a/dev-java/jcommander/jcommander-1.48.ebuild
+++ b/dev-java/jcommander/jcommander-1.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Command line parsing framework for Java"
 HOMEPAGE="https://github.com/cbeust/jcommander"
@@ -14,23 +14,15 @@ SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}/${PN}-${P}"
 
-JAVA_ANT_REWRITE_CLASSPATH="yes"
+RESTRICT="test"
 
 java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc README.markdown CHANGELOG
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java
+	rm -rf src/test || die
 }
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index f6ee813dffb8..2502905fe59d 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,2 +1 @@
-DIST Jaybird-2.1.5-src.zip 6047595 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868 SHA512 e6d7eb70cf59d5d9a2dd7817bc11574ba5f014f2aae6cb6c4b141e7d0a172cf091b950e3475ee5d4389f3ca3efae3f34ed1efbc694b74a2a99adc2694c936a7e WHIRLPOOL ca5e3fedce5f13a00ea37f946f9f0141d3132ea3b9209623961b32868946dd0e36621d0280716263031bc02dbcc7f8cd80de29da5e0235127d9c0d9e4deea54e
 DIST Jaybird-2.2.9-src.zip 9833669 SHA256 46b807c85efd3531aef612b5d7a71e570c02e344cf73d67890c1194d3a250828 SHA512 487e64658553f60fa2a1f9b6d7136504119bac2905c6480cac01a94ce2c6e70b82449ee9a1b9b1ee96a12646ef69064d542401fc62564662f14531dea3790e6e WHIRLPOOL f3197921d0eca901662353ab5150ba62b72ac40ccf884f78f229fadac2239bc56964d5ae452d0dcddf82099b66a71c734beaffe6b8a4b3d9bffec98061d7dc0a
diff --git a/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch b/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch
deleted file mode 100644
index 2a32c5a4126f..000000000000
--- a/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java
-index 179f58b..fec2ac7 100644
---- a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java
-+++ b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java
-@@ -23,7 +23,6 @@ package org.firebirdsql.jdbc;
- import java.sql.*;

- import java.util.*;

- 

--import org.apache.tools.ant.taskdefs.Get.DownloadProgress;

- import org.firebirdsql.gds.*;

- import org.firebirdsql.gds.impl.AbstractGDS;

- import org.firebirdsql.gds.impl.AbstractIscDbHandle;

diff --git a/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch b/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch
deleted file mode 100644
index a6d36de8a7db..000000000000
--- a/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- client-java/build/archive.xml	2005-06-25 19:26:26.000000000 -0400
-+++ build/archive.xml	2006-05-09 12:41:03.000000000 -0400
-@@ -57,7 +57,7 @@
- 

-   </target>

- 

--  <target name="jar-test" depends="compile">

-+  <target name="jar-test" depends="compile" if="tests">

- 

-     <mkdir dir="${build.lib}"/>

-     <jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf">

diff --git a/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch b/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch
deleted file mode 100644
index d66e7bf40049..000000000000
--- a/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur client-java_orig/build/compile.xml client-java/build/compile.xml
---- client-java_orig/build/compile.xml	2008-02-07 20:46:24.000000000 -0500
-+++ client-java/build/compile.xml	2008-02-13 14:46:08.000000000 -0500
-@@ -13,7 +13,7 @@
-     <ant antfile="build_native.xml"/>

-   </target>

-  

--  <target name="compile-examples">

-+  <target name="compile-examples" if="examples">

-   	<mkdir dir="${build.examples}"/>

-     <javac srcdir="${source.examples}"

-            destdir="${build.examples}"

-@@ -154,7 +154,7 @@
-     </path>

-   </target>

- 

--  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test">

-+  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test" if="tests">

-     <mkdir dir="${build.test}"/>

-     <javac srcdir="${source.test}"

-            destdir="${build.test}"

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
deleted file mode 100644
index 49e90180d821..000000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source examples test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-At="Jaybird-${PV/_/}-src"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${At}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	dev-java/ant-core
-	dev-java/log4j"
-DEPEND="=virtual/jdk-1.6*
-	app-arch/unzip
-	dev-java/ant-core
-	dev-java/log4j
-	test? (
-		=dev-java/junit-3.8*
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/client-java"
-
-MY_PN="jaybird"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
-	epatch "${FILESDIR}/compile_xml-2.1.2.patch"
-
-	cd "${S}/lib/"
-	rm -v *.jar
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	# the build.xml unpacks this and uses stuff
-	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
-	rm -v *.jar *.zip
-	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
-
-	# Hack to add ant.jar to classpath without patch
-	java-pkg_jar-from ant-core ant.jar jaas.jar
-	java-pkg_jar-from log4j log4j.jar log4j-core.jar
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	eant $(use test && echo "-Dtests=true") jars \
-		$(use_doc javadocs)
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full pool; do
-		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	done
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	fi
-
-	cd "${S}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples || die "installing examples failed"
-	fi
-
-	use source && java-pkg_dosrc "${S}"/src/*/org
-
-	cd "${S}/output"
-	use doc && java-pkg_dohtml -r docs/
-	dodoc etc/{*.txt,default.mf}
-	dohtml etc/*.html
-}
-
-src_test() {
-	#
-	# Warning about timeouts without Firebird installed and running Locally
-	#
-	ewarn "You will experience long timeouts when running junit tests"
-	ewarn "without Firebird installed and running locally. The tests will"
-	ewarn "complete without Firebird, but network timeouts prolong the"
-	ewarn "testing phase considerably."
-	ANT_TASKS="ant-junit" eant all-tests-pure-java
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
index c73a5d216e5b..669c6afb873e 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
index 2eac58363ba0..dd30ff28c52b 100644
--- a/dev-java/jempbox/Manifest
+++ b/dev-java/jempbox/Manifest
@@ -1,2 +1 @@
-DIST JempBox-0.2.0.zip 6131627 SHA256 a4c6def91c31aaae4b8ee4b3f9ecebef73fce2f608bf7fc906a89a9bef17978e SHA512 8468028cf04d78e4bcbd2108f21c26e70d23a39f9ee897c2edf0a982c8981cdcbf1f6474f222021ac68e65dc0e5f6063d2603658f694a99ccac6ee52715c3aad WHIRLPOOL bb8659ab900b8920ace7afb8787d30ed4a00c701f0962106dcb1891f7829c83a04a4f9de09c9b7b682340bed06fb58622ffd4ff60d0defd39c5485363161137f
 DIST pdfbox-1.7.1-src.zip 9167805 SHA256 805c6b893ff10216cc826aa44e7a2eaf35bb43ca8ed19896c43132d253d3145e SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0 WHIRLPOOL 438fcd6f2d0128b972dfd5be83b2bc455daf9f126ac5b7a6a5de8a41e29f482b462e8e48e07a21ac1e896de4daa5ffed2eee400ec96ac93fbbce25fef99b0ade
diff --git a/dev-java/jempbox/jempbox-0.2.0.ebuild b/dev-java/jempbox/jempbox-0.2.0.ebuild
deleted file mode 100644
index 6bd457993f39..000000000000
--- a/dev-java/jempbox/jempbox-0.2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2
-
-MY_PN="JempBox"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Java library that implements Adobe's XMP specification"
-HOMEPAGE="http://www.jempbox.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v lib/*.jar
-	rm -rf docs/javadoc
-
-	if use test; then
-		java-ant_xml-rewrite -f build.xml --change -e junit \
-			-a haltonfailure -v true
-		cd lib
-		java-pkg_jar-from --build-only junit
-	else
-		# no way to separate building of tests in build.xml
-		# at least it doesn't include them in <jar>
-		rm -rf src/test
-	fi
-}
-
-src_compile() {
-	eant package $(use_doc)
-
-	#tests delete the jar and javadocs so newjar, dojavadoc will fail to
-	#install jar and javadoc.
-	mkdir gentoo-dist
-	cp "lib/${MY_P}.jar" "gentoo-dist/${MY_P}.jar" || die "Failed to copy jar."
-	if use doc; then
-		cp -R website/build/site/javadoc gentoo-dist || die \
-			"Unable to copy javadoc"
-	fi
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant junit
-}
-
-src_install() {
-	java-pkg_newjar "gentoo-dist/${MY_P}".jar
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc gentoo-dist/javadoc
-	fi
-
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/jexcelapi/Manifest b/dev-java/jexcelapi/Manifest
index f400130f3224..16c2e545cc42 100644
--- a/dev-java/jexcelapi/Manifest
+++ b/dev-java/jexcelapi/Manifest
@@ -1 +1,2 @@
+DIST jexcelapi-2.6.8.tar.gz 1925926 SHA256 12f05e4453c203b91329a65329b564e86aaa77a005101f876c4de7b648c36034 SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1 WHIRLPOOL 24d60ad81961b224c6d63267ee4cb4432bca5bb89c1462797dc96dce4f7fb6403741c34819c78a36312a1df9f0fce756c1d026b1672c751fc8b3a42cc9f0e3c7
 DIST jexcelapi_2_6_8.tar.gz 1925926 SHA256 12f05e4453c203b91329a65329b564e86aaa77a005101f876c4de7b648c36034 SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1 WHIRLPOOL 24d60ad81961b224c6d63267ee4cb4432bca5bb89c1462797dc96dce4f7fb6403741c34819c78a36312a1df9f0fce756c1d026b1672c751fc8b3a42cc9f0e3c7
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild
new file mode 100644
index 000000000000..9fd07137f28d
--- /dev/null
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 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_P="${P//-/_}"
+MY_P="${MY_P//./_}"
+
+DESCRIPTION="A Java API to read, write, and modify Excel spreadsheets"
+HOMEPAGE="http://jexcelapi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="log4j"
+
+JAVA_RM_FILES=(
+	src/common/log/Log4jLoggerName.java
+	src/common/log/SimpleLoggerName.java
+)
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
new file mode 100644
index 000000000000..ca64b59652a6
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 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="JFreeChart is a free Java class library for generating charts"
+HOMEPAGE="http://www.jfree.org/jfreechart"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	dev-java/jfreesvg:2.1
+	>=dev-java/jcommon-1.0.23:1.0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.19-build.xml.patch"
+	"${FILESDIR}/${PN}-1.0.19-fix-TimeSeriesCollectionTest.patch"
+)
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_XML="ant/build.xml"
+EANT_BUILD_TARGET="compile-experimental"
+EANT_GENTOO_CLASSPATH="
+	jfreesvg-2.1
+	jcommon-1.0
+	servlet-api-3.0
+"
+
+EANT_DOC_TARGET="javadoc"
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_newjar "lib/${P}.jar" "${PN}.jar"
+	java-pkg_newjar "lib/${P}-experimental.jar" "${PN}-experimental.jar"
+
+	dodoc README.txt ChangeLog NEWS
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/org
+}
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index fa21fd18afeb..e8226ec09b48 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1 +1,2 @@
 DIST jopt-simple-4.7.tar.gz 109206 SHA256 082aae8f1d5f6169017fed90aceee41e2b83c3716aeebf877cbe6bb9b9c0a13b SHA512 02d89cfd5ff4e48c6968a99448f0b378c6c8ce1a035d1c815f4489e2efa24ad159f5013705716b6bdea905e3c963664e1aafb18b308e661a5402b42a0eb271ae WHIRLPOOL f0be49cce81c25ec2e825a8256c273decfbe89f5a46a988aff9807f29cd63593159347ed2c1757ad7e02521a55fdf6a1e0a9291065f7364e6dd4c6f691e1c868
+DIST jopt-simple-4.8.tar.gz 110173 SHA256 21adbb508568d244a827999c1ab1567a9021febad0566b0d0464de262859fed9 SHA512 cc5360cf97446117849f93397c41734a9a001ea623e9ea4223b8d760f36897c62103ab9d2dabfcf0fa032db8e33f7bc51759d626d7bd76dda3adc61fa6622984 WHIRLPOOL cb0e88abcf34a77f617bacc39a9152dafcc04ff9723cfb78bc454250acd4c7c78717c9772bb809e79bfd5da8ff032b323dbeb9d158ea79e53337db400a872050
diff --git a/dev-java/jopt-simple/jopt-simple-4.8.ebuild b/dev-java/jopt-simple/jopt-simple-4.8.ebuild
new file mode 100644
index 000000000000..bffe67c8fdb8
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 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 Java library for parsing command line options"
+HOMEPAGE="https://pholser.github.com/jopt-simple/"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/pholser-${PN}-587d4ee"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md
+}
diff --git a/dev-java/jrexx/Manifest b/dev-java/jrexx/Manifest
index 12fcf0d7c0a5..15cf0b9ebcd6 100644
--- a/dev-java/jrexx/Manifest
+++ b/dev-java/jrexx/Manifest
@@ -1 +1,2 @@
 DIST jrexx-1.1.1-src.zip 62878 SHA256 6655b611c7693f20da86cd8e933908483615341a916556e777535192aa8f1b0d SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1 WHIRLPOOL 1f2e4451672c1c557efd5edca511504095196746b529e14a9ab1a7bbe82a243cd59ffc047561e066f4f54a65356e6c14e88e0b809609b3ba2ae12a696c0792d8
+DIST jrexx-1.1.1.zip 62878 SHA256 6655b611c7693f20da86cd8e933908483615341a916556e777535192aa8f1b0d SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1 WHIRLPOOL 1f2e4451672c1c557efd5edca511504095196746b529e14a9ab1a7bbe82a243cd59ffc047561e066f4f54a65356e6c14e88e0b809609b3ba2ae12a696c0792d8
diff --git a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..454ef3b70e80
--- /dev/null
+++ b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 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="API for textual pattern matching based on the finite state automaton theory"
+HOMEPAGE="http://www.karneim.com/jrexx/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index 925cb101c4cf..ed6abb895234 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -7,13 +7,7 @@
 	<upstream>
 		<remote-id type="github">douglascrockford/JSON-java</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
diff --git a/dev-java/jssc/Manifest b/dev-java/jssc/Manifest
index 672d4f69bf49..9a063771358d 100644
--- a/dev-java/jssc/Manifest
+++ b/dev-java/jssc/Manifest
@@ -1 +1 @@
-DIST jssc-2.8.0-sources.jar 19489 SHA256 b5a9609b99b4543c88d20e0425a83461209d4851ef3ce312349c64b76ce1dc68 SHA512 7f3a8482d0982ed3e604b00217cbfa37ad442b5a2b562ff68805c186ee56423bd82706bbbe3b9f2705c8337009b7c71068ba7ebbb829ea3c96bc61f43b540b9d WHIRLPOOL 4c10ba9b373cb057c50c01564124a2258b15b335a059d2cb195b8d8b14b761cbe98a713020dc21118d17a3274f346357812a3dc64103eb12916052e1a1e37050
+DIST jssc-2.8.0.jar 19489 SHA256 b5a9609b99b4543c88d20e0425a83461209d4851ef3ce312349c64b76ce1dc68 SHA512 7f3a8482d0982ed3e604b00217cbfa37ad442b5a2b562ff68805c186ee56423bd82706bbbe3b9f2705c8337009b7c71068ba7ebbb829ea3c96bc61f43b540b9d WHIRLPOOL 4c10ba9b373cb057c50c01564124a2258b15b335a059d2cb195b8d8b14b761cbe98a713020dc21118d17a3274f346357812a3dc64103eb12916052e1a1e37050
diff --git a/dev-java/jssc/jssc-2.8.0.ebuild b/dev-java/jssc/jssc-2.8.0.ebuild
index e914d27308be..b43d4404f413 100644
--- a/dev-java/jssc/jssc-2.8.0.ebuild
+++ b/dev-java/jssc/jssc-2.8.0.ebuild
@@ -3,19 +3,23 @@
 # $Id$
 
 EAPI=5
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Apache MyFaces API - Core package"
 HOMEPAGE="https://github.com/scream3r/java-simple-serial-connector"
-SRC_URI="http://repo1.maven.org/maven2/org/scream3r/${PN}/${PV}/${P}-sources.jar"
+SRC_URI="http://repo1.maven.org/maven2/org/scream3r/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index 302dca3e8263..6034fcc96aab 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="readline">Use GNU readline instead of jline</flag>
-    <flag name="servletapi">Add optional support for servlet-api</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">jython</remote-id>
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..2109d3e16446
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
+HOMEPAGE="http://www.jcraft.com/jzlib/"
+SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="com"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README ChangeLog
+	use examples && java-pkg_doexamples example
+}
diff --git a/dev-java/kryo/Manifest b/dev-java/kryo/Manifest
index 1ef9e43bad0e..b5e70e10f5cd 100644
--- a/dev-java/kryo/Manifest
+++ b/dev-java/kryo/Manifest
@@ -1,3 +1 @@
-DIST kryo-1.05.zip 980393 SHA256 989c23c55fb5465cb4113f24fc728d17fa616bcf91bf4f8d9100c04c615b4a9e SHA512 b19aef102bf0e9a5980856ded3aaadd64616a0ed1d17488b5af1d349987c34603e641d2698712abba39a4fcaa2e9676ed11cc1902a8dfdaccba84a0a37161d40 WHIRLPOOL 4e007e5bb197e2269b9a970974937cbcb8c2905cb36885c2ea8a110f82524533c8e99875625d50155c8bb0b574fb4188404c1f0b9d7652ce4f101a4c2191be77
-DIST kryo-2.21.zip 1749241 SHA256 bab6232c7d07aa669fed19c15ecb4d319fb5072b3f7775d1d178d6c4fb8bd46e SHA512 e2bcf17b13e067b81951145981c091f3250c7c502fe30e9f41fcd0e62bb87bbf4373f5d367842e7b8966dad76f5580fa4e212edd1adf590a05b7e2f40e401c4a WHIRLPOOL 765875e8494de948a2cf594e5612b63504cddec9d91d7da6598cc69fb32b37925c4bfb4351650f9fe7a217535ae9882345d9194fb2dcef64dfec0b0b37371635
-DIST kryo-2.22.zip 2196334 SHA256 665c81ac37ff7912d3db94fcba766e9d9b14e920dea71be25f742b3c85202838 SHA512 4e2af99be7a251783886c717c2493f73c98faedc1bb5037d9a5344e539ed2a5eca1f1e02dec9adc68752d59ad07184bb4704f726f553261034a7287b83886b30 WHIRLPOOL 6fefa818d60fed4b4ea5672868e4a1f62e0bfcffafc5844943128db70195276b6b0074385abed1cc25ef583598b130a836ebf6d715851cf3eb73de8ba86d4ad2
+DIST kryo-2.24.0.zip 1203526 SHA256 199306ae97ee63f6f692d1725e0074ca1bc395d43526d4923bac436b04c0740d SHA512 0c804e7986678339865cb0dd000bce063e5a91d1f3ae56eba1ca1b1bcca5e917a5d69fe14ff0c986e36c49f115336efb6221d771dd19b4dda91a9a7a6daf1463 WHIRLPOOL 23f9d9f9536b820d9209bdac9769962b17d5f09af9f6e713c8e8f8a35a266da21fdb3bedde93850130b54a01b69faa75f6a230fd79ecb2e1d326ab7f0b02066a
diff --git a/dev-java/kryo/kryo-1.05.ebuild b/dev-java/kryo/kryo-1.05.ebuild
deleted file mode 100644
index d149b2d79c91..000000000000
--- a/dev-java/kryo/kryo-1.05.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Fast, efficient Java serialization and cloning"
-HOMEPAGE="https://github.com/EsotericSoftware/kryo"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="BSD-2"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="dev-java/objenesis:0
-	dev-java/reflectasm:0
-	dev-java/minlog:0"
-
-DEPEND="${CDEPEND}
-	test? ( dev-java/junit:4 )
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
-JAVA_SRC_DIR="${PN}/src"
-
-src_prepare() {
-	rm "${S}"/${PN}/pom.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_test() {
-	mkdir target/tests || die
-	local testcp="${S}/${PN}.jar:target/tests:$(java-pkg_getjars junit-4)"
-	testcp+=":$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${testcp}" -d target/tests $(find ${PN}/test -name "*.java")
-	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/kryo/kryo-2.21.ebuild b/dev-java/kryo/kryo-2.21.ebuild
deleted file mode 100644
index a6afe3c75307..000000000000
--- a/dev-java/kryo/kryo-2.21.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Fast, efficient Java serialization and cloning"
-HOMEPAGE="https://github.com/EsotericSoftware/kryo"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="dev-java/objenesis:0
-	dev-java/reflectasm:0
-	dev-java/minlog:0"
-
-DEPEND="${CDEPEND}
-	test? ( dev-java/junit:4 )
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}/java"
-
-JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	rm "${S}"/pom.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_test() {
-	mkdir target/tests || die
-	local testcp="${S}/${PN}.jar:target/tests:$(java-pkg_getjars junit-4)"
-	testcp+=":$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${testcp}" -d target/tests $(find test/ -name "*.java")
-	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/kryo/kryo-2.22.ebuild b/dev-java/kryo/kryo-2.22.ebuild
deleted file mode 100644
index a6afe3c75307..000000000000
--- a/dev-java/kryo/kryo-2.22.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Fast, efficient Java serialization and cloning"
-HOMEPAGE="https://github.com/EsotericSoftware/kryo"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="dev-java/objenesis:0
-	dev-java/reflectasm:0
-	dev-java/minlog:0"
-
-DEPEND="${CDEPEND}
-	test? ( dev-java/junit:4 )
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}/java"
-
-JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	rm "${S}"/pom.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_test() {
-	mkdir target/tests || die
-	local testcp="${S}/${PN}.jar:target/tests:$(java-pkg_getjars junit-4)"
-	testcp+=":$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${testcp}" -d target/tests $(find test/ -name "*.java")
-	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/kryo/kryo-2.24.0.ebuild b/dev-java/kryo/kryo-2.24.0.ebuild
new file mode 100644
index 000000000000..97c54be588ed
--- /dev/null
+++ b/dev-java/kryo/kryo-2.24.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Fast, efficient Java serialization and cloning"
+HOMEPAGE="https://github.com/EsotericSoftware/kryo"
+SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${P}.zip"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/objenesis:0
+	dev-java/reflectasm:0
+	dev-java/minlog:0"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
+
+src_prepare() {
+	rm "${S}"/pom.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_test() {
+	mkdir target/tests || die
+	local testcp="${S}/${PN}.jar:target/tests:$(java-pkg_getjars junit-4)"
+	testcp+=":$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${testcp}" -d target/tests $(find test/ -name "*.java")
+	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/laf-plugin/laf-plugin-0.2-r1.ebuild b/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild
new file mode 100644
index 000000000000..7cad2c21179b
--- /dev/null
+++ b/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 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="A generic plugin framework for look-and-feels"
+HOMEPAGE="http://laf-plugin.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}-src.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+EANT_BUILD_TARGET="dist"
+
+java_prepare() {
+	cp "${FILESDIR}/${P}-build.xml" build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/laf-plugin/laf-plugin-0.2.ebuild b/dev-java/laf-plugin/laf-plugin-0.2.ebuild
deleted file mode 100644
index 51a034965a87..000000000000
--- a/dev-java/laf-plugin/laf-plugin-0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A generic plugin framework for look-and-feels"
-HOMEPAGE="http://laf-plugin.dev.java.net/"
-# repackaged from zip and renamed to contain PV
-SRC_URI="mirror://gentoo/${P}-src.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-EANT_BUILD_TARGET="dist"
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 20b51b1a8ef5..da13b83be8f6 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,16 +1,4 @@
 DIST lucene-1.4.3-src.tar.gz 768320 SHA256 62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049 SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911 WHIRLPOOL dea750d36a33689fa46926271a5c3be62b011e327ce9fa671a480a7ff9ce4d430d678fbf6f82befd81510d574e303f71b627d15b438492a8a34d5f60b5569b95
-DIST lucene-1.9.1-src.tar.gz 6135056 SHA256 a06bd64ce779f3d4e4b539c280f6a882efb2fd8cba4ebbed02a2b6f92658524f SHA512 fb9f29e0d38d6525d7f6f86d339867a08bfe77ba18a023885a3ecb093d217840c274c767b6e1451f7c58135919c6159122756ebde4640a47420526502395a994 WHIRLPOOL c9d83447742d2d0a2a30e73eb6ed2659db9be77d8bba0de716bdcf73af4bbbf0bf789251a8657c72aed217bf2b2deecb0ce044cf38d1b9a835cf66c338e9d548
-DIST lucene-2.1.0-src.tar.gz 8154476 SHA256 b18c6bff8d74ddd6baabf9288aec45c34e90d74f6688657a4af2cbd0847e6ad9 SHA512 9e9970c6f44b568867d0b714852d063758e8958eac76fa21ef7ab3f0e51f62bc2073d24faf8ad14bce560d6539287e65b82a5db0a35834dc0a0787729cf4a7aa WHIRLPOOL a38d6ce7015c5a2511d0a2d1d848d9762818c11ca9821cff47ded077f5934135a140e8b0ac1e4eea5085ff925535669fc56b10d18e86d73e124b7dd2fe1e0f71
-DIST lucene-2.2.0-src.tar.gz 6054069 SHA256 c40372fbe4b586cf715c84194cef83df26bb65cc026aca1c3be22a5e81bd1370 SHA512 afb40d3e71e2f5e45150b4e84635b9022bfe495de2fd6bc18e9792398a62258396f242266babd7209dfa1706e61c54c982d6ee70264b7807b60e6f25321c9cc7 WHIRLPOOL a0ccdf8823bc8eac432f1b0e5048f33b01249c01cc7da4033dbcefdd7b0259eb31020ec996adbafeb37284959f177f90e22131544d5ad9080da686fc4af7bd7e
-DIST lucene-2.3.0-src.tar.gz 4591950 SHA256 c020207987cb3bf415bf168b64245da3900de086312b82ce9b11d275146420b6 SHA512 ee3aa3388932f38a06a23d75bc1ad0043238155f3b474c651ed716dc0b8f4158f49cb79002c31197f28e6d2286b7dc22d00e801d63ec153605b7af2b70a0387e WHIRLPOOL 0f259265c152bca2356940085581e8ff46e98ab5415d68d0714683582aea2f7746f939d8e0e30bc0987d0970b6735cf6346eee2be784efad4be442a950a8a88f
-DIST lucene-2.3.1-src.tar.gz 4597493 SHA256 84ddee3a667242917c8117d9e273d9e81ef7f4015c69a7758f12b8018054e646 SHA512 95269c89485c4b23566459543365788c4c4c9c4b0bce6273dff63185e1dfabf643c37fd166227ffd89e4a6ea223aba19c79f3fdf7429a0cd69aadf34b863c8f2 WHIRLPOOL a6b211db97749187b3ee0036933fad3a2cf97208a5a9553cafc5c0bb33c3a3fc9a502203f4b855b6a8c4ffa3faa7b1041c879c44dccd48a5da407cf5fc458bfe
-DIST lucene-2.3.2-src.tar.gz 4602041 SHA256 d0cc4b8a40900bbb3243d2e9d9987e0ea0e7d359a2992222bc9acf296b208416 SHA512 42bf988b2eed45ea8d8a3523d9fcf4e384e0e9729a25a54e518a34faf960370a8f7d824f537df7155dc2b64ac11e1b30a8e1ea745a0e054c86722f6e8551360d WHIRLPOOL d8db8e2962624f11e35d69f49a4bf000ebec33a6b01d42e71b5e19cc160c0a29167f94d6b96bd9d45154aa7292469d31c502670bfd0c54e78d333c89e6f33c03
-DIST lucene-2.4.0-src.tar.gz 5053702 SHA256 01509848b8cf2e6675a38fc06124c7622cdd573e975ebcc893c36903b416b7c7 SHA512 d01893a92e979d229103c30c02b96a328bdb04984c7af8633cb4c8acc0a9008f999da240489408a8412fcb42eb19ff2ade3bfea823ae735d50baab3228b89af4 WHIRLPOOL 3adf147dfd80dc1c9643152eb16011ee6a9f02f528d95f2ba8911caccd505c8f4cd93e603c556db5a7ded85c2a32cb1dc333a438b713e6fe6132aeee84ba1b04
 DIST lucene-2.4.1-src.tar.gz 5057003 SHA256 47ecc5e105717d356e0468433d1a60f84f620d79ff9f48a78ca4be6c349b6a10 SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e WHIRLPOOL e452450c1981724b133af16098b29a1bcc6bfdd1ce2785929599278c674fbe9c2863d35fe93ae78a361d790eda29da62b25613a4ee57fe3b49290dfd11ebd3be
-DIST lucene-2.9.1-src.tar.gz 12459850 SHA256 7e1d06d3bbc2a71889c84f5f89c8af0b438184097a57e7070790c79a1aeb9102 SHA512 1dae3a33b50f7a8e8a2e578ddc19ff9d33b49bb3cb39d1d5e6706140c8e737a81b2cb587eb51e2dc4899cd3b1b9ce3f4795c4552a99e48e0960fbcbed872c9ed WHIRLPOOL 9357b78e794248032cb9f6097d3969e48dbfe0179afae69e779e58d1ebaae0230f7003a4bb26ec6df951fedc4091c779529582dbdd5496b27cba0613a67254d8
-DIST lucene-2.9.4-src.tar.gz 12494586 SHA256 2a8bd7c6f0632bc406bcec0091d286b3efd4743c2d45fd88b0d0d564281780cd SHA512 75c08520f41ec6ca603fac42471dfec5310c5de2c8b4b762719329acc22d5ac2fbc676d328a9c83966c39b88a4cc0ac5e97960a18ee8459575b4c823ba5fd3d6 WHIRLPOOL 21b02cc87d956d04248f017a8b1b6c37d719428e9431642c6a2bf064f04d6878ee075eb5d4c7c080b20700af71dd66c01359c4de1de4b6934399a4832967b83b
-DIST lucene-3.0.0-src.tar.gz 12421467 SHA256 661fc4eec33c2c509c1a53896da469304a51c5cc5ce51313d9f77f385c63346a SHA512 7ae59713e6c7f74487c62461f29dfed43700ee56ce6367a32370e8e47c7e8ab89d1ed01fd6bc09ff2c1fcd8136a7e1383be6c2f41ba5cbcb72101865dbd20a12 WHIRLPOOL 591e50311303307b0be75f98316c7bc39d35df1505d8ce9478c5a2ea5bf9a28c96aeea6bd02bef2865b79094e1a98a9b4ed5afa6b4706fa06cd21d6208aae78b
-DIST lucene-3.0.3-src.tar.gz 12446839 SHA256 91365fe5af0279b7b6300f17033580746c90272417665d9572db1c1a9d1ba37e SHA512 b9a09a3efc63450c8d4fab840185b21aab288a7fb02a7f8f63af08ac3f3ebee18a255d9ecfdd3d7301e8c9e93bee90abe2ae10e2b91ed6770c1d7075848b5869 WHIRLPOOL 72f2f5ad089b790dd0eefe7a1b6cf3d1e8a2aa85ea42bb0cfc754498feb00a2ec2a4ad80e1f2228d7a873048c1b8057e32d19d17bfffb044ae23180605a21fcb
-DIST lucene-3.4.0-src.tgz 39329123 SHA256 e0471a61085b4aac8db831b5c981262d972a611e4fea491c4e188a9ee730ff2a SHA512 c5cc4394af12e72c47c246f59bd2e352ff9d5b5749bed5b68c3a0925ae85fc595cb316f1a15e9074597e9c347b4193aa9d7c039a06c4bf9a603362ce4c3f0b39 WHIRLPOOL e217842d77c7875e85442551b1748ae18c89dfeb71d3c24809fc625890fe2c8ce57de242d9a61f95474b8d12d20b2405ff2692286957cf686bca292b2cae0aea
 DIST lucene-3.5.0-src.tgz 39564076 SHA256 814dbfcd91b76522ae350817c306be8c4a72dfe8c809540be4b20209acfb9a27 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275 WHIRLPOOL ca2994a3de615d4f80f30f26f852ed6919830b81de666034997bdc65defdde2e0777f924d08f67ee7ca6467624a036305eb86c31fb0d7e59e0ffb57f3f69404f
 DIST lucene-3.6.2-src.tgz 32139784 SHA256 984bf1e82e32ecdc6c4ff7f582b5bd0a4c2bf68acd1d48bf6df74ad86c97ca8c SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965 WHIRLPOOL bfec9e7f937c75337b3582b7d5c4de5b954eb4d256f0218cbf36ea67bcb9fae8dc1e298c0e69e8168865ba21b75c271c29dd6b0adf40cae5f725f0b777b66f20
diff --git a/dev-java/lucene/files/disable-contrib.patch b/dev-java/lucene/files/disable-contrib.patch
deleted file mode 100644
index 550564fb40aa..000000000000
--- a/dev-java/lucene/files/disable-contrib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -u -r lucene-1.9.1-orig/build.xml lucene-1.9.1/build.xml
---- lucene-1.9.1-orig/build.xml	2006-02-27 21:12:42.000000000 +0100
-+++ lucene-1.9.1/build.xml	2008-01-16 13:28:50.000000000 +0100
-@@ -368,41 +368,10 @@
-         <packageset dir="src/java"/>
- 
- 	<packageset dir="src/demo"/>
--	
--        <packageset dir="contrib/analyzers/src/java"/>
--        <packageset dir="contrib/ant/src/java"/>
--        <packageset dir="contrib/highlighter/src/java"/>
--        <packageset dir="contrib/lucli/src/java"/>
--        <packageset dir="contrib/memory/src/java"/>
--        <packageset dir="contrib/miscellaneous/src/java"/>
--        <packageset dir="contrib/similarity/src/java"/>
--        <packageset dir="contrib/regex/src/java"/>
--        <packageset dir="contrib/snowball/src/java"/>
--        <packageset dir="contrib/spellchecker/src/java"/>
--        <packageset dir="contrib/surround/src/java"/>
--        <packageset dir="contrib/swing/src/java"/>
--        <packageset dir="contrib/wordnet/src/java"/>
- 
-         <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
- 
-         <group title="Demo" packages="org.apache.lucene.demo*"/>
--
--        <group title="contrib: Analysis" packages="org.apache.lucene.analysis.*"/>
--        <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
--
--        <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
--        <group title="contrib: Lucli" packages="lucli*"/>
--        <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
--        <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
--        <group title="contrib: MoreLikeThis" packages="org.apache.lucene.search.similar*"/>
--        <group title="contrib: RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
--        <group title="contrib: Snowball" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
--	<group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
--	<group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
--        <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
--        <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
--
--	
-       </javadoc>
-     </sequential>
-   </macrodef>
diff --git a/dev-java/lucene/files/lucene-manifest b/dev-java/lucene/files/lucene-manifest
deleted file mode 100644
index 3a742df6b264..000000000000
--- a/dev-java/lucene/files/lucene-manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
-Export-Package: org.apache.lucene,org.apache.lucene.analysis,org.apache.lucene.analysis.de,org.apache.lucene.analysis.standard,
- org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queryParser, org.apache.lucene.search,org.apache.lucene.search.spans,
- org.apache.lucene.store,org.apache.lucene.util
-Bundle-SymbolicName: org.apache.lucene
-Bundle-Version: 2.2.0
diff --git a/dev-java/lucene/lucene-1.9.1.ebuild b/dev-java/lucene/lucene-1.9.1.ebuild
deleted file mode 100644
index 3a3a5681fb94..000000000000
--- a/dev-java/lucene/lucene-1.9.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# This ebuild only builds the core of Lucene
-# It does not build any optional component (contributions)
-
-JAVA_PKG_IUSE="test source doc"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="1.9"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/junit dev-java/ant-junit )"
-
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -rf contrib # we remove entirely the contrib directory
-	epatch "${FILESDIR}/disable-contrib.patch"
-
-	if use test; then
-		mkdir lib
-		java-ant_rewrite-classpath "common-build.xml"
-	fi
-}
-
-src_compile() {
-	eant jar-core $(use_doc javadocs)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt
-	# WTF is with the jar version below
-	java-osgi_newjar-fromfile "build/lucene-core-1.9.2-dev.jar" \
-		"${FILESDIR}/lucene-manifest" "Apache Lucene"
-
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.1.0-r1.ebuild b/dev-java/lucene/lucene-2.1.0-r1.ebuild
deleted file mode 100644
index d392bb8023a4..000000000000
--- a/dev-java/lucene/lucene-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x64-macos"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.1.0-r2.ebuild b/dev-java/lucene/lucene-2.1.0-r2.ebuild
deleted file mode 100644
index 379def5d19d2..000000000000
--- a/dev-java/lucene/lucene-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.5"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.2.0-r1.ebuild b/dev-java/lucene/lucene-2.2.0-r1.ebuild
deleted file mode 100644
index bd7f6acb7c96..000000000000
--- a/dev-java/lucene/lucene-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.5"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.2.0.ebuild b/dev-java/lucene/lucene-2.2.0.ebuild
deleted file mode 100644
index 13a9f574f336..000000000000
--- a/dev-java/lucene/lucene-2.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.3.0.ebuild b/dev-java/lucene/lucene-2.3.0.ebuild
deleted file mode 100644
index f83874ddfb68..000000000000
--- a/dev-java/lucene/lucene-2.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz
-		 mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home=/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.3.1.ebuild b/dev-java/lucene/lucene-2.3.1.ebuild
deleted file mode 100644
index f83874ddfb68..000000000000
--- a/dev-java/lucene/lucene-2.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz
-		 mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home=/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.3.2-r1.ebuild b/dev-java/lucene/lucene-2.3.2-r1.ebuild
deleted file mode 100644
index e8c512a560fe..000000000000
--- a/dev-java/lucene/lucene-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz
-		 mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.3.2-r2.ebuild b/dev-java/lucene/lucene-2.3.2-r2.ebuild
deleted file mode 100644
index 6afd27af644b..000000000000
--- a/dev-java/lucene/lucene-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz
-		 mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.5"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.3.2.ebuild b/dev-java/lucene/lucene-2.3.2.ebuild
deleted file mode 100644
index 7196f0660acd..000000000000
--- a/dev-java/lucene/lucene-2.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz
-		 mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home=/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.4.0.ebuild b/dev-java/lucene/lucene-2.4.0.ebuild
deleted file mode 100644
index 44c1ffadd0f3..000000000000
--- a/dev-java/lucene/lucene-2.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e '/-Xmax/ d' common-build.xml
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home=/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.4.1.ebuild b/dev-java/lucene/lucene-2.4.1.ebuild
deleted file mode 100644
index b4dfce5334f4..000000000000
--- a/dev-java/lucene/lucene-2.4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_prepare() {
-	sed -i -e '/-Xmax/ d' common-build.xml
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.9.1-r1.ebuild b/dev-java/lucene/lucene-2.9.1-r1.ebuild
deleted file mode 100644
index 5a229491e610..000000000000
--- a/dev-java/lucene/lucene-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.9"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-nodeps:0
-	dev-java/javacc:0
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
-
-java_prepare() {
-	sed -i -e '/-Xmax/ d' common-build.xml
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home=/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.9.4.ebuild b/dev-java/lucene/lucene-2.9.4.ebuild
deleted file mode 100644
index a826ab1fc3be..000000000000
--- a/dev-java/lucene/lucene-2.9.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz
-		 mirror://apache/lucene/java/${PV}/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.9"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps:0
-	dev-java/javacc:0
-	dev-java/junit:0
-	test? ( dev-java/ant-junit )"
-# junit is needed for compilation because tests are compiled for javacc target even when not requested
-RDEPEND=">=virtual/jdk-1.5"
-
-java_prepare() {
-	sed -i -e '/-Xmax/ d' common-build.xml
-	find -name "*.jar" -type f | xargs rm -v
-	java-pkg_jar-from --build-only --into lib junit junit.jar junit-3.8.2.jar
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-3.0.0.ebuild b/dev-java/lucene/lucene-3.0.0.ebuild
deleted file mode 100644
index 2c5edfe2e8f9..000000000000
--- a/dev-java/lucene/lucene-3.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps:0
-	dev-java/javacc:0
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.5"
-
-java_prepare() {
-	sed -i -e '/-Xmax/ d' common-build.xml
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-3.0.3.ebuild b/dev-java/lucene/lucene-3.0.3.ebuild
deleted file mode 100644
index cebb169f907c..000000000000
--- a/dev-java/lucene/lucene-3.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz
-		 mirror://apache/lucene/java/${PV}/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps:0
-	dev-java/javacc:0
-	dev-java/junit:0
-	test? ( dev-java/ant-junit )"
-# junit is needed for compilation because tests are compiled for javacc target even when not requested
-RDEPEND=">=virtual/jdk-1.5"
-
-java_prepare() {
-	find -name "*.jar" -type f | xargs rm -v
-	sed -i -e '/-Xmax/ d' common-build.xml
-	java-pkg_jar-from --build-only --into lib junit junit.jar junit-3.8.2.jar
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-3.4.0.ebuild b/dev-java/lucene/lucene-3.4.0.ebuild
deleted file mode 100644
index 82c7bfdca96a..000000000000
--- a/dev-java/lucene/lucene-3.4.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-#JAVA_PKG_DEBUG=1
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine library
-written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-LICENSE="Apache-2.0"
-SLOT="3.4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps:0
-	dev-java/junit:4
-	dev-java/ant-junit:0
-	contrib? (
-	          dev-java/jakarta-regexp:1.4
-			  dev-java/commons-compress:0
-	          dev-java/commons-collections:0
-	          dev-java/commons-digester:0
-	          dev-java/commons-logging:0
-			  dev-java/commons-beanutils:1.7
-	)"
-RDEPEND=">=virtual/jdk-1.5"
-
-#dev-java/javacc:0 - no longer needed, files are prebuilt
-
-java_prepare() {
-	#find -name "*.jar" -type f | xargs rm -v
-	sed -i \
-		-e '/-Xmax/ d' \
-		common-build.xml
-	# FIXME: contrib builds do not work if junit not included
-	#java-pkg_jar-from --build-only --into lib \
-	#	junit-4 junit.jar junit-4.7.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
-	if use contrib ; then
-	  cd contrib/
-	  java-pkg_jar-from --build-only --into queries/lib \
-	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-compress commons-compress.jar commons-compress-1.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-collections commons-collections.jar commons-collections-3.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-digester commons-digester.jar commons-digester-1.7.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-	fi
-}
-
-src_compile() {
-	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
-	ANT_TASKS="none" eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		jar-core $(use_doc javadocs-core )
-	if use contrib ; then
-	 ANT_TASKS="none" eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		build-contrib $(use_doc javadocs-all )
-	fi
-}
-
-src_test() {
-	# FIXME: test does not get run, even when selected
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
-	    JRE_VERSION_MIGRATION.txt|| die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	if use contrib; then
-		for i in `find  build/contrib -name \*-${PV}.jar`
-		do
-		    j=${i##*/}
-			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
-		done
-	fi
-	if use doc; then
-		dohtml -r docs/* || die
-		java-pkg_dohtml -r build/docs/api
-	fi
-	if use source; then
-	     java-pkg_dosrc src/java/org || die
-	  	 if use contrib; then
-	    	java-pkg_dosrc  contrib  || die
-	  	 fi
-	fi
-}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
index 231722f3efdc..1c74a2c4c000 100644
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # TODO: Needs further resolution:
 #
diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
index c65d45a716dd..d3d590036a31 100644
--- a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.3"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # TODO: Needs further resolution:
 #
diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest
index 6e18d8ce580c..563519e23a30 100644
--- a/dev-java/metadata-extractor/Manifest
+++ b/dev-java/metadata-extractor/Manifest
@@ -1 +1 @@
-DIST metadata-extractor-2.2.2-src.jar 3936358 SHA256 38f8b12418afde99286b9b7c86158eb4fd2c47a23ed4af025af77bae301e1783 SHA512 5004ecef28e9fc1f24a4b13b4596c801e9b20fcb9c20165e79b2543837187b8cb019aa32c301e2850939a95a23224444d6eb7e23c45d8bf54cf267899052b2f7 WHIRLPOOL ff35285df14741babe45b2b1906b0d5ceacbc76a12684d0e676cb7ad784eeafaa9bee4016489ce5643d5bcf85d1140d69667f8f9a646c9720ae4eb2602bbf031
+DIST metadata-extractor-2.8.1.tar.gz 3132397 SHA256 0d734971e9896709fb9e11406cefbeaa0cf11d57fa7dca6b02acaf92a2a686fd SHA512 4e9fe88be4112fbf9ce481e7fd3b3a7c9544d1d5b1ebd646d2c6e2a2a1fe2d53a4b80ab859fe5e277c3e72f5e035aa46d7af7a953a182f5b8215edf9cde99974 WHIRLPOOL bc296ebe64b82ec9485f364e287139369bb1da5f98eab47db5014d0f1d263378d0341383da95bda3efa5fba6c81c3ebb9c30a3586aa7277ec893d2ad6ac5e52f
diff --git a/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch b/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch
deleted file mode 100644
index fb455f4f0943..000000000000
--- a/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- metadata-extractor.build	2009-01-31 15:22:58.000000000 +0200
-+++ metadata-extractor.build.fixed	2009-01-31 15:37:02.000000000 +0200
-@@ -24,25 +24,38 @@
-             srcdir="${src}"

-             destdir="${build}"

-             debug="${debug}"

--            verbose="${verbose}"/>

-+            verbose="${verbose}">
-+            <exclude name="**/test/*.java"/>
-+        </javac>

-+    </target>
-+    
-+    <target name="compile-test" description="compile the source">

-+        <javac classpath="${classpath}"

-+            srcdir="${src}"

-+            destdir="${build}"

-+            debug="${debug}"

-+            verbose="${verbose}">
-+            <include name="**/test/*.java"/>
-+        </javac>

-     </target>

- 

--    <target name="dist-binaries" depends="clean, compile, test" description="generate binary distribution">

-+    <target name="dist-binaries" depends="clean, compile" description="generate binary distribution">

-         <jar destfile="${dist}/metadata-extractor-${version}.jar" update="false" basedir="${build}">

-             <manifest>

-                 <attribute name="Main-Class" value="com.drew.imaging.jpeg.JpegMetadataReader"/>

--            </manifest>

-+            </manifest>
-+            <exclude name="**/test/*.class"/>

-         </jar>

-     </target>

- 

--    <target name="dist-source" depends="clean, compile, test" description="generate source distribution">

-+    <target name="dist-source" depends="clean, compile" description="generate source distribution">

-         <jar destfile="${dist}/metadata-extractor-${version}-src.jar" update="false">

-             <fileset dir="."

-                 includes="${src}/**/*.java, ${src}/**/*.jpg, ${lib}/junit.jar, metadata-extractor.build, ReleaseNotes.txt"/>

-         </jar>

-     </target>

- 

--    <target name="test" depends="compile" description="run all junit tests">

-+    <target name="test" depends="compile-test" description="run all junit tests">

-         <junit printsummary="yes" fork="yes" haltonfailure="yes">

-             <classpath>

-                 <pathelement location="${build}"/>

diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
deleted file mode 100644
index 915604427530..000000000000
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Metadata extraction framework for Exif and IPTC metadata segments, extraction support for JPEG files"
-HOMEPAGE="http://www.drewnoakes.com/code/exif/"
-SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="
-	|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	=dev-java/junit-3.8*
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-S=${WORKDIR}/
-
-src_unpack() {
-	jar xf "${DISTDIR}/${A}"
-	sed -e "s:clean, compile, test:clean, compile:" -i metadata-extractor.build || die "sed failed"
-	mv metadata-extractor.build build.xml
-
-	java-pkg_jar-from --build-only --into lib/ junit junit.jar
-}
-
-EANT_DOC_TARGET=""
-EANT_BUILD_TARGET="dist-binaries"
-
-src_install() {
-	dodoc ReleaseNotes.txt
-	java-pkg_newjar dist/*.jar "${PN}.jar"
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild
deleted file mode 100644
index 76b02905cb2a..000000000000
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Metadata extraction framework for Exif and IPTC metadata segments, extraction support for JPEG files"
-HOMEPAGE="http://www.drewnoakes.com/code/exif/"
-SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	test? ( dev-java/junit:0 )
-	app-arch/unzip:0"
-
-RDEPEND=">=virtual/jre-1.4"
-S=${WORKDIR}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-buildfix.patch
-
-	mv metadata-extractor.build build.xml || die
-
-	use test && java-pkg_jar-from --build-only --into lib/ junit junit.jar
-}
-
-EANT_DOC_TARGET=""
-EANT_BUILD_TARGET="dist-binaries"
-
-src_install() {
-	java-pkg_newjar dist/*.jar ${PN}.jar
-
-	dodoc ReleaseNotes.txt
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
new file mode 100644
index 000000000000..039db5ee1faf
--- /dev/null
+++ b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 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="Access the metadata in digital images and video via a simple Java API"
+HOMEPAGE="http://www.drewnoakes.com/code/exif/"
+SRC_URI="https://github.com/drewnoakes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+CDEPEND="dev-java/xmpcore:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="Source"
+JAVA_GENTOO_CLASSPATH="xmpcore"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {CONTRIBUTING,README}.md
+	use examples && java-pkg_doexamples Samples
+}
+
+src_test() {
+	local DIR=Tests
+	local CP="${DIR}:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find ${DIR} -name "*Test.java")
+	TESTS="${TESTS//Tests\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/metadata-extractor/metadata.xml b/dev-java/metadata-extractor/metadata.xml
index a00c8821038a..3d82341578d3 100644
--- a/dev-java/metadata-extractor/metadata.xml
+++ b/dev-java/metadata-extractor/metadata.xml
@@ -6,8 +6,15 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-		A general metadata extraction framework. Support currently exists for
-		Exif and Iptc metadata segments. Extraction of these segments is
-		provided for Jpeg files.
+	  metadata-extractor is a straightforward Java library for reading metadata from image files.
+
+	  Metadata metadata = ImageMetadataReader.readMetadata(imagePath);
+
+	  With that metadata object, you can iterate or query the various tag values that were read from the image.
+
+	  The library understands several formats of metadata, many of which may be present in a single image.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">drewnoakes/metadata-extractor</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/minlog/minlog-1.2.ebuild b/dev-java/minlog/minlog-1.2.ebuild
index 06033d13402c..69a7b4b85043 100644
--- a/dev-java/minlog/minlog-1.2.ebuild
+++ b/dev-java/minlog/minlog-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,12 +14,14 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="${CDEPEND}
+DEPEND="
+	${CDEPEND}
 	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.5"
 
 S="${WORKDIR}/${PN}"
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild
new file mode 100644
index 000000000000..bf5ae693af44
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+	http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+	http://hg.netbeans.org/binaries/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+	http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+	http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+	http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+	http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+	http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.0.2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.impl/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+	ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+	ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+	ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+	ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar  || die
+	ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.impl/external/processtreekiller-1.0.2.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.impl/external/winp-1.14-patched.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.0.2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild
new file mode 100644
index 000000000000..cc3491604922
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/opencsv/Manifest b/dev-java/opencsv/Manifest
index ea2f0500b8c5..583eedc6047e 100644
--- a/dev-java/opencsv/Manifest
+++ b/dev-java/opencsv/Manifest
@@ -1 +1 @@
-DIST opencsv-2.3-src-with-libs.tar.gz 280510 SHA256 04ebc52af08b20e18c193f194ea9d169a7737403b2376f1707d858dbd4e7950d SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106 WHIRLPOOL 069c1bf477c04f0ad6db927e7179c0dc29104c48e179f0fcf8e4c42b0de2e83e3e3ab5fd80ebbd8e13e12cacfbe231097b675e99ecb0ef1610277dbc9a9c927a
+DIST opencsv-2.3.tar.gz 280510 SHA256 04ebc52af08b20e18c193f194ea9d169a7737403b2376f1707d858dbd4e7950d SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106 WHIRLPOOL 069c1bf477c04f0ad6db927e7179c0dc29104c48e179f0fcf8e4c42b0de2e83e3e3ab5fd80ebbd8e13e12cacfbe231097b675e99ecb0ef1610277dbc9a9c927a
diff --git a/dev-java/opencsv/opencsv-2.3.ebuild b/dev-java/opencsv/opencsv-2.3.ebuild
index 242503b3aaf4..a6f96d817d89 100644
--- a/dev-java/opencsv/opencsv-2.3.ebuild
+++ b/dev-java/opencsv/opencsv-2.3.ebuild
@@ -6,32 +6,32 @@ EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A very simple csv (comma-separated values) parser library for Java"
 HOMEPAGE="http://opencsv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src-with-libs.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src-with-libs.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
-S="${WORKDIR}/${P}"
+RESTRICT="test"
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND="app-arch/unzip
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
-RESTRICT="test"
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
 
 java_prepare() {
 	java-pkg_clean
-}
-
-src_install() {
-	java-pkg_newjar deploy/${P}.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/au
+	rm -rf test || die
 }
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild
index a5f4cbf505db..342f7996daf4 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild
@@ -169,6 +169,7 @@ src_unpack() {
 		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
 		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
 		popd > /dev/null
+		use jce && unpack "${JCE_FILE}"
 	else
 		default
 	fi
diff --git a/dev-java/pat/Manifest b/dev-java/pat/Manifest
index fe92b6d9a764..a67471dcdd05 100644
--- a/dev-java/pat/Manifest
+++ b/dev-java/pat/Manifest
@@ -1,2 +1 @@
-DIST patdocs15.jar 246030 SHA256 19805bd985e473099b573d10e0809849c95affa288dd32dffde783ec6cd0b0d2 SHA512 09bc354352c1c29727a37a81bda167bc5755c270028c85b030f1e775df1f96a5777d864c6dbb78351425f1706d97645320ba2b08634f924b2cc5aef91980138a WHIRLPOOL 5f85b9676b79b8af46696b5bb5698b2b3bbac69ed79a5f57f5101cae91b42bd511336f03feb346f9679a76a2732ad649a54fbd3e4dcf5cd67047cdbc3bb8f7b0
-DIST patsrcfree153.jar 135452 SHA256 6a64747899e0fc82f607e4da7d330d74d3f527c01cd8f2d605bb87c9be3f0367 SHA512 4c62906a9f236351f8de457198e746229c48dc983275a95546815fe5af0083a54e204226abaf71ef01cf407c8be34f8e5594f65b126d45ff3e4ba75630ccdabe WHIRLPOOL c3c7d6f159ff670847e634bc58b808dc41bb66a7e9fa33cd204771c109d3f0972d37c7cbfac468efb55915b747238486adaac7cd4dc3ac51ddaa0a1feb7f4b46
+DIST pat-1.5.3.jar 135452 SHA256 6a64747899e0fc82f607e4da7d330d74d3f527c01cd8f2d605bb87c9be3f0367 SHA512 4c62906a9f236351f8de457198e746229c48dc983275a95546815fe5af0083a54e204226abaf71ef01cf407c8be34f8e5594f65b126d45ff3e4ba75630ccdabe WHIRLPOOL c3c7d6f159ff670847e634bc58b808dc41bb66a7e9fa33cd204771c109d3f0972d37c7cbfac468efb55915b747238486adaac7cd4dc3ac51ddaa0a1feb7f4b46
diff --git a/dev-java/pat/pat-1.5.3-r1.ebuild b/dev-java/pat/pat-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..95af89a56ed5
--- /dev/null
+++ b/dev-java/pat/pat-1.5.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-pkg-simple
+
+MY_PV=$(delete_all_version_separators)
+MAJORMINOR=$(get_version_component_range 1-2)
+DOC_VER=$(delete_all_version_separators ${MAJORMINOR})
+MY_P="${PN}-${PV}"
+
+DESCRIPTION="Regular Expressions in Java"
+HOMEPAGE="http://www.javaregex.com"
+SRC_URI="http://www.javaregex.com/binaries/${PN}srcfree${MY_PV}.jar -> ${P}.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/pat/pat-1.5.3.ebuild b/dev-java/pat/pat-1.5.3.ebuild
deleted file mode 100644
index 0ad1099da574..000000000000
--- a/dev-java/pat/pat-1.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2
-
-DESCRIPTION="Regular Expressions in Java"
-HOMEPAGE="http://www.javaregex.com"
-
-MY_PV=$(delete_all_version_separators)
-MAJORMINOR=$(get_version_component_range 1-2)
-DOC_VER=$(delete_all_version_separators ${MAJORMINOR})
-MY_P=${PN}-${PV}
-
-SRC_URI="http://www.javaregex.com/binaries/${PN}srcfree${MY_PV}.jar
-	doc? ( http://www.javaregex.com/binaries/patdocs${DOC_VER}.jar )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip"
-
-S=${WORKDIR}
-
-src_compile() {
-	ejavac $(find . -name "*.java")
-	jar cf ${PN}.jar $(find . -name "*.class")
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-
-	if use doc; then
-		dohtml docs/*.{html,jpg}
-		java-pkg_dojavadoc docs/javadoc
-	fi
-
-	use source && java-pkg_dosrc com
-}
diff --git a/dev-java/rat/rat-0.11.ebuild b/dev-java/rat/rat-0.11.ebuild
index aa139dfd4eb0..372e8de416a7 100644
--- a/dev-java/rat/rat-0.11.ebuild
+++ b/dev-java/rat/rat-0.11.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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
@@ -18,7 +19,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="
@@ -49,6 +50,6 @@ JAVA_GENTOO_CLASSPATH="
 "
 
 src_install() {
-	java-pkg_dolauncher "${MY_PN}" --main org.apache.rat.Report
 	java-pkg-simple_src_install
+	java-pkg_dolauncher "${MY_PN}" --main org.apache.rat.Report
 }
diff --git a/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml b/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml
deleted file mode 100644
index 41984daee5d1..000000000000
--- a/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 2/4/14 12:38 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="reflectasm-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="reflectasm-1.09"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="test"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch b/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch
deleted file mode 100644
index aa6a53ca4040..000000000000
--- a/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove test that unloads the current class loader. If this is enabled, the
-testAutoUnloadClassloaders testcase will fail if it's run after
-testRemoveClassloaders. Since junit generally runs tests in an arbitrary order
-this causes random testsuite failures.
-
---- reflectasm-1.09/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java
-+++ reflectasm-1.09/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java
-@@ -104,8 +104,6 @@
- 		assertEquals(initialCount+1, AccessClassLoader.activeAccessClassLoaders());

- 		AccessClassLoader.remove(testObject2.getClass().getClassLoader());

- 		assertEquals(initialCount+0, AccessClassLoader.activeAccessClassLoaders());

--		AccessClassLoader.remove(this.getClass().getClassLoader());

--		assertEquals(initialCount-1, AccessClassLoader.activeAccessClassLoaders());

- 	}

- 

- 	static public class Test {

diff --git a/dev-java/reflectasm/reflectasm-1.11.0.ebuild b/dev-java/reflectasm/reflectasm-1.11.0.ebuild
index c69fd2cc4aa7..3bdc751870b1 100644
--- a/dev-java/reflectasm/reflectasm-1.11.0.ebuild
+++ b/dev-java/reflectasm/reflectasm-1.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${P}.zip"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/asm:4"
diff --git a/dev-java/rngom/Manifest b/dev-java/rngom/Manifest
index 5fe4b46a1867..3bc8c982e40d 100644
--- a/dev-java/rngom/Manifest
+++ b/dev-java/rngom/Manifest
@@ -1,2 +1 @@
-DIST rngom-20051226.zip 1370492 SHA256 aafaeb2e7e1a712affcd89605a1df99c1deb77eb2424291b47556a597225542e SHA512 487fa97db3ac5d3ab2c9c64b8b406de789393dbe06e38d2b180ab4deb59813b2aeaa46b1ad7d5b55e67dd0558be98d300d7d91e66c922206b35822fdf931d0ef WHIRLPOOL 254d7fd0feba46b4fbf230fd9dd1cbfe6536f6cc06c403fa2b1092fe50464146125cab3a2e5bb6e006f4c3878d3cef4b624ba44ffb1c00b601e20e2474d6041e
 DIST rngom-20100718.jar 196334 SHA256 e0744ec61d2a8ede4004e520f54747f828d812c2907c1b2dc0eb4f93070f3dc9 SHA512 af634a3b30b726c9567bb2108dc9c041a60e2de4b395bf1efcca43060d22927896d10bf69b852a3e70b331659803f4dba074392f4be7de6cbdbc210ce90e25cb WHIRLPOOL 18a80fbe4d0f0d16c4bfaf12b6c5e228ffdad0848968a682b00ba956a2ae37e7fb03dae2ad17dae34e92564f667097ade26756f55757cf82ad1a78cf0ab62fa7
diff --git a/dev-java/rngom/files/build.xml-20051226 b/dev-java/rngom/files/build.xml-20051226
deleted file mode 100644
index cc3cf5bb8738..000000000000
--- a/dev-java/rngom/files/build.xml-20051226
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<project name="rngom" default="jar" basedir=".">
-  <target name="compile">
-    <mkdir dir="build"/>
-    <javac debug="false" srcdir="src" destdir="build">
-      <classpath>
-        <fileset dir="lib" includes="**/*.jar"/>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" depends="compile">
-    <jar destfile="rngom.jar">
-      <fileset dir="build" includes="**/*.class"/>
-    </jar>
-  </target>
-</project>
diff --git a/dev-java/rngom/rngom-20051226.ebuild b/dev-java/rngom/rngom-20051226.ebuild
deleted file mode 100644
index 834f05be1896..000000000000
--- a/dev-java/rngom/rngom-20051226.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="RNGOM is an open-source Java library for parsing RELAX NG grammars"
-HOMEPAGE="https://rngom.dev.java.net/"
-SRC_URI="https://rngom.dev.java.net/files/documents/1647/26424/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEP="dev-java/relaxng-datatype
-	dev-java/xsdlib"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	rm -v *.jar || die
-	mkdir lib || die
-
-	cd lib/
-	java-pkg_jarfrom relaxng-datatype
-	java-pkg_jarfrom xsdlib
-
-	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
-
-}
-
-src_compile() {
-	eant jar
-}
-
-src_install() {
-
-	java-pkg_dojar "${PN}.jar"
-
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc javadoc
-
-}
diff --git a/dev-java/rngom/rngom-20100718-r1.ebuild b/dev-java/rngom/rngom-20100718-r1.ebuild
index 386f19f7f55f..3f89ebd90944 100644
--- a/dev-java/rngom/rngom-20100718-r1.ebuild
+++ b/dev-java/rngom/rngom-20100718-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/kohsuke/${PN}/${PN}/${PV}/${P}-sourc
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
index fa8218ab9652..2131c361cae5 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -1,2 +1 @@
-DIST rxtx-2.1-7r2.zip 1345757 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 SHA512 977f098da9e9618a2bc1d2265f1a59c8bdeb00a228378af0176e2f7fa408fb0dcb309a8168de0febc13fa0e04d9d54c76c267a61b815037b5881100c4025a1ce WHIRLPOOL adafe3f944ed95cf28cefe1efc50f2402bbb475515f8085b6a19283a86df6ffd769387baf422dd89cbd5d5696674c0130cd07c48c72a9b4e2737026d56832fa5
 DIST rxtx-2.2pre2.zip 1491209 SHA256 3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03 SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514 WHIRLPOOL 0c2893c016ae99f918ca3605c83d18ec2b9ea0022628562a36859eaa20001ce6cfa15d7e77b80ee32e259f162ee1512b026a9965ec1402ae35ebed4b473796fc
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff
deleted file mode 100644
index 857c8342c371..000000000000
--- a/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-support /dev/ttyACMx devices natively
-upstream bug report pending: http://bugzilla.qbang.org/show_bug.cgi?id=139
-http://bugs.gentoo.org/show_bug.cgi?id=301126
-Signed-off: Thilo Bangert <bangert@gentoo.org>
-
---- src/RXTXCommDriver.java.orig	2010-01-15 17:30:46.000000000 +0100
-+++ src/RXTXCommDriver.java	2010-01-15 17:31:56.000000000 +0100
-@@ -519,6 +519,7 @@
- 					if(osName.equals("Linux"))
- 					{
- 						String[] Temp = {
-+						"ttyACM",       // linux USB Modems
- 						"ttyS", // linux Serial Ports
- 						"ttySA", // for the IPAQs
- 						"ttyUSB" // for USB frobs
-@@ -535,6 +536,7 @@
- 						"holter",    // custom card for heart monitoring
- 						"modem",     // linux symbolic link to modem.
- 						"rfcomm",       // bluetooth serial device
-+						"ttyACM",       // linux USB Modems
- 						"ttyircomm", // linux IrCommdevices (IrDA serial emu)
- 						"ttycosa0c", // linux COSA/SRP synchronous serial card
- 						"ttycosa1c", // linux COSA/SRP synchronous serial card
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
deleted file mode 100644
index 3d32f360d188..000000000000
--- a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/lfd/lockdaemon.c b/src/lfd/lockdaemon.c
-index bdb8553..d13c5eb 100644
---- a/src/lfd/lockdaemon.c
-+++ b/src/lfd/lockdaemon.c
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <signal.h>
- #include <pwd.h>
-+#include <limits.h>
- 
- #define FHS
- #define LOCKFILEPREFIX "LCK.."
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
new file mode 100644
index 000000000000..1e4ff4af57b7
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
@@ -0,0 +1,10 @@
+--- src/lfd/lockdaemon.c.orig	2007-04-26 06:26:07.000000000 +0100
++++ src/lfd/lockdaemon.c	2016-02-17 20:41:09.137509089 +0000
+@@ -69,6 +69,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <pwd.h>
++#include <limits.h>
+ 
+ #define FHS
+ #define LOCKFILEPREFIX "LCK.."
diff --git a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
deleted file mode 100644
index 149fb25528cb..000000000000
--- a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic toolchain-funcs versionator autotools java-pkg-2
-
-MY_PV="$(replace_version_separator 2 -)"
-MY_PV="$(replace_version_separator 3 r ${MY_PV})"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Native lib providing serial and parallel communication for Java"
-HOMEPAGE="http://rxtx.qbang.org/"
-SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="doc source lfd"
-
-RDEPEND=">=virtual/jre-1.4"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core
-	lfd? ( sys-apps/xinetd )
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# some minor fixes
-	sed -i -e "s:UTS_RELEASE::g" configure.in
-	sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in
-	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am
-
-	# some patches
-	epatch "${FILESDIR}/${MY_P}-lfd.diff" \
-		"${FILESDIR}/${MY_P}-nouts.diff" \
-		"${FILESDIR}/${MY_P}-add-ttyACM.diff" \
-		"${FILESDIR}/${MY_P}-lfd-include-limits.diff"
-
-	# update autotools stuff
-	rm acinclude.m4
-	eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf $(use_enable lfd lockfile_server) || die "econf failed"
-	emake || die "emake failed"
-
-	if use lfd; then
-		# see INSTALL in src/ldf
-		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die "compiling lfd failed"
-	fi
-
-	if use doc; then
-		emake docs || die "failed to emake docs"
-	fi
-
-	#Fix for src zip creation
-	if use source; then
-		mkdir -p src_with_pkg/gnu
-		ln -s ../../src src_with_pkg/gnu/io
-	fi
-}
-
-src_install() {
-	java-pkg_dojar RXTXcomm.jar
-	java-pkg_doso ${CHOST}/.libs/*.so
-
-	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
-	dohtml RMISecurityManager.html
-
-	if use lfd; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/lockfiled.xinetd" lfd
-		dosbin src/lfd/in.lfd
-		dodoc src/lfd/LockFileServer.rfc
-	fi
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src_with_pkg/gnu
-}
-
-pkg_postinst() {
-	if use lfd; then
-		elog "Don't forget to enable the LockFileServer"
-		elog "daemon (lfd) in /etc/xinetd.d/lfd"
-	else
-		elog "RXTX uses UUCP style device-locks. You should"
-		elog "add every user who needs to access serial ports"
-		elog "to the 'uucp' group:"
-		elog
-		elog "    usermod -aG uucp <user>"
-	fi
-}
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
new file mode 100644
index 000000000000..8cd2fc01a7d7
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit toolchain-funcs versionator autotools java-pkg-2
+
+MY_PV="$(delete_version_separator 2)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Native lib providing serial and parallel communication for Java"
+HOMEPAGE="http://rxtx.qbang.org/"
+SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="lfd"
+
+RDEPEND=">=virtual/jre-1.6
+	lfd? ( sys-apps/xinetd )"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
+	sed -i \
+		-e "s:UTS_RELEASE::g" \
+		-e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \
+		-e "s:-source ... -target ...:$(java-pkg_javac-args):g" \
+		configure.in || die
+
+	epatch \
+		"${FILESDIR}/${PN}-2.1-7r2-lfd.diff" \
+		"${FILESDIR}/${PN}-2.1-7r2-nouts.diff" \
+		"${FILESDIR}/${P}-add-ttyACM.patch" \
+		"${FILESDIR}/${P}-limits.patch"
+
+	rm acinclude.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lfd lockfile_server)
+}
+
+src_compile() {
+	emake
+
+	if use lfd ; then
+		# see INSTALL in src/ldf
+		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die
+	fi
+
+	if use doc ; then
+		emake docs
+	fi
+
+	# Fix for src zip creation
+	if use source ; then
+		mkdir -p src_with_pkg/gnu || die
+		ln -s ../../src src_with_pkg/gnu/io || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar RXTXcomm.jar
+	java-pkg_doso ${CHOST}/.libs/*.so
+
+	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
+	docinto html
+	dodoc RMISecurityManager.html
+
+	if use lfd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/lockfiled.xinetd" lfd
+		dosbin src/lfd/in.lfd
+		dodoc src/lfd/LockFileServer.rfc
+	fi
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src_with_pkg/gnu
+}
+
+pkg_postinst() {
+	if use lfd ; then
+		elog "Don't forget to enable the LockFileServer"
+		elog "daemon (lfd) in /etc/xinetd.d/lfd"
+	else
+		elog "RXTX uses UUCP style device-locks. You should"
+		elog "add every user who needs to access serial ports"
+		elog "to the 'uucp' group:"
+		elog
+		elog "    usermod -aG uucp <user>"
+	fi
+}
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index df04a942e691..e525e645380d 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -3,10 +3,15 @@ DIST sbt-0.13.10_rc2-ivy2-deps.tar.bz2 139970194 SHA256 b3ef28fbc330d8b8218712a4
 DIST sbt-0.13.10_rc2-sbt-deps.tar.bz2 38778951 SHA256 f2be26d49010fa521b4a0e9a112c465107838f5250883de4bc132926ccd685fa SHA512 c929562d18e2e5032d502556a960b25fa707c2893172425c2c3b5365a86ccd63729ce8795f12fd1aced5b39267f6db4b8e9d0c1eaf00ba20b071fac9044157f8 WHIRLPOOL b75096e0b2429a104b548e601e06fc5b3e452bda39d4fc434d8f98137275899a5c40ac2bb528324dd621eef4aa17e952648c9698cc4eeedd6e8aeb391509db16
 DIST sbt-0.13.10_rc2-src.tar.bz2 35017169 SHA256 c34051649a8c998a98d5ff401e622d6c3e54fc15b6e1aeac7e223c5ff8ce54aa SHA512 7e734fdecc631cc0307c09e6706b761dd55d1cb6a03aa29a0cd5826d86bfa44dde29ebc05bca7f947351a6b6510caef51d0c3df2b07d60895b41f074c319d1b8 WHIRLPOOL de34b47a87af7f77a2ee00230901cf21015312359f29cff8689692b7c9d2f148a8233224a3b5b488c63a55cde695b0928000938e6608c1437e4be2287ddc026d
 DIST sbt-0.13.10_rc2-test-deps.tar.bz2 266656 SHA256 62d0ed5b43898a42696f8b148e933d70871c2f75bf3f6b20ac39cea00b327f17 SHA512 7e30459f010eb9c8ffba8e8e4da90bcb7d03cdd4347e63d0207a9bf9b9ddeb38b68d2798c98452ea81bcddc9973e287066603ce06ebadf56c006f25e76fdb57d WHIRLPOOL e4c06db36cc2b0e4417a81c961bc470caa169e358734ab7f7b71103547286704e6cfd104fe342afd7df0270300073a695ee35342944e25a65e96bd036bb5a953
+DIST sbt-0.13.11-gentoo-binary.tar.bz2 144170371 SHA256 ca13e6d5751de14ac0fe3542f80c42c3dc74fabd3f897455b8f93391ab465f08 SHA512 705f8a5e3065ee6d88ca0044a1e0b55856e4cf167172fc3102503ff28b0992bc918da9ab8541320474abe7dd4956d2a0d33df1709894bace225993e32b85b667 WHIRLPOOL 0b94e74ebb827d9517d621606321e8fd0ca72c74b6f40776248e1bbcdf64e328c3bf83ece4c37adbbdaadb273f0951275a21d278ea3307e904a76c44809b4321
+DIST sbt-0.13.11-ivy2-deps.tar.bz2 139796284 SHA256 d8ad25a99e1dd8ebbc29955844543a1cee8bbd845cca9bb4fa92b62c27673a29 SHA512 e431e00884dbf58ca911d64da726b41b8aeae9987ae2725705c9c45b4601162e45d310f933e4214cf8a4d21ba9e7207365d9ba352cbe1511ce09f59cd33da033 WHIRLPOOL b56ba91892ee2dbb1d9d9609ffd8417184e291fa8c03f8a115757301c412a8d141a17ae315ac916067bab5b49d74f16cb82da497c8790c212f3ccc068721e24f
+DIST sbt-0.13.11-sbt-deps.tar.bz2 38783848 SHA256 c2059a2513cbee50afe506d1fb0511b384df99757273d941b136e5bb3155ca7e SHA512 53020538eac11d6ae268436987d98093f017f421750496080908fad36eb9148a4cce41ab1a231ff1a35868c5c07cc8e338f1793fc91d044802b3e95b900e9cc8 WHIRLPOOL 0e4617b728536be9adfcf683b1575a522c5c0f073098c7f685003f0a340bfc4fff06031252016227b8af38f666296185815508b89bb7e82334276e55c707e16e
+DIST sbt-0.13.11-src.tar.bz2 35163092 SHA256 1b987725b4e57d6139b02c9d43b18d6ec43880681cccdfca3a29c803e79f6494 SHA512 95065c452fbbf2a206ad8d8518f083abe608e8bad1075848fa7a4ad797e8a10e4127823cdb8502f4d9bd0eb01867298af7d69895eb1470bf71deba354871dd86 WHIRLPOOL 652ba691ea2dccf6eb22ea2b43d9b96e15597cb8ce2325eacd912752a60854f982e1a6fec8c049e144042c10e98b888a66b3fe923c63447ef46e6582786e4a81
 DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7
 DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007
 DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f
 DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
 DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
+DIST sbt-launch-0.13.11.jar 1210231 SHA256 c63ade35a7a7aa0d8e3bdc7c2353ce79b045083cfabf6bc6fab88584f6100bc1 SHA512 9db3d3e953e4246b09ce2265b76463b6000c6d1c9d1328eb0deb1b67e9c955816ef67f6aeaeca22dc46e27cc71ba833545ab39c5351b8230609c021ca9e818b9 WHIRLPOOL 6650144da7aef195779c4d23c594fee9c7f79e7b2758bb2c98c83732f75656b0143ec73023a98677201502a813c0e37bbec48cebbc6fe520484ec6bd53fb4019
 DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
 DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171
diff --git a/dev-java/sbt/sbt-0.13.11.ebuild b/dev-java/sbt/sbt-0.13.11.ebuild
new file mode 100644
index 000000000000..991ac8615188
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.11.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2016 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
+
+MY_PV="0.13.11"
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${MY_PV}"
+
+SV="2.10"
+
+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
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${L_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.6:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. Create the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.11
+# cd sbt-0.13.11
+# git checkout v0.13.11
+# cd ..
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-src.tar.bz2 \
+# sbt-0.13.11
+# 2. 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
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+# from SRC_URI
+# 3. Comment the sbt publishLocal line in src_compile.
+# 4. try:
+# FEATURES='noclean -test' emerge -v -1 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.
+# 5. 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.11/work'
+# export SV="2.10"
+# export L_P=sbt-0.13.11
+# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 6. cd ${WORKDIR}
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-ivy2-deps.tar.bz2 .ivy2
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-sbt-deps.tar.bz2 .sbt
+# Uncomment the sbt publishLocal line in src_compile.
+# 7. It *might* download 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}
+# ${S}/sbt-0.13.11 test
+# cd ${WORKDIR}
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-test-deps.tar.bz2 \
+# $(find .ivy2 .sbt -uid 0 -type f -print)
+# Note: It might not download anything in src_test, in which case sbt-0.13.11-test-deps.tar.bz2
+# is not required.
+# 8. Create the binary
+# cd $WORDKIR
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-gentoo-binary.tar.bz2 \
+# sbt-0.13.11 .ivy2/local
+# 9. Undo the earlier temporary edits to the ebuild.
+
+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
+		mkdir "${WORKDIR}/${L_P}" || die
+		cp -p "${DISTDIR}/${L_P}.jar" "${WORKDIR}/${L_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${L_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}/${L_P}/sbt-launch.jar" "\$@"
+		EOF
+		cat <<- EOF > "${S}/${P}"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${L_P}/sbt" "${S}/${P}" || 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}/${L_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
+		cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("$(java-pkg_get-vm-version)")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}"
+		"${S}/${P}" -Dsbt.log.noformat=true test || die
+	fi
+}
+
+src_install() {
+	# Place sbt-launch.jar at the end of the CLASSPATH
+	java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print | grep -v sbt-launch.jar) \
+				   $(find "${WORKDIR}"/.ivy2/local -name sbt-launch.jar -print)
+	local ja="-Dsbt.version=${PV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+	java-pkg_current-vm-matches "1.7" && ja+=" -XX:MaxPermSize=512M"
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
+}
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515.ebuild
index 238b617ab71b..a855e21ffd02 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515.ebuild
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Utilities and widgets to integrate Swing GUIs with web applications"
 HOMEPAGE="https://java.net/projects/swingx-ws/"
-SRC_URI="mirror://sourceforge/${PN}/Development/${MY_P}.zip"
+SRC_URI="mirror://sourceforge/bt747/Development/${MY_P}.zip"
 LICENSE="LGPL-2.1"
 SLOT="bt747"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-java/tomcat-jstl-compat/Manifest b/dev-java/tomcat-jstl-compat/Manifest
index 3d40f6296597..8f09839efd71 100644
--- a/dev-java/tomcat-jstl-compat/Manifest
+++ b/dev-java/tomcat-jstl-compat/Manifest
@@ -1 +1 @@
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+DIST tomcat-jstl-compat-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index 7e94860a0441..527fd4be58da 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -13,24 +14,29 @@ MY_COMPAT="${MY_PN}-compat"
 
 DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat jar"
 HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 
-CDEPEND="java-virtuals/servlet-api:3.0
+CDEPEND="
 	dev-java/tomcat-jstl-spec:0
-	dev-java/tomcat-jstl-impl:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+	dev-java/tomcat-jstl-impl:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
 	)
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -40,7 +46,7 @@ EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="compat/build.xml"
 
 java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml || die
 }
 
 EANT_TEST_TARGET="test"
diff --git a/dev-java/tomcat-jstl-el/Manifest b/dev-java/tomcat-jstl-el/Manifest
index 3d40f6296597..1ca781d9d514 100644
--- a/dev-java/tomcat-jstl-el/Manifest
+++ b/dev-java/tomcat-jstl-el/Manifest
@@ -1 +1 @@
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+DIST tomcat-jstl-el-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
index e8d693972af7..fd00193f8f9c 100644
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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
@@ -13,24 +14,29 @@ MY_EL="${MY_PN}-jstlel"
 
 DESCRIPTION="JSP Standard Tag Library (JSTL) - EL jar"
 HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 
-CDEPEND="java-virtuals/servlet-api:3.0
+CDEPEND="
 	dev-java/tomcat-jstl-impl:0
-	dev-java/tomcat-jstl-spec:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+	dev-java/tomcat-jstl-spec:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
 	)
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -40,7 +46,7 @@ EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="jstlel/build.xml"
 
 java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml || die
 }
 
 EANT_TEST_TARGET="test"
diff --git a/dev-java/tomcat-jstl-impl/Manifest b/dev-java/tomcat-jstl-impl/Manifest
index 3d40f6296597..e67d6af836ff 100644
--- a/dev-java/tomcat-jstl-impl/Manifest
+++ b/dev-java/tomcat-jstl-impl/Manifest
@@ -1 +1 @@
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+DIST tomcat-jstl-impl-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 065b69e46f27..9ab517d834c1 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,24 +13,29 @@ MY_IMPL="${MY_PN}-impl"
 
 DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
 HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 
-CDEPEND="dev-java/xalan:0
+CDEPEND="
+	dev-java/xalan:0
 	dev-java/tomcat-jstl-spec:0
 	dev-java/tomcat-servlet-api:3.1"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
 	)
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -39,18 +44,21 @@ EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
 EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="impl/build.xml"
 
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
+JAVA_RM_FILES=(
+	impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+)
 
+PATCHES=(
 	# This patch overrides a couple of methods.
-	epatch "${FILESDIR}"/${P}-ImportSupport.patch
-
+	"${FILESDIR}"/${P}-ImportSupport.patch
 	# This one disables one test case which doesn't work.
-	epatch "${FILESDIR}"/${P}-SetSupport.patch
+	"${FILESDIR}"/${P}-SetSupport.patch
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml || die
 
-	# This test case doesn't pass.
-	rm -v \
-		impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+	epatch "${PATCHES[@]}"
 }
 
 EANT_TEST_TARGET="test"
diff --git a/dev-java/tomcat-jstl-spec/Manifest b/dev-java/tomcat-jstl-spec/Manifest
index 3d40f6296597..4a702077a508 100644
--- a/dev-java/tomcat-jstl-spec/Manifest
+++ b/dev-java/tomcat-jstl-spec/Manifest
@@ -1 +1 @@
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+DIST tomcat-jstl-spec-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
index 9479bfb453de..5db72ed5e2ed 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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
@@ -13,7 +14,7 @@ MY_SPEC="${MY_PN}-spec"
 
 DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification jar"
 HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,14 +22,18 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
 	)
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -38,7 +43,7 @@ EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="spec/build.xml"
 
 java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml || die
 }
 
 EANT_TEST_TARGET="test"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 9fa582d04fd4..2f911c5a1d26 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,3 +1 @@
-DIST tomcat-native-1.1.33-src.tar.gz 388787 SHA256 523dde7393c57307eedf4972ebbe19a9e9af6f7699e3b1ef6dabd7a11677866e SHA512 62b3c806cd926ca13878b514714a422f4a5d932ccaee4cc328c101cfa92fd890f708d1fb429320a42f1e340b46f70c82a07b9ecf6cbd9d03c0e719b95e24e09b WHIRLPOOL afb57fdf32becae8860ed042d74e27a7208759c4a7c16163148e65c986b4dcfa9521e83bbe0a3fa6874a87f577be2ad31a043d3ec1888c11faec7ace21035419
-DIST tomcat-native-1.2.3-src.tar.gz 387023 SHA256 36bf786371742c98ca8b167d3cb59ad2162169bdcaab122da8d0e923dc10742f SHA512 3e64525d1801d776ba9d0cfa568bfcec74144160354b376be078afb30d506adfdbadaf84a76ab557963ba64fc333c589a73e917faea020cdcf33e36e316945af WHIRLPOOL 2681e27bced3da011a585d9d455d10bfa16cd167093869a515fa582cf2608cfd5ff68e9b3575741b3c62bd0840036fd8b436314eaeb5a4475ed339d97b9a4b54
 DIST tomcat-native-1.2.4-src.tar.gz 387352 SHA256 29d53d4646229a839ccb71b7b3caa25c256aab1965c33cc9d140247213b9b171 SHA512 c080867510fb9006832172ee0b1997cee067c6e0275b3f9bdf94f69c14b9a02317352d9cadd8a41d366fb5f25c42f7f8af419e0b699aaa5eefee20db96559e97 WHIRLPOOL bf0acc6a78a79b51d3802fb1e1bfb0ec3e71993723a1be58c5ac14d6d24bab6e54fc9d505e4d5c0852ce335b6edc47c6b57f99055c875258fa0414a702e06fb2
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild
deleted file mode 100644
index 2c849c689297..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.1.33-r1.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 base eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-IUSE="test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src/jni
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	base_src_compile
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}-dev.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.3.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.3.ebuild
deleted file mode 100644
index fdadfd936126..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.3.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 java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-IUSE="test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
index 2362ac2cd0f5..281d703b5136 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Native APR library for Tomcat"
 SLOT="0"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 IUSE="test"
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index dde1368bdcd9..0ed8788d0be8 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,6 +5,7 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d
 DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
+DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81 WHIRLPOOL 79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
index 2c0f12781f28..87f16b934944 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
deleted file mode 100644
index 9a200f06c158..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.68.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.68.ebuild
new file mode 100644
index 000000000000..4d6ba5488c50
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.68.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/trove/trove-3.0.2-r2.ebuild b/dev-java/trove/trove-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..821035c4545e
--- /dev/null
+++ b/dev-java/trove/trove-3.0.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 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="GNU Trove: High performance collections for Java"
+SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
+HOMEPAGE="http://trove4j.sourceforge.net"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PV}"
+
+RESTRICT="test"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	unzip -d "${P}" "${P}-src.jar" || die
+	cp -r "${P}"/* ./src || die
+	rm -rf "${P}" || die
+	find ./src \
+		-type f \
+		! -name "*.java" \
+		-exec rm -v {} \; || die
+	java-pkg_clean
+}
diff --git a/dev-java/velocity-dvsl/Manifest b/dev-java/velocity-dvsl/Manifest
new file mode 100644
index 000000000000..621ac643babe
--- /dev/null
+++ b/dev-java/velocity-dvsl/Manifest
@@ -0,0 +1 @@
+DIST velocity-dvsl-1.0.zip 91539 SHA256 f7b05089c38f4cd28700bb4e57c856a22c3a4700d2812c5a4c18a42bf0b78d2b SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01 WHIRLPOOL 9532e6b5d8737e98f67dff4023fbc0800666ff8fc616ff2233297ca506ea56661742830f663d15fee319bf5d2f06ff722cd498e5a926a1a644dd8023bbcde266
diff --git a/dev-java/velocity-dvsl/metadata.xml b/dev-java/velocity-dvsl/metadata.xml
new file mode 100644
index 000000000000..eeaecef8a654
--- /dev/null
+++ b/dev-java/velocity-dvsl/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 type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
new file mode 100644
index 000000000000..6f932943387e
--- /dev/null
+++ b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Declarative Velocity Style Language."
+HOMEPAGE="http://velocity.apache.org/dvsl/devel/"
+SRC_URI="mirror://apache/velocity/dvsl/${PV}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/dom4j:1
+	dev-java/velocity:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="
+	dom4j-1
+	ant-core
+	velocity
+"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf test src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}" --main org.apache.dvsl.DVSL
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
new file mode 100644
index 000000000000..bd3f8f37a088
--- /dev/null
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java framework for easy creation/rendering of documents"
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/jdom:0
+	dev-java/log4j:0
+	dev-java/ant-core:0
+	dev-java/werken-xpath:0
+	dev-java/jakarta-oro:2.0
+	dev-java/avalon-logkit:2.0
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/commons-collections:0
+	java-virtuals/servlet-api:2.3
+"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	jdom
+	log4j
+	ant-core
+	werken-xpath
+	jakarta-oro-2.0
+	servlet-api-2.3
+	commons-logging
+	commons-lang-2.1
+	avalon-logkit-2.0
+	commons-collections
+"
+
+JAVA_SRC_DIR="src"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf test src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
index f1d772cc9793..19c0e73f8b77 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
deleted file mode 100644
index f707a2d55127..000000000000
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="${PN}-20041217"
-
-DESCRIPTION="An XML-Java binding tool"
-HOMEPAGE="http://xmlbeans.apache.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/jaxen-1.1*
-	>=dev-java/ant-core-1.6.2"
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}/v1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/xml-xmlbeans-gentoo.patch"
-	java-ant_rewrite-classpath build.xml
-
-	cd "${S}"/external/lib
-	#TODO: includes and old copy named oldxbean.jar
-	#that probably should not be used
-	#rm -v *.jar
-
-	java-pkg_jar-from jaxen-1.1 jaxen.jar jaxen-1.1-beta-2.jar
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	eant xbean.jar $(use_doc docs) \
-		-Dgentoo.classpath=$(java-pkg_getjars ant-core)
-}
-
-# Tests always seem to fail #100895
-
-src_install() {
-	java-pkg_dojar build/lib/xbean*.jar
-
-	dodoc CHANGES.txt NOTICE.txt README.txt
-	if use doc; then
-		java-pkg_dojavadoc build/docs/reference
-		java-pkg_dohtml -r docs
-	fi
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/xmpcore/Manifest b/dev-java/xmpcore/Manifest
new file mode 100644
index 000000000000..c6f85688ca48
--- /dev/null
+++ b/dev-java/xmpcore/Manifest
@@ -0,0 +1 @@
+DIST xmpcore-5.1.2-sources.jar 136918 SHA256 3f2f5dd6c983ac574f9bf721ae0eacf888bc26eb40a8650b231d06f29d05ee75 SHA512 ad4c78a68f1d32a358b79bfb4acacbcc56eaa294af5afbb29eb916a1a488dba547e72c4d94809222fae63fd7c66940d9ce7cb6c06598f9c7b8691d0feaabdad8 WHIRLPOOL c2d39305158f10476e9986bcf16f75ca36852c6654a1ce00aae7f273972801cd585bc604c7d7f0ae1404b700572ee10460e909ef6005302d9cbf70d89ecb3fb5
diff --git a/dev-java/xmpcore/metadata.xml b/dev-java/xmpcore/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/xmpcore/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/xmpcore/xmpcore-5.1.2.ebuild b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
new file mode 100644
index 000000000000..0484d3b42461
--- /dev/null
+++ b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 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="Java library based on the Adobe C++ XMPCore library with a similar API"
+HOMEPAGE="http://www.adobe.com/devnet/xmp.html"
+SRC_URI="http://central.maven.org/maven2/com/adobe/xmp/${PN}/${PV}/${P}-sources.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
index 7c79dc5ee865..b557fa2fbc76 100644
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1 +1,2 @@
+DIST xp-0.5.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
 DIST xp.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
diff --git a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..d2c11ab3ed59
--- /dev/null
+++ b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
@@ -0,0 +1,30 @@
+diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
+index 2b0d90a..d1efd3e 100644
+--- a/com/jclark/xml/sax/Driver.java
++++ b/com/jclark/xml/sax/Driver.java
+@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
+ 

+     DTD dtd = event.getDTD();

+ 

+-    for (Enumeration enum = dtd.entityNames(DTD.NOTATION);

+-	 enum.hasMoreElements(); ) {

+-      String name = (String)enum.nextElement();

++    for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);

++	 enumx.hasMoreElements(); ) {

++      String name = (String)enumx.nextElement();

+       Entity entity = dtd.getEntity(DTD.NOTATION, name);

+       String systemId = entity.getSystemId();

+       if (systemId != null) {

+@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
+       }

+       dtdHandler.notationDecl(name, entity.getPublicId(), systemId);

+     }

+-    for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);

+-	 enum.hasMoreElements();) {

+-      String name = (String)enum.nextElement();

++    for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);

++	 enumx.hasMoreElements();) {

++      String name = (String)enumx.nextElement();

+       Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);

+       String notationName = entity.getNotationName();

+       if (notationName != null) {

diff --git a/dev-java/xp/xp-0.5-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
new file mode 100644
index 000000000000..c1e0a4656bc9
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 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="XP is an XML 1.0 parser written in Java"
+HOMEPAGE="http://www.jclark.com/xml/xp"
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+java_prepare() {
+	java-pkg_clean
+	epatch "${PATCHES[@]}"
+}
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 1ad8e764e51b..650b639f789d 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -7,3 +7,6 @@ DIST crystal-0.8.0.tar.gz 731304 SHA256 986a000bb2eded22e446fd55c543062770ec4000
 DIST crystal-0.11.1-1-linux-i686.tar.gz 12283213 SHA256 2db84f6a287925d02832192cb7c5b99d0f543afd5323286a3a8c1799d5952abe SHA512 c4cfcd51efa76492c0174d8a5273303d17e672273de1b35eafcce920710afadd031e7cfec775880ccedd7d6e87d0f2c27958b1499c8ce494fcc849c6e78ec2a5 WHIRLPOOL 849abefe1ebbf9b8aae484567662973b5712e1d55a45a123cd41f7f0cfd4ecd5f7bfe5d27e6ce227922b4985772f4b70acfb8e94ff8042c48a48f08c9cab5887
 DIST crystal-0.11.1-1-linux-x86_64.tar.gz 11854829 SHA256 742ee62b23d2ada2a9baa39d0f30973ca0b5b003504b04f2aad8483ef9b6f07b SHA512 ff0a8f25a5732936797f9d9359be9725d4d93f80d1d33ddf43e1833d4fd9dc9dcfc99e6d3a54e51c380cbdaacf0c8bf7b0077b939739434e604ad33f38dc56e0 WHIRLPOOL d26aa43fe08d05f29e38885b005ccd43a3f35a51e909d2ff4c343f1d617041d7b3c7f80414781abee482f43115b9d4a9963fa5001391a5d9a487f89580605811
 DIST crystal-0.11.1.tar.gz 830437 SHA256 bdff81fcb4f2dfdd50d79abba8a1ed0260bad4c1f055002cd16b9b6f443b8a15 SHA512 ba2dc5a74925c8cc84e0654773e4befb604b3c485294d54e8ed738d7f1eef42173bb94aa12a08b65845e29494073b83b1da7bbe9438df0ba0ed30dd8491ce4ba WHIRLPOOL 9cf36214ef6df4d1e9249e8f725343eb3235cb12323416b9247c478dbca97b42c3be317c58d478576dd1cb81dc3d57b8c5e8118a4fd11d6c103a40b277de7cbe
+DIST crystal-0.12.0-1-linux-i686.tar.gz 12301739 SHA256 0595aab4336e48d0d04f0a0f172f641ebb1c17ebdb6e2eebbbfa36a650323242 SHA512 b893f1c36f658356b19257c7eb60219d2dd0a20f00d8d27ce4f3136a05153d4e3ded090979623f2895eb7b0070a902b59cdc891aba88515ee6ba9e6cf065351c WHIRLPOOL dc81e6e0ea6619e697ae81a247849bf2bf10b5134f45fd2979a7bbfa7e1be53a5f79890ecebeab9f35c86b58bfca486c0e071c5baee06600c0d76cf1f6db3224
+DIST crystal-0.12.0-1-linux-x86_64.tar.gz 11874469 SHA256 ecd444dab34803fd97dcb9f82da47c60fad9de3c2f43d20195108d678e874f16 SHA512 ffea0d3a9864249a91d9a8243ffdb39c8bd54e931479b35414065fe30d5d2d79f5f4b743eaf3f7e8936a183673e2ff3ccb83fa5f2a9e2521443eb0632f5f6723 WHIRLPOOL 3938a93c5647f784e1782e747a432668726bf901f2aa1ac0992ff19ac69a008313d3922e492343deda7ae1786847c4fb2781ac26c34870d3e2aa0f378c38b5bc
+DIST crystal-0.12.0.tar.gz 851051 SHA256 918bad9b906fe252f3f66685487892ad7c13a31135aa5874ac1e52ea399328e3 SHA512 86ba58e3f69ecada49a8e6596f49cc4e4becb109c2725b9436eb5aa587c247aa4c309242e3fdc5d6a655726595005db4e33fcf868d7c888448c58af74d1b947f WHIRLPOOL 4523f8a1904feade28584ce828fbb96d302f6976f6a0a7836c4b8cc40ac4cc2c28c9b41eb2da6dead314dbaa3422f46727cce2443e10776cd271627fb4c3d2d6
diff --git a/dev-lang/crystal/crystal-0.12.0.ebuild b/dev-lang/crystal/crystal-0.12.0.ebuild
new file mode 100644
index 000000000000..b5f4005864ac
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.12.0.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 multilib
+
+BV=${PV}-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/manastech/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+	<sys-devel/llvm-3.7.0
+	dev-libs/boehm-gc[static-libs]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+src_compile() {
+	emake \
+		release=1 \
+		PATH="${PATH}":"${WORKDIR}"/${PN}-${BV}/bin \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="libs:/usr/$(get_libdir)/crystal"
+	use doc && emake doc
+}
+
+src_test() {
+	emake spec \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r doc/.
+	fi
+}
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
index 6fcd5cd094d2..d0b2c6988e0b 100644
--- a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
+++ b/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
@@ -10,7 +10,7 @@ inherit eutils toolchain-funcs
 
 SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 # Upstream only supports go on amd64, arm and x86 architectures.
-KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
 
 DESCRIPTION="Version of go compiler used for bootstrapping"
 HOMEPAGE="http://www.golang.org"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 545f19cff108..f83a7ed80e97 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,4 +1,11 @@
+DIST go-darwin-amd64-bootstrap.tbz 48361403 SHA256 afb6cc976c404933e68ee3125fe8fbf94b57b9d8db8501d2bd1ce692468fbc9b SHA512 aefaad5abd58ed96cf5658bae2e931f162c2699fb248104837a279955dea6fe6cd4d582766379d2689c04bdc009c19a19f17585d8401d49d1fac772dcf385b93 WHIRLPOOL aa1c06103ae72f0b1c62cccd82b1fa88c5310d3baad2d9eddd173322c04ad7a7b7b9fb6ac9407c8002c6eebb8691cd415bca3d50a17548d52a5022001c6b93e2
+DIST go-freebsd-386-bootstrap.tbz 47059629 SHA256 3cb5f0ce9f878682da458f266dc954829dec7cfc4c269c233abceaad4061e671 SHA512 39a48b78542095e1c2115e2d833ac6b4b4c9e03b8974ad3e5d48701f36cc383c9434d075e73b65343055677d2d83c4556e416ac90a71b3e2a4f0789adfa02888 WHIRLPOOL ff39a6ba507b9d200817a09dcfe045fd1a79fad03b824ed6cf3df8fa937d345ccc2d0d1dfad3f5cb38151b9674ab00b10aabe788ce8dd67a74251ab7aeae0209
+DIST go-freebsd-amd64-bootstrap.tbz 48451024 SHA256 c5b16adab514352f49eb9ffef0d499e954d5d6bb6aefc8e98543d24e2a8fd7b7 SHA512 097a48c9b3b7541b6c4aab6fe9304b7df461e31543609b836842294a2acecf14243d0efc80282b2e442f6be92d7e189dddab6ffd4487b115d94113205452352e WHIRLPOOL 691cecccc01383bd874e687c3644ceab06c33d3c9c57da737c2c1f8208dcc6d99bc18968f50c4e466049069f219e39f34ee8a8b6af0f667f31ae011528f4c591
+DIST go-linux-386-bootstrap.tbz 47156176 SHA256 ced390085b26074d805fe64a4bd4da618c5aa086fb5944d6df8df4a96aba05fc SHA512 d4236df8d71afa6afad0d90c1c84a3a27e7e9f4ab6a613a92ac52eeeed3303e097ab3f18a04af66928a6169c78bc73b85836755729695d2a0f65ddf0f6fde9ca WHIRLPOOL 30328edff5a8c4efac8a4f5336f09744d5fe8bc9ab2925eed5a5fc7a17c8e54f35badf6daf75a65e62237e4c2a52fe29a2baacd6c7463aa0c735a64bc5e91c0a
+DIST go-linux-amd64-bootstrap.tbz 48722911 SHA256 0ab0842fb1f6cc6f10a85f225ff1a2b9e5e4b38128a7136d0c1896819421a986 SHA512 ce4dbc979b63a4612f4a8f7e7a6c5247e11bbc3a2d62ab0537a1b405ec8ab22f153012421d2240a7d6a4f91a79bb3f1370454f9e843fac43b99757c17134e5b7 WHIRLPOOL a94d0e0a1c44e3385d23f8973d15e6ef041450a3578c38987f158c4f9f231d315bc5204539d9dc7322cc9ecb96b7618b22d023f906474e1348c5d666792dff58
+DIST go-linux-arm-bootstrap.tbz 46055976 SHA256 a44e33b95046e01fd7125c3cc3c34b13f83bbf692cddfd3e86e267da11de2a44 SHA512 a8cf3225dafd2f08b944e60d0fb6320b5e394646f5df2ca2464c76a2e6e6b72f4840ddcc65dc5f59c94907715780f1e25c73b480a79909d9455faad59ffd38d5 WHIRLPOOL 304bb37f94b8f5d0bd77c0d5faebed1cb627cc3b453c686d7297f6542ee3e0ddabc7139e13a21ee2f5a20caca273c63bcfbcbd4daf670b1dbfe77b599f8111ac
+DIST go-linux-arm64-bootstrap.tbz 45369354 SHA256 810c998e6701580fe0f26d46c5796eefce648e252ff9d6d761304e60556b7fc0 SHA512 3f64869430c03efa77796ed74d07a337e2a205802485605cbdd67778a08e5ce041ce3925b7a5cca0a6b4ad24ab70e07ee54091b010f67ec7370a985022f5a21e WHIRLPOOL f6f470081d5f23c190310280aaf7454a4f58fe4e7545bbd219046711f8d27ce97cc5f5f1c207e777067d1f6332e4b3f2c819b178e899d21c2d5d1d466a42cc37
+DIST go-linux-ppc64-bootstrap.tbz 45266082 SHA256 89902cebaf93b95dea225b7304eedcae101d6fb83bba0fcdfee001361b4868c0 SHA512 d013a1a5953207505a9f7e0c5cfdc7f463d4669fd18b36cf1df10126e9d4c012252bc4d207dd4503c34301e76197d8e89a9ed9d9d0b8a3b54b62e782b4c39d7b WHIRLPOOL 3ec868d94e8452a3cdb49a1292f9f32ebeb813ea297e419849cdee28c8d952887feb70e1095ce109ff6b8bb81dee47b7eb6f275b15bb6f46422095c3b260f968
 DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef
 DIST go1.5.3.src.tar.gz 12057623 SHA256 754e06dab1c31ab168fc9db9e32596734015ea9e24bc44cae7f237f417ce4efe SHA512 b348832ea7cb095cf793960cf9f4da5e9f6ca8de7b5262bb819de97efea4835643e30a18efd4a82d01ea3854a1905af9e134271716c4b68c9d2a8f6e15f65ff0 WHIRLPOOL aec869ec6af62601f6b83283417eef739141f99be938d419ef4a553028141e05ded7777fdff2a2d1a3e35e4976e4ec96a301b4875c509a370848d0df5dc9e0c8
-DIST go1.6rc1.src.tar.gz 12597286 SHA256 2d1a6756f24227dcee955add4af7d194eb4a8c3656b2c4ce778994e21a533a83 SHA512 539ba9603d87bf09d37ab37a7256cb6860357ce976ac000814e733d5ae4f2d1150a4d75412b70dba0fae453aa6fc36c0cc03874d9adce7d23a168551611a47f4 WHIRLPOOL c7f272dfec8a2526bacc1cba165afb5a7c8e6df2540132ce0934795df0c0952752ee7cdee3201a9f13da1f15b13c5b67c0879ef9eedfd60d47be0f9525b37961
-DIST go1.6rc2.src.tar.gz 12602910 SHA256 92914a23cde7e34e1d017175d785e5850fbb28f323a145028e2e26053ef1a598 SHA512 33771377244fd7e7e06e093738fe09381a90f9375e86a807b58e5c2169ffab16eacd832bb28e8e3b759f8ba3283626fe089a3c5bdced4e919218e49eb585e42d WHIRLPOOL b6cc9e0425b74abfa94c0bcbbd0f2e0e82ef6e83ed1d6f8362dfa5beb907db6e424810c9f1b2ec8a00faf65fcaf943eff1e39deec19a14674d5f039795848d3c
+DIST go1.6.src.tar.gz 12613308 SHA256 a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146 SHA512 59e9d72a80558fd5e3f176e068897a45333b36e35f6c00393647941a70e741168e65941b6059397378020c3b78ec3471a48809682f7efd97cf33eec6325fc3e8 WHIRLPOOL c6debe1a5039f0ca34c29b4a53f958503a724cae13715ea14f0237b5faacd26e09eb6405462e22abd6806540dd8fb9eb2fa08ff6e8676b0f6dffa267210f5eac
diff --git a/dev-lang/go/go-1.5.3.ebuild b/dev-lang/go/go-1.5.3.ebuild
index 8d4b5b1f367d..62e4a4d92048 100644
--- a/dev-lang/go/go-1.5.3.ebuild
+++ b/dev-lang/go/go-1.5.3.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
 	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
-	KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A concurrent garbage collected and typesafe programming language"
diff --git a/dev-lang/go/go-1.6_rc2.ebuild b/dev-lang/go/go-1.6-r1.ebuild
index 25fbae160658..25fbae160658 100644
--- a/dev-lang/go/go-1.6_rc2.ebuild
+++ b/dev-lang/go/go-1.6-r1.ebuild
diff --git a/dev-lang/go/go-1.6-r2.ebuild b/dev-lang/go/go-1.6-r2.ebuild
new file mode 100644
index 000000000000..e9e0d2bc3813
--- /dev/null
+++ b/dev-lang/go/go-1.6-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+SRC_URI="
+kernel_Darwin? (
+	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
+)
+kernel_FreeBSD? (
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-bootstrap.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-bootstrap.tbz )
+)
+kernel_linux? (
+	amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap.tbz )
+	arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap.tbz )
+	arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap.tbz )
+	ppc64? ( ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz )
+	x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap.tbz )
+)
+"
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://github.com/golang/go.git"
+	inherit git-r3
+else
+	SRC_URI+="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
+	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
+	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
+	case ${PV} in
+		*9999*|*_rc*) ;;
+		*)
+			KEYWORDS="-* ~amd64 ~arm64"
+			;;
+	esac
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped. The test data objects should also be left alone and unstripped.
+STRIP_MASK="/usr/lib/go/pkg/*.a
+	/usr/lib/go/src/debug/elf/testdata/*
+	/usr/lib/go/src/debug/dwarf/testdata/*
+	/usr/lib/go/src/runtime/race/*.syso"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}"/go
+fi
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+		./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+	insinto /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	doins -r bin doc lib pkg src
+	fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
+
+	cp -a misc "${D}"/usr/lib/go/misc
+
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
+}
+
+pkg_preinst()
+{
+	has_version '<dev-lang/go-1.4' &&
+		export had_support_files=true ||
+		export had_support_files=false
+}
+
+pkg_postinst()
+{
+	# If the go tool sees a package file timestamped older than a dependancy it
+	# will rebuild that file.  So, in order to stop go from rebuilding lots of
+	# packages for every build we need to fix the timestamps.  The compiler and
+	# linker are also checked - so we need to fix them too.
+	ebegin "fixing timestamps to avoid unnecessary rebuilds"
+	tref="usr/lib/go/pkg/*/runtime.a"
+	find "${EROOT}"usr/lib/go -type f \
+		-exec touch -r "${EROOT}"${tref} {} \;
+	eend $?
+
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} &&
+		${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "Release notes are located at http://golang.org/doc/go${PV}"
+	fi
+
+	if $had_support_files; then
+		ewarn
+		ewarn "All editor support, IDE support, shell completion"
+		ewarn "support, etc has been removed from the go package"
+		ewarn "upstream."
+		ewarn "For more information on which support is available, see"
+		ewarn "the following URL:"
+		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
+	fi
+}
diff --git a/dev-lang/go/go-1.6.ebuild b/dev-lang/go/go-1.6.ebuild
new file mode 100644
index 000000000000..c57298b629da
--- /dev/null
+++ b/dev-lang/go/go-1.6.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+inherit eutils toolchain-funcs
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://github.com/golang/go.git"
+	inherit git-r3
+else
+	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
+	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
+	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
+	KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=">=dev-lang/go-bootstrap-1.4.1"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped. The test data objects should also be left alone and unstripped.
+STRIP_MASK="/usr/lib/go/pkg/*.a
+	/usr/lib/go/src/debug/elf/testdata/*
+	/usr/lib/go/src/debug/dwarf/testdata/*
+	/usr/lib/go/src/runtime/race/*.syso"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}"/go
+fi
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+		./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+	insinto /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	doins -r bin doc lib pkg src
+	fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
+
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	dodir /usr/lib/go/misc
+	insinto /usr/lib/go/misc
+	doins -r misc/trace
+
+	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
+}
+
+pkg_preinst()
+{
+	has_version '<dev-lang/go-1.4' &&
+		export had_support_files=true ||
+		export had_support_files=false
+}
+
+pkg_postinst()
+{
+	# If the go tool sees a package file timestamped older than a dependancy it
+	# will rebuild that file.  So, in order to stop go from rebuilding lots of
+	# packages for every build we need to fix the timestamps.  The compiler and
+	# linker are also checked - so we need to fix them too.
+	ebegin "fixing timestamps to avoid unnecessary rebuilds"
+	tref="usr/lib/go/pkg/*/runtime.a"
+	find "${EROOT}"usr/lib/go -type f \
+		-exec touch -r "${EROOT}"${tref} {} \;
+	eend $?
+
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} &&
+		${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "Release notes are located at http://golang.org/doc/go${PV}"
+	fi
+
+	if $had_support_files; then
+		ewarn
+		ewarn "All editor support, IDE support, shell completion"
+		ewarn "support, etc has been removed from the go package"
+		ewarn "upstream."
+		ewarn "For more information on which support is available, see"
+		ewarn "the following URL:"
+		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
+	fi
+}
diff --git a/dev-lang/go/go-1.6_rc1.ebuild b/dev-lang/go/go-1.6_rc1.ebuild
deleted file mode 100644
index b234182bffe8..000000000000
--- a/dev-lang/go/go-1.6_rc1.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
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit eutils toolchain-funcs
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/golang/go.git"
-	inherit git-r3
-else
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
-	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
-	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
-	KEYWORDS=""
-fi
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="http://www.golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=dev-lang/go-bootstrap-1.4.1"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# The go language uses *.a files which are _NOT_ libraries and should not be
-# stripped. The test data objects should also be left alone and unstripped.
-STRIP_MASK="/usr/lib/go/pkg/*.a
-	/usr/lib/go/src/debug/elf/testdata/*
-	/usr/lib/go/src/debug/dwarf/testdata/*
-	/usr/lib/go/src/runtime/race/*.syso"
-
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}"/go
-fi
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-		./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-	insinto /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	doins -r bin doc lib pkg src
-	fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
-
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	dodir /usr/lib/go/misc
-	insinto /usr/lib/go/misc
-	doins -r misc/trace
-
-	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
-}
-
-pkg_preinst()
-{
-	has_version '<dev-lang/go-1.4' &&
-		export had_support_files=true ||
-		export had_support_files=false
-}
-
-pkg_postinst()
-{
-	# If the go tool sees a package file timestamped older than a dependancy it
-	# will rebuild that file.  So, in order to stop go from rebuilding lots of
-	# packages for every build we need to fix the timestamps.  The compiler and
-	# linker are also checked - so we need to fix them too.
-	ebegin "fixing timestamps to avoid unnecessary rebuilds"
-	tref="usr/lib/go/pkg/*/runtime.a"
-	find "${EROOT}"usr/lib/go -type f \
-		-exec touch -r "${EROOT}"${tref} {} \;
-	eend $?
-
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} &&
-		${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "Release notes are located at http://golang.org/doc/go${PV}"
-	fi
-
-	if $had_support_files; then
-		ewarn
-		ewarn "All editor support, IDE support, shell completion"
-		ewarn "support, etc has been removed from the go package"
-		ewarn "upstream."
-		ewarn "For more information on which support is available, see"
-		ewarn "the following URL:"
-		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
-	fi
-}
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 25fbae160658..cb0b662836d1 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -11,17 +11,35 @@ MY_PV=${PV/_/}
 
 inherit toolchain-funcs
 
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+SRC_URI="
+kernel_Darwin? (
+	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
+)
+kernel_FreeBSD? (
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-bootstrap.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-bootstrap.tbz )
+)
+kernel_linux? (
+	amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap.tbz )
+	arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap.tbz )
+	arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap.tbz )
+	ppc64? ( ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz )
+	x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap.tbz )
+)
+"
+
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://github.com/golang/go.git"
 	inherit git-r3
 else
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
+	SRC_URI+="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
 	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
 	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
 	case ${PV} in
 		*9999*|*_rc*) ;;
 		*)
-			KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+			KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 			;;
 	esac
 fi
@@ -33,7 +51,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-DEPEND=">=dev-lang/go-bootstrap-1.4.1"
+DEPEND=""
 RDEPEND="!<dev-go/go-tools-0_pre20150902"
 
 # These test data objects have writable/executable stacks.
@@ -114,9 +132,17 @@ pkg_pretend()
 	fi
 }
 
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
 src_compile()
 {
-	export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
 	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
 	export GOROOT="$(pwd)"
 	export GOBIN="${GOROOT}/bin"
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 96c604666fd2..65f24cd8fc59 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,23 +1,5 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
-DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
-DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
-DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
-DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 SHA256 e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81 WHIRLPOOL 997c96d0d9d6c603f8659a5ece91aa55b9a7bf5b428065ac55a0fa3d5577dab7fcc61157a983eb355832dc7c201fde4e5fcc9ff7bcb4d8b656847c2c1092b1dd
diff --git a/dev-lang/icc/icc-13.0.0.079.ebuild b/dev-lang/icc/icc-13.0.0.079.ebuild
deleted file mode 100644
index d026267569e4..000000000000
--- a/dev-lang/icc/icc-13.0.0.079.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=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/icc/icc-13.0.1.117.ebuild b/dev-lang/icc/icc-13.0.1.117.ebuild
deleted file mode 100644
index cb4a629a31f3..000000000000
--- a/dev-lang/icc/icc-13.0.1.117.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=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/icc/icc-13.1.2.146.ebuild b/dev-lang/icc/icc-13.1.2.146.ebuild
deleted file mode 100644
index 0b4bfc936a23..000000000000
--- a/dev-lang/icc/icc-13.1.2.146.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/icc/icc-13.1.3.163.ebuild b/dev-lang/icc/icc-13.1.3.163.ebuild
deleted file mode 100644
index 359ce70fd707..000000000000
--- a/dev-lang/icc/icc-13.1.3.163.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/icc/icc-14.0.0.080.ebuild b/dev-lang/icc/icc-14.0.0.080.ebuild
deleted file mode 100644
index 35900759e4fd..000000000000
--- a/dev-lang/icc/icc-14.0.0.080.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/icc/icc-14.0.1.106.ebuild b/dev-lang/icc/icc-14.0.1.106.ebuild
deleted file mode 100644
index 8a952573c88d..000000000000
--- a/dev-lang/icc/icc-14.0.1.106.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/icc/icc-14.0.2.144.ebuild b/dev-lang/icc/icc-14.0.2.144.ebuild
deleted file mode 100644
index 889533a557e9..000000000000
--- a/dev-lang/icc/icc-14.0.2.144.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/icc/icc-15.0.0.090.ebuild b/dev-lang/icc/icc-15.0.0.090.ebuild
deleted file mode 100644
index 44855aafa48b..000000000000
--- a/dev-lang/icc/icc-15.0.0.090.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/icc/icc-15.0.1.133.ebuild b/dev-lang/icc/icc-15.0.1.133.ebuild
deleted file mode 100644
index 1387245ff151..000000000000
--- a/dev-lang/icc/icc-15.0.1.133.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/icc/icc-15.0.2.164.ebuild b/dev-lang/icc/icc-15.0.2.164.ebuild
deleted file mode 100644
index dfcf4f4961ac..000000000000
--- a/dev-lang/icc/icc-15.0.2.164.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/icc/icc-15.0.3.187.ebuild b/dev-lang/icc/icc-15.0.3.187.ebuild
deleted file mode 100644
index d24fe8f38e47..000000000000
--- a/dev-lang/icc/icc-15.0.3.187.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/icc/icc-15.0.6.233.ebuild b/dev-lang/icc/icc-15.0.6.233.ebuild
new file mode 100644
index 000000000000..e07df89b00dc
--- /dev/null
+++ b/dev-lang/icc/icc-15.0.6.233.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=8470
+INTEL_DPV=2015_update6
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel C/C++ Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="eclipse linguas_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	!dev-lang/ifc[linguas_ja]
+	eclipse? ( dev-util/eclipse-sdk )"
+RDEPEND="${DEPEND}
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerproc compilerproc-devel"
+INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
+
+CHECKREQS_DISK_BUILD=325M
+
+src_install() {
+	if ! use linguas_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+	intel-sdp_src_install
+}
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index 178e7a808893..b56b03e6d2c9 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -1,2 +1,3 @@
 DIST icon-v950src.tgz 3115766 SHA256 ceb558bcf5b2edc3252b2d1d4ed640d2a218196f73d299b052f1e0c50e9b1557 SHA512 32f01ca65863525d92846b505ea61f6fbad5a11991d0476c5e79647459dee12746b4448f8d32f2766c198b6713587e48eb0f7f2a942ce42a929f080a85039fa3 WHIRLPOOL 641db3d8d6cc384772649cd0a80884ea9bbb7027df772b19ea6216f164bc589ffc1331cc80447483455e05f54405ed18af0ce69d9d48d4ea7d42ff1b341811c0
+DIST icon-v951src.tgz 3133040 SHA256 062a680862b1c10c21789c0c7c7687c970a720186918d5ed1f7aad9fdc6fa9b9 SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad WHIRLPOOL b79ba827a94b71982ad6df4eb1d3218fc4b44bd7331e611616da3544202ed1bd5ea607a6934496b3267b24bf9096cacbf303f4ab949a06e44a43dd8c81e55704
 DIST icon.v943src.tgz 3218627 SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff SHA512 9f89c7f1aaea1caea586aeb1ef74346a0f258c26ae74581a9ce7b59c2b590eb79316bdb9530b70d9af59ad06e6c444eec92016d0e5b015f4d467bde0baac2695 WHIRLPOOL e776f088ed6a4db10f9defc11a71187cdef4c6ca50b89f80c035b2981c650999cc27bebeab57b99b495653d42af2e34ea5827d6744d4b8f265c7d1883e864437
diff --git a/dev-lang/icon/files/icon-9.5.1-flags.patch b/dev-lang/icon/files/icon-9.5.1-flags.patch
new file mode 100644
index 000000000000..ff659b28bbc2
--- /dev/null
+++ b/dev-lang/icon/files/icon-9.5.1-flags.patch
@@ -0,0 +1,75 @@
+--- icon-v951src/ipl/cfuncs/Makefile
++++ icon-v951src/ipl/cfuncs/Makefile
+@@ -25,7 +25,7 @@
+ # library
+ 
+ $(FUNCLIB):	$(FUNCS) mklib.sh
+-		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../bin" \
++		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../bin" \
+ 		    sh mklib.sh $(FUNCLIB) $(FUNCS)
+ $(FUNCS):	icall.h
+ 
+--- icon-v951src/ipl/cfuncs/mklib.sh
++++ icon-v951src/ipl/cfuncs/mklib.sh
+@@ -12,7 +12,7 @@
+ set -x
+ case "$SYS" in
+    Linux*|*BSD*|GNU*)
+-      $CC -shared -o $LIBNAME -fPIC "$@";;
++      $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";;
+    CYGWIN*)
+       # move the win32 import library for iconx.exe callbacks
+       # created when iconx.exe was built
+--- icon-v951src/ipl/packs/loadfunc/Makefile
++++ icon-v951src/ipl/packs/loadfunc/Makefile
+@@ -28,7 +28,7 @@
+ 		echo '$$define FUNCLIB "./$(FUNCLIB)"'	>libnames.icn
+ 
+ $(FUNCLIB):	$(FUNCS)
+-		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../../bin" \
++		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../../bin" \
+ 			sh $(MKLIB) $(FUNCLIB) $(FUNCS)
+ 
+ 
+--- icon-v951src/src/common/Makefile
++++ icon-v951src/src/common/Makefile
+@@ -8,7 +8,7 @@
+ common:		$(OBJS) gpxmaybe
+ 
+ patchstr:	patchstr.c
+-		$(CC) $(CFLAGS) -o patchstr patchstr.c
++		$(CC) $(CFLAGS) $(LDFLAGS) -o patchstr patchstr.c
+ 
+ gpxmaybe:
+ 		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi
+@@ -25,7 +25,7 @@
+ 	  ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h
+ 
+ ../h/arch.h:	infer.c
+-		$(CC) $(CFLAGS) -o infer infer.c
++		$(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c
+ 		./infer >../h/arch.h
+ 
+ identify.o: ../h/version.h
+--- icon-v951src/src/rtt/Makefile
++++ icon-v951src/src/rtt/Makefile
+@@ -22,7 +22,7 @@
+ 
+ 
+ rtt:	$(OBJ)
+-	$(CC) $(LDFLAGS) -o rtt $(OBJ)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o rtt $(OBJ)
+ 
+ library:	$(OBJ)
+ 		rm -rf rtt.a
+--- icon-v951src/src/runtime/Makefile
++++ icon-v951src/src/runtime/Makefile
+@@ -30,7 +30,7 @@
+ 
+ iconx: $(COBJS) $(XOBJS)
+ 	cd ../common; $(MAKE)
+-	$(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
+ 	cp iconx ../../bin
+ 	strip $(SFLAGS) ../../bin/iconx$(EXE)
+ 
diff --git a/dev-lang/icon/icon-9.5.1.ebuild b/dev-lang/icon/icon-9.5.1.ebuild
new file mode 100644
index 000000000000..5c2d138d97ee
--- /dev/null
+++ b/dev-lang/icon/icon-9.5.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 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_PV=${PV//./}
+SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v${MY_PV}src.tgz"
+HOMEPAGE="http://www.cs.arizona.edu/icon/"
+DESCRIPTION="very high level language"
+
+LICENSE="public-domain HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X iplsrc"
+
+S="${WORKDIR}/icon-v${MY_PV}src"
+
+DEPEND="X? ( x11-proto/xextproto
+		x11-proto/xproto
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt )
+	|| ( sys-devel/gcc sys-devel/gcc-apple )"
+
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# do not prestrip files
+	find "${S}"/src -name 'Makefile' | xargs sed -i -e "/strip/d" || die
+}
+
+src_configure() {
+	# select the right compile target.  Note there are many platforms
+	# available
+	local mytarget;
+	if [[ ${CHOST} == *-darwin* ]]; then
+		mytarget="macintosh"
+	else
+		mytarget="linux"
+	fi
+
+	if use X; then
+		emake X-Configure name=${mytarget} -j1 || die
+	else
+		emake Configure name=${mytarget} -j1 || die
+	fi
+
+	# sanitise the Makedefs file generated by Configure
+	sed -i \
+		-e 's:-L/usr/X11R6/lib64::g' \
+		-e 's:-L/usr/X11R6/lib::g' \
+		-e 's:-I/usr/X11R6/include::g' \
+		Makedefs || die "sed of Makedefs failed"
+
+	append-flags $(test-flags -fno-strict-aliasing -fwrapv)
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+	make Samples || die "Samples failed"
+	make Test || die "Test failed"
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)
+
+	make Install dest="${ED}/usr/$(get_libdir)/icon" || die "Make install failed"
+	dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont
+	dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx
+	dosym /usr/$(get_libdir)/icon/bin/icon  /usr/bin/icon
+	dosym /usr/$(get_libdir)/icon/bin/vib   /usr/bin/vib
+
+	cd "${S}/man/man1" || die
+	doman "${PN}"t.1
+	doman "${PN}".1
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN}/man || die
+
+	cd "${S}/doc" || die
+	dodoc *.txt *.sed ../README
+	# dohtml ignores all anything except .html files, no use here
+	mkdir -p "${ED}"/usr/share/doc/${PF}/html
+	cp -dpR *.htm *.gif *.jpg *.css "${ED}"/usr/share/doc/${PF}/html || die
+	rm -rf "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die
+
+	# optional Icon Programming Library
+	if use iplsrc; then
+		cd "${S}" || die
+		dodir /usr/$(get_libdir)/icon/ipl
+		rm -fv ipl/{BuildBin,BuildExe,CheckAll,Makefile} || die
+		insinto /usr/$(get_libdir)/icon
+		doins -r ipl
+	fi
+}
diff --git a/dev-lang/icon/metadata.xml b/dev-lang/icon/metadata.xml
index e659cbb78d8c..4b1d2db2694d 100644
--- a/dev-lang/icon/metadata.xml
+++ b/dev-lang/icon/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>cwills@witznd.net</email>
+		<name> Cheyenne Wills</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
 <use><flag name="iplsrc">install the icon programming library source</flag></use>
 </pkgmetadata>
diff --git a/dev-lang/idb/Manifest b/dev-lang/idb/Manifest
index 43fc94664c5b..f6e1ee819220 100644
--- a/dev-lang/idb/Manifest
+++ b/dev-lang/idb/Manifest
@@ -1,19 +1,4 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
diff --git a/dev-lang/idb/idb-13.0.0.079.ebuild b/dev-lang/idb/idb-13.0.0.079.ebuild
deleted file mode 100644
index 3fbc3478be91..000000000000
--- a/dev-lang/idb/idb-13.0.0.079.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="~dev-libs/intel-common-${PV}[compiler]"
-RDEPEND="${DEPEND}
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
diff --git a/dev-lang/idb/idb-13.0.1.117-r1.ebuild b/dev-lang/idb/idb-13.0.1.117-r1.ebuild
deleted file mode 100644
index b10f8517e17e..000000000000
--- a/dev-lang/idb/idb-13.0.1.117-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="~dev-libs/intel-common-${PV}[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
diff --git a/dev-lang/idb/idb-13.0.2.146.ebuild b/dev-lang/idb/idb-13.0.2.146.ebuild
deleted file mode 100644
index 5d045fb66f13..000000000000
--- a/dev-lang/idb/idb-13.0.2.146.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
diff --git a/dev-lang/idb/idb-13.0.3.163.ebuild b/dev-lang/idb/idb-13.0.3.163.ebuild
deleted file mode 100644
index dd2398c02396..000000000000
--- a/dev-lang/idb/idb-13.0.3.163.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
diff --git a/dev-lang/idb/idb-14.0.0.080.ebuild b/dev-lang/idb/idb-14.0.0.080.ebuild
deleted file mode 100644
index 7f145b6b9096..000000000000
--- a/dev-lang/idb/idb-14.0.0.080.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-_INTEL_PV1=14
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-pkg_setup() {
-	_INTEL_PV1=13 intel-sdp_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
diff --git a/dev-lang/idb/idb-14.0.1.106.ebuild b/dev-lang/idb/idb-14.0.1.106.ebuild
deleted file mode 100644
index af1acbff6c01..000000000000
--- a/dev-lang/idb/idb-14.0.1.106.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-_INTEL_PV1=14
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-pkg_setup() {
-	_INTEL_PV1=13 intel-sdp_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
diff --git a/dev-lang/idb/idb-14.0.2.144.ebuild b/dev-lang/idb/idb-14.0.2.144.ebuild
deleted file mode 100644
index c54969e51c16..000000000000
--- a/dev-lang/idb/idb-14.0.2.144.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-_INTEL_PV1=14
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-pkg_setup() {
-	_INTEL_PV1=13 intel-sdp_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
diff --git a/dev-lang/ifc/Manifest b/dev-lang/ifc/Manifest
index 96c604666fd2..65f24cd8fc59 100644
--- a/dev-lang/ifc/Manifest
+++ b/dev-lang/ifc/Manifest
@@ -1,23 +1,5 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
-DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
-DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
-DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
-DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 SHA256 e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81 WHIRLPOOL 997c96d0d9d6c603f8659a5ece91aa55b9a7bf5b428065ac55a0fa3d5577dab7fcc61157a983eb355832dc7c201fde4e5fcc9ff7bcb4d8b656847c2c1092b1dd
diff --git a/dev-lang/ifc/ifc-13.0.0.079-r1.ebuild b/dev-lang/ifc/ifc-13.0.0.079-r1.ebuild
deleted file mode 100644
index 0417a65d9d59..000000000000
--- a/dev-lang/ifc/ifc-13.0.0.079-r1.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=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=300M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/en_US/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/ifc/ifc-13.0.1.117.ebuild b/dev-lang/ifc/ifc-13.0.1.117.ebuild
deleted file mode 100644
index 4376644594c2..000000000000
--- a/dev-lang/ifc/ifc-13.0.1.117.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=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=300M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/ja_JP/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/ifc/ifc-13.1.2.146.ebuild b/dev-lang/ifc/ifc-13.1.2.146.ebuild
deleted file mode 100644
index bdb684844695..000000000000
--- a/dev-lang/ifc/ifc-13.1.2.146.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/ja_JP/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/ifc/ifc-13.1.3.163.ebuild b/dev-lang/ifc/ifc-13.1.3.163.ebuild
deleted file mode 100644
index ce9886550d70..000000000000
--- a/dev-lang/ifc/ifc-13.1.3.163.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/ja_JP/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
diff --git a/dev-lang/ifc/ifc-14.0.0.080.ebuild b/dev-lang/ifc/ifc-14.0.0.080.ebuild
deleted file mode 100644
index eb7b3151b5f8..000000000000
--- a/dev-lang/ifc/ifc-14.0.0.080.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=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/ifc/ifc-14.0.1.106.ebuild b/dev-lang/ifc/ifc-14.0.1.106.ebuild
deleted file mode 100644
index b071b9dfc806..000000000000
--- a/dev-lang/ifc/ifc-14.0.1.106.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=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/ifc/ifc-14.0.2.144.ebuild b/dev-lang/ifc/ifc-14.0.2.144.ebuild
deleted file mode 100644
index ca81b2d218f2..000000000000
--- a/dev-lang/ifc/ifc-14.0.2.144.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=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/ifc/ifc-15.0.0.090.ebuild b/dev-lang/ifc/ifc-15.0.0.090.ebuild
deleted file mode 100644
index 52c9ec4426e4..000000000000
--- a/dev-lang/ifc/ifc-15.0.0.090.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=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/ifc/ifc-15.0.1.133.ebuild b/dev-lang/ifc/ifc-15.0.1.133.ebuild
deleted file mode 100644
index 4ecbfbece4ec..000000000000
--- a/dev-lang/ifc/ifc-15.0.1.133.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=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
diff --git a/dev-lang/ifc/ifc-15.0.2.164.ebuild b/dev-lang/ifc/ifc-15.0.2.164.ebuild
deleted file mode 100644
index 627c1bcd2780..000000000000
--- a/dev-lang/ifc/ifc-15.0.2.164.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
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-
-	rm opt/intel/composerxe-2015_update2.2.164/documentation/en_US/third-party-programs.txt || die
-
-	intel-sdp_src_install
-}
diff --git a/dev-lang/ifc/ifc-15.0.3.187.ebuild b/dev-lang/ifc/ifc-15.0.3.187.ebuild
deleted file mode 100644
index 6c8fb8c97eda..000000000000
--- a/dev-lang/ifc/ifc-15.0.3.187.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-
-	intel-sdp_src_install
-}
diff --git a/dev-lang/ifc/ifc-15.0.6.233.ebuild b/dev-lang/ifc/ifc-15.0.6.233.ebuild
new file mode 100644
index 000000000000..70f2b08f1fd4
--- /dev/null
+++ b/dev-lang/ifc/ifc-15.0.6.233.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=8470
+INTEL_DPV=2015_update6
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel FORTRAN Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="linguas_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="!dev-lang/ifc[linguas_jp]"
+RDEPEND="${DEPEND}
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerprof compilerprof-devel"
+INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
+
+CHECKREQS_DISK_BUILD=375M
+
+src_install() {
+	if ! use linguas_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+
+	intel-sdp_src_install
+}
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 9e2a3cf9f803..13df3102f272 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -2,3 +2,4 @@ DIST lazarus-1.0.12-0.tar.gz 47687878 SHA256 542ddd60f4a404d7020ed6962a545db910a
 DIST lazarus-1.2.2-0.tar.gz 51558117 SHA256 ac2154c38b3918a08d762977073e606c272c5d4ba5cb4805bf8cd25965f3bd58 SHA512 ed6d228eae355860a8608263205ce00569785f8e39e06990fe8f17a5d070c05e2602d42e9258e42b0345f857e02b287083898f56dc5f4069157c9bace136988c WHIRLPOOL 514b9eac0bd59a0621d6c30f16d9d78f384dd6efddda163ee97b73ab24a42e6e630ec8fa17bc271b02a209618cd104ccb98d07637c67035a84141f148945cacb
 DIST lazarus-1.2.4-0.tar.gz 51606253 SHA256 e8622f2b29988514c9b7b7ff6cf2058a8b73e9ef0fd7998c82e1e958d2347d28 SHA512 c1858a2b89402d3cfb4baa704cdeb51dc541bf5dcac91230f93f62035988b5e5fec3851bf033876128db5da18713389a9eb6ca73c944dae36c0d6fb30e7727f8 WHIRLPOOL fddb4d650e3400b2fe1cfde1d431be3d752f81dbe715b821f55368628097225ce9156e4065f58c27346cba5a041127c25e7cc80ca15b77aab9e6188cfdd3b215
 DIST lazarus-1.2.6-0.tar.gz 51618690 SHA256 c0c7e648716f27edd6f1adf908fd5733654c3cd3db6458582ccd4343a8605eea SHA512 f7f227621ee69b7056dd87dab19e2217496ac2f280e3aa6dacdac890e55dfb9595a0562c06e50cb4b4f50d021739785d840eb19ec6d77040febb86fe78a5a47a WHIRLPOOL aff1abb59380553e92d956d35393689eed55bd8684a8c182b048cea774236defe9107b0449131a7868526721658f72e7d0c68578a55d56e53e3a68dc7d51fe3a
+DIST lazarus-1.6.0-0.tar.gz 55911739 SHA256 cbce02be1ed902a4978a13144446023d955c0db69a1dba42c93a83b8a24f3ca8 SHA512 6ac84325aa2caf7896b3cb55df72199ab04bf25320257510b288cde8fb679161834dca9ad3d07d39c164c05ab35c0cd248651a13c826d454c0dc84a558589576 WHIRLPOOL 2e3b1ac39fd79dcb457bfbe22c73ddcf781e9e5f0c263d88bd9b6e2ff9e417f2e1094702e1bc190788a1f5a86470b8165bc586f22d02a8b370db9245cfd9131e
diff --git a/dev-lang/lazarus/lazarus-1.6.0.ebuild b/dev-lang/lazarus/lazarus-1.6.0.ebuild
new file mode 100644
index 000000000000..171ae1b2280c
--- /dev/null
+++ b/dev-lang/lazarus/lazarus-1.6.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+FPCVER="2.6.4"
+
+DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
+HOMEPAGE="http://www.lazarus.freepascal.org/"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.6/${P}-0.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="minimal"
+
+DEPEND=">=dev-lang/fpc-${FPCVER}[source]
+	net-misc/rsync
+	x11-libs/gtk+:2
+	>=sys-devel/binutils-2.19.1-r1:="
+RDEPEND="${DEPEND}
+	!=gnome-base/librsvg-2.16.1"
+
+RESTRICT="strip" #269221
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch
+
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set} ; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+		#sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
+	fi
+}
+
+src_compile() {
+	LCL_PLATFORM=gtk2 emake \
+		$(usex minimal "" "bigide") \
+		-j1
+}
+
+src_install() {
+	diropts -m0755
+	dodir /usr/share
+	# Using rsync to avoid unnecessary copies and cleaning...
+	# Note: *.o and *.ppu are needed
+	rsync -a \
+		--exclude="CVS"     --exclude=".cvsignore" \
+		--exclude="*.ppw"   --exclude="*.ppl" \
+		--exclude="*.ow"    --exclude="*.a"\
+		--exclude="*.rst"   --exclude=".#*" \
+		--exclude="*.~*"    --exclude="*.bak" \
+		--exclude="*.orig"  --exclude="*.rej" \
+		--exclude=".xvpics" --exclude="*.compiled" \
+		--exclude="killme*" --exclude=".gdb_hist*" \
+		--exclude="debian"  --exclude="COPYING*" \
+		--exclude="*.app" \
+		"${S}" "${ED%/}"/usr/share \
+		|| die "Unable to copy files!"
+
+	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
+	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
+	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
+	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
+	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
+
+	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
+}
diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index 7640cd437eb1..0b781a1689e0 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -5,6 +5,9 @@
 		A Borland Delphi lookalike for linux.
 		Uses the free pascal compiler.
 	</longdescription>
+	<maintainer type="person">
+            <email>amynka@gentoo.org</email>
+        </maintainer>
 	<use>
 		<flag name="minimal">Don't build extra packages from the
 			bigide component</flag>
diff --git a/dev-lang/logtalk/Manifest b/dev-lang/logtalk/Manifest
index 1780f69f20ea..4944e412e746 100644
--- a/dev-lang/logtalk/Manifest
+++ b/dev-lang/logtalk/Manifest
@@ -1,3 +1,4 @@
 DIST lgt2410.tar.bz2 621950 SHA256 ba083578b7b8665cec8a2123152f42b4f554d586f8422ef521e32eb7e7306267 SHA512 81377ef68cd9ed6fbcfb07c818efa1c9310c3918cfdd400886141c976a3eeea0086c00fa3e9a45475b8852c3cd3163ee56def12aa26c2c360ddf2999ba9501b7 WHIRLPOOL 6775f69b6d69835acf1dc585312c2ecc56292de9fe6068ccf881611d973ed493b9420ca958eb2ce9333889a780003f6b2f9ffdfbfc83c8e8624b0bf9d9db82f5
 DIST lgt2422.tar.bz2 690047 SHA256 e8204b3182e9062f23e05d6e492a250de12b93baa8586716c8572f2266365a2e SHA512 db976729ae8499ef128f9f7ad257f600f07cb867bfb9ac350ac2c846712d18ebfd5989c674cf0a65286c6f525f5c4273d9b04632ae3719efae7d8047c448c085 WHIRLPOOL 6d76474fa586cc1c10551b2d2db36954466668716c719ce793ed2db9f663272d60462c2f7cde3783010d482df479308d0e5c0da24fd0a0f806a2055b8401d8ce
 DIST logtalk-3.00.0.tar.bz2 1886297 SHA256 7462eaf8fd7fa865f8cccbb449a97981fbcb109a21536e2420f205b3b4b814b2 SHA512 bb4ecc709e71eee9a9a532bfcef764095e581189f3e17c9c0f2d80ceeaa4dd993d7da087b07e27f4a377a40d7a798378591d89ab6c801c7a26c1b1d646c7b76c WHIRLPOOL 21c3c9fc99e89173d3e0c109ca435847c2c735e17abca70e0f0c7646a3f8a8927e00aeb075386beec4e406faeb1ec7bc9ea7ec014933e5657c7c1d5c4d52099d
+DIST logtalk-3.03.0.tar.bz2 1997131 SHA256 db48ee13f119a3956e87c2fabceddc03e008391dd1542f5e07909b3840bb0534 SHA512 8445b0dda78ce0a7a0fe380b03d061271eb924df34c8f035c96a949b177c99234e2998c65f18c55be04c7d661c94473448eb2dc79a586dbc346ab07887f0e98a WHIRLPOOL 37faa40c55c0c60dc9111fc323554fdf1747f9c3c328799fcdf73d765311a8b2af6faeab2b2523736425647a38b0c8ebce155f438efec052acc82c2c5dd8dd19
diff --git a/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch b/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
new file mode 100644
index 000000000000..b28fd4852b04
--- /dev/null
+++ b/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
@@ -0,0 +1,34 @@
+--- logtalk-3.03.0.orig/scripts/logtalk_user_setup.sh	2016-02-16 22:09:02.000000000 +0100
++++ logtalk-3.03.0/scripts/logtalk_user_setup.sh	2016-02-20 09:49:34.000000000 +0100
+@@ -110,14 +110,12 @@
+ 
+ echo "Copying Logtalk files and directories..."
+ mkdir -p "$LOGTALKUSER"/contributions
+-mkdir -p "$LOGTALKUSER"/docs
+ mkdir -p "$LOGTALKUSER"/examples
+ mkdir -p "$LOGTALKUSER"/library
+ mkdir -p "$LOGTALKUSER"/scratch
+ mkdir -p "$LOGTALKUSER"/tests
+ mkdir -p "$LOGTALKUSER"/tools
+ cp -RL "$LOGTALKHOME"/contributions "$LOGTALKUSER"/
+-cp -RL "$LOGTALKHOME"/docs "$LOGTALKUSER"/
+ cp -RL "$LOGTALKHOME"/examples "$LOGTALKUSER"/
+ cp -RL "$LOGTALKHOME"/library "$LOGTALKUSER"/
+ cp -RL "$LOGTALKHOME"/scratch "$LOGTALKUSER"/
+@@ -131,16 +129,7 @@
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2*
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.dtd
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.xsd
+-ln -sf "$LOGTALKHOME"/BIBLIOGRAPHY.bib "$LOGTALKUSER"/BIBLIOGRAPHY.bib
+-ln -sf "$LOGTALKHOME"/CUSTOMIZE.md "$LOGTALKUSER"/CUSTOMIZE.md
+-ln -sf "$LOGTALKHOME"/INSTALL.md "$LOGTALKUSER"/INSTALL.md
+-ln -sf "$LOGTALKHOME"/LICENSE.txt "$LOGTALKUSER"/LICENSE.txt
+-ln -sf "$LOGTALKHOME"/QUICK_START.md "$LOGTALKUSER"/QUICK_START.md
+-ln -sf "$LOGTALKHOME"/README.md "$LOGTALKUSER"/README.md
+-ln -sf "$LOGTALKHOME"/RELEASE_NOTES.md "$LOGTALKUSER"/RELEASE_NOTES.md
+-ln -sf "$LOGTALKHOME"/UPGRADING.md "$LOGTALKUSER"/UPGRADING.md
+ ln -sf "$LOGTALKHOME"/adapters "$LOGTALKUSER"/adapters
+-ln -sf "$LOGTALKHOME"/manuals "$LOGTALKUSER"/manuals
+ ln -sf "$LOGTALKHOME"/paths "$LOGTALKUSER"/paths
+ ln -sf "$LOGTALKHOME"/coding "$LOGTALKUSER"/coding
+ ln -sf "$LOGTALKHOME"/tools/lgtdoc/xml/lgt2html.sh "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2html
diff --git a/dev-lang/logtalk/logtalk-3.03.0.ebuild b/dev-lang/logtalk/logtalk-3.03.0.ebuild
new file mode 100644
index 000000000000..ceb2e7eec365
--- /dev/null
+++ b/dev-lang/logtalk/logtalk-3.03.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime
+
+DESCRIPTION="Open source object-oriented logic programming language"
+HOMEPAGE="http://logtalk.org"
+SRC_URI="http://logtalk.org/files/${P}.tar.bz2"
+LICENSE="logtalk"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc fop xslt"
+
+DEPEND=""
+RDEPEND="
+	xslt? ( dev-libs/libxslt )
+	fop? ( dev-java/fop )
+	${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-user-docs.patch
+}
+
+src_install() {
+	# Look at scripts/install.sh for upstream installation process.
+	# Install logtalk base
+	mv scripts/logtalk_user_setup.sh integration/
+	mkdir -p "${D}/usr/share/${P}"
+	cp -r adapters coding contributions core examples integration \
+		library paths scratch tests tools VERSION.txt \
+		loader-sample.lgt settings-sample.lgt tester-sample.lgt \
+		"${D}/usr/share/${P}" \
+		|| die "Failed to install files"
+
+	# Install mime file, the database will be updated later
+	insinto /usr/share/mime/packages
+	doins scripts/freedesktop/logtalk.xml
+
+	# Install documentation
+	dodoc ACKNOWLEDGMENTS.md BIBLIOGRAPHY.bib CUSTOMIZE.md \
+		INSTALL.md LICENSE.txt QUICK_START.md README.md \
+		RELEASE_NOTES.md UPGRADING.md VERSION.txt
+	if use doc ; then
+		dohtml -r docs/* \
+			|| die "Failed to install html core documentation"
+		dohtml -r manuals/* \
+			|| die "Failed to install html manual"
+	fi
+
+	rm -f man/man1/logtalk_backend_select.1
+	rm -f man/man1/logtalk_version_select.1
+	doman man/man1/*.1 || die "Failed to install man pages"
+
+	# Integration symlinks
+	dosym /usr/share/${P}/integration/logtalk_user_setup.sh \
+		/usr/bin/logtalk_user_setup
+	dosym /usr/share/${P}/integration/bplgt.sh \
+		/usr/bin/bplgt
+	dosym /usr/share/${P}/integration/cxlgt.sh \
+		/usr/bin/cxlgt
+	dosym /usr/share/${P}/integration/eclipselgt.sh \
+		/usr/bin/eclipselgt
+	dosym /usr/share/${P}/integration/gplgt.sh \
+		/usr/bin/gplgt
+	dosym /usr/share/${P}/integration/lplgt.sh \
+		/usr/bin/lplgt
+	dosym /usr/share/${P}/integration/qplgt.sh \
+		/usr/bin/qplgt
+	dosym /usr/share/${P}/integration/quintuslgt.sh \
+		/usr/bin/quintuslgt
+	dosym /usr/share/${P}/integration/sicstuslgt.sh \
+		/usr/bin/sicstuslgt
+	dosym /usr/share/${P}/integration/swilgt.sh \
+		/usr/bin/swilgt
+	dosym /usr/share/${P}/integration/xsblgt.sh \
+		/usr/bin/xsblgt
+	dosym /usr/share/${P}/integration/xsbmtlgt.sh \
+		/usr/bin/xsbmtlgt
+	dosym /usr/share/${P}/integration/yaplgt.sh \
+		/usr/bin/yaplgt
+
+	dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2xml.sh \
+		/usr/bin/lgt2xml
+	use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2html.sh \
+		/usr/bin/lgt2html
+	use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2txt.sh \
+		/usr/bin/lgt2txt
+	use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2md.sh \
+		/usr/bin/lgt2md
+	use fop  && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2pdf.sh \
+		/usr/bin/lgt2pdf
+
+	# Install environment files
+	echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk
+	doenvd 99logtalk
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	ewarn "Before running logtalk, users should execute"
+	ewarn "logtalk_user_setup *once*"
+	ewarn ""
+	ewarn "The following integration scripts are installed"
+	ewarn "for running logtalk with selected Prolog compilers:"
+	ewarn "B-Prolog: /usr/bin/bplgt"
+	ewarn "CxProlog: /usr/bin/cxlgt"
+	ewarn "ECLiPSe: /usr/bin/eclipselgt"
+	ewarn "GNU Prolog: /usr/bin/gplgt"
+	ewarn "Lean Prolog: /usr/bin/lplgt"
+	ewarn "Qu-Prolog: /usr/bin/qplgt"
+	ewarn "Quintus Prolog: /usr/bin/quintuslgt"
+	ewarn "SICStus Prolog: /usr/bin/sicstuslgt"
+	ewarn "SWI Prolog: /usr/bin/swilgt"
+	ewarn "XSB: /usr/bin/xsblgt"
+	ewarn "XSB MT: /usr/bin/xsbmtlgt"
+	ewarn "YAP: /usr/bin/yaplgt"
+	ewarn ""
+
+	ewarn "The environment has been set up to make the above"
+	ewarn "integration scripts find files automatically for logtalk."
+	ewarn "Please run 'etc-update && source /etc/profile' to update"
+	ewarn "the environment now, otherwise it will be updated at next"
+	ewarn "login."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 70336966da61..9159496d20c1 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1 +1,2 @@
 DIST MoarVM-2016.01.tar.gz 3314742 SHA256 d409b684c7c92b144b31cf7f0408f30ccbb033ce646f57d7fbaeb9683773e37b SHA512 019433a985c8245c231d533b8310fceda185a694681aaecb922602ad98897c636c40fbe1a36ba656af4c242b28315611f656454eb41f25e0f891b652210eb435 WHIRLPOOL f603e1f60667771e0200e731b37ff854346d00a0de484a9b3072f83e0ee624bc2b7d7e862c872d9062a4397adb5bfab31d835754966a7fe44490312c82a37e8e
+DIST MoarVM-2016.02.tar.gz 3313448 SHA256 3bdacebba98e6b2d3d10f12af0ab514dec27fb24b15ed00aef479b7d190ce40a SHA512 fdeb107e071bcd7a893f15f105e722543010a87710cbd2ac4ce322000c96c9dae5c5e661dd8d60e712c4fe22d860650a003485d75f95a5b19fcde266f8fe483d WHIRLPOOL 9ccb54d147d558b4fa52bfe9b098384b3d61dffba598db803828bb0cbbc8bae9fd6a527d093c07a421cd97a59952e11ffaf9c6cef93ce9b48778009558e96732
diff --git a/dev-lang/moarvm/moarvm-2016.02.ebuild b/dev-lang/moarvm/moarvm-2016.02.ebuild
new file mode 100644
index 000000000000..0e7c088bae43
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2016.02.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 multilib
+
+MY_PN="MoarVM"
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libuv"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/MoarVM-${PV}"
+
+src_configure() {
+	perl Configure.pl --prefix="/usr"|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index c9cefeeedc4b..76e7c0da11e7 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1 +1,2 @@
 DIST nqp-2016.01.tar.gz 5117110 SHA256 87875120af7167093643f2a35869d66a61f735220a9348627ba89cf294387c8b SHA512 e79668f7f5f3679fe3b93f63e1151da1eab109ef4acc6f8ae3da3d9e5c3da814440dd43279978b1a13f30647d7c52bda5575b02f366bd928965b06b47c6d6d91 WHIRLPOOL d2369417707332d8bc045f6f93da81e1301ec2599f197664d80e6edeefc1bc7a2147ad3b7e893eef0fb6b96adf2f68f5ab44b948801e266e68d99552253abeda
+DIST nqp-2016.02.tar.gz 5121833 SHA256 051ddd4bab8f73a688836d896340320ff7043a6ecbd5c53be099249e75e33b8d SHA512 9a3233e351ebdf73ed27d3eade2052936d1a49ea95d32a8176e426e7126c720e4a3f69dedc4067925272293329b08ab397f6a7523b9e4129952847fbd86fcf0d WHIRLPOOL 1bad2dc420d59f07c3d9b8d9dcc78d51a772ed2672419fc53e427c68e24fce5645a0dcfd4a4e138e6333f9e909297b49fafe190e6dc763cca8e52dce20309ec5
diff --git a/dev-lang/nqp/nqp-2016.02.ebuild b/dev-lang/nqp/nqp-2016.02.ebuild
new file mode 100644
index 000000000000..ab671dfb77de
--- /dev/null
+++ b/dev-lang/nqp/nqp-2016.02.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# still not working
+RESTRICT="test"
+
+inherit eutils multilib versionator
+
+GITCRAP=1d6b8cb
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc java +moar"
+REQUIRED_USE="|| ( java moar )"
+
+RDEPEND="
+	java? ( >=virtual/jre-1.7 )
+	moar? ( ~dev-lang/moarvm-${PV} )
+	dev-libs/libffi"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+S=${WORKDIR}/perl6-nqp-${GITCRAP}
+
+src_configure() {
+	use java && myconf+="jvm,"
+	use moar && myconf+="moar,"
+	perl Configure.pl --backend=${myconf} --prefix=/usr || die
+	# dirty hack to make dyncall not fail
+	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
+	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
+	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
+
+	# more dirty hack to allow building with newer gcc
+	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
+	sed -i -e 's/-Werror=nested-externs//' Makefile || die
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.pod || die
+
+	if use doc; then
+		dodoc -r docs/* || die
+	fi
+}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index 51dfadefa5c8..37e1a28799a4 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -3,4 +3,6 @@ DIST python-exec-2.0.2.tar.bz2 82217 SHA256 c411638fe94953c1e8ff57e7b66f601a8176
 DIST python-exec-2.1.tar.bz2 82167 SHA256 adac4e9ae677ca0fbb9efc55573ecbb0e8361ed7a60a5241e7abc1056fba06ad SHA512 cadfb7723aa412caec4a449909769b14a800c19650c64768b0ffb30b2c0645e70c9a039f960f3263c6c18490bb73c0129b83a72c7407f558bcaf3652cc4c8bcf WHIRLPOOL 72b73b216faf7caa8afbc3ce316771bd832e468cf84835267dc3833d5c52fce24578e09f2d3aa8a322f324426eda5e53bd9611711ea976679574b2be764c2525
 DIST python-exec-2.2.1.tar.bz2 82990 SHA256 c0fcb0c9593b26cf56cdf39ff265586a2203d608f6bfafecde0ff756de019f04 SHA512 3ca01ce229e4ecdf09a55f6bad0c90c1f0a9cff1fecb0013bb2ada1e187044631ad01af0fa70fb805465dd4e6c953cc97203d91f55ccb5208f63bf4771c0bb20 WHIRLPOOL 92e9c4629f292a0f517927e05aceda68f0c797426070ec23139dedeb1eac4d2a315892fd231ee0fe019dd3e9c6bd148fad9764ad65617012b1ef0bfbe0415506
 DIST python-exec-2.2.tar.bz2 82269 SHA256 041dccf96c31bfac5eee9c43bdf511821449313a5b7d0bd745bed09151e1bffe SHA512 9492d94e7134b555a2f3b81cbd4e159074fed21b1471090547618da34dab70264a3fa40c8b7f79c42b61938655006dd5659e26389649a2401c26b4e0c90c9ac1 WHIRLPOOL 0b13d73c2e3c9606589201af34504c317965c29bb5cfe211479d893c606ca05dff62755fcba5f76d0a653a2719f36119e6f3db050ffa9f9bb01ef2ff7b68cb4d
+DIST python-exec-2.3.2.tar.bz2 84786 SHA256 c575247d6152c4f524c716a7fed879ffeb9ca7d65fac591b05cf0d726bf9cd1f SHA512 7beb938e338eb9abc711f6ba844f57647b679fe3e2b2d984897de142b81506bf5614565c30c119905bbb6949c5717d8ba23d5c9fd0208d554cd62fb5bb0ca30e WHIRLPOOL 47a4e5d76c1f40184b54e1cb8535ddbbf0a0f3042f59190730e6270acbc1ff8ba303c88cee818e88108d64cf25c6f13d869cf5aba74f51f11bf408723b8af274
 DIST python-exec-2.3.tar.bz2 84201 SHA256 04f7c92727f666e4f950157a39ed6ac0a48d1a746736cc515a97195a30a3f9fe SHA512 fc6b8702a7009873b42dcde4b1771913f43ab45d92c62b9856a903b48dbe32c4ab588abe239e4512d9e2026a24aff26ec572f5cd98613e6a0160dcbd642e0849 WHIRLPOOL 3c5c238dbbf174dbbede06109bfc32e9675f53ded011dffdc0ce9327adff778bec6d89aba18ea531548d3e1ed17808f1a29cc1085f620baada74d71695f56b41
+DIST python-exec-2.4.2.tar.bz2 86808 SHA256 d3659764eeb462492a0e6586e74d618a1e2329353dddcf50519052a9a6a1dbe5 SHA512 728bf9fc23ce5f8ebdd2f8c385f779378beb8eabb61d227df9a40dad1157eb4619426b14eaf1f44d0591f2110c7930cdbe7c9ee3eb380574fafa243a19b128d3 WHIRLPOOL 9cc952c33634be6463ad69f162dfb514bc2573535a324736a4f7d8d1158470f2e47cdc0ad05b0ac8e60c098d7a4308a888943f966fb3c10a1a09657363947aaa
diff --git a/dev-lang/python-exec/python-exec-2.3.2.ebuild b/dev-lang/python-exec/python-exec-2.3.2.ebuild
new file mode 100644
index 000000000000..121f31e7587c
--- /dev/null
+++ b/dev-lang/python-exec/python-exec-2.3.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# eselect-python because of /usr/bin/python* collisions and new config
+# python versions because of missing $scriptdir/python* symlinks
+RDEPEND="
+	!<app-eselect/eselect-python-20160206
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=( "${EPYTHON}" )
+	done
+
+	local myconf=(
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Prepare and own the template
+	sed -n -e '/^#/p' config/python-exec.conf.example \
+		> "${T}"/python-exec.conf || die
+	insinto /etc/python-exec
+	doins "${T}"/python-exec.conf
+
+	local f
+	for f in python{,2,3}; do
+		# symlink the C wrapper for python to avoid shebang recursion
+		# bug #568974
+		dosym python-exec2c /usr/bin/"${f}"
+	done
+	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+		# those are python scripts (except for new python-configs)
+		# so symlink them via the python wrapper
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then
+		# preserve current configuration
+		cp "${EROOT}"etc/python-exec/python-exec.conf \
+			"${ED}"etc/python-exec/python-exec.conf || die
+	else
+		# preserve previous Python version preference
+		local py old_pythons=()
+		local config_base=${EROOT}etc/env.d/python
+
+		# start with the 'global' preference (2 vs 3)
+		if [[ -f ${config_base}/config ]]; then
+			old_pythons+=( "$(<${config_base}/config)" )
+		fi
+
+		# then try specific py3 selection
+		for py in 3; do
+			local target=
+
+			if [[ -f ${config_base}/python${py} ]]; then
+				# try the newer config files
+				target=$(<${config_base}/python${py})
+			elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+				# check the older symlink format
+				target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+				# check if it's actually old eselect symlink
+				[[ ${target} == python?.? ]] || target=
+			fi
+
+			# add the extra target if found and != global
+			if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then
+				old_pythons+=( "${target}" )
+			fi
+		done
+
+		if [[ ${old_pythons[@]} ]]; then
+			einfo "Keeping the following Python preference: ${old_pythons[*]}"
+
+			local IFS=$'\n'
+			echo "${old_pythons[*]}" \
+				>> "${ED}"etc/python-exec/python-exec.conf || die
+		fi
+	fi
+}
diff --git a/dev-lang/python-exec/python-exec-2.4.2.ebuild b/dev-lang/python-exec/python-exec-2.4.2.ebuild
new file mode 100644
index 000000000000..121f31e7587c
--- /dev/null
+++ b/dev-lang/python-exec/python-exec-2.4.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# eselect-python because of /usr/bin/python* collisions and new config
+# python versions because of missing $scriptdir/python* symlinks
+RDEPEND="
+	!<app-eselect/eselect-python-20160206
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=( "${EPYTHON}" )
+	done
+
+	local myconf=(
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Prepare and own the template
+	sed -n -e '/^#/p' config/python-exec.conf.example \
+		> "${T}"/python-exec.conf || die
+	insinto /etc/python-exec
+	doins "${T}"/python-exec.conf
+
+	local f
+	for f in python{,2,3}; do
+		# symlink the C wrapper for python to avoid shebang recursion
+		# bug #568974
+		dosym python-exec2c /usr/bin/"${f}"
+	done
+	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+		# those are python scripts (except for new python-configs)
+		# so symlink them via the python wrapper
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then
+		# preserve current configuration
+		cp "${EROOT}"etc/python-exec/python-exec.conf \
+			"${ED}"etc/python-exec/python-exec.conf || die
+	else
+		# preserve previous Python version preference
+		local py old_pythons=()
+		local config_base=${EROOT}etc/env.d/python
+
+		# start with the 'global' preference (2 vs 3)
+		if [[ -f ${config_base}/config ]]; then
+			old_pythons+=( "$(<${config_base}/config)" )
+		fi
+
+		# then try specific py3 selection
+		for py in 3; do
+			local target=
+
+			if [[ -f ${config_base}/python${py} ]]; then
+				# try the newer config files
+				target=$(<${config_base}/python${py})
+			elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+				# check the older symlink format
+				target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+				# check if it's actually old eselect symlink
+				[[ ${target} == python?.? ]] || target=
+			fi
+
+			# add the extra target if found and != global
+			if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then
+				old_pythons+=( "${target}" )
+			fi
+		done
+
+		if [[ ${old_pythons[@]} ]]; then
+			einfo "Keeping the following Python preference: ${old_pythons[*]}"
+
+			local IFS=$'\n'
+			echo "${old_pythons[*]}" \
+				>> "${ED}"etc/python-exec/python-exec.conf || die
+		fi
+	fi
+}
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild
index b13bf8bf4d6d..b835c894838d 100644
--- a/dev-lang/python-exec/python-exec-9999.ebuild
+++ b/dev-lang/python-exec/python-exec-9999.ebuild
@@ -68,10 +68,16 @@ src_install() {
 	insinto /etc/python-exec
 	doins "${T}"/python-exec.conf
 
-	# Create Python interpreter executable wrappers
 	local f
-	for f in python{,2,3}{,-config} 2to3 idle pydoc pyvenv; do
-		dosym python-exec2-c /usr/bin/"${f}"
+	for f in python{,2,3}; do
+		# symlink the C wrapper for python to avoid shebang recursion
+		# bug #568974
+		dosym python-exec2c /usr/bin/"${f}"
+	done
+	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+		# those are python scripts (except for new python-configs)
+		# so symlink them via the python wrapper
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
 	done
 }
 
diff --git a/dev-lang/python/python-2.7.11-r2.ebuild b/dev-lang/python/python-2.7.11-r2.ebuild
index 6fccccee1e80..d9fd3d660f72 100644
--- a/dev-lang/python/python-2.7.11-r2.ebuild
+++ b/dev-lang/python/python-2.7.11-r2.ebuild
@@ -104,6 +104,8 @@ src_prepare() {
 	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
 	epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
 
+	epatch_user
+
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \
 		Lib/distutils/sysconfig.py \
@@ -115,8 +117,6 @@ src_prepare() {
 		Modules/getpath.c \
 		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
-	epatch_user
-
 	eautoreconf
 }
 
diff --git a/dev-lang/python/python-3.4.3-r7.ebuild b/dev-lang/python/python-3.4.3-r7.ebuild
index f599fd900e5a..8272a412760d 100644
--- a/dev-lang/python/python-3.4.3-r7.ebuild
+++ b/dev-lang/python/python-3.4.3-r7.ebuild
@@ -75,6 +75,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
 	epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
 
+	epatch_user
+
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \
 		Lib/distutils/sysconfig.py \
@@ -86,8 +88,6 @@ src_prepare() {
 		Modules/getpath.c \
 		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
-	epatch_user
-
 	eautoreconf
 }
 
diff --git a/dev-lang/python/python-3.5.1-r2.ebuild b/dev-lang/python/python-3.5.1-r2.ebuild
index 7f82e77d001c..d73faa1d5e60 100644
--- a/dev-lang/python/python-3.5.1-r2.ebuild
+++ b/dev-lang/python/python-3.5.1-r2.ebuild
@@ -73,6 +73,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
 	epatch "${FILESDIR}/3.5-secondary-targets.patch"
 
+	epatch_user
+
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		configure.ac \
 		Lib/distutils/command/install.py \
@@ -87,8 +89,6 @@ src_prepare() {
 
 	#sed -i -e 's/\$(GRAMMAR_H): \$(GRAMMAR_INPUT) \$(PGEN)/$(GRAMMAR_H): \$(GRAMMAR_INPUT)/' Makefile.pre.in || die
 
-	epatch_user
-
 	eautoreconf
 }
 
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 66dca89eac8f..c7a3eef62e97 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,2 +1,4 @@
 DIST qp9.1.tar.gz 1460679 SHA256 1f3052f2700d537b33207943a3ade48b2b3aa5cd01cafc0475bcf26c645bc9af SHA512 44590be9d1ecec97fa6c82b657e9ecc3778f833644055ee87c9a6a36996663d139ffd7b583d72f8ac317648e0f22ccbc2a1da9c3a5eabd23381c668e5d073cbb WHIRLPOOL 37ec4e25c2284b267f72c016b4ea1e542d735c9da5f6532d1f6b439af2b91422ddc251d31e1a17b6366ee6af0e754acdbf8a0c44ef03f46a2515f14b1259b732
 DIST qp9.5.tar.gz 1537445 SHA256 7e4b9883fad00b16c919620033da48482b2eccc875b37f8170d674ce9f72aee2 SHA512 7a79090a6e3f0263e38cf5e5724a5c35c63c8cca2842fa8c07f9ff84011ef7ac9a22b195713aeb626a787c9391c612f3fea0ff38c084634a2f62258feb3eb6e2 WHIRLPOOL 3f589998f3480925fa3ad3c54f1f0ba4122cfa12c48d9bf1269e92a0fdf52d1823cd8dae8851e36d2c97ec2f869da10ff6ee7f2663b752d1d396e1b5a95ca982
+DIST qp9.6.tar.gz 1539483 SHA256 631ab73af271279d583c5ecf19e5542dd8dff097179e3bb34ac2624aeb029f7a SHA512 a15d3f2254d9ed9a2032f7e2902363f2ed2dbf0a7ba67a89aae79202d38954a195e93725aa828d19d50d7a891d8cea4f0d23af66ffd55984738db9b612467cd8 WHIRLPOOL 3dcc746da3283044267abd7aa00795b1bff79bffd206c1bf227087281d94f2dc4a390a5ccd85933641aea150313b2f62e0e9fbe491ef4fafa73e4fdd9b35d7d1
+DIST qp9.7.tar.gz 1539804 SHA256 9b77c97e0cb981669cf27df0f68875ba44958e67cc82ac71a4f5d2665b96708b SHA512 20a7a00eab2ec489489f95d78eb4dc8edf71d99fae2f23807158ca78d0bbd1b66d03460f0e06f91ac4ecafd9aab2bbdd109368ba8d3cc2c8452e17c634035c19 WHIRLPOOL 20a790902848790cfedefc6434eda01bb4b0ed2cfdf26c7d1a7914cef9916d161fcd397001a7f5a0aadf2d710112446bd99103f161ef22ad7b3567b45b33ac6d
diff --git a/dev-lang/qu-prolog/qu-prolog-9.6.ebuild b/dev-lang/qu-prolog/qu-prolog-9.6.ebuild
new file mode 100644
index 000000000000..057bf8d3fbab
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-9.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
+
+LICENSE="Qu-Prolog GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples pedro qt4 readline threads"
+
+RDEPEND="
+	!dev-util/mpatch
+	!dev-util/rej
+	qt4? ( dev-qt/qtgui:4 )
+	pedro? ( net-misc/pedro )
+	readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable debug) \
+		$(use_enable threads multiple-threads)
+
+	if use qt4; then
+		cd "${S}"/src/xqp || die
+		eqmake4 xqp.pro
+	fi
+}
+
+src_compile() {
+	emake OPTIMISATION="${CXXFLAGS}"
+
+	if use qt4; then
+		cd "${S}"/src/xqp || die
+		emake
+	fi
+}
+
+src_install() {
+	sed \
+		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
+		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
+
+	dobin bin/{qc,qecat,qp,kq}
+
+	into /usr/$(get_libdir)/${PN}
+	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
+
+	use qt4 && dobin src/xqp/xqp
+
+	insinto /usr/$(get_libdir)/${PN}/bin
+	doins bin/rl_commands
+	doins bin/{qc1.qup,qecat,qg,qp}.qx
+
+	insinto /usr/$(get_libdir)/${PN}/library
+	doins prolog/library/*.qo
+
+	insinto /usr/$(get_libdir)/${PN}/compiler
+	doins prolog/compiler/*.qo
+
+	doman doc/man/man1/*.1
+
+	dodoc README
+
+	if use doc ; then
+		docinto reference-manual
+		dodoc doc/manual/*.html
+		docinto user-guide
+		dodoc doc/user/main.pdf
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.ql
+		docinto examples
+		newdoc examples/README README.examples
+	fi
+}
diff --git a/dev-lang/qu-prolog/qu-prolog-9.7.ebuild b/dev-lang/qu-prolog/qu-prolog-9.7.ebuild
new file mode 100644
index 000000000000..057bf8d3fbab
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-9.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
+
+LICENSE="Qu-Prolog GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples pedro qt4 readline threads"
+
+RDEPEND="
+	!dev-util/mpatch
+	!dev-util/rej
+	qt4? ( dev-qt/qtgui:4 )
+	pedro? ( net-misc/pedro )
+	readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable debug) \
+		$(use_enable threads multiple-threads)
+
+	if use qt4; then
+		cd "${S}"/src/xqp || die
+		eqmake4 xqp.pro
+	fi
+}
+
+src_compile() {
+	emake OPTIMISATION="${CXXFLAGS}"
+
+	if use qt4; then
+		cd "${S}"/src/xqp || die
+		emake
+	fi
+}
+
+src_install() {
+	sed \
+		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
+		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
+
+	dobin bin/{qc,qecat,qp,kq}
+
+	into /usr/$(get_libdir)/${PN}
+	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
+
+	use qt4 && dobin src/xqp/xqp
+
+	insinto /usr/$(get_libdir)/${PN}/bin
+	doins bin/rl_commands
+	doins bin/{qc1.qup,qecat,qg,qp}.qx
+
+	insinto /usr/$(get_libdir)/${PN}/library
+	doins prolog/library/*.qo
+
+	insinto /usr/$(get_libdir)/${PN}/compiler
+	doins prolog/compiler/*.qo
+
+	doman doc/man/man1/*.1
+
+	dodoc README
+
+	if use doc ; then
+		docinto reference-manual
+		dodoc doc/manual/*.html
+		docinto user-guide
+		dodoc doc/user/main.pdf
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.ql
+		docinto examples
+		newdoc examples/README README.examples
+	fi
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 030bae90ea73..4ee253d28f34 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1 +1,2 @@
 DIST rakudo-2016.01.1.tar.gz 2687265 SHA256 897d01bcb27c209bd51918bb5be6adc6e6ea9dbc2c6b65414f9ac081aa8c5d7b SHA512 31228d49577f5d25b306a987650af0ae11bb2fa80fcaeee421dbe88dc9812edd5a399999f8727dee11d74177b7b9bca0290e26c4240c7baed35fabb4c912f85f WHIRLPOOL 52b2d7d1a0461883b1d07bbb492994f7eb8930a8726565d9a4788883e16510fc052dc066bf8443e09042548d76a3f3ca1cb17be8baa23b16f5742eb52f33c39b
+DIST rakudo-2016.02.tar.gz 2691766 SHA256 8ccfbf24f49bf4f5aa0304ffa69abbd90b97dc59f2c65e2384c6b609e3d3f00a SHA512 9fa891a84e882626050772231dee15ad20f1c2d84b5b9ff985964efbff45f18e0a1940dad2cc1fbb8b91f69d9f7f2a3034998819e8ddbf0c380684b326d299ca WHIRLPOOL 2a55ec29df905ec79fee842f84394ac8733d1b116fc90c29a06e8953a77b15bfc193d974a804f99d41ee0b9fce87d4b07ff6e367f03243d08d03f20340fe766e
diff --git a/dev-lang/rakudo/rakudo-2016.02.ebuild b/dev-lang/rakudo/rakudo-2016.02.ebuild
new file mode 100644
index 000000000000..623e8f443bd6
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2016.02.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="test"
+
+RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10"
+
+#PATCHES=(${FILESDIR}/${PV})
+
+src_configure() {
+	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar
+}
+
+src_test() {
+	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
+	default
+}
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index c74a6d6174d6..405c169588ab 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -181,8 +181,6 @@ DIST scala-2.11.7-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bcc
 DIST scala-2.11.7-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
 DIST scala-2.11.7-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
 DIST scala-2.11.7.tar.gz 6443003 SHA256 1679ee604bc4e881b0d325e164c39c02dcfa711d53cd3115f5a6c9676c5915ef SHA512 f74614a303bdc28068b212e9fe4aa499db4a5a9ff87bf1af93d6b3598784edd3f2e37cedbdbc20c9aa507965845b4b511bfc786ff82f31dbc3365af796062611 WHIRLPOOL d7ebd8b9a6c34d90d7b7dd62d79406ff2776ed65037e93cd20c0ce2f954e3380896b67ee88813abe322303ebb7894070c68b1045ce71923ae26e876f1fa57a88
-DIST scala-2.9.2-gentoo-binary.tar.bz2 32370003 SHA256 43e07596f28e723cf1e2d41ed95c312af8422059de8c229d18eadb46d487c9ca SHA512 b0873dbe5d93b1665372c44f9473e1d4616f5347c26e0950cf2366b08e1f68069b1c527bda7bfcecb8af4afeaa1c9cae7d324d36509d5f2072e725310fd1cc7b WHIRLPOOL ffcba39e9f04eccadc16bda8770e42f2725fcf21172f7f6798f3849282c276d3671c93e0eaeb4a0a46a73a815cb31300302354f8e99ce888a5687739ab0f50f8
-DIST scala-2.9.2.tar.gz 38434121 SHA256 1b931103051f4f6b2f8788ac6f5392b5f29e1109e97f0e19340ff6185fbab4ad SHA512 c8ce17728976c506c90d2eec792904d39a16d35d153914a7c936e43e530f20d8cdf494287187c513393e2db7837b8ec9d417c56f6bb47be3b0501f2a57f52b63 WHIRLPOOL 08774dd06a6814a33a21643a0af361310ca8aae649968d4d411a3ffba32e855d320f052bda0707db356c01e1f4e1c1b0cafd67881d1666d046ad8934084e7635
 DIST scala-2.9.3-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
 DIST scala-2.9.3-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
 DIST scala-2.9.3-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
diff --git a/dev-lang/scala/scala-2.10.2-r3.ebuild b/dev-lang/scala/scala-2.10.2-r3.ebuild
index 9ae487c09913..41067bf211c6 100644
--- a/dev-lang/scala/scala-2.10.2-r3.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -73,7 +73,6 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	=virtual/jdk-1.7*
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		dev-java/ant-contrib:0
 	)
diff --git a/dev-lang/scala/scala-2.10.3-r2.ebuild b/dev-lang/scala/scala-2.10.3-r2.ebuild
index 40a9e351d137..32db056a93c7 100644
--- a/dev-lang/scala/scala-2.10.3-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -84,7 +84,6 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	=virtual/jdk-1.7*
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
diff --git a/dev-lang/scala/scala-2.10.4-r2.ebuild b/dev-lang/scala/scala-2.10.4-r2.ebuild
index c3e0af4ea0e5..ddde1171315a 100644
--- a/dev-lang/scala/scala-2.10.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		=virtual/jdk-1.7*
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.10.6.ebuild b/dev-lang/scala/scala-2.10.6.ebuild
index 8bf584d6c00e..cf4d985e57bd 100644
--- a/dev-lang/scala/scala-2.10.6.ebuild
+++ b/dev-lang/scala/scala-2.10.6.ebuild
@@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		=virtual/jdk-1.7*
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
index 6b222043bcb2..5549c589453b 100644
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild
index 0f3b1ae16921..f265eabaa52a 100644
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index e384d9d5c77e..464ddf1676ee 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild
index 4d8c9fde4661..141f8517c76b 100644
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild
index c4bafb09624a..c28cc61d6c4d 100644
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild
index 0cedfbd1bfd8..e1ac0212e2db 100644
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.9.2-r1.ebuild b/dev-lang/scala/scala-2.9.2-r1.ebuild
deleted file mode 100644
index 094572bbf067..000000000000
--- a/dev-lang/scala/scala-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,148 +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"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-sources-${PV}"
-SV="$(get_version_component_range 1-2)"
-
-# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc examples source" ebuild scala-*.ebuild compile
-# cd $WORDKIR
-# fix dist/latest link.
-# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.tgz -> ${P}.tar.gz )
-	binary? ( https://dev.gentoo.org/~ali_bush/distfiles/${P}-gentoo-binary.tar.bz2 )"
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="binary emacs"
-# one fails with 1.7, two with 1.4 (blackdown)
-#RESTRICT="test"
-
-DEPEND="virtual/jdk:1.6
-	java-virtuals/jdk-with-com-sun
-	!binary? (
-		dev-java/ant-contrib:0
-	)
-	app-arch/xz-utils"
-RDEPEND=">=virtual/jre-1.6
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin"
-
-PDEPEND="emacs? ( app-emacs/scala-mode )"
-
-S="${WORKDIR}/${P}-sources"
-
-CHECKREQS_MEMORY="1532M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		CHECKREQS_MEMORY="1532M"
-
-		check-reqs_pkg_setup
-	fi
-}
-
-java_prepare() {
-	if ! use binary; then
-		pushd lib &> /dev/null
-		# other jars are needed for bootstrap
-		#rm -v jline.jar ant/ant-contrib.jar #cldcapi10.jar midpapi10.jar msil.jar *.dll || die
-		rm -v ant/ant-contrib.jar || die
-		java-pkg_jar-from --into ant --build-only ant-contrib
-		popd &> /dev/null
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		#unset ANT_OPTS as this is set in the build.xml
-		#sets -X type variables which might come back to bite me
-		unset ANT_OPTS
-
-		# reported in bugzilla that multiple launches use less resources
-		# https://bugs.gentoo.org/show_bug.cgi?id=282023
-		eant all.clean
-		eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
-			newlibs newforkjoin build-opt
-		eant dist.done
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	eant test.suite || die "Some tests aren't passed"
-}
-
-#scala_launcher() {
-#	local SCALADIR="${EPREFIX}/usr/share/${PN}"
-#	local bcp="${EPREFIX}${SCALADIR}/lib/scala-library.jar"
-#	java-pkg_dolauncher "${1}" --main "${2}" \
-#		--java_args "-Xmx256M -Xms32M -Dscala.home=${SCALADIR} -Denv.emacs=${EMACS}"
-#}
-
-src_install() {
-	cd dists/latest || die
-
-	local SCALADIR="/usr/share/${PN}-${SV}"
-
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-
-	#sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins src/*-src.jar
-	fi
-
-	java-pkg_dojar lib/*.jar
-
-	pushd man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd
-
-	#docs and examples are not contained in the binary tgz anymore
-	if ! use binary; then
-		local docdir="doc/${PN}-devel-docs"
-		dodoc doc/README ../../docs/TODO || die
-		if use doc; then
-			java-pkg_dojavadoc "${docdir}/api"
-			dohtml -r "${docdir}/tools" || die
-		fi
-
-		use examples && java-pkg_doexamples "${docdir}/examples"
-	fi
-
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		#pushd "${ED}/usr/bin" &>/dev/null
-		local _name=$(basename "${b}")
-		dosym "/usr/share/${PN}-${SV}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-		#popd &>/dev/null
-	done
-	#scala_launcher fsc scala.tools.nsc.CompileClient
-	#scala_launcher scala scala.tools.nsc.MainGenericRunner
-	#scala_launcher scalac scala.tools.nsc.Main
-	#scala_launcher scaladoc scala.tools.nsc.ScalaDoc
-	#scala_launcher scalap scala.tools.scalap.Main
-}
diff --git a/dev-lang/scala/scala-2.9.3.ebuild b/dev-lang/scala/scala-2.9.3.ebuild
index fbb26b83a42c..265c450cc381 100644
--- a/dev-lang/scala/scala-2.9.3.ebuild
+++ b/dev-lang/scala/scala-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -79,7 +79,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		=virtual/jdk-1.7*
 		dev-java/ant-core:0
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index bd16fe6e9ab4..45577ad65370 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,4 +1,3 @@
-DIST firefox-3.6.15.source.tar.bz2 51552828 SHA256 405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f SHA512 82bf0a6c6cb30fc0b18b067ac3d9cb7e48a0fd0126edd851e628d49e429aea33500a5a5eba87bce922e51b1b7410ccccfe4f8b7ce5573bdbd718c76da7acb1da WHIRLPOOL b788d7ba2cfcaec4f317e615878401a7a1fb985aaa43829831c17b699812e59adb7874247114e0143da63198118cab059796fc5d5fd08d72ccc54b4fef279f85
 DIST js-1.7.0.tar.gz 1165607 SHA256 44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51 WHIRLPOOL 8044b306b3a1f0abed5ac8a6bf4f9ed70e1ebc6f83f44934a6306d9ed68cd73124f82e40430d764f158377031f5ee986595e58fdb52259ab6a3a8674eaf4eed1
 DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 WHIRLPOOL 58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e
 DIST mozjs-24.2.0.tar.bz2 15624530 SHA256 e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8 SHA512 49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4 WHIRLPOOL ea74d19c79b1a0fe407e2803900c49c23e8b76444fb4e20995072c3c59427e8df1895df04f2f4de779a1c58cd1166dd97aeaf7564350832011efe89dbcf9583e
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch
deleted file mode 100644
index 106ec144f893..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/js-1.8.5/js/src/configure.in	2011-03-31 15:08:36.000000000 -0400
-+++ b/js-1.8.5/js/src/configure.in	2012-11-02 15:32:38.000000000 -0400
-@@ -3550,7 +3550,7 @@
- _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
-   # gcc needs -mfpu=neon to recognize NEON instructions
--  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+  CFLAGS="$CFLAGS -mfpu=neon"
- fi
- AC_TRY_COMPILE([],
-                [asm("vadd.i8 d0, d0, d0");],
-@@ -4654,12 +4654,6 @@
- dnl ========================================================
- MOZ_ARG_HEADER(Individual module options)
- 
--dnl Setup default CPU arch for arm target
--case "$target_cpu" in
--  arm*)
--    MOZ_ARM_ARCH=armv7
--  ;;
--esac
- dnl ========================================================
- dnl = Enable building the Thumb2 instruction set
- dnl ========================================================
-@@ -4668,66 +4662,35 @@
-     MOZ_THUMB2=1,
-     MOZ_THUMB2=)
- if test -n "$MOZ_THUMB2"; then
--  MOZ_ARM_ARCH=armv7
-+    AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what you are doing])
-+else
-+    AC_MSG_CHECKING([for thumb2 support in arm architecture])
-+    AC_LANG_SAVE
-+    AC_LANG_C
-+    AC_TRY_LINK([int ac_test(int i) { return i; }],[asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1;],
-+      [MOZ_THUMB2=1
-+        AC_MSG_RESULT([yes])],
-+      [MOZ_THUMB2=
-+        AC_MSG_RESULT([no])])
-+    AC_LANG_RESTORE
- fi
- 
- dnl ========================================================
- dnl = Enable building for ARM specific CPU features
- dnl ========================================================
--MOZ_ARG_WITH_STRING(cpu-arch,
--[  --with-cpu-arch=arch      Use specific arm architecture CPU features, default armv7],
--    MOZ_ARM_ARCH=$withval)
--
- if test -n "$MOZ_THUMB2"; then
-   case "$target_cpu" in
-     arm*)
--      if test "$MOZ_ARM_ARCH" != "armv7"; then
--        AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH])
--      fi
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_THUMB2)
--        AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-       fi
-     ;;
--    *)
--      AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])
--    ;;
--  esac
--elif test "$MOZ_ARM_ARCH" = "armv7"; then
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--      else
--        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
--      fi
--    ;;
--    *)
--      AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
--    ;;
--  esac
--else
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--      fi
--      ;;
-   esac
- fi
- 
- AC_SUBST(MOZ_THUMB2)
--AC_SUBST(MOZ_ARM_ARCH)
- 
- dnl ========================================================
- dnl =
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
deleted file mode 100644
index 65d0a2df8ba6..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/js/src/Makefile.in	2012-06-18 13:53:41.000000000 -0400
-+++ b/js/src/Makefile.in	2012-06-18 13:55:44.000000000 -0400
-@@ -965,10 +965,10 @@
- endif
- endif
- 
--install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
--ifneq (,$(LIBRARY))
--	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
--	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
-+install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
-+ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
-+	$(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst $(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
- endif
- ifneq (,$(SHARED_LIBRARY))
- ifeq (,$(HOST_BIN_SUFFIX))
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
deleted file mode 100644
index 847bf792c5b2..000000000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
---- a/js/src/jsapi-tests/Makefile.in
-+++ b/js/src/jsapi-tests/Makefile.in
-@@ -55,17 +55,17 @@ CPPSRCS = \
-   testSameValue.cpp \
-   testDebugger.cpp \
-   testDefineGetterSetterNonEnumerable.cpp \
-   testExtendedEq.cpp \
-   $(NULL)
- 
- DEFINES         += -DEXPORT_JS_API
- 
--LIBS      = $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
-+LIBS      = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS)
- 
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
- 
- ifdef _MSC_VER
- ifdef WINCE
- WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
- endif
- endif
diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild
deleted file mode 100644
index b38ada4235d2..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-MY_P="js-${PV}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="threadsafe unicode"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.5-build.patch"
-	epatch "${FILESDIR}/${PN}-1.6-header.patch"
-	epatch "${FILESDIR}/${P}-threadsafe.diff"
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
-	fi
-}
-
-src_compile() {
-	use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
-	tc-export CC LD AR
-	if use threadsafe; then
-		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
-		|| die "emake with threadsafe enabled failed";
-	else
-		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
-		|| die "emake without threadsafe enabled failed";
-	fi
-}
-
-src_install() {
-	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
-	dodoc ../jsd/README
-	dohtml README.html
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
deleted file mode 100644
index 9fc66714efa4..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-MY_P="js-${PV}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="threadsafe unicode"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.5-build.patch"
-	epatch "${FILESDIR}/${PN}-1.6-header.patch"
-	epatch "${FILESDIR}/${P}-threadsafe.diff" \
-		"${FILESDIR}"/${P}-ldflags.patch
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
-	fi
-}
-
-src_compile() {
-	use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
-	tc-export CC LD AR
-	if use threadsafe; then
-		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
-			XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}" \
-				|| die "emake with threadsafe enabled failed";
-	else
-		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" XLDFLAGS="$(raw-ldflags)" \
-		HOST_LDFLAGS="${LDFLAGS}" || die "emake without threadsafe enabled failed";
-	fi
-}
-
-src_install() {
-	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
-	dodoc ../jsd/README
-	dohtml README.html
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild
deleted file mode 100644
index 2a130bc464c7..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs multilib
-
-MY_P="js-${PV}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="threadsafe"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.5-build.patch"
-	epatch "${FILESDIR}/${PN}-1.6-header.patch"
-	epatch "${FILESDIR}/${P}-threadsafe.diff"
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
-	fi
-}
-
-src_compile() {
-	tc-export CC LD AR
-	if use threadsafe; then
-		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
-		|| die "emake with threadsafe enabled failed";
-	else
-		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
-		|| die "emake without threadsafe enabled failed";
-	fi
-}
-
-src_install() {
-	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
-	dodoc ../jsd/README
-	dohtml README.html
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
deleted file mode 100644
index da38130333a6..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
+++ /dev/null
@@ -1,77 +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 eutils toolchain-funcs multilib python-any-r1
-
-MY_PV="${PV}"
-MY_PV="${MY_PV/1.8.2/3.6}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
-SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE="threadsafe"
-
-S="${WORKDIR}/mozilla-1.9.2"
-BUILDDIR="${S}/js/src"
-
-RDEPEND="threadsafe? ( >=dev-libs/nspr-4.8.6 )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
-
-	epatch_user
-
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
-	fi
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	local myconf
-
-	use threadsafe && myconf="${myconf} \
-		--with-system-nspr --enable-threadsafe"
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" econf \
-		${myconf}
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	emake -j1
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake install DESTDIR="${D}"
-	dobin shell/js
-	dodoc ../jsd/README
-	dohtml README.html
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name
-		install_name_tool -id "${EPREFIX}"/usr/$(get_libdir)/libmozjs.dylib \
-			"${ED}"/usr/$(get_libdir)/libmozjs.dylib || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild
new file mode 100644
index 000000000000..dc29910d0b3a
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
+
+MY_PN="js"
+TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
+MY_P="${MY_PN}-${PV}"
+TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0/mozjs185"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE="debug minimal static-libs test"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${S}/js/src"
+
+RDEPEND=">=dev-libs/nspr-4.7.0
+	sys-libs/readline:0
+	x64-macos? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	virtual/pkgconfig"
+
+pkg_setup(){
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		export LC_ALL="C"
+	fi
+}
+
+src_prepare() {
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=400727
+	# https://bugs.gentoo.org/show_bug.cgi?id=420471
+	epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=438746
+	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=441928
+	epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=439260
+	epatch "${FILESDIR}"/${P}-symbol-versions.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=441934
+	epatch "${FILESDIR}"/${PN}-1.8.5-ia64-fix.patch
+	epatch "${FILESDIR}"/${PN}-1.8.5-ia64-static-strings.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=431560
+	epatch "${FILESDIR}"/${PN}-1.8.5-isfinite.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=552786
+	epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=439558
+	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+
+	epatch_user
+
+	cd "${BUILDDIR}" || die
+	eautoconf
+}
+
+src_configure() {
+	cd "${BUILDDIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" \
+	econf \
+		${myopts} \
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		--disable-optimize \
+		--disable-profile-guided-optimization \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+cross_make() {
+	emake \
+		CFLAGS="${BUILD_CFLAGS}" \
+		CXXFLAGS="${BUILD_CXXFLAGS}" \
+		AR="${BUILD_AR}" \
+		CC="${BUILD_CC}" \
+		CXX="${BUILD_CXX}" \
+		RANLIB="${BUILD_RANLIB}" \
+		"$@"
+}
+src_compile() {
+	cd "${BUILDDIR}" || die
+	if tc-is-cross-compiler; then
+		tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
+		cross_make jscpucfg host_jsoplengen host_jskwgen
+		cross_make -C config nsinstall
+		mv {,native-}jscpucfg || die
+		mv {,native-}host_jskwgen || die
+		mv {,native-}host_jsoplengen || die
+		mv config/{,native-}nsinstall || die
+		sed -i \
+			-e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			Makefile || die
+		sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
+		rm -f config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o || die
+	fi
+	emake
+}
+
+src_test() {
+	cd "${BUILDDIR}/jsapi-tests" || die
+	# for bug 415791
+	pax-mark mr jsapi-tests
+	emake check
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake DESTDIR="${D}" install
+	# bug 437520 , exclude js shell for small systems
+	if ! use minimal ; then
+		dobin shell/js
+		pax-mark m "${ED}/usr/bin/js"
+	fi
+	dodoc ../../README
+	dohtml README.html
+
+	if ! use static-libs; then
+		# We can't actually disable building of static libraries
+		# They're used by the tests and in a few other places
+		find "${D}" -iname '*.a' -delete || die
+	fi
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 56d89877ae9a..013ac0604b5e 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -2,6 +2,5 @@ DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
 DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
 DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
-DIST swipl-7.3.14.tar.gz 16190376 SHA256 2f201f79a01c65a9c2296b622d207749442c3ae1c62d3d9866a4a03f71d5e64f SHA512 3a88329d2c244b8614dfd55cbd0978bb1b59c975b6767ff18255d7c5dcfe713f04e252dc180b70d2daac4790c940d31ab060cec0371d0b36b13fd4e4b482e1c8 WHIRLPOOL 74e023c56f074c279249759f40e009c70698e282094201ae0f9ab0a88d42b29080b7db5c3337303b5b1f42615d7ff8afe1d96a2b2887e933440252778daa03b6
-DIST swipl-7.3.15.tar.gz 16216228 SHA256 4ff611d8db31ff097edba66f8ee45cdffb229be75f66974d3d1beb114ab85d47 SHA512 2a2d61413e7c98366cb4dd472044b381b296b60b68867e61a2a38f52f3be538603c60710770f766e6f4fa53383bd40043f053352fd96d5054766225e91b4f8d9 WHIRLPOOL 76224d6db53090ffd4d44573acb463c8c79b2d08699625d98ee9e23da7a8211a84ba3aaea054d81d18228f1ce84be32811f5d4d61fadb12431e0ab29f47ffd05
 DIST swipl-7.3.16.tar.gz 16214414 SHA256 584dce14e7eea75189c9133bb4eda05d639d6a4562b8cfca738ece25f0c2479e SHA512 5df2bd845087bb3f26e65d06b7db341b14500c7fc69b5c62b3ddd20d146c4280ffc79d5490d18239c0e70dab85e4424d81423deead148d7d1af768ae6800b3b8 WHIRLPOOL d7f45266ac2d1c36d7cd27e0e98f3856697d397060802790b5984c221092a69553a7bbbb761aa482aaba4892542f12c7786965b3db5fa1860f9864a404f0810b
+DIST swipl-7.3.17.tar.gz 16231043 SHA256 ec1cdbeee833c0aff59a3e7aa182581d3b44562064cbd0983176aaf0b265652a SHA512 dc32f5bed52f985b81b967b43d132f5a2f79cf15ee04aaf189eae2c5713a24f41a5bcb0ff75710218ddc3d4d125bcd50a8a1255fead6933a5f4ffff0cf538aa9 WHIRLPOOL 2eb10cc73ab911e58bb6b61a4933cee31bdaba4b6172744a2566f46a39559da6d5ac91a0269d70c4850aeec8b39c3e66c738708bace24d080dc4881ec52e9077
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.14.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.14.ebuild
deleted file mode 100644
index 7422945b5c1a..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.3.14.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline:= )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.5:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.15.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.17.ebuild
index f9a7b8b391ad..f9a7b8b391ad 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.3.15.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.17.ebuild
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index f95f84715fd4..99ab7861c14a 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,6 +1,4 @@
 DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b
-DIST tuprolog-2.5.0.zip 4847183 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04 SHA512 cf026d2171537fe3ca04a4cf572497fb1ce32ff2d0c206268fd62cf7b8216f61da73150def1ee884b367451a5da57a354e1f7ba75deb28e34ed3d390cb5ee35b WHIRLPOOL fb11d691262ac5fc16a7258ab73cde32623068402645ffcecbd4701b499ab674f2da8a3c7bbb0ca750651803f6e134085b89730667fd6b01faaa36ff15ec115e
-DIST tuprolog-2.6.0.tar.gz 8366655 SHA256 5c9416c72ddde806720c1bce122a8bb12cab04a9af35a42b88067e1b145bf0c5 SHA512 5253f0d65787e9f090a8b4da8df007da269492098686fa5847e8d624a6656d1820b36c5b096e51d6f40480fea02a64793797c23161627942f076fc5eae414b82 WHIRLPOOL 81de4453dd6b62558260f31ab2e3af1f2a256934cc8a24a9e18723bd95ef646b206941169a3d69994f26f20c65c00b14022392f35ccb8573d8a7cbc7af16b353
-DIST tuprolog-2.7.0.tar.gz 9005490 SHA256 93cec171d48e40a695baafcce419b75fc3d7b6e5ef06b0e787b4823e09f571a7 SHA512 88a9edb5c26317ea82e114a7e82d933d99f85ca89f1244d92de66e7eae11c8c61ed771c104a70ec210c1a65dca2b3ca2c3aba077d3afab4b250b62d14e83c7e4 WHIRLPOOL 3f4c76bea53b899d7be6fa93a9b24c5aaab84bd5ba4c65ca2a988e3a8acaeb1f2d0205c3a60720fbbf02a54d52bb6e7c39b5504ae9777d80d8f238b7c3c7050a
 DIST tuprolog-2.7.2.tar.gz 9104934 SHA256 8b0c653d3c9d701197f13d8dec6e45548565cddfd052a5bec9578f4e6a50f21e SHA512 c327893e0fcf777b6ad8951b3baf88bc9527bf88e9d06ac54af04e777e6c0fc255b15f492c2cf483859d3a1966897d5969e1496370b88287b96e83d92babc722 WHIRLPOOL cf5082d0ca07f8bc59e678c27b1fb8aaa8879f6b15dc887949cb61760dfd721ba4a6fd5b05fb979ea94e6ab607dfcff5707be47d5ac657623556426e734ca395
 DIST tuprolog-2.9.0.tar.gz 4841110 SHA256 e789c7f1777a4f57698ac4756d03574f8fd5be4cebb1d5226722c35df75e163f SHA512 be15c99c40f750f3d1d4b70ae7ced9fe3792e8747876b6190ec1a01dd287e0fa34f88671f99f9e3fd7249e6fd44da7c4dadce0cd111b44b24e0e43d31c85165e WHIRLPOOL ada10ff775dc5e55d5c55c4dc920f5a4e7f8654891a10cf815734649e384fe6351921b807c54f6a6e8503fcbd0cbd9ee7f1569140bb5eba7e77e4da85f907203
+DIST tuprolog-2.9.2.tar.gz 6262268 SHA256 4205dff584b492e10f214c71ce7bc0e81297a915156ca1e10cfac8b34c8c0a6e SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316 WHIRLPOOL 18dceea5e95be3e60b10fa8692970e61d9b16b2f518ac342de271ac7c6cb8313e8e9ca359fb93753d43a2c09780e47f212776ce560f9c2fefdb21d44f3316c77
diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml
new file mode 100644
index 000000000000..0e585bd4369c
--- /dev/null
+++ b/dev-lang/tuprolog/files/build-2.9.2.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?><project default="jar" name="tuprolog">
+
+	<!-- some properties -->
+	<property name="src.dir" value="src"/>
+	<property name="build.dir" value="build"/>
+	<property name="docs.dir" value="docs"/>
+	<property name="dist.dir" value="dist"/>
+	<property name="test.dir" value="test"/>
+	<property name="test.build.dir" value="test.build"/>
+	<property name="jarfile" value="${ant.project.name}.jar"/>
+	<property file="build.properties"/>
+
+	<path id="compile.classpath">
+		<fileset dir="lib" includes="*.jar"/>
+		<pathelement path="${gentoo.classpath}"/>
+	</path>
+
+	<!-- init -->
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${dist.dir}"/>
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${docs.dir}"/>
+		<mkdir dir="${test.build.dir}"/>
+	</target>	
+
+	<!-- compile everything -->
+	<target depends="init" name="compile">
+		<javac deprecation="off"
+			destdir="${build.dir}"
+			encoding="ISO-8859-1"
+			srcdir="${src.dir}"
+			target="1.7">
+			<classpath>
+				<path refid="compile.classpath"/>
+			</classpath>
+		</javac>
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java"/>
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- build the jar file -->
+	<target depends="compile" name="jar">
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
+			<manifest>
+				<attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<!-- generate javadocs -->
+	<target depends="init" name="javadoc">
+		<javadoc
+			author="false"
+			destdir="${docs.dir}"
+			encoding="ISO-8859-1"
+			breakiterator="yes"
+			packagenames="alice.*"
+			sourcepath="${src.dir}"
+			use="true"
+			version="true"
+			verbose="no"
+			windowtitle="${ant.project.name} API">
+			<classpath>
+				<path refid="compile.classpath"/>
+			</classpath>
+		</javadoc>
+	</target>
+
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+		<delete dir="${dist.dir}"/>
+		<delete dir="${docs.dir}"/>
+		<delete dir="${test.build.dir}"/>
+	</target>
+
+	<!-- run testsuite -->
+	<target name="test">
+		<path id="dist.classpath">
+			<fileset dir="${dist.dir}">
+				<include name="*.jar"/>
+			</fileset>
+		</path>
+		<javac classpathref="dist.classpath"
+			deprecation="off"
+			destdir="${test.build.dir}"
+			encoding="ISO-8859-1"
+			srcdir="${test.dir}/unit"
+			target="1.7"/>
+		<junit haltonfailure="on" showoutput="no" printsummary="yes">
+			<classpath>
+				<path refid="dist.classpath"/>
+				<pathelement path="${test.build.dir}"/>
+			</classpath>
+			<formatter type="xml"/>
+			<batchtest todir="${test.build.dir}">
+				<fileset dir="${test.build.dir}">
+					<include name="**/*TestCase.class"/>
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
deleted file mode 100644
index aa1f3dcbab2f..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff -ur 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2p-deploy/src/alice/tuprolog/ChoicePointStore.java
---- 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java	2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/ChoicePointStore.java	2012-01-15 09:20:48.000000000 +1300
-@@ -35,7 +35,6 @@
- 	

- 	/**

- 	 * Return the actual choice-point store

--	 * @return

- 	 */

- 	public ChoicePointContext getPointer() {

- 		return pointer;

-@@ -44,7 +43,6 @@
- 	/**

- 	 * Check if a choice point exists in the store.

- 	 * As a side effect, removes choice points which have been already used and are now empty. 

--	 * @return

- 	 */

- 	protected boolean existChoicePoint() {

- 		if (pointer == null) return false;

-diff -ur 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2p-deploy/src/alice/tuprolog/ClauseStore.java
---- 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java	2010-11-04 11:55:42.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/ClauseStore.java	2012-01-15 09:20:48.000000000 +1300
-@@ -62,8 +62,6 @@
- 	
- 	/**
- 	 * Verify if there is a term in compatibleGoals compatible with goal. 
--	 * @param goal
--	 * @param compGoals
- 	 * @return true if compatible or false otherwise.
- 	 */
- 	protected boolean existCompatibleClause() {
-diff -ur 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2p-deploy/src/alice/tuprolog/EngineManager.java
---- 2p-deploy.orig/src/alice/tuprolog/EngineManager.java	2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/EngineManager.java	2012-01-15 09:20:48.000000000 +1300
-@@ -87,7 +87,7 @@
- 	/**

- 	 *  Solves a query

- 	 *

--	 * @param g the term representing the goal to be demonstrated

-+	 * @param query the term representing the goal to be demonstrated

- 	 * @return the result of the demonstration

- 	 * @see SolveInfo

- 	 **/

-diff -ur 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2p-deploy/src/alice/tuprolog/PrimitiveManager.java
---- 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java	2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/PrimitiveManager.java	2012-01-15 09:20:48.000000000 +1300
-@@ -87,7 +87,7 @@
- 	 * This involves identifying structs representing builtin
- 	 * predicates and functors, and setting up related structures and links
- 	 *
--	 * @parm term the term to be identified
-+	 * @param term the term to be identified
- 	 * @return term with the identified built-in directive
- 	 */
- 	public Term identifyDirective(Term term) {
-diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java
---- 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java	2011-01-28 16:31:44.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java	2012-01-15 09:20:48.000000000 +1300
-@@ -109,7 +109,7 @@
- 	/**

- 	 * Loads a library constructed from a theory.

- 	 * 

--	 * @param theory

-+	 * @param th

- 	 *            theory text

- 	 * @param libName

- 	 *            name of the library

-diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java
---- 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java	2011-01-19 16:34:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java	2012-01-15 09:20:48.000000000 +1300
-@@ -372,7 +372,7 @@
- 	/**

- 	 * Sets an arbitrary seed for the Random object.

- 	 * 

--	 * @param seed Seed to use

-+	 * @param t Seed to use

- 	 * @return true if seed Term has a valid long value, false otherwise

- 	 */

- 	public boolean set_seed_1(Term t) throws PrologError {

-diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java
---- 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java	2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java	2012-01-15 09:20:48.000000000 +1300
-@@ -1390,8 +1390,6 @@
- 
- 	/**
- 	 * Generates a fresh numeric identifier
--	 * 
--	 * @return
- 	 */
- 	protected Struct generateFreshId() {
- 		return new Struct("$obj_" + id++);
-diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java	2012-01-15 09:20:48.000000000 +1300
-@@ -317,7 +317,6 @@
-         displayLibraryManagerStatus();

-     }

- 

--    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

-     public void closeLibraryDialog()

-     {

-     	onClose();

-diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2p-deploy/src/alice/tuprologx/ide/ToolBar.java
---- 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java	2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/tuprologx/ide/ToolBar.java	2012-01-15 09:20:48.000000000 +1300
-@@ -232,8 +232,6 @@
- 

-     /**

-      * Set the tuProlog config frame

--     *

--     * @param libraryManager a libraryManager to associate to the libraryDialog 

-      */

- 	public void setPrologConfig(PrologConfigFrame configFrame)

- 	{

-diff -ur 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java
---- 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2010-01-21 21:29:48.000000000 +1300
-+++ 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java	2012-01-15 09:20:48.000000000 +1300
-@@ -1252,7 +1252,6 @@
- 	
- 	/**
- 	 * Generates a fresh numeric identifier
--	 * @return
- 	 */
- 	protected Struct generateFreshId() {
- 		return new Struct("$obj_" + id++);        
-diff -ur 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2p-deploy/src/alice/util/ReadOnlyLinkedList.java
---- 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java	2010-03-17 18:14:10.000000000 +1300
-+++ 2p-deploy/src/alice/util/ReadOnlyLinkedList.java	2012-01-15 09:32:03.000000000 +1300
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
- 
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
-  * and ensures that the given list is navigated only.
-  *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
-  * support modifiers methods, and throws {@link UnsupportedOperationException}
-  * if invoked.
-  *
-diff -ur 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2p-deploy/src/alice/util/jedit/InputHandler.java
---- 2p-deploy.orig/src/alice/util/jedit/InputHandler.java	2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/InputHandler.java	2012-01-15 09:20:48.000000000 +1300
-@@ -24,7 +24,7 @@
-  *
-  * @author Slava Pestov
-  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
-  */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
- 	/**
- 	 * Grabs the next key typed event and invokes the specified
- 	 * action with the key as a the action command.
--	 * @param action The action
-+	 * @param listener The action
- 	 */
- 	public void grabNextKeyStroke(ActionListener listener)
- 	{
-diff -ur 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2p-deploy/src/alice/util/jedit/JEditTextArea.java
---- 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java	2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/JEditTextArea.java	2012-01-15 09:20:48.000000000 +1300
-@@ -1389,7 +1389,7 @@
- 
- 	/**
- 	 * Sets if the selection should be rectangular.
--	 * @param overwrite True if the selection should be rectangular,
-+	 * @param rectSelect True if the selection should be rectangular,
- 	 * false otherwise.
- 	 */
- 	public final void setSelectionRectangular(boolean rectSelect)
-diff -ur 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2p-deploy/src/alice/util/jedit/KeywordMap.java
---- 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java	2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/KeywordMap.java	2012-01-15 09:20:48.000000000 +1300
-@@ -75,7 +75,7 @@
- 	/**
- 	 * Adds a key-value mapping.
- 	 * @param keyword The key
--	 * @Param id The value
-+	 * @param id The value
- 	 */
- 	public void add(String keyword, byte id)
- 	{
-diff -ur 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2p-deploy/src/alice/util/jedit/TextAreaPainter.java
---- 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java	2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/TextAreaPainter.java	2012-01-15 09:20:48.000000000 +1300
-@@ -75,7 +75,7 @@
- 	/**
- 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i>
- 	 * will be used to paint tokens with id = <i>n</i>.
--	 * @see org.gjt.sp.jedit.syntax.Token
-+	 * @see alice.util.jedit.Token
- 	 */
- 	public final SyntaxStyle[] getStyles()
- 	{
-@@ -86,7 +86,7 @@
- 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i>
- 	 * will be used to paint tokens with id = <i>n</i>.
- 	 * @param styles The syntax styles
--	 * @see org.gjt.sp.jedit.syntax.Token
-+	 * @see alice.util.jedit.Token
- 	 */
- 	public final void setStyles(SyntaxStyle[] styles)
- 	{
-@@ -356,7 +356,7 @@
- 
- 	/**
- 	 * Repaints the text.
--	 * @param g The graphics context
-+	 * @param gfx The graphics context
- 	 */
- 	public void paint(Graphics gfx)
- 	{
-diff -ur 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2p-deploy/src/alice/util/jedit/TokenMarker.java
---- 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java	2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/TokenMarker.java	2012-01-15 09:20:48.000000000 +1300
-@@ -24,7 +24,7 @@
-  * @author Slava Pestov
-  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
-  *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
-  */
- public abstract class TokenMarker
- {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
deleted file mode 100644
index 256710934666..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java	2012-08-03 03:45:45.000000000 +0200
-@@ -36,7 +36,6 @@
-     

-     /**

- 	 * Return the actual choice-point store

--	 * @return

- 	 */

-     public ChoicePointContext getPointer() {

-         return pointer;

-@@ -45,7 +44,6 @@
-     /**

-      * Check if a choice point exists in the store.

-      * As a side effect, removes choice points which have been already used and are now empty. 

--     * @return

-      */

-     protected boolean existChoicePoint() {

-         if (pointer == null) return false;

-@@ -93,4 +91,4 @@
-         return l;

-     }

-     

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java	2012-08-03 03:45:45.000000000 +0200
-@@ -62,8 +62,6 @@
-     
-     /**
-      * Verify if there is a term in compatibleGoals compatible with goal. 
--     * @param goal
--     * @param compGoals
-      * @return true if compatible or false otherwise.
-      */
-     protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
-     }
-     
-     
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java	2012-08-03 03:45:45.000000000 +0200
-@@ -96,7 +96,7 @@
-     /**

-      *  Solves a query

-      *

--     * @param g the term representing the goal to be demonstrated

-+     * @param query the term representing the goal to be demonstrated

-      * @return the result of the demonstration

-      * @see SolveInfo

-      **/

-@@ -243,4 +243,4 @@
-     }

-     

-     

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java	2012-08-03 03:45:45.000000000 +0200
-@@ -33,10 +33,6 @@
- 	 * event description

- 	 */

-     private String msg;

--    /**

--	 * @uml.property  name="env"

--	 * @uml.associationEnd  

--	 */

-     private Engine env;

- 

-     public SpyEvent(Object source, String msg_) {

-@@ -63,4 +59,4 @@
-         return msg + ((env == null) ? "" : env.toString());

-     }

- 

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java	2012-08-03 03:45:45.000000000 +0200
-@@ -114,7 +114,7 @@
-     /**

-      * Loads a library constructed from a theory.

-      * 

--     * @param theory

-+     * @param th

-      *            theory text

-      * @param libName

-      *            name of the library

-@@ -1356,4 +1356,4 @@
-                 { "\\", "expression_bitwise_not", "functor" } };

-     }

- 

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java	2012-08-03 03:45:45.000000000 +0200
-@@ -375,7 +375,7 @@
-     /**

-      * Sets an arbitrary seed for the Random object.

-      * 

--     * @param seed Seed to use

-+     * @param t Seed to use

-      * @return true if seed Term has a valid long value, false otherwise

-      */

-     public boolean set_seed_1(Term t) throws PrologError {

-@@ -470,4 +470,4 @@
-         }

-         return true;

-     }

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java	2012-08-03 03:45:45.000000000 +0200
-@@ -1393,8 +1393,6 @@
- 
-     /**
-      * Generates a fresh numeric identifier
--     * 
--     * @return
-      */
-     protected Struct generateFreshId() {
-         return new Struct("$obj_" + id++);
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java	2012-08-03 03:45:45.000000000 +0200
-@@ -89,7 +89,7 @@
-      * This involves identifying structs representing builtin
-      * predicates and functors, and setting up related structures and links
-      *
--     * @parm term the term to be identified
-+     * @param term the term to be identified
-      * @return term with the identified built-in directive
-      */
-     public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- 	}
-     /**/
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java	2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java	2012-08-03 03:45:45.000000000 +0200
-@@ -10,8 +10,5 @@
-     public void getNextSolution();

-     public void acceptSolution();

-     public void stopEngine();

--    /**

--	 * @uml.property  name="goal"

--	 */

-     public String getGoal();

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java	2012-08-03 03:45:45.000000000 +0200
-@@ -325,7 +325,6 @@
-         displayLibraryManagerStatus();

-     }

- 

--    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

-     public void closeLibraryDialog()

-     {

-         onClose();

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java	2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java	2012-08-03 03:45:45.000000000 +0200
-@@ -242,8 +242,6 @@
- 

-     /**

-      * Set the tuProlog config frame

--     *

--     * @param libraryManager a libraryManager to associate to the libraryDialog 

-      */

-     public void setPrologConfig(PrologConfigFrame configFrame)

-     {

-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java	2012-08-03 03:45:45.000000000 +0200
-@@ -1252,7 +1252,6 @@
- 	
- 	/**
- 	 * Generates a fresh numeric identifier
--	 * @return
- 	 */
- 	protected Struct generateFreshId() {
- 		return new Struct("$obj_" + id++);        
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java	2012-08-03 03:45:45.000000000 +0200
-@@ -24,7 +24,7 @@
-  *
-  * @author Slava Pestov
-  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
-  */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
-     /**
-      * Grabs the next key typed event and invokes the specified
-      * action with the key as a the action command.
--     * @param action The action
-+     * @param listener The action
-      */
-     public void grabNextKeyStroke(ActionListener listener)
-     {
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java	2012-08-03 03:48:07.000000000 +0200
-@@ -1401,7 +1401,7 @@
- 
- 	/**
- 	 * Sets if the selection should be rectangular.
--	 * @param overwrite True if the selection should be rectangular,
-+	 * @param rectSelect True if the selection should be rectangular,
- 	 * false otherwise.
- 	 */
- 	public final void setSelectionRectangular(boolean rectSelect)
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java	2012-08-03 03:45:45.000000000 +0200
-@@ -75,7 +75,7 @@
-     /**
-      * Adds a key-value mapping.
-      * @param keyword The key
--     * @Param id The value
-+     * @param id The value
-      */
-     public void add(String keyword, byte id)
-     {
-@@ -102,9 +102,6 @@
-     }
- 
-     // protected members
--    /**
--	 * @uml.property  name="mapLength"
--	 */
-     protected int mapLength;
- 
-     protected int getStringMapKey(String s)
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java	2012-08-03 03:45:45.000000000 +0200
-@@ -75,7 +75,7 @@
- 
-     /**
- 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
--	 * @see  org.gjt.sp.jedit.syntax.Token
-+	 * @see  alice.util.jedit.Token
- 	 */
-     public final SyntaxStyle[] getStyles()
-     {
-@@ -85,7 +85,7 @@
-     /**
- 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- 	 * @param styles  The syntax styles
--	 * @see  org.gjt.sp.jedit.syntax.Token
-+	 * @see  alice.util.jedit.Token
- 	 */
-     public final void setStyles(SyntaxStyle[] styles)
-     {
-@@ -356,7 +356,7 @@
- 
-     /**
-      * Repaints the text.
--     * @param g The graphics context
-+     * @param gfx The graphics context
-      */
-     public void paint(Graphics gfx)
-     {
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java	2012-08-03 03:45:45.000000000 +0200
-@@ -23,7 +23,7 @@
-  * @author Slava Pestov
-  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
-  *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
-  */
- public abstract class TokenMarker
- {
-diff -ur tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java
---- tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java	2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java	2012-08-03 03:45:45.000000000 +0200
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
- 
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
-  * and ensures that the given list is navigated only.
-  *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
-  * support modifiers methods, and throws {@link UnsupportedOperationException}
-  * if invoked.
-  *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch
deleted file mode 100644
index 7eba988d5ba3..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java	2013-02-14 12:01:56.000000000 +0100
-@@ -36,7 +36,6 @@
-     

-     /**

- 	 * Return the actual choice-point store

--	 * @return

- 	 */

-     public ChoicePointContext getPointer() {

-         return pointer;

-@@ -45,7 +44,6 @@
-     /**

-      * Check if a choice point exists in the store.

-      * As a side effect, removes choice points which have been already used and are now empty. 

--     * @return

-      */

-     protected boolean existChoicePoint() {

-         if (pointer == null) return false;

-@@ -93,4 +91,4 @@
-         return l;

-     }

-     

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java	2013-02-14 12:01:56.000000000 +0100
-@@ -62,8 +62,6 @@
-     
-     /**
-      * Verify if there is a term in compatibleGoals compatible with goal. 
--     * @param goal
--     * @param compGoals
-      * @return true if compatible or false otherwise.
-      */
-     protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
-     }
-     
-     
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java	2013-02-14 12:01:56.000000000 +0100
-@@ -96,7 +96,7 @@
-     /**

-      *  Solves a query

-      *

--     * @param g the term representing the goal to be demonstrated

-+     * @param query the term representing the goal to be demonstrated

-      * @return the result of the demonstration

-      * @see SolveInfo

-      **/

-@@ -243,4 +243,4 @@
-     }

-     

-     

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java	2013-02-14 12:01:56.000000000 +0100
-@@ -33,10 +33,6 @@
- 	 * event description

- 	 */

-     private String msg;

--    /**

--	 * @uml.property  name="env"

--	 * @uml.associationEnd  

--	 */

-     private Engine env;

- 

-     public SpyEvent(Object source, String msg_) {

-@@ -63,4 +59,4 @@
-         return msg + ((env == null) ? "" : env.toString());

-     }

- 

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java	2013-02-14 12:01:56.000000000 +0100
-@@ -116,7 +116,7 @@
-     /**

-      * Loads a library constructed from a theory.

-      * 

--     * @param theory

-+     * @param th

-      *            theory text

-      * @param libName

-      *            name of the library

-@@ -1358,4 +1358,4 @@
-                 { "\\", "expression_bitwise_not", "functor" } };

-     }

- 

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java	2013-02-14 12:01:56.000000000 +0100
-@@ -375,7 +375,7 @@
-     /**

-      * Sets an arbitrary seed for the Random object.

-      * 

--     * @param seed Seed to use

-+     * @param t Seed to use

-      * @return true if seed Term has a valid long value, false otherwise

-      */

-     public boolean set_seed_1(Term t) throws PrologError {

-@@ -470,4 +470,4 @@
-         }

-         return true;

-     }

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java	2013-02-14 12:12:49.000000000 +0100
-@@ -265,7 +265,7 @@
-      * @author Michele Mannino
-      * Creates of a java object - not backtrackable case
-      * @param className The name of the class 
--     * @oaram path The list of the paths where the class may be contained
-+     * @param paths The list of the paths where the class may be contained
-      * @param argl The list of the arguments used by the constructor
-      * @param id The name of the prolog term
-      * @throws JavaException
-@@ -1745,8 +1745,6 @@
- 
-     /**
-      * Generates a fresh numeric identifier
--     * 
--     * @return
-      */
-     protected Struct generateFreshId() {
-         return new Struct("$obj_" + id++);
-@@ -2099,4 +2097,4 @@
-         this.eventFullClass = eventClass;
-         listenerInterfaceName = n;
-     }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java	2013-02-14 12:05:56.000000000 +0100
-@@ -49,7 +49,7 @@
- 	 * If a library with the same name is already present,
- 	 * a warning event is notified and the request is ignored.
- 	 *
--	 * @param the name of the Java class containing the library to be loaded
-+	 * @param className the name of the Java class containing the library to be loaded
- 	 * @return the reference to the Library just loaded
- 	 * @throws InvalidLibraryException if name is not a valid library
- 	 */
-@@ -81,8 +81,8 @@
- 	 * If a library with the same name is already present,
- 	 * a warning event is notified and the request is ignored.
- 	 *
--	 * @param the name of the Java class containing the library to be loaded
--	 * @param the list of the paths where the library may be contained
-+	 * @param className the name of the Java class containing the library to be loaded
-+	 * @param paths the list of the paths where the library may be contained
- 	 * @return the reference to the Library just loaded
- 	 * @throws InvalidLibraryException if name is not a valid library
- 	 */
-@@ -305,4 +305,4 @@
- 	
- 	
- 
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java	2013-02-14 12:01:56.000000000 +0100
-@@ -89,7 +89,7 @@
-      * This involves identifying structs representing builtin
-      * predicates and functors, and setting up related structures and links
-      *
--     * @parm term the term to be identified
-+     * @param term the term to be identified
-      * @return term with the identified built-in directive
-      */
-     public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- 	}
-     /**/
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.6.0/src/alice/tuprolog/Struct.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/Struct.java	2013-02-14 12:06:46.000000000 +0100
-@@ -201,7 +201,7 @@
-     }
-     
-     /**
--	 * @return
-+	 * @return predicateIndicator
- 	 */
-     String getPredicateIndicator() {
-         return predicateIndicator;
-@@ -894,4 +894,4 @@
- 	}
-     /**/
-     
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java	2013-02-14 12:01:56.000000000 +0100
-@@ -10,8 +10,5 @@
-     public void getNextSolution();

-     public void acceptSolution();

-     public void stopEngine();

--    /**

--	 * @uml.property  name="goal"

--	 */

-     public String getGoal();

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-02-14 12:12:14.000000000 +0100
-@@ -370,7 +370,7 @@
-      * Add a library from file chooser path.

-      *

-      * @param libraryClassname The name of the .class of the library to be added.

--     * @param path from file chooser.

-+     * @param file from file chooser.

-      */

-     public void addLibrary(String libraryClassname, File file)

-     {

-@@ -498,7 +498,6 @@
-         displayLibraryManagerStatus();

-     }

- 

--    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

-     public void closeLibraryDialog()

-     {

-         onClose();

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java	2013-02-14 12:11:42.000000000 +0100
-@@ -131,7 +131,7 @@
- 	     * Add a library to the manager.

- 	     *

- 	     * @param libraryClassname The name of the .class of the library to be added.

--	     * @param path The path where is contained the library.

-+	     * @param file The path where is contained the library.

- 	     * @throws ClassNotFoundException if the library class cannot be found.

- 	     * @throws InvalidLibraryException if the library is not a valid tuProlog library.

- 	     */

-@@ -235,7 +235,7 @@
-      * Load a library from the Library Manager into the engine.

-      *

-      * @param library The library to be loaded into the engine.

--     * @param path The library path where is contained the library.

-+     * @param file The library path where is contained the library.

-      * @throws InvalidLibraryException

-      */

-     public void loadLibrary(String library, File file) throws InvalidLibraryException {

-@@ -290,4 +290,4 @@
- 				klass.getName().replace('.', '/') + ".class");

- 	}

- 

--} // end LibraryManager class
-\ No newline at end of file
-+} // end LibraryManager class

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java	2013-02-14 12:01:56.000000000 +0100
-@@ -242,8 +242,6 @@
- 

-     /**

-      * Set the tuProlog config frame

--     *

--     * @param libraryManager a libraryManager to associate to the libraryDialog 

-      */

-     public void setPrologConfig(PrologConfigFrame configFrame)

-     {

-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-02-14 12:01:56.000000000 +0100
-@@ -1252,7 +1252,6 @@
- 	
- 	/**
- 	 * Generates a fresh numeric identifier
--	 * @return
- 	 */
- 	protected Struct generateFreshId() {
- 		return new Struct("$obj_" + id++);        
-diff -ur tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java
---- tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java	2013-02-14 12:10:02.000000000 +0100
-@@ -35,7 +35,7 @@
- 	

-     /**

-      * Constructor that specifies the URLs array.

--	 * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"

-+	 * @param urls - Used to load a directory a URL ends with "/" or "\"

- 	 * otherwise it loads a class contained into a .jar

- 	 */

- 

-@@ -148,7 +148,7 @@
- 	

- 	/**

- 	 * Remove array URLs method.

--	 * @param urls - URL to be removed.

-+	 * @param url - URL to be removed.

- 	 */

- 

- 	public void removeURL(URL url) throws IllegalArgumentException

-diff -ur tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.6.0/src/alice/util/InspectionUtils.java
---- tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/InspectionUtils.java	2013-02-14 12:09:22.000000000 +0100
-@@ -14,9 +14,9 @@
- 	/**
- 	 * @author Michele Mannino
- 	 * 
--	 * @param type: class to be inspected
--	 * @param methodName: name of method
--	 * @param parms: array of params
-+	 * @param type class to be inspected
-+	 * @param methodName name of method
-+	 * @param parms array of params
- 	 */
- 	public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
- 	    Method[] methods = type.getMethods();
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java	2013-02-14 12:01:56.000000000 +0100
-@@ -24,7 +24,7 @@
-  *
-  * @author Slava Pestov
-  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
-  */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
-     /**
-      * Grabs the next key typed event and invokes the specified
-      * action with the key as a the action command.
--     * @param action The action
-+     * @param listener The action
-      */
-     public void grabNextKeyStroke(ActionListener listener)
-     {
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java	2013-02-14 12:01:56.000000000 +0100
-@@ -1401,7 +1401,7 @@
- 
- 	/**
- 	 * Sets if the selection should be rectangular.
--	 * @param overwrite True if the selection should be rectangular,
-+	 * @param rectSelect True if the selection should be rectangular,
- 	 * false otherwise.
- 	 */
- 	public final void setSelectionRectangular(boolean rectSelect)
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java	2013-02-14 12:01:56.000000000 +0100
-@@ -75,7 +75,7 @@
-     /**
-      * Adds a key-value mapping.
-      * @param keyword The key
--     * @Param id The value
-+     * @param id The value
-      */
-     public void add(String keyword, byte id)
-     {
-@@ -102,9 +102,6 @@
-     }
- 
-     // protected members
--    /**
--	 * @uml.property  name="mapLength"
--	 */
-     protected int mapLength;
- 
-     protected int getStringMapKey(String s)
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java	2013-02-14 12:01:56.000000000 +0100
-@@ -75,7 +75,7 @@
- 
-     /**
- 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
--	 * @see  org.gjt.sp.jedit.syntax.Token
-+	 * @see  alice.util.jedit.Token
- 	 */
-     public final SyntaxStyle[] getStyles()
-     {
-@@ -85,7 +85,7 @@
-     /**
- 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- 	 * @param styles  The syntax styles
--	 * @see  org.gjt.sp.jedit.syntax.Token
-+	 * @see  alice.util.jedit.Token
- 	 */
-     public final void setStyles(SyntaxStyle[] styles)
-     {
-@@ -356,7 +356,7 @@
- 
-     /**
-      * Repaints the text.
--     * @param g The graphics context
-+     * @param gfx The graphics context
-      */
-     public void paint(Graphics gfx)
-     {
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java	2013-02-14 12:01:56.000000000 +0100
-@@ -23,7 +23,7 @@
-  * @author Slava Pestov
-  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
-  *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
-  */
- public abstract class TokenMarker
- {
-diff -ur tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java
---- tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java	2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java	2013-02-14 12:01:56.000000000 +0100
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
- 
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
-  * and ensures that the given list is navigated only.
-  *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
-  * support modifiers methods, and throws {@link UnsupportedOperationException}
-  * if invoked.
-  *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch
deleted file mode 100644
index cd67ac58daf5..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java	2013-05-16 13:56:42.000000000 +0200
-@@ -36,7 +36,6 @@
-     

-     /**

- 	 * Return the actual choice-point store

--	 * @return

- 	 */

-     public ChoicePointContext getPointer() {

-         return pointer;

-@@ -45,7 +44,6 @@
-     /**

-      * Check if a choice point exists in the store.

-      * As a side effect, removes choice points which have been already used and are now empty. 

--     * @return

-      */

-     protected boolean existChoicePoint() {

-         if (pointer == null) return false;

-@@ -93,4 +91,4 @@
-         return l;

-     }

-     

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java	2013-05-16 13:56:42.000000000 +0200
-@@ -62,8 +62,6 @@
-     
-     /**
-      * Verify if there is a term in compatibleGoals compatible with goal. 
--     * @param goal
--     * @param compGoals
-      * @return true if compatible or false otherwise.
-      */
-     protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
-     }
-     
-     
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java	2013-05-16 13:56:42.000000000 +0200
-@@ -33,10 +33,6 @@
- 	 * event description

- 	 */

-     private String msg;

--    /**

--	 * @uml.property  name="env"

--	 * @uml.associationEnd  

--	 */

-     private Engine env;

- 

-     public SpyEvent(Object source, String msg_) {

-@@ -63,4 +59,4 @@
-         return msg + ((env == null) ? "" : env.toString());

-     }

- 

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java	2013-05-16 13:56:42.000000000 +0200
-@@ -116,7 +116,7 @@
-     /**

-      * Loads a library constructed from a theory.

-      * 

--     * @param theory

-+     * @param th

-      *            theory text

-      * @param libName

-      *            name of the library

-@@ -1358,4 +1358,4 @@
-                 { "\\", "expression_bitwise_not", "functor" } };

-     }

- 

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java	2013-05-16 13:56:42.000000000 +0200
-@@ -379,7 +379,7 @@
-     /**

-      * Sets an arbitrary seed for the Random object.

-      * 

--     * @param seed Seed to use

-+     * @param t Seed to use

-      * @return true if seed Term has a valid long value, false otherwise

-      */

-     public boolean set_seed_1(Term t) throws PrologError {

-@@ -474,4 +474,4 @@
-         }

-         return true;

-     }

--}
-\ No newline at end of file
-+}

-Only in tuprolog-2.7.0/src/alice/tuprolog/lib: IOLibrary.java.orig
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java	2013-05-16 13:56:42.000000000 +0200
-@@ -265,7 +265,7 @@
-      * @author Michele Mannino
-      * Creates of a java object - not backtrackable case
-      * @param className The name of the class 
--     * @oaram path The list of the paths where the class may be contained
-+     * @param paths The list of the paths where the class may be contained
-      * @param argl The list of the arguments used by the constructor
-      * @param id The name of the prolog term
-      * @throws JavaException
-@@ -1745,8 +1745,6 @@
- 
-     /**
-      * Generates a fresh numeric identifier
--     * 
--     * @return
-      */
-     protected Struct generateFreshId() {
-         return new Struct("$obj_" + id++);
-@@ -2099,4 +2097,4 @@
-         this.eventFullClass = eventClass;
-         listenerInterfaceName = n;
-     }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java	2013-05-16 13:56:42.000000000 +0200
-@@ -49,7 +49,7 @@
- 	 * If a library with the same name is already present,
- 	 * a warning event is notified and the request is ignored.
- 	 *
--	 * @param the name of the Java class containing the library to be loaded
-+	 * @param className the name of the Java class containing the library to be loaded
- 	 * @return the reference to the Library just loaded
- 	 * @throws InvalidLibraryException if name is not a valid library
- 	 */
-@@ -83,8 +83,8 @@
- 	 * If a library with the same name is already present,
- 	 * a warning event is notified and the request is ignored.
- 	 *
--	 * @param the name of the Java class containing the library to be loaded
--	 * @param the list of the paths where the library may be contained
-+	 * @param className the name of the Java class containing the library to be loaded
-+	 * @param paths the list of the paths where the library may be contained
- 	 * @return the reference to the Library just loaded
- 	 * @throws InvalidLibraryException if name is not a valid library
- 	 */
-@@ -314,4 +314,4 @@
- 	
- 	
- 
--}
-\ No newline at end of file
-+}
-Only in tuprolog-2.7.0/src/alice/tuprolog: LibraryManager.java.orig
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java	2013-05-16 13:56:42.000000000 +0200
-@@ -89,7 +89,7 @@
-      * This involves identifying structs representing builtin
-      * predicates and functors, and setting up related structures and links
-      *
--     * @parm term the term to be identified
-+     * @param term the term to be identified
-      * @return term with the identified built-in directive
-      */
-     public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- 	}
-     /**/
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.7.0/src/alice/tuprolog/Struct.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/Struct.java	2013-05-16 13:56:42.000000000 +0200
-@@ -201,7 +201,7 @@
-     }
-     
-     /**
--	 * @return
-+	 * @return predicateIndicator
- 	 */
-     String getPredicateIndicator() {
-         return predicateIndicator;
-@@ -894,4 +894,4 @@
- 	}
-     /**/
-     
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java	2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java	2013-05-16 13:56:42.000000000 +0200
-@@ -10,8 +10,5 @@
-     public void getNextSolution();

-     public void acceptSolution();

-     public void stopEngine();

--    /**

--	 * @uml.property  name="goal"

--	 */

-     public String getGoal();

--}
-\ No newline at end of file
-+}

-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-05-16 13:56:42.000000000 +0200
-@@ -370,7 +370,7 @@
-      * Add a library from file chooser path.

-      *

-      * @param libraryClassname The name of the .class of the library to be added.

--     * @param path from file chooser.

-+     * @param file from file chooser.

-      */

-     public void addLibrary(String libraryClassname, File file)

-     {

-@@ -498,7 +498,6 @@
-         displayLibraryManagerStatus();

-     }

- 

--    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

-     public void closeLibraryDialog()

-     {

-         onClose();

-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java	2013-05-16 13:56:42.000000000 +0200
-@@ -131,7 +131,7 @@
- 	     * Add a library to the manager.

- 	     *

- 	     * @param libraryClassname The name of the .class of the library to be added.

--	     * @param path The path where is contained the library.

-+	     * @param file The path where is contained the library.

- 	     * @throws ClassNotFoundException if the library class cannot be found.

- 	     * @throws InvalidLibraryException if the library is not a valid tuProlog library.

- 	     */

-@@ -235,7 +235,7 @@
-      * Load a library from the Library Manager into the engine.

-      *

-      * @param library The library to be loaded into the engine.

--     * @param path The library path where is contained the library.

-+     * @param file The library path where is contained the library.

-      * @throws InvalidLibraryException

-      */

-     public void loadLibrary(String library, File file) throws InvalidLibraryException {

-@@ -290,4 +290,4 @@
- 				klass.getName().replace('.', '/') + ".class");

- 	}

- 

--} // end LibraryManager class
-\ No newline at end of file
-+} // end LibraryManager class

-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java	2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java	2013-05-16 13:56:42.000000000 +0200
-@@ -242,8 +242,6 @@
- 

-     /**

-      * Set the tuProlog config frame

--     *

--     * @param libraryManager a libraryManager to associate to the libraryDialog 

-      */

-     public void setPrologConfig(PrologConfigFrame configFrame)

-     {

-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-05-16 13:56:42.000000000 +0200
-@@ -1252,7 +1252,6 @@
- 	
- 	/**
- 	 * Generates a fresh numeric identifier
--	 * @return
- 	 */
- 	protected Struct generateFreshId() {
- 		return new Struct("$obj_" + id++);        
-diff -ur tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java
---- tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java	2013-05-16 13:50:43.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java	2013-05-16 13:56:42.000000000 +0200
-@@ -35,7 +35,7 @@
- 	

-     /**

-      * Constructor that specifies the URLs array.

--	 * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"

-+	 * @param urls - Used to load a directory a URL ends with "/" or "\"

- 	 * otherwise it loads a class contained into a .jar

- 	 */

- 

-@@ -148,7 +148,7 @@
- 	

- 	/**

- 	 * Remove array URLs method.

--	 * @param urls - URL to be removed.

-+	 * @param url - URL to be removed.

- 	 */

- 

- 	public void removeURL(URL url) throws IllegalArgumentException

-diff -ur tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.7.0/src/alice/util/InspectionUtils.java
---- tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java	2013-05-16 13:50:43.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/InspectionUtils.java	2013-05-16 13:56:42.000000000 +0200
-@@ -14,9 +14,9 @@
- 	/**
- 	 * @author Michele Mannino
- 	 * 
--	 * @param type: class to be inspected
--	 * @param methodName: name of method
--	 * @param parms: array of params
-+	 * @param type class to be inspected
-+	 * @param methodName name of method
-+	 * @param parms array of params
- 	 */
- 	public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
- 	    Method[] methods = type.getMethods();
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java	2013-05-16 13:56:42.000000000 +0200
-@@ -24,7 +24,7 @@
-  *
-  * @author Slava Pestov
-  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
-  */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
-     /**
-      * Grabs the next key typed event and invokes the specified
-      * action with the key as a the action command.
--     * @param action The action
-+     * @param listener The action
-      */
-     public void grabNextKeyStroke(ActionListener listener)
-     {
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java	2013-05-16 13:56:42.000000000 +0200
-@@ -1401,7 +1401,7 @@
- 
- 	/**
- 	 * Sets if the selection should be rectangular.
--	 * @param overwrite True if the selection should be rectangular,
-+	 * @param rectSelect True if the selection should be rectangular,
- 	 * false otherwise.
- 	 */
- 	public final void setSelectionRectangular(boolean rectSelect)
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java	2013-05-16 13:56:42.000000000 +0200
-@@ -75,7 +75,7 @@
-     /**
-      * Adds a key-value mapping.
-      * @param keyword The key
--     * @Param id The value
-+     * @param id The value
-      */
-     public void add(String keyword, byte id)
-     {
-@@ -102,9 +102,6 @@
-     }
- 
-     // protected members
--    /**
--	 * @uml.property  name="mapLength"
--	 */
-     protected int mapLength;
- 
-     protected int getStringMapKey(String s)
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java	2013-05-16 13:56:42.000000000 +0200
-@@ -75,7 +75,7 @@
- 
-     /**
- 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
--	 * @see  org.gjt.sp.jedit.syntax.Token
-+	 * @see  alice.util.jedit.Token
- 	 */
-     public final SyntaxStyle[] getStyles()
-     {
-@@ -85,7 +85,7 @@
-     /**
- 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- 	 * @param styles  The syntax styles
--	 * @see  org.gjt.sp.jedit.syntax.Token
-+	 * @see  alice.util.jedit.Token
- 	 */
-     public final void setStyles(SyntaxStyle[] styles)
-     {
-@@ -356,7 +356,7 @@
- 
-     /**
-      * Repaints the text.
--     * @param g The graphics context
-+     * @param gfx The graphics context
-      */
-     public void paint(Graphics gfx)
-     {
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java	2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java	2013-05-16 13:56:42.000000000 +0200
-@@ -23,7 +23,7 @@
-  * @author Slava Pestov
-  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
-  *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
-  */
- public abstract class TokenMarker
- {
-diff -ur tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java
---- tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java	2013-05-16 13:50:43.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java	2013-05-16 13:56:42.000000000 +0200
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
- 
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
-  * and ensures that the given list is navigated only.
-  *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
-  * support modifiers methods, and throws {@link UnsupportedOperationException}
-  * if invoked.
-  *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
new file mode 100644
index 000000000000..0416258e9e14
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
@@ -0,0 +1,20 @@
+--- tuprolog-2.9.2.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java	2015-02-27 14:02:49.000000000 +0100
++++ tuprolog-2.9.2/test/unit/alice/tuprolog/JavaLibraryTestCase.java	2016-02-17 15:24:47.000000000 +0100
+@@ -39,7 +39,7 @@
+ 		SolveInfo goal = engine.solve(new Struct("demo", t));

+ 		assertFalse(goal.isSuccess());

+ 	}

+-

++/*

+ 	public void testDynamicObjectsRetrival() throws PrologException {

+ 		Prolog engine = new Prolog();

+ 		JavaLibrary lib = (JavaLibrary) engine.getLibrary("alice.tuprolog.lib.JavaLibrary");

+@@ -53,7 +53,7 @@
+ 		TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);

+ 		assertEquals(2, counter.getValue());

+ 	}

+-

++*/

+ 	

+ 	public void test_java_object() throws PrologException, IOException

+ 	{

diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
new file mode 100644
index 000000000000..d94dc66bbac5
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
@@ -0,0 +1,116 @@
+diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java	2015-01-11 14:48:57.000000000 +0100
+@@ -9,11 +9,11 @@
+ import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.util.*;
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+ 
+ import alice.tuprolog.event.LibraryEvent;
+ import alice.tuprolog.event.WarningEvent;
+-import alice.util.AssemblyCustomClassLoader;
++//import alice.util.AssemblyCustomClassLoader;
+ 
+ /**
+  * @author Alex Benini
+@@ -179,31 +179,7 @@
+ 				} else
+ 				// .NET
+ 				{
+-					Assembly asm = null;
+-					boolean classFound = false;
+-					className = "cli."
+-							+ className.substring(0, className.indexOf(","))
+-									.trim();
+-					for (int i = 0; i < paths.length; i++)
+-					{
+-						try
+-						{
+-							asm = Assembly.LoadFrom(paths[i]);
+-							loader = new AssemblyCustomClassLoader(asm, urls);
+-							lib = (Library) Class.forName(className, true, loader).newInstance();
+-							if (lib != null)
+-							{
+-								classFound = true;
+-								break;
+-							}
+-						} catch (Exception e)
+-						{
+-							e.printStackTrace();
+-							continue;
+-						}
+-					}
+-					if (!classFound)
+-						throw new InvalidLibraryException(className, -1, -1);
++					throw new InvalidLibraryException(className, -1, -1);
+ 				}
+ 			}
+ 
+@@ -462,4 +438,4 @@
+ 		return optimizedDirectory;
+ 	}
+ 
+-}
+\ No newline at end of file
++}
+diff -urN tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java	2015-01-11 14:46:23.000000000 +0100
+@@ -18,7 +18,7 @@
+ package alice.tuprologx.ide;

+ 

+ import alice.tuprolog.*;

+-import alice.util.AssemblyCustomClassLoader;

++//import alice.util.AssemblyCustomClassLoader;

+ 

+ import java.io.File;

+ import java.net.URL;

+@@ -26,7 +26,7 @@
+ import java.util.ArrayList;

+ import java.util.Hashtable;

+ import java.util.StringTokenizer;

+-import cli.System.Reflection.Assembly;

++//import cli.System.Reflection.Assembly;

+ 

+ /**

+  * A dynamic manager for tuProlog libraries.

+@@ -155,10 +155,7 @@
+ 	        	// .NET

+ 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))

+ 	        	{

+-	        		Assembly asm = Assembly.LoadFrom(file.getPath());

+-	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});

+-	        		libraryClassname = "cli." + libraryClassname.substring(0, 

+-	        				libraryClassname.indexOf(",")).trim();

++	        		throw new InvalidLibraryException(libraryClassname,-1,-1);

+ 	        	}

+ 	        	// JVM

+ 	        	else

+diff -urN tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java	2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
+@@ -1,21 +0,0 @@
+-package alice.util;

+-

+-import java.net.URL;

+-

+-public class AssemblyCustomClassLoader extends java.net.URLClassLoader

+-{

+-  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)

+-  {

+-    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));

+-    // explicitly calling addURL() is safer than passing it to the super constructor,

+-    // because this class loader instance may be used during the URL construction.

+-    for (URL url : urls) {

+-    	addURL(url);

+-	}    

+-  }

+-  

+-  public void addUrl(URL url)

+-  {

+-	  addURL(url);

+-  }

+-}
+\ No newline at end of file
diff --git a/dev-lang/tuprolog/tuprolog-2.5.0.ebuild b/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
deleted file mode 100644
index 011c8f545ca5..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/javassist-3"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	test? ( dev-java/ant-junit )"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist-3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-javadocs.patch
-
-	cp "${FILESDIR}"/build.xml "${S}" || die
-	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
-		|| die "sed build.xml failed"
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit
-	cd "${S}"
-	ANT_TASKS="ant-junit" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-2.6.0.ebuild b/dev-lang/tuprolog/tuprolog-2.6.0.ebuild
deleted file mode 100644
index 74294621632a..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=virtual/jdk-1.7
-	>=dev-java/javassist-3"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4
-		dev-java/hamcrest-core
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist-3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-javadocs.patch
-
-	cp "${FILESDIR}"/build.xml "${S}" || die
-	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
-		|| die "sed build.xml failed"
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit-4
-	java-pkg_jar-from hamcrest-core
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
-		|| die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-2.7.0.ebuild b/dev-lang/tuprolog/tuprolog-2.7.0.ebuild
deleted file mode 100644
index 106d49674129..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=virtual/jdk-1.7
-	>=dev-java/javassist-3"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4
-		dev-java/hamcrest-core
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist-3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-javadocs.patch
-
-	cp "${FILESDIR}"/build.xml "${S}" || die
-	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
-		|| die "sed build.xml failed"
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit-4
-	java-pkg_jar-from hamcrest-core
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
-		|| die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
new file mode 100644
index 000000000000..10ce06ab7b0f
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://tuprolog.unibo.it/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=virtual/jdk-1.7:=
+	 dev-java/javassist:3"
+
+DEPEND="${RDEPEND}
+	dev-java/ant-core
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+		dev-java/hamcrest-core:1.3
+	)"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist:3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-ikvm.patch
+	epatch "${FILESDIR}"/${P}-no-dynamic-object-test.patch
+
+	cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit:4
+	java-pkg_jar-from hamcrest-core:1.3
+	cd "${S}"
+	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dojar dist/2p.jar
+	java-pkg_dojar lib/autocomplete.jar
+	java-pkg_dojar lib/rsyntaxtextarea.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+		dodoc doc/tuprolog-guide.pdf
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins doc/examples/*.pl
+	fi
+}
diff --git a/dev-lang/vala/vala-0.30.1.ebuild b/dev-lang/vala/vala-0.30.1.ebuild
index 0f2884d51e6d..7f1ba9e66c5e 100644
--- a/dev-lang/vala/vala-0.30.1.ebuild
+++ b/dev-lang/vala/vala-0.30.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.30"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 011cee3f8d4f..9d4eb32202bc 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,6 +1,8 @@
 DIST XSB336.tar.gz 11823814 SHA256 3ac7448d7c323717d67edd09f37515ef991d71871ca3ce521975981fee1d9de7 SHA512 dc227e1338454a181ee2c3f84b2c8083bd4607252d89368a614a9894c5403eaf173fdc036a548aab8c6eb2ed7252e5e69a5caedff20710e83cf8c6ec66a8317a WHIRLPOOL bc48fe7dced9c3050253f2122507715abb0a528ba702432ca63a0385cccf47d9a8a1f47b901f779811c238d2015a368a420adbb93d4f68f0640396069112ad19
 DIST XSB337.tar.gz 12176947 SHA256 6deb73ed8774ff2e0414ee7a1af29a3768b964f3fe22e7579670d61c3ca7ff40 SHA512 e98c56ad7fb107252160a03a1c07567119921be6a06c7be22960f2334517ccc8799d8bc49d4e260697f5d5912dda0236dc697b4fb8016652b4f81255ae442883 WHIRLPOOL 2daac410add67fcdffcd47660d0bf52701626be23dd6c2400efbe21e2f3f02b5f11d5231e9fac19787369ddf9a8499d9c876889849078dcd4714ca0ed5c75f8a
 DIST XSB350.tar.gz 12122366 SHA256 f9664f89e56294d0d174d81b23ebd8314a5f9cc38816ee6ce5ab9d51bfeca63f SHA512 2ef45ef3427f331ad678deb41f7b9ef8bbc4f6d8ef6ec060e755115e91a002f3ac694c53f8f777d1b0790040f3318c23116a6b98c50faeeb541b3e9c2ed22e9f WHIRLPOOL bbdfea2ff42e28abfaf6532a46517c538fc391bef629589445903403435b2227adb2c6ce5705bc0edc16cb478b32f4b86a1250ad27b9b2fa91d49683e25ae887
+DIST XSB360.tar.gz 12842882 SHA256 bb8d2b30e598574e263ddb48b7569e5582953a0c4f8b16d55f6bbf306e9e7faa SHA512 2ac2f4d4c7501479648b7f618815d4cd996969791a617f2148ef7498cf08bacd67eab298136303b6804cb689129ae3365e1490ec693f2232f9c9f1ad515d9c6c WHIRLPOOL 057a1939ff4115c2fc4cd91f10458a4d89847b6394723ea05a4a86d9e7986ee3c03f7ff1b2eff2389ec3c1be7d20b69cdf77be016066cf261b2af131dfbb2176
 DIST xsb-3.3.6-gentoo-patchset-1.tar.gz 17711 SHA256 7630aa3497a80e6a39580bb050da8169318842de3f6b17a8b1f8a721ea6ec0e4 SHA512 a554833e974973f3bf6ad9d63d1e7bcbe358cfccdd35ad3f982375cfa171637484277c9c8be95c5eea34dac87845d02b6abc7d4675e1ff324c64603ae06338d1 WHIRLPOOL 5a0c6bfcc554e5c34f57acf1de2001bfbdea7e18e2ed1037409f58dc2151199c79af01f7d7cca8b7dea79bfe571fca8ff6b1f78ab368d7255e49dab8fe61fa3e
 DIST xsb-3.3.7-gentoo-patchset-0.tar.gz 18248 SHA256 2eaad6dedac906f207c24713d92115086196f3c626d1b0e0401c71b4bfe10038 SHA512 3943000e40abad25da8fef2983e059dadf6d794a5a40406a3fb9d7e29506afb0d5ad1d86b0825849ea7dd9741fdfafa2b71fc2fd26cc2b679e39d85f76a91959 WHIRLPOOL d2d51c482d1ff207709c8ed280eb148c632d81d4670ead646c8eb5a62651932dbe292adca03060d1b591405fdbad274be1b767fd3e19e5a4f4e4da3fd4277ea6
 DIST xsb-3.5.0-gentoo-patchset-0.tar.gz 5337 SHA256 3dbdbc3bbbfeac4083221ec89d524026fa9ec8a528baacb1c1e3495629a0bbee SHA512 a1158d4480dada855c3cdb80b065b1c3ac2c9b7e8da16ce0a39e7ffb70821c547ae2ba3bf1776a2c70f02bf85828bedbaa81cf4be469c7aeced5d8df541aa998 WHIRLPOOL 1b61a1136433e3119eb6a4018adf8aafd67bbc90333452fb9cb4ac49957a05fd4b40fd64ef7bfc5e472cd2c4277d62f8d3b5db1bf3f9e5f9d396133ae78c8e84
+DIST xsb-3.6.0-gentoo-patchset-2.tar.gz 7051 SHA256 14fe682df72677e09c9ecaee7a1ef1b0f8f155344789ce90a917bc5a02735947 SHA512 285211c9d1fa52acff707b0ad38f3da06374b8ac187ad66e9148508cbc0ec5c0f60b3e4461705b072510360ce72f81b5d5cfa4bbd1258510e7abfbbe8f0788b0 WHIRLPOOL 5c82f3b268a86b0f5bdbf0a4ffbe755253367d6d84cb24f7c6c2bf216833fb40afe4ca357148c882d57cc754cd75fc1ff7beca3084eeb104a015581e5872b337
diff --git a/dev-lang/xsb/xsb-3.6.0.ebuild b/dev-lang/xsb/xsb-3.6.0.ebuild
new file mode 100644
index 000000000000..0bca9f5748fd
--- /dev/null
+++ b/dev-lang/xsb/xsb-3.6.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="XSB${PV//./}"
+
+PATCHSET_VER="2"
+
+inherit eutils autotools java-pkg-opt-2
+
+DESCRIPTION="XSB is a logic programming and deductive database system"
+HOMEPAGE="http://xsb.sourceforge.net"
+SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug iodbc java mysql odbc pcre threads xml"
+
+RDEPEND="curl? ( net-misc/curl )
+	iodbc? ( dev-db/libiodbc )
+	java? ( >=virtual/jdk-1.4:= )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/XSB
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	cd "${S}"/build
+	eautoconf
+}
+
+src_configure() {
+	cd "${S}"/build
+
+	econf \
+		--prefix=/usr/$(get_libdir) \
+		--disable-optimization \
+		--without-smodels \
+		$(use_with odbc) \
+		$(use_with iodbc) \
+		$(use_enable threads mt) \
+		$(use_enable debug)
+
+	if use curl ; then
+		cd "${S}"/packages/curl
+		econf
+	fi
+
+	if use mysql ; then
+		cd "${S}"/packages/dbdrivers/mysql
+		econf
+	fi
+
+	if use odbc ; then
+		cd "${S}"/packages/dbdrivers/odbc
+		econf
+	fi
+
+	if use pcre ; then
+		cd "${S}"/packages/pcre
+		econf
+	fi
+
+	if use xml ; then
+		cd "${S}"/packages/xpath
+		econf
+	fi
+}
+
+src_compile() {
+	cd "${S}"/build
+
+	emake || die "emake failed"
+
+	# All XSB Packages are compiled using a single Prolog engine.
+	# Consequently they must all be compiled using a single make job.
+
+	cd "${S}"/packages
+	rm -f *.xwam
+	emake -j1 || die "emake packages failed"
+
+	if use curl ; then
+		emake -j1 curl || die "emake curl package failed"
+		emake -j1 sgml || die "emake sgml package failed"
+		if use xml ; then
+			emake -j1 xpath || die "emake xpath package failed"
+		fi
+	fi
+
+	if use mysql ; then
+		emake -j1 mysql || die "emake mysql package failed"
+	fi
+
+	if use odbc ; then
+		emake -j1 odbc || die "emake odbc package failed"
+	fi
+
+	if use pcre ; then
+		emake -j1 pcre || die "emake pcre package failed"
+	fi
+}
+
+src_install() {
+	cd "${S}"/build
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
+	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die
+
+	cd "${S}"/packages
+	local PACKAGES=${XSB_INSTALL_DIR}/packages
+	insinto ${PACKAGES}
+	doins *.xwam || die
+
+	insinto ${PACKAGES}/chr
+	doins chr/*.xwam || die
+
+	insinto ${PACKAGES}/clpqr
+	doins clpqr/*.xwam || die
+
+	insinto ${PACKAGES}/gap
+	doins gap/*.xwam || die
+
+	insinto ${PACKAGES}/justify
+	doins justify/*.xwam || die
+	doins justify/*.H || die
+
+	insinto ${PACKAGES}/regmatch
+	doins regmatch/*.xwam || die
+	insinto ${PACKAGES}/regmatch/cc
+	doins regmatch/cc/*.H || die
+
+	insinto ${PACKAGES}/slx
+	doins slx/*.xwam || die
+
+	insinto ${PACKAGES}/wildmatch
+	doins wildmatch/*.xwam || die
+	insinto ${PACKAGES}/wildmatch/cc
+	doins wildmatch/cc/*.H || die
+
+	if use curl ; then
+		insinto ${PACKAGES}/curl
+		doins curl/*.xwam || die
+		insinto ${PACKAGES}/curl/cc
+		doins curl/cc/*.H || die
+		insinto ${PACKAGES}/sgml
+		doins sgml/*.xwam || die
+		insinto ${PACKAGES}/sgml/cc
+		doins sgml/cc/*.H || die
+		insinto ${PACKAGES}/sgml/cc/dtd
+		doins sgml/cc/dtd/* || die
+		if use xml ; then
+			insinto ${PACKAGES}/xpath
+			doins xpath/*xwam || die
+			insinto ${PACKAGES}/xpath/cc
+			doins xpath/cc/*.H || die
+		fi
+	fi
+
+	if use mysql || use odbc ; then
+		insinto ${PACKAGES}/dbdrivers
+		doins dbdrivers/*.xwam || die
+		doins dbdrivers/*.H || die
+		insinto ${PACKAGES}/dbdrivers/cc
+		doins dbdrivers/cc/*.H || die
+		if use mysql ; then
+			insinto ${PACKAGES}/dbdrivers/mysql
+			doins dbdrivers/mysql/*.xwam || die
+			insinto ${PACKAGES}/dbdrivers/mysql/cc
+			doins dbdrivers/mysql/cc/*.H || die
+		fi
+		if use odbc ; then
+			insinto ${PACKAGES}/dbdrivers/odbc
+			doins dbdrivers/odbc/*.xwam || die
+			insinto ${PACKAGES}/dbdrivers/odbc/cc
+			doins dbdrivers/odbc/cc/*.H || die
+		fi
+	fi
+
+	if use pcre ; then
+		insinto ${PACKAGES}/pcre
+		doins pcre/*.xwam || die
+		insinto ${PACKAGES}/pcre/cc
+		doins pcre/cc/*.H || die
+	fi
+
+	cd "${S}"
+	dodoc FAQ README || die
+}
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 32f5a6a86567..c26109486161 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -2,5 +2,5 @@ DIST yap-6.2.2-gentoo-patchset-2.tar.gz 5736 SHA256 a4c74594a1342ae748c6f00b2ddd
 DIST yap-6.2.2.tar.gz 5496746 SHA256 c9b5feb1ac6488797e8c722053db239cc208f7f6f09135f1e6d5f5802f90878e SHA512 8b357f02cd631b7e4d6a44911d82d329b82a654b24637d448ba0e4393ab34918df685c453f4e8b8ebb3aba71034f653c4522478cfafbb24f157c083b623bfc5e WHIRLPOOL 7d266b06874aab2c5b56391ee0d03be025f7cf2ae5ab9a2ca2ef5989b6ef5229bde491919a1b77f3af362798af83bc47614fd3bd293c0d9f4b74d202adb86ea5
 DIST yap-6.3.2-gentoo-patchset-6.tar.gz 4138 SHA256 a5691612842b89e8dc3f5755fe076f3203574da34256bcba78ce282451cfde27 SHA512 c2dc49c0e185e6b6d7bdae175d470926f7b072dad1e46d30e36e885ca4d0abc8a7908b3abc946b1d7c77006973f8ef9e7dc862ecc4ef756eff5d83a06674e5a7 WHIRLPOOL 7046a9d74d34e9f561f71b762f81ae208784eb6daccb4e0bfe7980729bd5094d34858f7d88b54c9d4589e6b835707a0150fd0a6c2b98d41d9238efbc1badb805
 DIST yap-6.3.2.tar.gz 6447312 SHA256 876a31a05a8e50a32bda8597d3381953e3ed99f37f06e7075209a501b8e2d1ed SHA512 8fd93d4e448e92f5dfd4b0dd18e0ce988766d99b3bf7a72bce3931d551c873a11468764bef6bbb132a5518870f2bce0a00658536614db3cdc6586af27d56555d WHIRLPOOL f4507cb41735f40bf343b608a443f017e118c2b99da38e8a59e630b397c4812ce087ce097e85d5af9552191b5f77559609b22f446d05a3513fec08582ea43804
-DIST yap-6.3.3-gentoo-patchset-2.tar.gz 3295 SHA256 770976f1ca7454083274f240f3a1f89e3571606ec5d0f7a9234cf850a98ce395 SHA512 945fc8ba3a6b29fb2e065c8a64bb07d51d74cbb0daa693828ff78130eb83bfd81651771eaa0296e708c434cf42955c71c860b038ad0f8406a9632549284b12e8 WHIRLPOOL 596cf57db3a0e950099170b4744e240e3dbce0f73ea7dab5e9fa140420ad224e31dd2e8e72b6440ae847b3330a2566acb484fc24fde853e12bae7afadad5b578
+DIST yap-6.3.3-gentoo-patchset-4.tar.gz 4428 SHA256 6fbf0e18191b768b608c1dc781a78fb3c8e3a4050ca4ba933b9651c80d6a0842 SHA512 fce5e997fe2efb1b1253dd8f36da14b351108b150a77c27e8d5404f96f106b7329e6ffc6a55e135ada975386c4e6ab8ccfc9a1c44e5d3eeb0e89f2aab52fcbf5 WHIRLPOOL 81ff5a6133d63a6c9588043fe0133ccf22227f58cd79338531a625271384b686226287fb608a4712378232d6e7fa6e7944236be3183f6ecd51c699fb9a853ed7
 DIST yap-6.3.3.tar.gz 7879301 SHA256 aee3b449b1669af07a8291ce6e7fb0a9b35e1343e2ab96fadb1a37552397fa78 SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80 WHIRLPOOL 3b4095ff9ecbd532d2211e9158f6bd400248b43386027894c08754aadc14712a60325aeb950b361f14b2bc105053ff8a70b025e305fb79003a68f4226a39b724
diff --git a/dev-lang/yap/yap-6.3.3.ebuild b/dev-lang/yap/yap-6.3.3.ebuild
index 2ad9b4672b2a..4dc19644a871 100644
--- a/dev-lang/yap/yap-6.3.3.ebuild
+++ b/dev-lang/yap/yap-6.3.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=5
 
 inherit eutils flag-o-matic java-pkg-opt-2 multilib
 
-PATCHSET_VER="2"
+PATCHSET_VER="4"
 
 DESCRIPTION="YAP is a high-performance Prolog compiler"
 HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
@@ -19,12 +19,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="R debug doc examples gmp java mpi mysql odbc readline static threads"
 
 RDEPEND="sys-libs/zlib
-	gmp? ( dev-libs/gmp )
-	java? ( >=virtual/jdk-1.4 )
+	gmp? ( dev-libs/gmp:0 )
+	java? ( >=virtual/jdk-1.4:= )
 	mpi? ( virtual/mpi )
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline sys-libs/ncurses )
+	readline? ( sys-libs/readline:= sys-libs/ncurses:= )
 	R? ( dev-lang/R )"
 
 DEPEND="${RDEPEND}
@@ -50,6 +50,7 @@ src_configure() {
 
 	econf \
 		--libdir=/usr/$(get_libdir) \
+		--disable-prism \
 		$(use_enable !static dynamic-loading) \
 		$(use_enable threads) \
 		$(use_enable threads pthread-locking) \
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 1af7e0b79b34..e17bd180c40f 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,3 +1,3 @@
 DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d98dadcd99d7271fb319f6279b846bf36 SHA512 1c1a1f41d6911c73a25a83396fb183d99ee139378766235b8885ee68c2b738137d55c108e7ea3ec2853e5ac5f17936b87df554bea45a1c19db3caea5bcee5d0d WHIRLPOOL 2a26ce1685ed3c78242c0ef29b4e5dea95ba070e531503f00f378f36974a8e1aa858b66640fe48ccc7c1ace9619671ff3c6d71aaf78e81a6ef5b55ab2be64090
-DIST appstream-glib-0.5.5.tar.xz 1855288 SHA256 c539b261678b152554cd0548f973c371188403dfdb88e6ca979cc378ff50bbff SHA512 529cfcca989c501ab5666c98ce85fa085afe08df72de8217802d8baa6b606c5f6e1038adb57b29351a40ec2de71cf99c1dbf4b18289286d1b7ebb5a7f15be5de WHIRLPOOL b29fc6825cb4906e8951d81301e97bb41f2c79cdb6e78475a5a1b8daa8d15bfab531903f802c2036f2065d18245f609819f72018711d0d71a0b59348752893b7
 DIST appstream-glib-0.5.7.tar.xz 1858904 SHA256 6d7fe9c5a3dd4488398628ad283a6383cc5324a02f6ff504c73393adc4972264 SHA512 f91d06cdea924d64375bd163437b9c10f9aa99e99bd2e9a015abfb1d506a58877faebfb1e320d4883e84f87b951501f5ad3a3f13a34ee4b4ff121538a9e881d6 WHIRLPOOL d5b0d02d283d069e429f4890e304be6df4465b1a384cc011a12566c7dc6b1ae239cd08a828c6e037abef24ba9613612528f9b9a4090cf62aff7a43a4a2349d26
+DIST appstream-glib-0.5.9.tar.xz 1868132 SHA256 f0e4818553fe763894c660fec2c461b8815f83869acbf165daf32e2e41a5b166 SHA512 3c39233df97c464bfc993b54cee7eea01407220de39f833e34a017f6efc4c9bad0eb1762d72aed5eee94bb6a66044c7e031ede6685e1804b7ad6833b12fa9f7b WHIRLPOOL bbcc4318fafb1c3d94a8d695b924d2dec6f8c1bc968de3ca1480a8db6df47b7f30d2b656be09d7b6c2d7ed919b943452eca5b35e4559ff869872e97374228234
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild
deleted file mode 100644
index d207a6c8183c..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.5.5.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
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~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.45.8:2
-	dev-libs/libyaml
-	>=media-libs/fontconfig-2.11
-	>=media-libs/freetype-2.4:2
-	>=net-libs/libsoup-2.51.92:2.4
-	sys-apps/util-linux
-	>=x11-libs/gdk-pixbuf-2.31.5:2
-	x11-libs/gtk+:3
-	x11-libs/pango
-	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 \
-		--enable-firmware \
-		--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/appstream-glib/appstream-glib-0.5.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild
new file mode 100644
index 000000000000..6bb20a3f2010
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.9.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="~alpha amd64 ~arm ~hppa ~ia64 ~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.45.8:2
+	dev-libs/libyaml
+	>=media-libs/fontconfig-2.11
+	>=media-libs/freetype-2.4:2
+	>=net-libs/libsoup-2.51.92:2.4
+	sys-apps/util-linux
+	>=x11-libs/gdk-pixbuf-2.31.5:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	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
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-builder \
+		--enable-firmware \
+		--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.18.0.ebuild b/dev-libs/atk/atk-2.18.0.ebuild
index 23f3d2bc227a..b9466dfc0a45 100644
--- a/dev-libs/atk/atk-2.18.0.ebuild
+++ b/dev-libs/atk/atk-2.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.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/boehm-gc/boehm-gc-7.4.0.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.0.ebuild
index 5f49136fbec3..acfac76a2920 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.0.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.0.ebuild
@@ -35,6 +35,7 @@ src_configure() {
 src_compile() {
 	# Workaround build errors. #574566
 	use ia64 && emake src/ia64_save_regs_in_stack.lo
+	use sparc && emake src/sparc_mach_dep.lo
 	default
 }
 
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
index 7a4be804203b..fa6d46c14fbb 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
@@ -35,6 +35,7 @@ src_configure() {
 src_compile() {
 	# Workaround build errors. #574566
 	use ia64 && emake src/ia64_save_regs_in_stack.lo
+	use sparc && emake src/sparc_mach_dep.lo
 	default
 }
 
diff --git a/dev-libs/btparser/btparser-0.26.ebuild b/dev-libs/btparser/btparser-0.26.ebuild
index 8361f569ae77..82b6fa616b4c 100644
--- a/dev-libs/btparser/btparser-0.26.ebuild
+++ b/dev-libs/btparser/btparser-0.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 1e9d7e76d259..27b8be9696a0 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -2,3 +2,4 @@ DIST efl-1.12.2-lauch_via_logind_or_root_privilege.patch.xz 6276 SHA256 9af4e2cc
 DIST efl-1.12.2.tar.bz2 46808743 SHA256 aa1a6b95de3d92dda819e1245254e3d9c0d68f77d27d89afb1ae3f2244c0bf0c SHA512 8d137a4cd7a11f102b949bfc7047b3be870df6d7ede72765b005914729bf291f59d1f70b69ab7fbbd3328975068aa5ded2f10e556a7d4f7c31aedfcd0d7340e9 WHIRLPOOL 531f81000dafbd88dacd24588a3832a7c2afccf466d070d78d86641b8c0e3e64854c4f9d8dfe46ab0fb84fd6890ac6eb3e8e63d02ef58bedf88c265412f3ddf7
 DIST efl-1.15.2.tar.xz 43176564 SHA256 dd738f19f454621a7fa1fdb4c008457c170989f5f0c535edfed7b6773ae6c2a4 SHA512 bee8d7473bac73545ca02180f42614b7ae6ee0628fe8879b35bbf6809353535df8b1fa01f19ddc81d2ee1ecb5e36512b63c3be4b6b982f4efe8e410aa8ad5c56 WHIRLPOOL 380debdded1989412579cbe17d057512acb8381527c6c50606e6e936ea8bd0f1f1077861ca9afbb5661f404eb658c0dc288d991b204fbca72506d7b89f511df2
 DIST efl-1.16.1.tar.xz 43216556 SHA256 ef01be81598f03aa0e873951cf8280d963fad2b543cdbd3d749916e91825da84 SHA512 85ea5ec7a0d79ce4d9b4308cc262922b0c7b21bef8e415ea774e5e1c7916519a02f9c9526dc2d47c985c055796a81df173a78ea1cb13d2440b87b865473ee38c WHIRLPOOL 03e0398fcc09ebfcbaf5567224f028da273e225d7281553e5ff1997d52b1a3ef2c74423bc58ac2eeb12ac10d20068a6062d870cbc4fdc3b746866af72f5db0db
+DIST efl-1.17.0.tar.xz 43485360 SHA256 c13540bad764d014fea2c079fad8fcca62e5c229994d43aa4eb692d2c9b73afe SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da WHIRLPOOL a9687320a5a61a727dd1ad8d757b260f72165ed54fb311cb0ff0c33590b8fc083aae1850cd8bdc5ae5c7506df119a445457cda9e076193692130c92e01e2d5bf
diff --git a/dev-libs/efl/efl-1.17.0.ebuild b/dev-libs/efl/efl-1.17.0.ebuild
new file mode 100644
index 000000000000..3972324ef27e
--- /dev/null
+++ b/dev-libs/efl/efl-1.17.0.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+elif [[ *"${PV}" == *"_pre"* ]] ; then
+	MY_P=${P%%_*}
+	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment pax-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind wayland webp X xim xine xpm"
+
+REQUIRED_USE="
+	pulseaudio?	( sound )
+	opengl?		( || ( X sdl wayland ) )
+	gles?		( || ( X wayland ) )
+	gles?		( !sdl )
+	gles?		( egl )
+	sdl?		( opengl )
+	wayland?	( egl !opengl gles )
+	xim?		( X )
+"
+
+RDEPEND="
+	drm? (
+		>=dev-libs/libinput-0.8
+		media-libs/mesa[gbm]
+		>=x11-libs/libdrm-2.4
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib )
+	glib? ( dev-libs/glib:2 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl )
+		)
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	!oldlua? ( >=dev-lang/luajit-2.0.0 )
+	oldlua? ( dev-lang/lua:* )
+	physics? ( >=sci-physics/bullet-2.80 )
+	pixman? ( x11-libs/pixman )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	systemd? ( sys-apps/systemd )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib )
+	valgrind? ( dev-util/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.8.0
+		>=x11-libs/libxkbcommon-0.3.1
+		media-libs/mesa[gles2,wayland]
+	)
+	webp? ( media-libs/libwebp )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXp
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+	xpm? ( x11-libs/libXpm )
+
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.20.0
+	sys-libs/zlib
+	virtual/jpeg:0=
+
+	!dev-libs/ecore
+	!dev-libs/edbus
+	!dev-libs/eet
+	!dev-libs/eeze
+	!dev-libs/efreet
+	!dev-libs/eina
+	!dev-libs/eio
+	!dev-libs/embryo
+	!dev-libs/eobj
+	!dev-libs/ephysics
+	!media-libs/edje
+	!media-libs/emotion
+	!media-libs/ethumb
+	!media-libs/evas
+"
+#external lz4 support currently broken because of unstable ABI/API
+#	app-arch/lz4
+
+#soft blockers added above for binpkg users
+#hard blocks are needed for building
+CORE_EFL_CONFLICTS="
+	!!dev-libs/ecore
+	!!dev-libs/edbus
+	!!dev-libs/eet
+	!!dev-libs/eeze
+	!!dev-libs/efreet
+	!!dev-libs/eina
+	!!dev-libs/eio
+	!!dev-libs/embryo
+	!!dev-libs/eobj
+	!!dev-libs/ephysics
+	!!media-libs/edje
+	!!media-libs/emotion
+	!!media-libs/ethumb
+	!!media-libs/evas
+"
+
+DEPEND="
+	${CORE_EFL_CONFLICTS}
+
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	enlightenment_src_prepare
+
+	# Remove stupid sleep command.
+	# Also back out gnu make hack that causes regen of Makefiles.
+	# Delete var setting that causes the build to abort.
+	sed -i \
+		-e '/sleep 10/d' \
+		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+		-e '/BARF_OK=/s:=.*:=:' \
+		configure || die
+}
+
+src_configure() {
+	if use ssl && use gnutls ; then
+		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
+		einfo "gnutls has been selected for you."
+	fi
+	if use opengl && use gles ; then
+		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
+		einfo "opengl has been selected for you."
+	fi
+
+	E_ECONF=(
+		--with-profile=$(usex debug debug release)
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-x11=$(usex X xlib none)
+		$(use_with X x)
+		--with-opengl=$(usex opengl full $(usex gles es none))
+		--with-glib=$(usex glib)
+		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
+
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable drm)
+		$(use_enable doc)
+		$(use_enable eet image-loader-eet)
+		$(use_enable egl)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable oldlua lua-old)
+		$(use_enable physics)
+		$(use_enable pixman)
+		$(use_enable pixman pixman-font)
+		$(use_enable pixman pixman-rect)
+		$(use_enable pixman pixman-line)
+		$(use_enable pixman pixman-poly)
+		$(use_enable pixman pixman-image)
+		$(use_enable pixman pixman-image-scale-sample)
+		$(use_enable png image-loader-png)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l2)
+		$(use_enable valgrind)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		--enable-cserve
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+
+		--disable-tizen
+		--disable-gesture
+		--disable-gstreamer
+		--enable-xinput2
+		--disable-xinput22
+		--disable-multisense
+		--enable-libmount
+
+		# external lz4 support currently broken because of unstable ABI/API
+		#--enable-liblz4
+	)
+
+	enlightenment_src_configure
+}
+
+src_compile() {
+	if host-is-pax && ! use oldlua ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+	enlightenment_src_compile
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+
+	enlightenment_src_install
+}
diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
index 55d75c027b77..aebcc03576eb 100644
--- a/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
+++ b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs stlport"
 
 RDEPEND="stlport? ( >=dev-libs/STLport-5 )
diff --git a/dev-libs/folks/folks-0.11.2.ebuild b/dev-libs/folks/folks-0.11.2.ebuild
index 4b397f00a82f..2f7627abb895 100644
--- a/dev-libs/folks/folks-0.11.2.ebuild
+++ b/dev-libs/folks/folks-0.11.2.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/freexl/Manifest b/dev-libs/freexl/Manifest
index 73fc3a2bc6aa..d973cc704c25 100644
--- a/dev-libs/freexl/Manifest
+++ b/dev-libs/freexl/Manifest
@@ -1 +1,2 @@
 DIST freexl-1.0.0e.tar.gz 921094 SHA256 ab07ebd7efa8779e11252752e5bc119accd57a610408a0e198151f4fcc969bfa SHA512 09191cc1b959f50dff28d8a8c4f28c559935e999918bc1273e8b7ee1cd8d7902d25d591bfd570b18fc4ee4e5b3b8c57e8979c43783d8411244bc6148c6ede7ed WHIRLPOOL da93b2ecdda3a0dfe5b3936460b376fdbe27658ac277b3bcb6eb48c2e7b11eca25ea1139a47936b05b7a4603139f1b299dc281b1b56880b62edc618c6b0ddab5
+DIST freexl-1.0.1.tar.gz 933371 SHA256 df0127e1e23e9ac9a189c27880fb71207837e8cba93d21084356491c9934b89b SHA512 a945d642a7ae9bc7c9dfc48a5bfd61da71290558bbcc73124bc09f08e8eae3bc96ab5e478a5b5205a897ad5d7783269a8232992d5068121436013c51524801c5 WHIRLPOOL 3d5277d3797784cd561867c95bdd80104088acc0b8b5b92268e540c313621421b1b065bafcef59b43fd4311d7cebeddcdb0f1cb22005a80b717719b1c524a597
diff --git a/dev-libs/freexl/freexl-1.0.1.ebuild b/dev-libs/freexl/freexl-1.0.1.ebuild
new file mode 100644
index 000000000000..db6703f1a25d
--- /dev/null
+++ b/dev-libs/freexl/freexl-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Simple XLS data extraction library"
+HOMEPAGE="http://www.gaia-gis.it/gaia-sins/"
+SRC_URI="http://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
+IUSE="static-libs"
+
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/gdl/gdl-3.18.0.ebuild b/dev-libs/gdl/gdl-3.18.0.ebuild
index 5d23138334cb..faf931fe8db2 100644
--- a/dev-libs/gdl/gdl-3.18.0.ebuild
+++ b/dev-libs/gdl/gdl-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/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/glib/glib-2.46.2-r1.ebuild b/dev-libs/glib/glib-2.46.2-r1.ebuild
index 92ad2ffdfbb0..736a3ace76f4 100644
--- a/dev-libs/glib/glib-2.46.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.46.2-r1.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.46.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
index a85f562b8b54..53918df6d61f 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.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.46.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
index 9b2328495d66..dbd8a09d0138 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.46.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/gom/gom-0.3.2.ebuild b/dev-libs/gom/gom-0.3.2.ebuild
index 718bd302f0f0..3ca9916d0644 100644
--- a/dev-libs/gom/gom-0.3.2.ebuild
+++ b/dev-libs/gom/gom-0.3.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection python"
 REQUIRED_IUSE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
 
diff --git a/dev-libs/intel-common/Manifest b/dev-libs/intel-common/Manifest
index 96c604666fd2..65f24cd8fc59 100644
--- a/dev-libs/intel-common/Manifest
+++ b/dev-libs/intel-common/Manifest
@@ -1,23 +1,5 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
-DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
-DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
-DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
-DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 SHA256 e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81 WHIRLPOOL 997c96d0d9d6c603f8659a5ece91aa55b9a7bf5b428065ac55a0fa3d5577dab7fcc61157a983eb355832dc7c201fde4e5fcc9ff7bcb4d8b656847c2c1092b1dd
diff --git a/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild b/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild
deleted file mode 100644
index 9f082d6db514..000000000000
--- a/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=325M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		MANPATH=${INTEL_SDP_EDIR}/man/en_US
-		INTEL_LICENSE_FILE=${INTEL_SDP_EDIR}/licenses
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-	dodir ${INTEL_SDP_DIR}/licenses
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-13.0.0.079.ebuild b/dev-libs/intel-common/intel-common-13.0.0.079.ebuild
deleted file mode 100644
index a66e0bb016ae..000000000000
--- a/dev-libs/intel-common/intel-common-13.0.0.079.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=325M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		MANPATH=${INTEL_SDP_EDIR}/man/en_US
-		INTEL_LICENSE_FILE=${INTEL_SDP_EDIR}/licenses
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-	dodir ${INTEL_SDP_DIR}/licenses
-}
diff --git a/dev-libs/intel-common/intel-common-13.0.1.117.ebuild b/dev-libs/intel-common/intel-common-13.0.1.117.ebuild
deleted file mode 100644
index 44f802e847c6..000000000000
--- a/dev-libs/intel-common/intel-common-13.0.1.117.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=325M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-13.1.2.146.ebuild b/dev-libs/intel-common/intel-common-13.1.2.146.ebuild
deleted file mode 100644
index c50958f4d168..000000000000
--- a/dev-libs/intel-common/intel-common-13.1.2.146.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-13.1.3.163.ebuild b/dev-libs/intel-common/intel-common-13.1.3.163.ebuild
deleted file mode 100644
index fdc1379fd0da..000000000000
--- a/dev-libs/intel-common/intel-common-13.1.3.163.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-14.0.0.080.ebuild b/dev-libs/intel-common/intel-common-14.0.0.080.ebuild
deleted file mode 100644
index 60f0840bc346..000000000000
--- a/dev-libs/intel-common/intel-common-14.0.0.080.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-14.0.1.106.ebuild b/dev-libs/intel-common/intel-common-14.0.1.106.ebuild
deleted file mode 100644
index e3ba452140e3..000000000000
--- a/dev-libs/intel-common/intel-common-14.0.1.106.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-14.0.2.144.ebuild b/dev-libs/intel-common/intel-common-14.0.2.144.ebuild
deleted file mode 100644
index 7a779d09fe34..000000000000
--- a/dev-libs/intel-common/intel-common-14.0.2.144.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-15.0.0.090-r1.ebuild b/dev-libs/intel-common/intel-common-15.0.0.090-r1.ebuild
deleted file mode 100644
index d18c02e513b7..000000000000
--- a/dev-libs/intel-common/intel-common-15.0.0.090-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-15.0.1.133.ebuild b/dev-libs/intel-common/intel-common-15.0.1.133.ebuild
deleted file mode 100644
index 48cd1a45e0f7..000000000000
--- a/dev-libs/intel-common/intel-common-15.0.1.133.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-15.0.2.164.ebuild b/dev-libs/intel-common/intel-common-15.0.2.164.ebuild
deleted file mode 100644
index 86ca01cdc752..000000000000
--- a/dev-libs/intel-common/intel-common-15.0.2.164.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-15.0.3.187.ebuild b/dev-libs/intel-common/intel-common-15.0.3.187.ebuild
deleted file mode 100644
index d0f42e36d6aa..000000000000
--- a/dev-libs/intel-common/intel-common-15.0.3.187.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
diff --git a/dev-libs/intel-common/intel-common-15.0.6.233.ebuild b/dev-libs/intel-common/intel-common-15.0.6.233.ebuild
new file mode 100644
index 000000000000..98c375cc3366
--- /dev/null
+++ b/dev-libs/intel-common/intel-common-15.0.6.233.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=8470
+INTEL_DPV=2015_update6
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
+
+IUSE="+compiler"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+CHECKREQS_DISK_BUILD=375M
+
+pkg_setup() {
+	einfo ${INTEL_SDP_EDIR}
+	INTEL_BIN_RPMS="openmp openmp-devel"
+	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
+	if use compiler; then
+		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
+		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
+	fi
+	intel-sdp_pkg_setup
+}
+
+src_install() {
+	intel-sdp_src_install
+	local path rootpath ldpath arch fenv=35intelsdp
+	cat > ${fenv} <<-EOF
+		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
+		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
+	EOF
+	for arch in ${INTEL_ARCH}; do
+			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
+			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
+			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
+	done
+	cat >> ${fenv} <<-EOF
+		PATH=${path#:}
+		ROOTPATH=${rootpath#:}
+		LDPATH=${ldpath#:}
+	EOF
+
+	doenvd ${fenv}
+
+	cat >> "${T}"/40-${PN} <<- EOF
+	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
+	EOF
+	insinto /etc/revdep-rebuild/
+	doins "${T}"/40-${PN}
+}
diff --git a/dev-libs/libbsd/libbsd-0.8.2.ebuild b/dev-libs/libbsd/libbsd-0.8.2.ebuild
index 8ea964288df0..b24a6b8df277 100644
--- a/dev-libs/libbsd/libbsd-0.8.2.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 pkg_setup() {
diff --git a/dev-libs/libcroco/libcroco-0.6.11.ebuild b/dev-libs/libcroco/libcroco-0.6.11.ebuild
index 74ab744bc6b5..7c0bce98f758 100644
--- a/dev-libs/libcroco/libcroco-0.6.11.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.11.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-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-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 4a2fcffb8df7..003d4d03671d 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,2 +1,2 @@
-DIST libfilezilla-0.3.0.tar.bz2 372588 SHA256 1ca09836fc166f21cedb71a45e5efc0771650a74d9f611d1fe320f36b53fa42d SHA512 c243cf32bddcee2ce568c08e81deebe7335e6b7f793751972d1b4f7629e3cd70113489c6cbc48c41a9ad0632eb5b7d3cb8ab470d591419b19563dcb9dab3a0dd WHIRLPOOL 66cc027349d31656c885b1063eff482b5a3077fbbd9dbb6e7c03a4880cc654574a8d010ff906ddcd057fef0a440c2093c6627ac7972c9b552b950302e7befae5
 DIST libfilezilla-0.3.1.tar.bz2 372673 SHA256 a4adde9ce2de975e0f8b111705b9f89939466f19edf609efb785a6bf00f050ef SHA512 7f6342e4b3be1c96b76d19b388c3b3f29406dcbf23ec012300f8c35fe1c81fce95725727ff8386d4ae536b8eb59466766d768b6f2ccdef33b69ac7a009cf618f WHIRLPOOL dee1734825225f4ce9d22348e8a83b6c52f153b5889f8895f692554fc7749ceeab87b063f5e464f62360349b58c7957eacf1243ff0b5fe019d596b278ae8c861
+DIST libfilezilla-0.4.0.1.tar.bz2 373987 SHA256 6003689254e9d250bcdefc1414dcc4a0d324fda3d59436a497e249b225f4b1d1 SHA512 6a86cb7794ace650e2d49c01c668d901d669b0bfbde78a4e72528fea40edfc5579cc4d594ea214fd259113b6cd1be5d4808d1465452745cb7a8cf0aa8c66c9c1 WHIRLPOOL 4c98ff899965f3deab2a13f6d64585e7f4be93ac12a21418e35fadee93ce53343898066b8190785813256644ef77d662a78f89345fd418fc351bb59ff6ed2d1c
diff --git a/dev-libs/libfilezilla/libfilezilla-0.3.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.3.0.ebuild
deleted file mode 100644
index 25ecdfc87b7e..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.4.0.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.4.0.1.ebuild
new file mode 100644
index 000000000000..2139f8e583c9
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.4.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
diff --git a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
index 9906b91b03f3..9c4e1246ad46 100644
--- a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_IUSE="
 	vala? ( introspection )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # configure checks for gtk:3, but only uses it for demos which are not installed
 RDEPEND="
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 1c34b02bde69..2f80e0495d64 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libgit2-glib-0.22.8.tar.xz 429300 SHA256 05c9453b195f1af0df2a5d8bc71472c9fb26d14bb8fbb5b688ad1b8ef7a30959 SHA512 caa0076127cd846b31bc9d341ecb0a07b0a4e960b16387b241f1e322627d304636bf59c34a657675444a7a5be66ab645416be0be14cc0e841078f5ce2ac7c9fd WHIRLPOOL 831b57d9da81c5fb3e5ad06a6e7080b1570e2b215eb193a3704cb4b7caa2e361c3290e0b15ab3d27ecc4402756e9d1cd4e8db0da0ea4cd119eafefe32a987213
-DIST libgit2-glib-0.23.6.tar.xz 448916 SHA256 5c8d6b5cb81ab64b96cb0c52ef37463b6d8998a40ce77a08eda9db66fb781144 SHA512 463bc92cd27fdcb6cce0f9f5232a3288b40059fe0ed525b1969cbb7380f76f5bd666e0fdc160b02ef5a4987feb96064b9a3b04682e5b54dbfaa70f5372bfe6f6 WHIRLPOOL f311a5f772008707cb11869bb9960dc355d40c6781457a5efbb554929e769c019a22a741d83eb96dc80f81a004aae4714aa9c0ffd1af794b4ed0cd7ae1c6c9e1
+DIST libgit2-glib-0.23.10.tar.xz 450552 SHA256 398ea6ff5fb1eafa61f2908da5ff8722dc051a2081be6cbed76a2ab07ecab1af SHA512 bf85ca562bb1e00fb65d499d133daaa9deeb8abe37e1caa33148c469e91f43f685c222fe976985b4a5e9cef4ebaec9e92d90d5a87287f0c6012f798ed9755a07 WHIRLPOOL 91d55e52c507a80d28f110f7feb183dd046db4389732ff4a68996156ef2a04e956c71ef485c36c9b8f945208f699bed883d5c914eb8e53db1301c7e9b59eb1f1
 DIST libgit2-glib-0.23.8.tar.xz 449096 SHA256 50853d1fbdabcdf67c14d3295a973c1c6f625b7d298459e494135a31984f140b SHA512 19624d7d83aef35e2d98002d75ce5dcc0fa2067ea29972b8f221758ae33c635150e46e511d748b7f4ca90de1ffdb3d5f20b22fd7b2f243ef9529295a4275dde9 WHIRLPOOL 4d630e143a50cd1bd7baa09cc8887bb144a03f71e739c924ae1c57cb1898e1666cff6be868bf2b4489cd009ec6e2fa52b4440a26d49168debaf27cdf133a44f7
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild
new file mode 100644
index 000000000000..070feb8239f7
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.23.10.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"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+IUSE="python ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libgit2-0.23.0:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/gobject-introspection-0.10.1:=
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	ssh? ( dev-libs/libgit2[ssh] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable vala)
+}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.23.6.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.23.6.ebuild
deleted file mode 100644
index d5f0661decb1..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.23.6.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
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4,3_5} )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python ssh +vala"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libgit2-0.23.0:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/gobject-introspection-0.10.1:=
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	ssh? ( dev-libs/libgit2[ssh] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libgit2/libgit2-0.23.4.ebuild b/dev-libs/libgit2/libgit2-0.23.4.ebuild
index 4299de189188..746b9b921ac6 100644
--- a/dev-libs/libgit2/libgit2-0.23.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.4.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 ~arm ~x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm ~x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgusb/libgusb-0.2.8.ebuild b/dev-libs/libgusb/libgusb-0.2.8.ebuild
index 2e5cef78f761..82d647026274 100644
--- a/dev-libs/libgusb/libgusb-0.2.8.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.8.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+introspection static-libs vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/libgweather-3.18.1.ebuild b/dev-libs/libgweather/libgweather-3.18.1.ebuild
index 06e47a2a0163..fc6178069628 100644
--- a/dev-libs/libgweather/libgweather-3.18.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.18.1.ebuild
@@ -16,7 +16,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 0f7d21ebe853..76709ac00d14 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,6 +1,5 @@
 DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
 DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
 DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645
-DIST libinput-1.1.3.tar.xz 815840 SHA256 b95af39391e2b91957af0addce691a4070b28aff69cd2348823bf6ce8169995e SHA512 ee51b6d005bacca57c4cad5a8b70097990299bf934cb460016176630009cea872e5413e053b09b456d35e085268a9a96ceb667ef0f4cd3b874e89cda2bb1c344 WHIRLPOOL 2934b26ef372f337873eefc5fd0c3464e8d380fc263a6cd0fda759fa5d1efe974dd3a83e076aec0ee2e85259784452c7294b163f8ca657af9c2c803c69540867
-DIST libinput-1.1.4.tar.xz 819536 SHA256 302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6 SHA512 54c1ca1cbb747d62950f5f5bf6a906cdb6b0e79305ba9d7e8408828691eb523be517bb88e739c6ab5465ec95b69c81f096fe8ad4b6bbbd010d431e72d79d0763 WHIRLPOOL 82b9831bce546d4d1329fbf51f64bfea8a1d23bee11cf1664212ba7949e18bff6ae471e2e248f8ec16dc93d8514024a5576fb2a298edea433899c2a69189d6b8
 DIST libinput-1.1.5.tar.xz 806960 SHA256 5e08c45dbb8bf32490cc6cd626da098564d646d161a07cba2e3adbd9745c0622 SHA512 031663c46b556048224aab018eb8ea76e34aace77508e52e6ef382a452585fafd4c91b427c0892aab3c624c0cfedc15c388922ae7166248e5da65575ff900c31 WHIRLPOOL 760cc1cf0c6657efbdadadd2f50e188d86465e1aa3f287275323d6fad9156b684de0d3b6dbf6e3fd5213018770726087ee282833f25ba5ef67918c0284b885a1
+DIST libinput-1.2.0.tar.xz 866284 SHA256 1754b917fe675507ea80445b4f2e91d76cb6a6935508fe37234807affb316e2c SHA512 ab5b534ac5db7d4142e41c61e1f8fbc7f4c9cf89567fa27196fa9300f57db7328d61af25c93126905ad06061e1b2def0abe70654ac3710b6476379f84343cce8 WHIRLPOOL 2f74bcd3ae694db9f52c450c6b96d24fd320da2002e900cf69a3ce2d9c33b00213097c0330867f32b175b5fe80d06099c3bdc461a2001f4eee4f2481ab1e32fc
diff --git a/dev-libs/libinput/libinput-1.1.3.ebuild b/dev-libs/libinput/libinput-1.1.3.ebuild
deleted file mode 100644
index 26877357fe85..000000000000
--- a/dev-libs/libinput/libinput-1.1.3.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
-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.1.4.ebuild b/dev-libs/libinput/libinput-1.1.4.ebuild
deleted file mode 100644
index 26877357fe85..000000000000
--- a/dev-libs/libinput/libinput-1.1.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
-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.1.5.ebuild b/dev-libs/libinput/libinput-1.1.5.ebuild
index c1d8674d12ab..c2225a060262 100644
--- a/dev-libs/libinput/libinput-1.1.5.ebuild
+++ b/dev-libs/libinput/libinput-1.1.5.ebuild
@@ -11,7 +11,7 @@ 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"
+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.
diff --git a/dev-libs/libinput/libinput-1.2.0.ebuild b/dev-libs/libinput/libinput-1.2.0.ebuild
new file mode 100644
index 000000000000..4c41c2f7bb41
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 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="input_devices_wacom 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="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.1.2 )
+	>=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() {
+	# 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 input_devices_wacom libwacom) \
+		$(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/libixion/Manifest b/dev-libs/libixion/Manifest
index e1da979aa372..f2e35ea40d5e 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,3 +1,4 @@
+DIST libixion-0.11.0.tar.xz 365652 SHA256 97a6e7f2b1fcbff69e76fe4e1df62f1cfcc353820472991e37de00aacb024293 SHA512 ebba456908c74d952256b7ba4b675ebbe0978e1cf39aa2fa03f0f11050fd874cfa8393f92f29cdf70d539bb6a11db94b639f81fdcbf14ee0d4de62236cd85d30 WHIRLPOOL cf0db731cdf6c70555036135eb5c22ad7abc327ff56223604922b7080abb7e31dd56cd9af8e397a4b0c7dac00f5901299a6ee0ff7044915d280b2f754667988e
 DIST libixion-0.7.0.tar.bz2 398089 SHA256 c9594ec93e911b40b26784ccdae47df8ea3a7d9b57bbad876733e4efcedf5581 SHA512 bda96a9cefb4bd842cd399a74c2fb5791d2a1d1d06d07106e1a121dc0bc02c00bef371b480ab1a7f922d5292c4d94fa8f7faaa2c6cd7596f2bc08b6ddfc929f5 WHIRLPOOL 0881a4b350eb6e8dc30ec166630cf46f85af07f41010b51b1b359787641d7f742ae10f1d4b1b3e438460bdb72468f43158c5baf1da95a0b70ed9d380c230f7d3
 DIST libixion-0.9.0.tar.xz 351388 SHA256 2112b4304667c4c2cdb8f3d331cc4ba696ea581db7d228b5b06ea2559e7531a5 SHA512 da6ca9e79841f1f529328e39a2977d95a261ddaaf4a254bfc46de004d52d4b1e8fc0c8c1cbeb3e8ee18e9a5663b046cf1d3f232f31bdd83db75a766be654f49b WHIRLPOOL f35087fce0a0e53650b988b36ecde8378aa75d2a4b769f6046dce544b9fe89a0025c82a6ab2564b5a12c813e0726875c088d5cc37cfcad055d79d2c5563d53af
 DIST libixion-0.9.1.tar.xz 356500 SHA256 77e35c163cd27657b83626a6da26c3b90f37ba9089d00aa25f384a9ac4b4e3a1 SHA512 074318c6db01ec13f6cbdfb8d7d04aede9f20cac4c23476b570a37638b0e68170aabf977520b94dfc2dce079314109c2e70d64376f9f314890d4d60854458c03 WHIRLPOOL ed79f0ed5705f8f8c5a24603fa4386b8822b477a21896d13eaf5fbe52d0f12fbf451f68de49314d8736160f82895047ba4d387431f989683553316d523bb0ce4
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
index a4e7239568a2..df945abc3928 100644
--- a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
@@ -1,34 +1,48 @@
-commit 59c360c9fe438a2805d65decc6c7889bc99a7747
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun May 31 10:14:17 2015 +0200
-
-    python: Make it optional
-    
-    python bindings are built unless disabled
-
-diff --git a/configure.ac b/configure.ac
-index 03f6120..1c7d8b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,6 @@ AC_PREREQ([2.63])
+--- a/configure.ac	2016-02-06 17:08:05.505990463 +0100
++++ b/configure.ac	2016-02-06 17:08:42.316530268 +0100
+@@ -15,18 +15,13 @@
  AC_INIT([libixion], [ixion_version])
  AC_CONFIG_HEADERS([config.h])
  AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
 -AM_PATH_PYTHON(2.7.0)
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
  
- AC_ARG_WITH(hash-container-compat,
-@@ -28,6 +27,9 @@ AC_ARG_WITH(mdds-include-path,
-     AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.])
- ,)
- 
+-AC_ARG_WITH(hash-container-compat,
+-[
+-  --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo
+-],
+-,with_hash_container_compat=no)
+-
+-AC_ARG_WITH(mdds-include-path,
+-    AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.])
+-,)
 +AC_ARG_ENABLE([python],
-+    AS_HELP_STRING([--disable-python], [Disable python bindings]))
-+
++    [AS_HELP_STRING([--disable-python], [Disable python bindings])],
++    [enable_python="$enableval"],
++    [enable_python=yes]
++)
+ 
  IXION_API_VERSION=ixion_api_version
  IXION_MAJOR_VERSION=ixion_major_version
- IXION_MINOR_VERSION=ixion_minor_version
-@@ -82,7 +84,11 @@ fi
+@@ -66,23 +61,19 @@
+ AC_FUNC_STRTOD
+ AC_CHECK_FUNCS([gettimeofday])
+ 
+-CPPFLAGS="$CPPFLAGS -D_REENTRANT -DMDDS_HASH_CONTAINER_BOOST"
++CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ 
+-AC_MSG_CHECKING([whether to turn on hash container compatibility])
+-if test "z$with_hash_container_compat" = "zno"; then
+-    AC_MSG_RESULT([no])
+-    BOOST_REQUIRE([1.36])
+-    BOOST_UNORDERED
+-else
+-    AC_MSG_RESULT([yes])
+-    DEFINES="$DEFINES -D_IXION_HASH_CONTAINER_COMPAT"
+-fi
++BOOST_REQUIRE([1.36])
+ 
+ # Check for mdds.
  PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0])
  
  # Check for python.
@@ -37,20 +51,32 @@ index 03f6120..1c7d8b2 100644
 +    AM_PATH_PYTHON(2.7.0)
 +    PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])
 +])
-+AM_CONDITIONAL([PYTHON], [test "x$enable_python" != "xno"])
++AM_CONDITIONAL([BUILD_PYTHON], [test "x$enable_python" != "xno"])
  
  CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden"
  
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6e138a4..cd912ab 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,7 @@
--SUBDIRS = libixion python
-+SUBDIRS = libixion
-+if PYTHON
-+	SUBDIRS += python
-+endif
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include $(MDDS_CFLAGS)
+@@ -101,3 +92,10 @@
+                  src/libixion/constants.inl
+                  src/python/Makefile])
+ AC_OUTPUT
++
++AC_MSG_NOTICE([
++==============================================================================
++Build configuration:
++	python:               $enable_python
++==============================================================================
++])
+--- a/src/python/Makefile.am	2016-02-06 17:08:12.138907540 +0100
++++ b/src/python/Makefile.am	2016-02-06 17:08:38.034583800 +0100
+@@ -1,3 +1,5 @@
++if BUILD_PYTHON
++
+ pyexec_LTLIBRARIES = ixion.la
+ ixion_la_SOURCES = \
+ 	document.hpp \
+@@ -16,3 +18,5 @@
  
+ AM_TESTS_ENVIRONMENT = PYTHONPATH=.libs$${PYTHONPATH:+:$${PYTHONPATH}}; export PYTHONPATH;
+ TESTS = ../../test/ixion-python-test.py
++
++endif
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch
new file mode 100644
index 000000000000..1a62bbc9b55b
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch
@@ -0,0 +1,13 @@
+diff --git a/src/python/Makefile.am b/src/python/Makefile.am
+index 0dfae54..094e0cf 100644
+--- a/src/python/Makefile.am
++++ b/src/python/Makefile.am
+@@ -10,7 +10,7 @@ ixion_la_SOURCES = \
+ 	sheet.hpp \
+ 	sheet.cpp
+ 
+-ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex initixion
++ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit_ixion
+ ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS)
+ ixion_la_LIBADD = \
+ 	../libixion/libixion-@IXION_API_VERSION@.la \
diff --git a/dev-libs/libixion/libixion-0.11.0.ebuild b/dev-libs/libixion/libixion-0.11.0.ebuild
new file mode 100644
index 000000000000..0d63dd71fb96
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.11.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit eutils python-single-r1 ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.11" # based on SONAME of libixion.so
+[[ ${PV} == 9999 ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="python static-libs"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-util/mdds:1=
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/libixion/libixion-0.9.0.ebuild b/dev-libs/libixion/libixion-0.9.0.ebuild
index f36ed2573dbb..59b884225db9 100644
--- a/dev-libs/libixion/libixion-0.9.0.ebuild
+++ b/dev-libs/libixion/libixion-0.9.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libixion/libixion-0.9.1.ebuild b/dev-libs/libixion/libixion-0.9.1.ebuild
index ff9dd6d029b8..9c993be33bd9 100644
--- a/dev-libs/libixion/libixion-0.9.1.ebuild
+++ b/dev-libs/libixion/libixion-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,7 +27,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 "
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -37,8 +37,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.1-typo.patch"
-	epatch "${FILESDIR}/${PN}-0.9.1-python-optional.patch"
+	epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" \
+		"${FILESDIR}/${PN}-0.9.1-python-optional.patch" \
+		"${FILESDIR}/${PN}-0.9.1-python-symbol.patch"
 	eautoreconf
 }
 
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 676202bf741d..0a1ad4313631 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
 
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
 inherit eutils python-single-r1 ${GITECLASS}
@@ -17,7 +17,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0/0.12"
+SLOT="0/0.11" # based on SONAME of libixion.so
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="python static-libs"
@@ -27,7 +27,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.12.0:=
+	dev-util/mdds:1=
 "
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -37,6 +37,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/dev-libs/libixion/metadata.xml b/dev-libs/libixion/metadata.xml
index 13ce236ee519..4fc2ac069dc2 100644
--- a/dev-libs/libixion/metadata.xml
+++ b/dev-libs/libixion/metadata.xml
@@ -5,4 +5,7 @@
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">ixion/ixion</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index bb890c783dc6..17ba2ed1d589 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,2 +1 @@
-DIST liblinear-196.tar.gz 361430 SHA256 e61297bf72f882ba891ec7b77fbc633d6d933738c1d61780917d75747bd0539c SHA512 6ed1ed45a98c1ff050537d4dd3234088c9ec394d339456168133200d074d1eb5ce80391dd2bf99b1a74e3bd4907ca7b04a5dd95bc42fcfad84ec8a6c38a7feb9 WHIRLPOOL a3622c23b29a0c40e00d1af8d53323c2131123d568223ab54a9dcd0c746906a576f57fd5e4d207643283a655647ebd66a9ac13c31fc36a2ffbac2e0bfdfcd98e
 DIST liblinear-210.tar.gz 381662 SHA256 9e559d1f0714799d4cf7742fb186012459285e25bed9c5847d5d8032daefc8de SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8 WHIRLPOOL 6756930f5fec958f3f137b9757a6a3704d1a5ab799d1634e2223990847ebe05a2602a77e4310a4f653434230ca47c0053de2ff3a03dc1cb265f85a6148db6f5d
diff --git a/dev-libs/liblinear/liblinear-196-r1.ebuild b/dev-libs/liblinear/liblinear-196-r1.ebuild
deleted file mode 100644
index 959b5e8cfee0..000000000000
--- a/dev-libs/liblinear/liblinear-196-r1.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
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-src_prepare() {
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-}
-
-src_compile() {
-	CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		emake lib all
-}
-
-src_install() {
-	dolib ${PN}.so.2
-	dosym ${PN}.so.2 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	insinto /usr/include
-	doins linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-210.ebuild b/dev-libs/liblinear/liblinear-210.ebuild
deleted file mode 100644
index db3c49f45ead..000000000000
--- a/dev-libs/liblinear/liblinear-210.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
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-src_prepare() {
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-}
-
-src_compile() {
-	CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		emake lib all
-}
-
-src_install() {
-	dolib ${PN}.so.3
-	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	insinto /usr/include
-	doins linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 4f3b00575c96..ee5fcb1ab0a5 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,3 +1,2 @@
 DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e
-DIST libnl-3.2.26.tar.gz 896005 SHA256 1323ff6cea47efe9f988893b09840942a8c36131f472a9f3b96eb68d8f8d7555 SHA512 5ab4a3a40244d71e0c8c50fcef30a67f814509d508e9537c85f2d710578a8a61513e7f26b2c0c29a9817484ca6ecd005e53b4f9054cd878274ae3b439abbe516 WHIRLPOOL 84854749fc312c867d9eec1e4d91bbeb5a132f79c004c5db0504a7d60136a2f39263b4efd4b0d1cd2e07f6cd363cc5e68f93089cb9b9dd58a45f416338c41a6f
 DIST libnl-3.2.27.tar.gz 905330 SHA256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 SHA512 f66d1c42eef75f6a1008abd6850f00abb0290d49bb685b4df43464c4dbf57d68fd4551f2a77bb2f375fd0a342b73cfd54d17c791f01ea43ce02683c8703e3a33 WHIRLPOOL 0bf32ca28b1f858caf99cb633ae4c3b863e53f8cb4b3b1703b454117e2eea2563d34b08c4ac920afb63e45c4717ba7628730a428df76f56818fe10cf336c4185
diff --git a/dev-libs/libnl/libnl-3.2.26.ebuild b/dev-libs/libnl/libnl-3.2.26.ebuild
deleted file mode 100644
index 789e89dc9e04..000000000000
--- a/dev-libs/libnl/libnl-3.2.26.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
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1 eutils libtool multilib multilib-minimal
-
-NL_P=${P/_/-}
-
-DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
-SRC_URI="
-	https://github.com/thom311/${PN}/releases/download/${PN}${PV//./_}/${P}.tar.gz
-"
-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"
-IUSE="static-libs python utils"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	sys-devel/flex
-	sys-devel/bison
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( ChangeLog )
-
-S=${WORKDIR}/${NL_P}
-
-MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
-	/usr/include/libnl3/netlink/cli/addr.h
-	/usr/include/libnl3/netlink/cli/class.h
-	/usr/include/libnl3/netlink/cli/cls.h
-	/usr/include/libnl3/netlink/cli/ct.h
-	/usr/include/libnl3/netlink/cli/exp.h
-	/usr/include/libnl3/netlink/cli/link.h
-	/usr/include/libnl3/netlink/cli/neigh.h
-	/usr/include/libnl3/netlink/cli/qdisc.h
-	/usr/include/libnl3/netlink/cli/route.h
-	/usr/include/libnl3/netlink/cli/rule.h
-	/usr/include/libnl3/netlink/cli/tc.h
-	/usr/include/libnl3/netlink/cli/utils.h
-)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
-	epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch
-
-	elibtoolize
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-
-	# out-of-source build broken
-	# https://github.com/thom311/libnl/pull/58
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		# Unset DOCS= since distutils-r1.eclass interferes
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..3612205fec10
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://gitlab.com/orcus/orcus.git"
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit eutils ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Standalone file import filter library for spreadsheet documents"
+HOMEPAGE="https://gitlab.com/orcus/orcus"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="+spreadsheet-model static-libs tools"
+
+RDEPEND="
+	>=dev-libs/boost-1.51.0:=
+	sys-libs/zlib:=
+	spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/mdds-0.8.1:0
+"
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/liborcus/liborcus-0.7.1.ebuild b/dev-libs/liborcus/liborcus-0.7.1.ebuild
index 7c68d4c97fbe..87cbf3624b7b 100644
--- a/dev-libs/liborcus/liborcus-0.7.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,11 +23,11 @@ IUSE="static-libs"
 
 RDEPEND="
 	>=dev-libs/boost-1.51.0:=
-	>=dev-libs/libixion-0.9:=
+	=dev-libs/libixion-0.9*:=
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.8.1
+	>=dev-util/mdds-0.8.1:0
 "
 
 src_prepare() {
diff --git a/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..8a6c9f20feb3
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit eutils ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Standalone file import filter library for spreadsheet documents"
+HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.10" # based on SONAME of liborcus.so
+
+#[[ ${PV} == 9999 ]] || \
+#KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS=""
+
+IUSE="+spreadsheet-model static-libs tools"
+
+RDEPEND="
+	>=dev-libs/boost-1.51.0:=
+	sys-libs/zlib:=
+	spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/mdds-0.11:0
+"
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/liborcus/liborcus-0.9.2.ebuild b/dev-libs/liborcus/liborcus-0.9.2.ebuild
deleted file mode 100644
index 6668627e3640..000000000000
--- a/dev-libs/liborcus/liborcus-0.9.2.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
-
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.10"
-
-#[[ ${PV} == 9999 ]] || \
-#KEYWORDS="~amd64 ~arm ~ppc ~x86"
-KEYWORDS=""
-
-IUSE="static-libs"
-
-RDEPEND="
-	>=dev-libs/boost-1.51.0:=
-	=dev-libs/libixion-0.9*:=
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.11
-"
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index e175a1e15171..64a4c246dcdb 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 
+PYTHON_COMPAT=( python{3_4,3_5} )
+
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils ${GITECLASS}
+inherit eutils python-single-r1 ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -15,28 +17,39 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0/0.10"
+SLOT="0/0.11" # based on SONAME of liborcus.so
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="static-libs"
+IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
 	>=dev-libs/boost-1.51.0:=
-	=dev-libs/libixion-0.9*:=
 	sys-libs/zlib:=
+	python? ( ${PYTHON_DEPS} )
+	spreadsheet-model? ( =dev-libs/libixion-9999:= )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.11
+	dev-util/mdds:1
 "
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-werror \
-		$(use_enable static-libs static)
+		$(use_enable python) \
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
 }
 
 src_install() {
diff --git a/dev-libs/liborcus/metadata.xml b/dev-libs/liborcus/metadata.xml
index 13ce236ee519..76fa89e1b408 100644
--- a/dev-libs/liborcus/metadata.xml
+++ b/dev-libs/liborcus/metadata.xml
@@ -5,4 +5,11 @@
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
+	<use>
+		<flag name="spreadsheet-model">Enable the spreadsheet model implementation</flag>
+		<flag name="tools">Build miscellaneous tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">orcus/orcus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libpeas/libpeas-1.16.0.ebuild b/dev-libs/libpeas/libpeas-1.16.0.ebuild
index 9a447442a1ad..04128cdd531b 100644
--- a/dev-libs/libpeas/libpeas-1.16.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.16.0.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/librevenge/Manifest b/dev-libs/librevenge/Manifest
index a6e65d930abb..2a920e89a961 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,3 +1,4 @@
 DIST librevenge-0.0.1.tar.xz 390796 SHA256 0cb22773dd1b268f71b291fba0e27127853e8e55ac6ec0fcf5370487d7eeee7d SHA512 65cc0e089a24e291700cca4a3f4d390d4646a1d6d847c060c068d53b525b7c69f0d870d2cafaf4d2f52cc102608e5a26c8883a455d031841e03cfbd32051e422 WHIRLPOOL d0645652b4f7834e5f14ccc24ba567d1fcf036183185c5b00e64615fce303ac5f9137b729ebf62615390ad8a482205b545158b4cdb9ffdedc8b429d57ded5a78
 DIST librevenge-0.0.2.tar.xz 396628 SHA256 f6f280c4345546aad16aeafd5cf2e4a4ac31a81606171755465bba0d96efcf0f SHA512 28e53aefdfe8585ef148781e53379a986b5becb459a27dffe8546341e7ada6a3323bc27ab3170227a532e796869b634ad0443324af72b16835a4287a64994637 WHIRLPOOL 648006d5024370e31e8b1bc2db4a7182572aa1ff5c4473754c02cbd33f30c51361fd4b6e6cd450aa40d08372eddd136c140cc7cac53e29188593b146fb55f121
 DIST librevenge-0.0.3.tar.xz 420288 SHA256 7ce7784ac732cb702cb42704779f4a36dfcd2f7187ba6ea12b500c9e0f2e16e4 SHA512 568ad98c861c13cda3461aad50df164a37f53e8e169231da7043dbfcab963b7870169badbe67c73532278ea229fea36c7dba4f0f03ea95730c17f49d01c0a2be WHIRLPOOL 025f5c2ef740c6ce59d378366b3cd78abab211e077a08029af8d58e6de05a28992c5457cbd8e77a84fb756ad5dc638b0cef9146c9d3b13519590b2e7872fc7ed
+DIST librevenge-0.0.4.tar.xz 421604 SHA256 933f0729f04267cc354b9a02bc3e9afefa5512a3bdd0b45f159ee14a3e3347b2 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712 WHIRLPOOL 25e886e305799a983ecb23fc69452bd6936495305b248398c89e20add79828e6ae52a0b98e8e0465d241178a09b11ec0dfdc2e8bab78ade27c022e5933fff371
diff --git a/dev-libs/librevenge/librevenge-0.0.4.ebuild b/dev-libs/librevenge/librevenge-0.0.4.ebuild
new file mode 100644
index 000000000000..66db90100705
--- /dev/null
+++ b/dev-libs/librevenge/librevenge-0.0.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="A helper library for REVerse ENGineered formats filters"
+HOMEPAGE="http://sf.net/p/libwpd/librevenge"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
+	inherit git-r3 autotools
+	KEYWORDS=""
+else
+	SRC_URI="http://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+}
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index 829840f115ea..e98fab1c9b99 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit eutils multilib-minimal
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} = 9999 ]] && eautoreconf
 }
 
diff --git a/dev-libs/libsigc++/libsigc++-2.6.2.ebuild b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
index 04dbd1ad7703..d889754b3e4a 100644
--- a/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
index 97975971727b..195aaa238bda 100644
--- a/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-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"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libxml2/libxml2-2.9.3.ebuild b/dev-libs/libxml2/libxml2-2.9.3.ebuild
index 85dc26a1aac6..34e9b7105a24 100644
--- a/dev-libs/libxml2/libxml2-2.9.3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-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"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 48b9fbbeb2c1..471a599ad37c 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,3 +1,3 @@
 DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41
 DIST libzip-1.1.1.tar.xz 458864 SHA256 69e690f567e172d8f69b58ca237b61a690eaa1c5aa2293e1a2a446496bdf14c1 SHA512 24f6d3026986bbc3b9633ed78bb38e13d468cf9be307871db4fa11cc37218eaf2b2019d49882ec57ce773922e5ab2383472715bd438662db83fcb4ba9c01ce69 WHIRLPOOL 65e8c41b3369edc705a1ac3f1411849d44888611754e8737a9efecb7b5bb34b5d556bd226c274875b0cba4e8a4a3b370ec30b49d6fe5175510c377d57379aaaa
-DIST libzip-1.1.tar.xz 458528 SHA256 13b0b49637f9857ab8ba7335f529e26d02aadacf2074bf0c9b28889a0fc83b24 SHA512 0a250835155eb2ed19a00718e086b3e05741c9bcf01c7c73ed6e83fd989d9fb0bddf192f69c989f75860e4e9a44490b263fd08d9b06994e534fc0374667df2f0 WHIRLPOOL 7d59cbfb32d96230ef57e4dd7e57fbef5e3d2e1a3c92044bcee876c8de855e84eb189608c0c123265cb9e47ccf4b3cf216186f27a0f6afb14c1dca3dfd4d42fc
+DIST libzip-1.1.2.tar.xz 457140 SHA256 a921b45b5d840e998ff2544197eba4c3593dccb8ad0ee938630c2227c2c59fb3 SHA512 5f34fdb2d3066e61e53c7356fbb7f4ecb83fc5990ad658106dd0e46e5455ed3d370a06c27b0f8c5b0ca52c573ff1c605a8744660756853e1e6b12b3bd3898bd8 WHIRLPOOL 88a8ae534216efa797cc9841063a117488c0181ddc66bc2c0741c96afc3440b6c4c6e9fb009647c161d2f4df0e4d29cdea4ea03e55590127d291c77c6dd79d06
diff --git a/dev-libs/libzip/libzip-1.1.2.ebuild b/dev-libs/libzip/libzip-1.1.2.ebuild
new file mode 100644
index 000000000000..18d15cafdf27
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 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
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="http://www.nih.at/libzip/"
+SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+"
+
+DOCS=( AUTHORS NEWS API-CHANGES THANKS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.2-headers.patch"
+)
diff --git a/dev-libs/libzip/libzip-1.1.ebuild b/dev-libs/libzip/libzip-1.1.ebuild
deleted file mode 100644
index 75c3201563ee..000000000000
--- a/dev-libs/libzip/libzip-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 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
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="http://www.nih.at/libzip/"
-SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-"
-
-DOCS=( AUTHORS NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.11.2-headers.patch"
-	"${FILESDIR}/${P}-missing-extern.patch"
-)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 3066f8cdb81a..288879dc93c6 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1 +1,2 @@
 DIST link-grammar-4.8.6.tar.gz 2879287 SHA256 6a63bf84e487876bc15311844fdb4d482b2f9d01f3c1d52d45cc7ff6beacc893 SHA512 70e1a605b295f6f49e707c701a2fd1bb1905b7d34b950bbf9b3f6fa70c289f1d40c7791ba755b50cfeb847a5dc634239fd58c7933f716f378fce2bfda62b0535 WHIRLPOOL 75ed2446f4243e3623eecf9fcfb22146d48e0df260aea5fb77a7035f7eeab0ee9a214110dfd15be4858bf04a7a83b129066197e32949acfba6e726d4eddf8762
+DIST link-grammar-5.3.3.tar.gz 4093300 SHA256 99bdec507a84079cd1d26b0f94dbca0bab7c0888073fe68d682febaf67746a79 SHA512 da4c3ac4fb3e0baf2c3d4654aad91ae92d4759c4ea66fe01c9ca84107d171e542a42c4bd508e7cc6be293116c02528042e79b2aefa5a80b253f6ac792110f714 WHIRLPOOL 073319778e8876c0ea97ab8c68923f543b95c8fdf58ae4b0a42126fe589396414ad1f279c49903f2bb70f0a7fdfddb382f256e49b00036ec3795cfb62683652d
diff --git a/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild b/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild
new file mode 100644
index 000000000000..50dcbac8e3bd
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 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=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils gnome2 java-pkg-opt-2 python-any-r1
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
+SRC_URI="https://github.com/opencog/${PN}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="aspell +hunspell java python static-libs threads"
+
+RDEPEND="
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+	java? (
+		>=virtual/jdk-1.6:*
+		dev-java/ant-core )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+pkg_setup() {
+	if use aspell && use hunspell; then
+		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
+		ewarn "you want aspell support."
+	fi
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+	AT_M4DIR="ac-helpers/" eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-perl-bindings \
+		--enable-shared \
+		$(use_enable aspell) \
+		$(use_enable hunspell) \
+		$(usex hunspell --with-hunspell-dictdir=/usr/share/myspell) \
+		$(use_enable java java-bindings) \
+		$(use_enable python python-bindings) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthreads)
+}
+
+pkg_preinst() {
+	use java && java-pkg-opt-2_pkg_preinst
+	gnome2_pkg_preinst
+}
diff --git a/dev-libs/link-grammar/metadata.xml b/dev-libs/link-grammar/metadata.xml
index 82e4c90bde02..d0d22785b362 100644
--- a/dev-libs/link-grammar/metadata.xml
+++ b/dev-libs/link-grammar/metadata.xml
@@ -6,9 +6,10 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<longdescription lang="en">
-		The Link Grammar Parser is a syntactic parser of English, based on link
-		grammar, an original theory of English syntax. The system is written in
-		generic C code, and runs on any platform with a C compiler.
+		The Link Grammar Parser is a syntactic parser of English, Russian, Arabic and Persian (and other languages as well),
+		based on Link Grammar, an original theory of syntax and morphology. Given a sentence, the system assigns to it a
+		syntactic structure, which consists of a set of labelled links connecting pairs of words. The parser also produces a "constituent" 
+		(HPSG style phrase tree) representation of a sentence (showing noun phrases, verb phrases, etc.).
 	</longdescription>
 	<use>
 		<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
diff --git a/dev-libs/nettle/nettle-3.2.ebuild b/dev-libs/nettle/nettle-3.2.ebuild
index 5a3f4e7e7269..a7b74e8de115 100644
--- a/dev-libs/nettle/nettle-3.2.ebuild
+++ b/dev-libs/nettle/nettle-3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6" # subslot = libnettle soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 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 ~m68k-mint ~sparc-solaris ~x86-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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/npth/npth-1.2.ebuild b/dev-libs/npth/npth-1.2.ebuild
index d9dc362728ce..a9f559ae4ae9 100644
--- a/dev-libs/npth/npth-1.2.ebuild
+++ b/dev-libs/npth/npth-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,5 +11,5 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 670c75d858da..f66349d25cc1 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,7 +1,7 @@
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
-DIST nss-3.19.2.tar.gz 6953657 SHA256 1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae SHA512 d3c45010f8dace58f9da9efe0f9792f8b8a69384e100663f33c949685cdd1ce70e5131f279bc82336622841c41dbc0a4d70a7cc6839a1782dbe8b3c3fd8bc59d WHIRLPOOL d69ab02e12f6b22f47df7be7925343c58e68a69b33833b85d6f2ca70f652d9d159accea45f2c141fa89245ab64dffff0f1289129427564203fe2faf3af1c11e3
 DIST nss-3.20.1.tar.gz 6958956 SHA256 ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97 SHA512 c8db693a81b8ddb4d2a742c2fce3f23dd40736e54c55c0de072f84572fcdad8fb7646e4b8ea696e4c97ea6c9cb0fa144f573f8776c2839eb25c4075b50d01d74 WHIRLPOOL 3d4667b243ba6ac596ea7e9936bf9cba7aa1b9767fd19b53352c3a9a9eef0f1a0a9e7da719634dbc9dfcc087d187d5e774ae351c1e57545e8b8c1f40e41e42e6
 DIST nss-3.20.tar.gz 6955552 SHA256 5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c SHA512 50f666209cadd4e463f98643ec67e35f4d1b88381e17db9eed7c67559b19799fcc27e49d72536f546d4c45bca2afa4664e5590f868775a4397a77111d68fc366 WHIRLPOOL 84f20e6764b3621762fcfcb9223a3861e1f5ff02078b19b7df2eb58430a5f96943d962dca2d3366b18cd434acf3d3be746242c5064497167d5671c50233834de
 DIST nss-3.21.tar.gz 6978112 SHA256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 SHA512 0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53 WHIRLPOOL 7504d83de606d61840e06cb855ea688eb022d5eef062bcb7ac4d1064db96b96e35ae4ce0aff9d389a2140a7c3b974aaa9a86ada52af1199d462fdb48b11b42e4
+DIST nss-3.22.tar.gz 6992347 SHA256 30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611 SHA512 f97251a17ad4ea889878ffeba64f19560978cf82c512b84c301be248ee4fe764345838fb8a88233b0fe12abe7bf78ce521a6ac64fa8d16bd0e1283eac9c17be1 WHIRLPOOL 8e128f3c8eb411c6569bd6d4d1edb55041e214913669687a5481d16f9aff245d3fc827f9a8c96e4723b3f0ec127d4461a1cda247dc296d9dce34513c7ab7e43d
 DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501 WHIRLPOOL 279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
 DIST nss-pem-20140125.tar.bz2 28805 SHA256 62604dfc4178399a804e87ca7566d8316a0a40a535de3b2d0fa48fd80c97f768 SHA512 352faf812735e1374c534ada6dd577842603ea193dafaacfd51f201599ffe3f7a23ce1c673421e42f8b692091b58085f90843c29f70ae916949715e7baba2b39 WHIRLPOOL 3ae81410f6f4d2699e9dc55982cad03c226045fbeee25984d53d37ff78ce5c96d008d6837e1c0a10b6c96cdff17c21142e437159896d314e81afc8820867ca62
diff --git a/dev-libs/nss/nss-3.19.2.ebuild b/dev-libs/nss/nss-3.19.2.ebuild
deleted file mode 100644
index 7153cea127a1..000000000000
--- a/dev-libs/nss/nss-3.19.2.ebuild
+++ /dev/null
@@ -1,326 +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 toolchain-funcs multilib-minimal
-
-NSPR_VER="4.10.8"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
-PEM_P="${PN}-pem-${PEM_GIT_REV}"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
-	nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	# Custom changes for gentoo
-	epatch "${FILESDIR}/${PN}-3.17.1-gentoo-fixups.patch"
-	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
-	use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
-	use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
-	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
-	epatch "${FILESDIR}/${PN}-cacert-class3.patch" # 521462
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	cp -L */lib/libfreebl.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.h
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils="shlibsign"
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
-			cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
-			nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
-			pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
-			symkeyutil tstclnt vfychain vfyserv"
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	local l libs=() liblist
-	for l in ${NSS_CHK_SIGN_LIBS} ; do
-		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
-	done
-	liblist=$(printf '%s:' "${libs[@]}")
-	echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
-	doenvd "${T}/90nss-${ABI}"
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.21-r1.ebuild b/dev-libs/nss/nss-3.21-r1.ebuild
deleted file mode 100644
index fff45f49f83d..000000000000
--- a/dev-libs/nss/nss-3.21-r1.ebuild
+++ /dev/null
@@ -1,331 +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 toolchain-funcs multilib-minimal
-
-NSPR_VER="4.10.8"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
-PEM_P="${PN}-pem-20140125"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
-	nss-pem? ( https://dev.gentoo.org/~anarchy/dist/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	# Custom changes for gentoo
-	epatch "${FILESDIR}/${PN}-3.21-gentoo-fixups.patch"
-	epatch "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	epatch "${FILESDIR}/${PN}-3.21-hppa-byte_order.patch"
-
-	if use cacert ; then
-		epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
-		epatch "${FILESDIR}/${PN}-3.21-cacert-class3.patch" #521462
-	fi
-	use nss-pem && epatch "${FILESDIR}/${PN}-3.21-enable-pem.patch" \
-		"${FILESDIR}/${PN}-3.21-pem-werror.patch"
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	cp -L */lib/libfreebl.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.h
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils="shlibsign"
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
-			cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
-			nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
-			pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
-			symkeyutil tstclnt vfychain vfyserv"
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	local l libs=() liblist
-	for l in ${NSS_CHK_SIGN_LIBS} ; do
-		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
-	done
-	liblist=$(printf '%s:' "${libs[@]}")
-	echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
-	doenvd "${T}/90nss-${ABI}"
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.21.ebuild b/dev-libs/nss/nss-3.21.ebuild
deleted file mode 100644
index 6f0a7798102f..000000000000
--- a/dev-libs/nss/nss-3.21.ebuild
+++ /dev/null
@@ -1,327 +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 toolchain-funcs multilib-minimal
-
-NSPR_VER="4.10.8"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
-PEM_P="${PN}-pem-20140125"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
-	nss-pem? ( https://dev.gentoo.org/~anarchy/dist/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	# Custom changes for gentoo
-	epatch "${FILESDIR}/${PN}-3.21-gentoo-fixups.patch"
-	epatch "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
-	use nss-pem && epatch "${FILESDIR}/${PN}-3.21-enable-pem.patch" \
-		"${FILESDIR}/${PN}-3.21-pem-werror.patch"
-	epatch "${FILESDIR}/${PN}-3.21-cacert-class3.patch" # 521462
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	cp -L */lib/libfreebl.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.h
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils="shlibsign"
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
-			cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
-			nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
-			pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
-			symkeyutil tstclnt vfychain vfyserv"
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	local l libs=() liblist
-	for l in ${NSS_CHK_SIGN_LIBS} ; do
-		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
-	done
-	liblist=$(printf '%s:' "${libs[@]}")
-	echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
-	doenvd "${T}/90nss-${ABI}"
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.22.ebuild b/dev-libs/nss/nss-3.22.ebuild
new file mode 100644
index 000000000000..31ef4af4e66a
--- /dev/null
+++ b/dev-libs/nss/nss-3.22.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.10.8"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
+PEM_P="${PN}-pem-20140125"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
+	nss-pem? ( https://dev.gentoo.org/~anarchy/dist/${PEM_P}.tar.bz2 )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cacert +nss-pem utils"
+CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	# Custom changes for gentoo
+	epatch "${FILESDIR}/${PN}-3.21-gentoo-fixups.patch"
+	epatch "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	epatch "${FILESDIR}/${PN}-3.21-hppa-byte_order.patch"
+
+	if use cacert ; then
+		epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+		epatch "${FILESDIR}/${PN}-3.21-cacert-class3.patch" #521462
+	fi
+	use nss-pem && epatch "${FILESDIR}/${PN}-3.21-enable-pem.patch" \
+		"${FILESDIR}/${PN}-3.21-pem-werror.patch"
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	cp -L */lib/libfreebl.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils="shlibsign"
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			nssutils="addbuiltin atob baddbdir btoa certcgi certutil
+			cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
+			nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
+			pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
+			symkeyutil tstclnt vfychain vfyserv"
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 42e089fc5a91..b9ecd2c294a6 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,2 +1,3 @@
 DIST ocl-icd-2.1.3.tar.gz 419083 SHA256 8338c6ae5cb7a9b34dfe79922f5e32c4f78c535a2217321dae842f72e0a2b175 SHA512 5d0704bed8a664950131c985fc32ffe5e078874945642417122df79c66bad804307192db49a561330268664ceb59756b268cf52201b809398efe58c85f823ad3 WHIRLPOOL f2757e00dcd9d484b1536ebb6b776bf5b54cd3e13cfa1b56fc95ef1e71f3db36bdb4ff996b2ddfb18d63082ebfdf743b9aeb41ed76910020724cfde7839e741b
 DIST ocl-icd-2.2.3.tar.gz 446966 SHA256 93a5ac3b23fb10731cc9e6406a58f7a21825562877787ed08c3a41f08b504d0c SHA512 da890da32cd61e42f610df472ac651d47edb1b014d98c25a778551fe6973bdb47753417b2eeab220a07f2862468845e3ac31a2e9631eac5eed05153f09da2cb9 WHIRLPOOL 1025d9b10d0140777d50abef5049df033b5a3f405807997eef3c3d88c7d4c1bd568316a20a40f936eb253da5b473aedbc764702bf5145c6c4203d85b6b420239
+DIST ocl-icd-2.2.8.tar.gz 452374 SHA256 25360a62a80558f3128164510b53ee00713a54db45de2faa1b6f4bd28191a184 SHA512 4d0364616c105ec421a39cc6a38b3a835a63280188a1e19f595eff655d50581ab1af83d2aa26fec956d33b5f492789797b3a05e29897e4342d38521d8902da96 WHIRLPOOL 89479c3bfcc366c67b7ff4bb04b4d4982cabd61984dab4e341b3b493c9676b0283e1d9960e0e0bd300330caf7b072d4a3d6a32fd3fbcbd8942428d5c80fe1cc5
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
new file mode 100644
index 000000000000..20cd5fb8f16e
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.8.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 multilib
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
+SRC_URI="https://forge.imag.fr/frs/download.php/698/${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="dev-lang/ruby"
+RDEPEND="app-eselect/eselect-opencl"
+
+src_prepare() {
+	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors/
+	doins ocl-icd.icd
+
+	emake DESTDIR="${D}" install
+
+	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
+	mkdir -p ${OCL_DIR} || die "mkdir failed"
+
+	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
+}
diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest
index 03410cebcf49..fa7b3a139def 100644
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@@ -1,4 +1,2 @@
-DIST qcustomplot-sharedlib-1.3.1.tar.gz 1926 SHA256 214b4dc82c612822b46976159864cc34732ebf0ce717bbe6d930760374344495 SHA512 1debdffed022dd3cd419d0a928176b6b0b1365739feaf8ca69458a9c6e16aa64c95d9b68eed2cde0699d7ab82e5dd66bcff8bbdb2f26e4a14e3186b3350342e6 WHIRLPOOL a51fd6ec8e46619a61b778656475ee2b3ff194d2b15c160246b1689f1b945160beece5a8762bf3fb1c8e9bc7f0cd570472379b0a679138d80609d6c3b38b481b
 DIST qcustomplot-sharedlib-1.3.2.tar.gz 1924 SHA256 18af836d2ac32f0dc2a4b1485c3038f4f5f3acf07550d86077ba5871e54bb269 SHA512 645d71c9d63ccd324f341778556f0b9ddceb3fee87b037c66f7ea7624973e24e292da7539861ffa1c8545cc0691a1041110b25d688f0b3d8787a44798a5e190e WHIRLPOOL d7ff5ffa460ac6b05816f1705f29ea82bbd709ca131ad3dc496abab1e718524f1dbe536dfaf726b0508143dbc76256a080fad8544c4e4412e58b980309e1aa2a
-DIST qcustomplot-source-1.3.1.tar.gz 224892 SHA256 b557728956945931ff75d21c0894c52a6341850ad246811affdda8b10bbc8486 SHA512 ce5d74d7ae1fb8f4547368c712e3e6f5192cf64df9ece4b055910f0ab4c4244446b3869f078214e38bb5337e755647e07f9a111f96553172b7960ae434d7800b WHIRLPOOL c1d3a817bf389d2e64df489961f072d5b0317c321a3a5d77f5176e8200ea01dc721953a396cd63e87a8ae1ece79406b3b6e6453af0c9550272850eb4f6ac33c4
 DIST qcustomplot-source-1.3.2.tar.gz 225912 SHA256 a3649824c6d2d08efb0b54629e6ffe4cc57fa08ad9eb9f39edbb0c30b9659b51 SHA512 0e9fefd3f6e4428009428d3155b1a26e1d4b2a62567ca7812cefa67c06fa53f301229d8bd2c3abbe0fb7ddacb9a07515522ded56c0745cd31b1f85323d4499fb WHIRLPOOL fb5c59c71aee5fc95af9a75054f7a41a28eac7c70f296cf1b0dc4a58927f73b94a5b02203b520e367f673e4741959d195cebe6f50141be8157122aa249ea6c4a
diff --git a/dev-libs/qcustomplot/qcustomplot-1.3.1.ebuild b/dev-libs/qcustomplot/qcustomplot-1.3.1.ebuild
deleted file mode 100644
index 3f36f22fc871..000000000000
--- a/dev-libs/qcustomplot/qcustomplot-1.3.1.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
-
-inherit qmake-utils
-
-DESCRIPTION="Qt C++ widget for plotting and data visualization"
-HOMEPAGE="http://www.qcustomplot.com/"
-SRC_URI="
-	http://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
-	http://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="qt5"
-
-RDEPEND="
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-source
-
-src_prepare() {
-	sed \
-		-e 's:../../::g' \
-		-e '/CONFIG/s:shared.*:shared:g' \
-		"${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die
-}
-
-src_configure() {
-	use qt5 && eqmake5 || eqmake4
-}
-
-src_install() {
-	dolib.so lib${PN}*
-	doheader ${PN}.h
-	dodoc changelog.txt
-}
diff --git a/dev-libs/smack/smack-0.5.0.ebuild b/dev-libs/smack/smack-0.5.0.ebuild
index f4dc7f8d4aec..0915ebccbd1f 100644
--- a/dev-libs/smack/smack-0.5.0.ebuild
+++ b/dev-libs/smack/smack-0.5.0.ebuild
@@ -14,5 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/snappy"
+DEPEND="app-arch/snappy
+	dev-libs/boost"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/softhsm/softhsm-2.0.0.ebuild b/dev-libs/softhsm/softhsm-2.0.0.ebuild
index dc1cee0ab8e1..4572953a7287 100644
--- a/dev-libs/softhsm/softhsm-2.0.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ LICENSE="BSD"
 
 RDEPEND="
 	dev-db/sqlite:3
-	dev-libs/botan[threads]
+	dev-libs/botan[threads,-bindist]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 94acbe2649b3..e0dda49e46d2 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,2 +1 @@
-DIST starpu-1.1.2.tar.gz 4704168 SHA256 971e324a936ab5a572202d3356a1e783e6fcca8d068ab2814209f737fcf03dfa SHA512 8601fe1564e86f731211993d2aa851898e20b4ce110943dd5037824b2d538aca5cd2fe8bc868805c1e48c20d47e15bc1db8c22be60113d2aabf191882a7039f8 WHIRLPOOL fc572857269339b68120286b829f259f565ef19947ac017dd61e3d3b663f555dc918139f5a3a88f2a17be6df088a05ae9261d08dbf6f966948a3663dc33667c0
-DIST starpu-1.1.4.tar.gz 5022944 SHA256 ba36e605bd3915afb5b8ac6582b33ebd2ca65139b879d928e6b218f6d2e4b37e SHA512 a448839e33675b17cdef389dbf91e85b7ef9cafcf93ce0c99f755bf8eb548ecb3240b97602b2f3c9799128c651e889446ae3013e62f391c05b279ae38fb041d6 WHIRLPOOL acb58667379ec67635af853b41881479fcdfbda1b6ba27b353aac57bdeed0cbc2cb5a6b923f003b222d0ef685778fa3445003ed4f34606e6eb41d1d45dcc0c21
+DIST starpu-1.1.5.tar.gz 5209660 SHA256 3b93d3d54b2bd4c96d49ca4a46f6d4ed077c7d7602baa2044152ef55ad5d9b15 SHA512 e22a51c601c1997f6a9279e87b22a96f2b25a9c8bb4b715ee3a048ed8af638997610ba72c7b42f61d9401464464c57402feebc76368f9df6ca84fa1305baeedd WHIRLPOOL dc2e17be76b58e5c2c902f653d2e2cf4961cf2618347d2f7ebe7b7597c0c5abfb93690e117ded809ae9f84586b380e8355fd8767a09974a479b06c76addd48b7
diff --git a/dev-libs/starpu/starpu-1.1.2.ebuild b/dev-libs/starpu/starpu-1.1.2.ebuild
deleted file mode 100644
index 6293be00a4d5..000000000000
--- a/dev-libs/starpu/starpu-1.1.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils toolchain-funcs cuda
-
-DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
-HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4
-	static-libs test"
-
-RDEPEND="
-	sys-apps/hwloc:0=
-	sci-mathematics/glpk:0=
-	blas? ( virtual/blas )
-	cuda? ( dev-util/nvidia-cuda-toolkit
-			x11-drivers/nvidia-drivers
-			blas? ( sci-libs/magma ) )
-	fftw? ( sci-libs/fftw:3.0= )
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )
-	qt4? (  >=dev-qt/qtgui-4.7:4
-			>=dev-qt/qtopengl-4.7:4
-			>=dev-qt/qtsql-4.7:4
-			x11-libs/qwt )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )
-	test? ( gcc-plugin? ( dev-scheme/guile ) )"
-
-src_prepare() {
-	# upstream did not want the patches so apply sed's
-	sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die
-	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
-	autotools-utils_src_prepare
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-
-	local myeconfargs=(
-		--disable-build-examples
-		$(use_enable cuda)
-		$(use_enable debug)
-		$(use_enable doc build-doc)
-		$(use_enable fftw starpufft)
-		$(use_enable gcc-plugin gcc-extensions)
-		$(use_enable opencl)
-		$(use_enable opengl opengl-render)
-		$(use_enable qt4 starpu-top)
-		$(use_with mpi mpicc "$(type -P mpicc)")
-		$(use cuda && use_enable blas magma)
-		$(use mpi && use_enable test mpi-check)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1 showcheck
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dodoc "${BUILD_DIR}"/doc/doxygen/*.pdf
-		dohtml -r "${BUILD_DIR}"/doc/doxygen/html/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-libs/starpu/starpu-1.1.4.ebuild b/dev-libs/starpu/starpu-1.1.4.ebuild
deleted file mode 100644
index 94a9c8a8bc10..000000000000
--- a/dev-libs/starpu/starpu-1.1.4.ebuild
+++ /dev/null
@@ -1,84 +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 toolchain-funcs cuda
-
-DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
-HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4
-	static-libs test"
-
-RDEPEND="
-	sys-apps/hwloc:0=
-	sci-mathematics/glpk:0=
-	blas? ( virtual/blas )
-	cuda? ( dev-util/nvidia-cuda-toolkit
-			x11-drivers/nvidia-drivers
-			blas? ( sci-libs/magma ) )
-	fftw? ( sci-libs/fftw:3.0= )
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )
-	qt4? (  >=dev-qt/qtgui-4.7:4
-			>=dev-qt/qtopengl-4.7:4
-			>=dev-qt/qtsql-4.7:4
-			x11-libs/qwt )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )
-	test? ( gcc-plugin? ( dev-scheme/guile ) )"
-
-src_prepare() {
-	# upstream did not want the patches so apply sed's
-	sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die
-	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
-	autotools-utils_src_prepare
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-
-	local myeconfargs=(
-		--disable-build-examples
-		$(use_enable cuda)
-		$(use_enable debug)
-		$(use_enable doc build-doc)
-		$(use_enable fftw starpufft)
-		$(use_enable gcc-plugin gcc-extensions)
-		$(use_enable opencl)
-		$(use_enable opengl opengl-render)
-		$(use_enable qt4 starpu-top)
-		$(use_with mpi mpicc "$(type -P mpicc)")
-		$(use cuda && use_enable blas magma)
-		$(use mpi && use_enable test mpi-check)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1 showcheck
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dodoc "${BUILD_DIR}"/doc/doxygen/*.pdf
-		dohtml -r "${BUILD_DIR}"/doc/doxygen/html/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-libs/starpu/starpu-1.1.5.ebuild b/dev-libs/starpu/starpu-1.1.5.ebuild
new file mode 100644
index 000000000000..73f5a6635d0e
--- /dev/null
+++ b/dev-libs/starpu/starpu-1.1.5.ebuild
@@ -0,0 +1,84 @@
+# 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 toolchain-funcs cuda
+
+DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
+HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4
+	static-libs test"
+
+RDEPEND="
+	sys-apps/hwloc:0=
+	sci-mathematics/glpk:0=
+	blas? ( virtual/blas )
+	cuda? ( dev-util/nvidia-cuda-toolkit
+			x11-drivers/nvidia-drivers
+			blas? ( sci-libs/magma ) )
+	fftw? ( sci-libs/fftw:3.0= )
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/freeglut:0= )
+	qt4? (  >=dev-qt/qtgui-4.7:4
+			>=dev-qt/qtopengl-4.7:4
+			>=dev-qt/qtsql-4.7:4
+			x11-libs/qwt:5 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base )
+	test? ( gcc-plugin? ( dev-scheme/guile ) )"
+
+src_prepare() {
+	# upstream did not want the patches so apply sed's
+	sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die
+	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
+	autotools-utils_src_prepare
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+
+	local myeconfargs=(
+		--disable-build-examples
+		$(use_enable cuda)
+		$(use_enable debug)
+		$(use_enable doc build-doc)
+		$(use_enable fftw starpufft)
+		$(use_enable gcc-plugin gcc-extensions)
+		$(use_enable opencl)
+		$(use_enable opengl opengl-render)
+		$(use_enable qt4 starpu-top)
+		$(use_with mpi mpicc "$(type -P mpicc)")
+		$(use cuda && use_enable blas magma)
+		$(use mpi && use_enable test mpi-check)
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test -j1 showcheck
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use doc; then
+		dodoc "${BUILD_DIR}"/doc/doxygen/*.pdf
+		dohtml -r "${BUILD_DIR}"/doc/doxygen/html/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-libs/syck/Manifest b/dev-libs/syck/Manifest
deleted file mode 100644
index 668019e9b607..000000000000
--- a/dev-libs/syck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST syck-0.55.tar.gz 354205 SHA256 ac881945c9dfe5dd6395a5db921e8256d1d359295bb66a1acbfe49fb637c1a3a SHA512 b2adc38e3e616f4eb5f5146baf0e8b385517e32e46ad872c9a451a680ea8c52fead00234286b6bc07fac9ad816d7ece8daf4a77a34c2999926c198de3b6ba1b7 WHIRLPOOL 946a0a372db6d1483a128a7daf2d8d6db74a2e0e7c82902b08faf5089ede6a8afad35cf307a126d9feeb3070561f3aa3b545a38c1f5e1a0f22b255943eec14bf
diff --git a/dev-libs/syck/files/syck-0.55-64bit.patch b/dev-libs/syck/files/syck-0.55-64bit.patch
deleted file mode 100644
index dc77ddb4c118..000000000000
--- a/dev-libs/syck/files/syck-0.55-64bit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./lib/syck_st.c~	2003-03-04 17:10:11.000000000 +0000
-+++ ./lib/syck_st.c	2007-06-04 15:00:22.000000000 +0100
-@@ -5,6 +5,7 @@
- #include "config.h"
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "syck_st.h"
- 
- #ifdef NT
-@@ -54,7 +55,6 @@
-     numhash,
- };
- 
--extern int strcmp();
- static int strhash();
- static struct st_hash_type type_strhash = {
-     strcmp,
---- ./lib/syck.h~	2005-04-13 07:27:54.000000000 +0100
-+++ ./lib/syck.h	2007-06-04 14:26:32.000000000 +0100
-@@ -17,6 +17,8 @@
- #define YAML_DOMAIN     "yaml.org,2002"
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <ctype.h>
- #ifdef HAVE_ST_H
- #include <st.h>
---- ./lib/emitter.c~	2007-06-04 15:40:23.000000000 +0100
-+++ ./lib/emitter.c	2007-06-04 15:51:03.000000000 +0100
-@@ -378,7 +378,8 @@
- {
-     SYMID oid;
-     char *anchor_name = NULL;
--    int indent = 0, x = 0;
-+    int indent = 0;
-+    long x = 0;
-     SyckLevel *lvl = syck_emitter_current_level( e );
-     
-     /* Add new level */
diff --git a/dev-libs/syck/metadata.xml b/dev-libs/syck/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-libs/syck/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-libs/syck/syck-0.55-r4.ebuild b/dev-libs/syck/syck-0.55-r4.ebuild
deleted file mode 100644
index 60f8a3c20e2d..000000000000
--- a/dev-libs/syck/syck-0.55-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils flag-o-matic
-
-DESCRIPTION="Syck is an extension for reading and writing YAML swiftly in popular scripting languages"
-HOMEPAGE="http://whytheluckystiff.net/syck/"
-SRC_URI="http://rubyforge.org/frs/download.php/4492/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="php python"
-
-DEPEND="python? ( !dev-python/pysyck )"
-RDEPEND="${DEPEND}"
-PDEPEND="php? ( dev-php/pecl-syck
-		    !=dev-libs/syck-0.55-r1 )"
-
-DISTUTILS_SETUP_FILES=("ext/python|setup.py")
-PYTHON_MODNAME="yaml2xml.py ydump.py ypath.py"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/syck-0.55-64bit.patch"
-}
-
-src_configure() {
-	append-flags -fPIC
-	econf
-}
-
-src_compile() {
-	emake
-	use python && distutils_src_compile
-}
-
-src_install() {
-	einstall
-	use python && distutils_src_install
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/dev-libs/syck/syck-0.55-r6.ebuild b/dev-libs/syck/syck-0.55-r6.ebuild
deleted file mode 100644
index 0a597e98c136..000000000000
--- a/dev-libs/syck/syck-0.55-r6.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
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Syck is an extension for reading and writing YAML swiftly in popular scripting languages"
-HOMEPAGE="http://whytheluckystiff.net/syck/"
-SRC_URI="http://rubyforge.org/frs/download.php/4492/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="php python"
-
-DEPEND="python? ( !dev-python/pysyck )"
-RDEPEND="${DEPEND}"
-PDEPEND="php? ( dev-php/pecl-syck
-		    !=dev-libs/syck-0.55-r1 )"
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/syck-0.55-64bit.patch"
-}
-
-src_configure() {
-	append-flags -fPIC
-	econf
-}
-
-src_compile() {
-	emake
-	if use python; then
-		pushd ext/python > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR=${D} install
-	if use python; then
-		pushd ext/python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
index c30f438fcd1c..890d4e4184a4 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
 LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt +introspection +quvi test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index c5186942713e..9f3ed8199687 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,4 +1,3 @@
-DIST ucommon-5.2.2.tar.gz 792081 SHA256 9d5f3f4d1ef897482fe470b0dd65b0df516aaeb874eac3a33a455abca13f39e9 SHA512 5d5e526675cb39dffea48c38a14dff4eb1316a59c60e2352cfdbb0727ff4db00417e9704026f106da5d34f92ec2be3385b0763d66196f345f0b775bf62eb0125 WHIRLPOOL f857c4b06aff4bbb1ff84edc810d674c7d77a92bb4bcdb62fed64e77e9979c7d736b93596166de6c5fb848745aa7efc1b666231bdb6a33c3b959953b4b114ac2
 DIST ucommon-6.0.3.tar.gz 806841 SHA256 228f3a0fa78173e9fa43e154250a7ed4f1e5be720a81fd2768506c088190c432 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 WHIRLPOOL 93135ae4ec3c0e6d5203ebed6c6736b9b768d623d99a20674ee0a0ce48622d783efea6b8ca4eb22d5c2653b5059ff9626a35bf0ccfbad7d422a5cdf6c190c7c8
 DIST ucommon-6.1.10.tar.gz 833384 SHA256 d7a15ed31e3c418b41d95d5ff5e1bc24dfc4c2a465a099c6fd30e0b6c9f7be92 SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050 WHIRLPOOL 31666dc7e4c00b9acc7ba9d7a26033ec7ff28674722597e9677ba426b79fae45a170c5caaaa4066738d072090c2dacd465dc861aebbbd50cde36877b3b1a1e59
 DIST ucommon-6.3.1.tar.gz 830661 SHA256 b59aa5414e756935ef9c479ece837f5700e4a5f39b0a016daa90528b175f59d5 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec WHIRLPOOL 0bad6d56c0f1111a1aa15f7532ce6507be897a2b7ce27e452e71c08064f3f854b6864d3f7ed58ed476edf6777fc256374ab08e9c89bbb4f4abfcef8486969fed
diff --git a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild
deleted file mode 100644
index dba6ed5587ca..000000000000
--- a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug ssl gnutls"
-
-RDEPEND="ssl? (
-		!gnutls? ( dev-libs/openssl )
-		gnutls? (
-			net-libs/gnutls[-nettle]
-			dev-libs/libgcrypt:0
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
-		  "${FILESDIR}/${P}-address.patch")
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/urdfdom_headers/Manifest b/dev-libs/urdfdom_headers/Manifest
index cd1f16a78d44..0338398d8102 100644
--- a/dev-libs/urdfdom_headers/Manifest
+++ b/dev-libs/urdfdom_headers/Manifest
@@ -1,2 +1,3 @@
 DIST urdfdom_headers-0.3.0.tar.gz 9931 SHA256 f059350cd85fc3b8394ed0c3bd0d4b8d14fa9c8edd09c3ee01881b4711843087 SHA512 249ea2a2cb8196eb14e005f32a3376585a5a25d599ff041b562500e2e9f17a988a8cd0dfd575853e1cfc7ca736882e856998718b702b8d0be0fc4a011d8d9dd9 WHIRLPOOL 9f7919fb1b56eedfafa8b474e2c990349f070cee10d7e48f66d5e02246583915804d5ab0c60ea98a3013b8adaabb3e0f33e814a0d79e86c2e4ced0a06e2115d8
 DIST urdfdom_headers-0.4.0.tar.gz 11488 SHA256 01fec111f91805eb5bcbbee56b5da7413de7a7485ad4c63ea51614ebdfc25eca SHA512 c04807d52a252c5def9d1a8dbc23dc694e432b7f777607a79de1aa74d66a20c19b5cce911051de734d21e08daa925ceaf4272a6504bf39bc2289eeda60e7f5e6 WHIRLPOOL 9fa094be524a0f7c9e76d2946e9321effd3058b11221c4b8a389ab30bb18ac63f2336b247c3d4563ddcd92e48b9f5d6add7805ae57ee9f0d726d8a4b87e58e20
+DIST urdfdom_headers-0.4.1.tar.gz 11473 SHA256 e210f9234af47bfc9fa4bb17d004fb3eac4513dcdfe639fb7b1c2db6408c8cd8 SHA512 cf123fb842159fbfae1083a770b6229063c6444712c686e7e461020c8efcd43e076c6db1d2035a26e5842a66dc17d4d6d2416c7c01772c890a9b75f50977b7f2 WHIRLPOOL 92a4239c532e32df1c7e7a264759b423ed2da55d1c8e5105933bd2f4b46f6c0cf31b9dfe1f7aeedc72b77bccc20341976a01d587940c6285900d5dc427b07e85
diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-0.4.1.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-0.4.1.ebuild
new file mode 100644
index 000000000000..956b287f7714
--- /dev/null
+++ b/dev-libs/urdfdom_headers/urdfdom_headers-0.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/urdfdom_headers"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="URDF (U-Robot Description Format) headers"
+HOMEPAGE="http://ros.org/wiki/urdf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
new file mode 100644
index 000000000000..79fe818c8edf
--- /dev/null
+++ b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
@@ -0,0 +1,49 @@
+make static lib build/install controllable so we can disable it by default
+
+punt the -debug lib variants ... if people want debug libs, they can rebuild
+the package using their desired build settings.
+
+--- a/Makefile
++++ b/Makefile
+@@ -291,8 +291,10 @@
+ OPT_LIB_SHARED      = libustr-$(VERS_BSO).so.$(VERS_ESO)
+ OPT_LIB_STATIC      = libustr.a
+ 
+-LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED)
+-LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC)
++LIB_SHARED = $(OPT_LIB_SHARED)
++ifeq ($(USE_STATIC),yes)
++LIB_STATIC = $(OPT_LIB_STATIC)
++endif
+ 
+ DEPS_NONC_ALL  = $(SRC_HDRS) $(SRC_SRCS_H)
+ DEPS_C_ALL     = $(SRC_HDRS)
+@@ -388,17 +390,14 @@
+ 		install -d $(DESTDIR)$(bindir)
+ 		install -d $(DESTDIR)$(libdir)/pkgconfig
+ 		$(HIDE)echo Installing files
++ifeq ($(USE_STATIC),yes)
+ 		install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC)
++endif
+ 		install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)
+ 		-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
+ 		ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
+ 		-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
+ 		ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
+-		-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
+-		ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
+-		-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
+-		ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
+-		$(LDCONFIG) -n $(DESTDIR)$(libdir)
+ 		install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS)
+ 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS)
+ 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS)
+@@ -406,7 +406,7 @@ endif
+ 		install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1)
+ 		install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3)
+ 		install -m 755 -t $(DESTDIR)$(bindir) ustr-import
+-		install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc
++		install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc
+ 
+ ustr-import-multilib: ustr-import-multilib.in
+ 		sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 3d12db66fe13..524aa433671f 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -10,4 +10,7 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
+<use>
+	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
index d89800819504..0c7387c16ecc 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
@@ -26,38 +26,49 @@ src_prepare() {
 	multilib_copy_sources
 }
 
-multilib_src_compile() {
+_emake() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		mandir="${EPREFIX}/usr/share/man" \
+		SHRDIR="${EPREFIX}/usr/share/${P}" \
+		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
 		HIDE= \
-		all-shared
+		"$@"
+}
+
+multilib_src_configure() {
+	# The included configure tests require execution.
+
+	# We require vsnprintf everywhere as it's in POSIX.
+	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
+	chmod a+rx autoconf_vsnprintf
+
+	# Always use stdint.h as it's in POSIX.
+	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
+
+	# Figure out the size of size_t.
+	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
+	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
+	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
+	chmod a+rx autoconf_64b
+
+	# Generate the config file now to avoid bad makefile deps.
+	_emake ustr-import
+}
+
+multilib_src_compile() {
+	_emake all-shared
 }
 
 multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="/usr/share/man" \
-		SHRDIR="/usr/share/${P}" \
-		DOCSHRDIR="/usr/share/doc/${PF}" \
-		HIDE= \
-		install
+	_emake DESTDIR="${D}" install
 }
 
 multilib_src_test() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		check
+	_emake check
 }
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
new file mode 100644
index 000000000000..784d946467ce
--- /dev/null
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Low-overhead managed string library for C"
+HOMEPAGE="http://www.and.org/ustr"
+SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD-2 MIT LGPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="static-libs ustr-import"
+
+DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ustr-conf.h
+	/usr/include/ustr-conf-debug.h
+)
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc_5-check.patch"
+	epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
+	multilib_copy_sources
+}
+
+_emake() {
+	emake \
+		USE_STATIC=$(usex static-libs) \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		mandir="${EPREFIX}/usr/share/man" \
+		SHRDIR="${EPREFIX}/usr/share/${P}" \
+		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		HIDE= \
+		"$@"
+}
+
+multilib_src_configure() {
+	# The included configure tests require execution.
+
+	# We require vsnprintf everywhere as it's in POSIX.
+	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
+	chmod a+rx autoconf_vsnprintf
+
+	# Always use stdint.h as it's in POSIX.
+	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
+
+	# Figure out the size of size_t.
+	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
+	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
+	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
+	chmod a+rx autoconf_64b
+
+	# Generate the config file now to avoid bad makefile deps.
+	_emake ustr-import
+}
+
+multilib_src_compile() {
+	_emake all-shared
+}
+
+multilib_src_install() {
+	_emake DESTDIR="${D}" install
+
+	if ! use ustr-import ; then
+		rm -r \
+			"${ED}/usr/bin/ustr-import" \
+			"${ED}/usr/share/man/man1/ustr-import.1" \
+			"${ED}/usr/share/${P}" || die
+	fi
+}
+
+multilib_src_test() {
+	_emake check
+}
diff --git a/dev-libs/utfcpp/utfcpp-2.3.4.ebuild b/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
index 6776e8f532a9..4788f7ad6f24 100644
--- a/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
+++ b/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/utfcpp/utf8_v${PV//./_}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-libs/vala-common/vala-common-0.30.1.ebuild b/dev-libs/vala-common/vala-common-0.30.1.ebuild
index 05615377031f..d5c3a73b303a 100644
--- a/dev-libs/vala-common/vala-common-0.30.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.30.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/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"
+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
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index d0ea0fa30509..945a1cd3037f 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,3 +1,4 @@
+DIST wayland-1.10.0.tar.xz 368976 SHA256 4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc SHA512 772e89bdfa494bc263b5c6c4692784738e55a6c6196d5a8e6180f269e0c2d7592f159efb0dca1b1489273e14ba8cda16f5522e58fc9824beff8688f11a00f985 WHIRLPOOL 35a6c27deee3b2f1fe272c54f242c77bed84feaed0d47d94d03563bf9738c60ed54f9bd7d26a862ed165de6eb8817decad49b100ed1f10179f00b25a0636b6c9
 DIST wayland-1.6.1.tar.xz 418628 SHA256 d1aeb95b433cab33a928b56cb80efa551802e0a064adb4a8ea1517249d3c10b0 SHA512 28a0980ece2fb4ba0ca688f3913ffba34c2741167d7686be80cfbc9cb56f995282a68173d69d2849eb5c2986684ebe6d5cfaca04518ab74a4512c8dfb4d8d0c2 WHIRLPOOL be307a292c8f939921700fc85c9ad1675c491fdc3e1a16ffc52512e39d971f6afdbd378c60c57a64781cdccb364ed77271e07b64f5c3b7b96abd45a1595dfc4e
 DIST wayland-1.7.0.tar.xz 372004 SHA256 bdea47a2db96f7e53f1ce0351559c0af5b7f7aae7e95f0a884a78af9f1057c9c SHA512 2475a5e8c2ef5c4bc97d90f946a89e4155d840a342886a7634df5423e5764973dbf5d721e1a8a941b7bd2305017cdcb74af7a29bee7bb8b58373306e5c03add7 WHIRLPOOL 152be0d1c3ac314cd3dcd765e6a04eaa71b618b1577c423147ccb5b1d82cdeaf09d09c8933746e6bd100b2d59374749084eede36b9075a153328fda179955ea2
 DIST wayland-1.8.1.tar.xz 374116 SHA256 f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8 SHA512 392edd22203fc44a37a66d7a099d0534f047f49e91b28614092346f0167c07a39431c5919f2ea1deaf460dc53a77fba8504a7a7f5d03af638267c767bb07ae19 WHIRLPOOL f15ea109324c0c84b848f458acb6786248fb1c7ee8dafd6ef945d4f80f5b87b911dd2d2c0485b1ceeeed95454990e186e7d8b04d366f903954dd8998a1f3999f
diff --git a/dev-libs/wayland/wayland-1.10.0.ebuild b/dev-libs/wayland/wayland-1.10.0.ebuild
new file mode 100644
index 000000000000..bf4b8cc1a071
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.10.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+	AUTOTOOLS_AUTORECONF=1
+fi
+
+inherit autotools-multilib toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="http://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+		sys-apps/grep[pcre]
+	)
+	virtual/pkgconfig"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable doc documentation)
+	)
+	if tc-is-cross-compiler ; then
+		myeconfargs+=( --with-host-scanner )
+	fi
+	if ! multilib_is_native_abi; then
+		myeconfargs+=( --disable-documentation )
+	fi
+
+	autotools-multilib_src_configure
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	autotools-multilib_src_test
+}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
index f89cd34fd75e..1bd98ab5eb2b 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 #IUSE="java lua mono perl php python ruby tcl"
 #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
 IUSE="java lua perl php python ruby tcl"
diff --git a/dev-libs/xapian/xapian-1.2.22.ebuild b/dev-libs/xapian/xapian-1.2.22.ebuild
index fdc7cf22350f..6291028e5476 100644
--- a/dev-libs/xapian/xapian-1.2.22.ebuild
+++ b/dev-libs/xapian/xapian-1.2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch b/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch
new file mode 100644
index 000000000000..07d3892eb0b6
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch
@@ -0,0 +1,8 @@
+diff -r -U1 gcl.orig/makefile gcl/makefile
+--- gcl.orig/makefile	2014-10-23 23:29:00.000000000 +0200
++++ gcl/makefile	2016-02-17 18:10:29.871808118 +0100
+@@ -267,3 +267,3 @@
+ 	$(AWK) 'BEGIN {print "#include \"include.h\"";print "#include \"cmponly.h\"";print "---"} {a=$$1;gsub("\\.\\.\\.","",a);print "\"#define " $$1 "\" " a}' $< |\
+-	$(CC) -E -I./$(HDIR) - |\
++	$(CC) -E -P -I./$(HDIR) - |\
+ 	$(AWK) '/^\-\-\-$$/ {i=1;next} {if (!i) next} {gsub("\"","");print}' >$@
diff --git a/dev-lisp/gcl/gcl-2.6.12.ebuild b/dev-lisp/gcl/gcl-2.6.12.ebuild
index 11e8275ba21b..959c2692a57b 100644
--- a/dev-lisp/gcl/gcl-2.6.12.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,6 +38,7 @@ src_prepare() {
 	chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh
 	chmod a+x bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv mp/gcclab
 	chmod a+x o/egrep-def utils/replace xbin/*
+	epatch "${FILESDIR}"/${P}-gcc5.patch
 
 	# fedora patches
 	epatch "${WORKDIR}"/fedora/fd-leak.patch
@@ -62,6 +63,7 @@ src_prepare() {
 src_configure() {
 	strip-flags
 	filter-flags -fstack-protector -fstack-protector-all
+	append-cflags $(test-flags-CC -fgnu89-inline)
 
 	local tcl=""
 	if use tk; then
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index cf8fd522d39e..5dd7eb2722c2 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -24,5 +24,5 @@ DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 SHA256 724425fe0d28747c7d31c66
 DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 SHA256 a198df14f45cdf302017116744c8946a8b4143291efe1799553554133c22b46a SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 WHIRLPOOL 05ad3606b23e6196d443328f367b7351612d0f4991d71a5a04f1f45b5bb604809d6ed11c8cf62bc639d6f9dd8e5704b52a050603d4745713c5818fcbd36852bf
 DIST sbcl-1.3.0-source.tar.bz2 5722767 SHA256 d60caf6a0a495e41fc9e7f6a797e7c4188cef1f9de84ca263ff654d4d7ae99b3 SHA512 4bcdc3e4d101ec64b6af2db8101e3b18b298c343d7928984604dc17d531b986787ba84ce1276c41066a9a2c06270d2aeb26870ba7b18ecb7daaa6b3a6c7f6450 WHIRLPOOL e635064fad32556ce0017c3cf27bfda02581dc627b0884d3dc0b1bc44c62cd4a0ea6690997b53414ddd7355cc06647f2952ccf3c2d329baa0e137b5fd992ea3b
 DIST sbcl-1.3.0-x86-64-linux-binary.tar.bz2 9830954 SHA256 e6e801f0cc31fd6a14cf20b983c6ef2be5750225fad221bf9621788c0a0a90c5 SHA512 916fdd1627903b7227a6d5962a2534fa2cd9003f832b975c96d0e11c301d73c7c3225cfd4121f10cbcdde87dcac9079b9a48e6737ba9a3d2c18c484bae3c371d WHIRLPOOL a4372dd59df03e0e0e8d2359799e0580b6829e001c219ef28504cc7db8b3a8ad7429ecdcd36bb72ed5196192d9f66b2854c5b6960cd5f97c31afd758a17c6a67
-DIST sbcl-1.3.1-source.tar.bz2 5725055 SHA256 a2e547e471a368349a43b1feee78ca6139aae0c60b8fcaa6ab0fd0e5b8e0ed3d SHA512 c8cd794b74222144c3b232bc7f1d44380e4a1f334e92d53e584f87fb4737b40b6efff931db4891a7661708ce4465ed4a1c0e7831372639fdec645ab61689a622 WHIRLPOOL fc676c0290882fb29cc342ad69588d8557d0d57ff6413a7af034526819d4f895415fa220dfcea4566008c9793f5985a1c3d33f7fab9442b0ee48b932467b9da9
-DIST sbcl-1.3.1-x86-64-linux-binary.tar.bz2 9787871 SHA256 a7c997d5d589b6f76888ddc8883e200a73484664cc6959e63d698687ed3c0136 SHA512 ef4be5ec29a35c25513cb5e0ee681bf213eb1c44b461be6f1a9c4ade09915a02bd83cce9a13e54d2e1fecc628fc7883eaa1829ae8c22ef09f9fef834dcbe7c49 WHIRLPOOL 674111e06c562875bd52e71b1d441ef1d16aba590952397ddf0fd02b608208ce6265d02718affb4bb30f73fca28bff0888eae0e2521e4d895910e6e6b54c3ead
+DIST sbcl-1.3.2-source.tar.bz2 5739508 SHA256 d382f196ea7795c3541bcda433e0bb8b5610a62bb9f83309fe20629e6090afa2 SHA512 c0f34a5475707706f949ba5a4eca7097fc198ec973e729772b3c4a852b8a56508184f99e77c98db3bf6fdeaa2ebd3c01169c1c4b1d4750a81301ca2727b8e638 WHIRLPOOL 37ddcba9b782ee3677665c44cb8cf1c164125a48421529b6d5e3b46e0395be039610604809442a601471bf00bbe7916c3d27e9d90f9328e5fe1c70a7aa43c139
+DIST sbcl-1.3.2-x86-64-linux-binary.tar.bz2 9724466 SHA256 5331056a6c7cd638d3d815458180a457d098e85c1e3821af055b9998670fe2ed SHA512 192bc19d372d39049c93aff57ae07531264a3595c1cb4553511d69771010901dce25b1403825b75c147eb121f90aa7f230814861fd948f9b916d6254ecba2ad2 WHIRLPOOL 667e305844b6982b23f3c486dd1356731721f0a62da3c4ccb8fce538d43ed9044af150a1a4c0b507f511a5a85fde2efbecc80ba25b843b5c3859aa772b202bb6
diff --git a/dev-lisp/sbcl/sbcl-1.3.1.ebuild b/dev-lisp/sbcl/sbcl-1.3.1.ebuild
deleted file mode 100644
index c05f890fd820..000000000000
--- a/dev-lisp/sbcl/sbcl-1.3.1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# 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.3.1
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.2.7
-BV_ARM64=1.3.1
-BV_PPC_MACOS=1.0.47
-BV_X86_MACOS=1.1.6
-BV_X64_MACOS=1.2.11
-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/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
-	# bugs #560276, #561018
-	epatch "${FILESDIR}"/sb-posix-test-1.2.15.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 use pax_kernel ; 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-lisp/sbcl/sbcl-1.3.2.ebuild b/dev-lisp/sbcl/sbcl-1.3.2.ebuild
new file mode 100644
index 000000000000..ce385f2b6733
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.3.2.ebuild
@@ -0,0 +1,239 @@
+# 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.3.2
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.2.7
+BV_ARM64=1.3.2
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+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/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
+	# bugs #560276, #561018
+	epatch "${FILESDIR}"/sb-posix-test-1.2.15.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 use pax_kernel ; 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/lualdap/lualdap-1.2.0.ebuild b/dev-lua/lualdap/lualdap-1.2.0.ebuild
index 6f65198c0ddc..b0d14d8e0779 100644
--- a/dev-lua/lualdap/lualdap-1.2.0.ebuild
+++ b/dev-lua/lualdap/lualdap-1.2.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-RDEPEND="dev-lang/lua:*"
+RDEPEND="dev-lang/lua:* net-nds/openldap"
 DEPEND="${RDEPEND}
 	net-nds/openldap
 	virtual/pkgconfig"
diff --git a/dev-ml/custom_printf/Manifest b/dev-ml/custom_printf/Manifest
deleted file mode 100644
index b4c760213a21..000000000000
--- a/dev-ml/custom_printf/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST custom_printf-112.24.tar.gz 56205 SHA256 dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9 SHA512 6bb37c9d4f9abb520659bb0fbb3fb6ce8ed44fde602a868b822f4ef89e52c4009ced639fb7d21d8e1aa798474293fb7d3b487a85d57391a412cd2c0933e64993 WHIRLPOOL 41d831d23c10790196b7a02e11045ed2baa3c70279d9ea611751e7ba1e7a96a918bdd60702d73d5edabaa50dbce6f3852bb9c19044d8508d6e66401ab2f93db6
-DIST custom_printf-113.00.00.tar.gz 56196 SHA256 4672db143ec72e4ff5d35490b0ae8b366755154f0b7660c29037ca5d9fbb6647 SHA512 02079132cf68ffc27ca1ac41cf183d10207d2e7570952010bbd0a376b11fec40b34a70ab13f79553eb4f425c1477791a1b1ad4f691b8354e93e283b7c4d72a9f WHIRLPOOL 81f40341eaa6a1fcb7ca696dc94720a630367093c01e7a9fb95fea8db10f150669dd9db2cbebd96defec4c29c670577a809bc3b11deecd84da7554600d94b572
diff --git a/dev-ml/custom_printf/custom_printf-112.24.00.ebuild b/dev-ml/custom_printf/custom_printf-112.24.00.ebuild
deleted file mode 100644
index 01b71822c2c4..000000000000
--- a/dev-ml/custom_printf/custom_printf-112.24.00.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="5"
-
-inherit oasis
-
-DESCRIPTION="Syntax extension for printf format strings"
-HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P%.*}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-ml/type-conv-109.20.00:=
-	dev-ml/sexplib:=
-	dev-ml/pa_ounit:=
-	dev-ml/camlp4:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/custom_printf/custom_printf-113.00.00.ebuild b/dev-ml/custom_printf/custom_printf-113.00.00.ebuild
deleted file mode 100644
index 6bfad310175f..000000000000
--- a/dev-ml/custom_printf/custom_printf-113.00.00.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="5"
-
-inherit oasis
-
-DESCRIPTION="Syntax extension for printf format strings"
-HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-ml/type-conv-109.20.00:=
-	dev-ml/sexplib:=
-	dev-ml/pa_ounit:=
-	dev-ml/camlp4:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/custom_printf/metadata.xml b/dev-ml/custom_printf/metadata.xml
deleted file mode 100644
index 91d86fdbaf9e..000000000000
--- a/dev-ml/custom_printf/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 type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/gsl-ocaml/Manifest b/dev-ml/gsl-ocaml/Manifest
new file mode 100644
index 000000000000..4a14aa791d04
--- /dev/null
+++ b/dev-ml/gsl-ocaml/Manifest
@@ -0,0 +1 @@
+DIST gsl-ocaml-1.19.1.tar.gz 167549 SHA256 05891594ed3b4ea0c2f201531aeafce1280b937a18ba76d818760252c2b34b66 SHA512 be199d46479f07a16d2f667d7a29675171bc4ecc5a6e5948335bf98f72e6f12474d16455a22e6bfc73683f1d67de3a186d75f817f398f6621241b640c333e07d WHIRLPOOL 85f687b24dacde0d3c6f9f2c1920583e30e57f02e1f6d4dc797db3a846090d2c60d7509b3d70b2374aa31d6b4a9658acb578012f8671d024a24e90e3f5e748a2
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
new file mode 100644
index 000000000000..0038063b83d0
--- /dev/null
+++ b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 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="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)"
+HOMEPAGE="https://github.com/mmottl/gsl-ocaml"
+SRC_URI="https://github.com/mmottl/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+DEPEND=">=sci-libs/gsl-1.19"
+RDEPEND="${DEPEND}
+	!dev-ml/ocamlgsl"
+
+DOCS=( CHANGES.txt README.md NOTES.md TODO.md )
+
+src_prepare() {
+	oasis_configure_opts="$(use_enable examples)"
+}
diff --git a/dev-ml/gsl-ocaml/metadata.xml b/dev-ml/gsl-ocaml/metadata.xml
new file mode 100644
index 000000000000..4fb2e6728cec
--- /dev/null
+++ b/dev-ml/gsl-ocaml/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 type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+GSL interface for OCaml
+</longdescription>
+  <upstream>
+    <remote-id type="bitbucket">mmottl/gsl-ocaml</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/macaque/Manifest b/dev-ml/macaque/Manifest
index 9117b8493cfd..f1c7373877fb 100644
--- a/dev-ml/macaque/Manifest
+++ b/dev-ml/macaque/Manifest
@@ -1 +1,2 @@
 DIST macaque-0.7.2.tar.gz 106245 SHA256 8b20335419cb640f9c86eced851a7349351b0825a955043465a41de1d72ec715 SHA512 9823052350083d8042db11eb103cbc71ba85580884a4dcf82c5fb011e59875595ad49b5a6c800f1f6cf5ae86aa5659bab81b623db58bcf1290e18900112d3c5c WHIRLPOOL 11fa5be1189edbadc37348e5b285e998adb4aec58481e0c0eb8bf5ff35e645c155c60cd43239671b1e1d9f66d132fda1755f9f6eec7ed3dcfe606796fdab0c05
+DIST macaque-0.7.4.tar.gz 64896 SHA256 16629ee969aa02d7e0b01b98d6b0c9f19e32b91672c2ebc432d30ee522ae5352 SHA512 db664226e58ad3db2dc00e920dcc757242b0bcc8d1b6406e6743afe6cdbe789546af131a00c07a5e2e63ed39b9017c2d8e2f5bbce63a741df58bf14633aae89a WHIRLPOOL 032582ed6ca98f840ba7de57dc838c6d0702239b15a83a52b7b6551b90a86e367927ec8005d2adf1053c646a1d6bd90744c250c2bb58619a2a0ad0b7d1e94937
diff --git a/dev-ml/macaque/macaque-0.7.4.ebuild b/dev-ml/macaque/macaque-0.7.4.ebuild
new file mode 100644
index 000000000000..19d2258ef8c6
--- /dev/null
+++ b/dev-ml/macaque/macaque-0.7.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="DSL for SQL Queries in Caml"
+HOMEPAGE="http://ocsigen.org/macaque/"
+SRC_URI="https://github.com/ocsigen/macaque/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/pgocaml-2.1:=
+	dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+DOCS=( Changelog README.md )
+OASIS_SETUP_COMMAND="./setup.exe"
+
+src_configure() {
+	emake setup.exe
+	oasis_src_configure
+}
diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest
index 38ea71ffcff6..104f53acba35 100644
--- a/dev-ml/ocaml-cstruct/Manifest
+++ b/dev-ml/ocaml-cstruct/Manifest
@@ -1,2 +1,3 @@
 DIST ocaml-cstruct-1.7.1.tar.gz 245894 SHA256 7869d096fe7c6231bbceefe3b2205417b28b6c10f4174b7e2cfdfa46956eaaa5 SHA512 67dd276ab2f895ef80cc7ba5b48d51bcfcf52ac49aa29cd4b17aa00be109198347a50229b81fbe506d831ace753d72f3b4bb80f19e8e57fa29d9ba65da472f19 WHIRLPOOL 8145930a1dcadbcf48c1da0dcba10a45f3d52c8ae2565aee7e609bd3eeb5eead9cee9ef423332a580ab77ceabb2f301917226d1a73e1b7f6efc7a3096c4112d6
 DIST ocaml-cstruct-1.8.0.tar.gz 250696 SHA256 e1635072283ae5db7889966ce92e916749bcd192012a0c46285827beba1263d7 SHA512 38ea6301b48603f8b63c73a7aa42312d25bbd16fb8524e1de2b69a54e45e9e1c1326201e19fcf2953d2719607139c903d76296a32fb7058998c079ac112adc9c WHIRLPOOL 6fdabfc1143331662757826de11c62c3947fb59155ba68e866a2f9939963deacd52d5832417997833deff9a9ff902675d266a98b41e0d2cf9f29c4d4c628601e
+DIST ocaml-cstruct-1.9.0.tar.gz 254162 SHA256 2d175bf1e2cdc5ca43cb30bd3fa507beee2f18b2cbecae801ab6ffaecde16c9c SHA512 fad3788c0888599a3171d4062b9d9f4c539c0cbb1d8b6d4f6be2f3456ffe235444def4e619a94ca75336cf555b5133e6e60edc07a03dc0abdd772acf9371b666 WHIRLPOOL 99984c32625d9dbf452a7191f4103228bedbd7eee23bfb1eee7834022a023dee1582fca9704fcbe09ed37424ca7d684c482426d3b30b5f1dc66cc55b78769532
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.9.0.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.9.0.ebuild
new file mode 100644
index 000000000000..0589e77428ac
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.9.0.ebuild
@@ -0,0 +1,45 @@
+# 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="Map OCaml arrays onto C-like structs"
+HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +camlp4 +lwt +ppx"
+
+RDEPEND="
+	async? ( dev-ml/async:= )
+	camlp4? ( dev-ml/camlp4:= )
+	lwt? ( dev-ml/lwt:= )
+	ppx? ( dev-ml/ppx_tools:= )
+	>=dev-lang/ocaml-4.01:=
+	dev-ml/ocplib-endian:=
+	dev-ml/sexplib:=
+	dev-ml/type-conv:=
+"
+DEPEND="
+	test? ( dev-ml/ounit )
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable lwt)
+		$(use_enable camlp4)
+		$(use_enable async)
+		$(use_enable ppx)
+		--enable-unix
+	" oasis_src_configure
+}
+
+DOCS=( CHANGES README.md TODO.md )
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 88844f37a948..79985b88ff76 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1 +1,2 @@
 DIST ocaml-ctypes-0.4.1.tar.gz 162601 SHA256 74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5 SHA512 8155ffe16a58d5714ceb602afa5531c93526defca39a16047328ac06d2c7c7f52b768b18170391f467e1f6919c69275734faf85d27315e11b8bbefcb1bc8afa9 WHIRLPOOL d8d0ef24e0b6c40f50fddf38fed7238cf95573909d2809cc2ab5c1b9b3dab333210e1ce99cf805804576a79d08d819e2ecdee7b4a6a9e13efb13e7b9f88ad802
+DIST ocaml-ctypes-0.4.2.tar.gz 162968 SHA256 704efcbf3b99c180855ad4faed0dd7cec4f2384f9b8963b572329697be8cbae4 SHA512 78e51a4ea35efd6d854b81c65d3e224175927a3c87b9b665d173cefeb3f424e1ed8fc8dfbbb4ce33b4bc43163ecf647ba9b502e69c82eb05ddcde66b8d6c99e4 WHIRLPOOL 124c6f91ae1ae980994f8cca483a2090c60b62864abe8d4b9aac725b2131f331d385a6a1e5b7685e4f61ac4e3e53cb22ac0cad9b32ebefa444d2ef00e15f7caa
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.2.ebuild
new file mode 100644
index 000000000000..8ebc7be8e1da
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.2.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 findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	virtual/libffi
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-ipaddr/Manifest b/dev-ml/ocaml-ipaddr/Manifest
index d06da58ad9e2..f9be2aa65d3e 100644
--- a/dev-ml/ocaml-ipaddr/Manifest
+++ b/dev-ml/ocaml-ipaddr/Manifest
@@ -1 +1,2 @@
 DIST ocaml-ipaddr-2.6.1.tar.gz 64458 SHA256 7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0 SHA512 a22382b5118caf0a29322e52d40523cbf52edd21d477c2e4581a5f70441b71f948b75ff7d55a7cf6c32f0e68c430c3aff59a05d9514b29e858ff78f4c649c4c6 WHIRLPOOL 418a3bcbef9a1198962bd5d09381756520eaced7e86f8ba204810b786187cfb6e020019da331d85e11d510fa744802c66d52a450fb31a9ff8a418004ff1d4cbe
+DIST ocaml-ipaddr-2.7.0.tar.gz 65470 SHA256 3031abb4a5391af8b7e307db09807ef748fc718ee23855e2f933df47892d4c23 SHA512 36ce32945e05166165ba9d2d6d10a9fb1531a50ff4e9e1a87d1bf557e767fa2938af9cbaeea7da4eefd058d687f0b36696075fd4c9ed075f5207e3c9f5488c87 WHIRLPOOL 188acfc6e110253b62f92a21a08a1519650289141b9649bed2e80b7850f9cdaa8327859933501ff0b938c2896f42ba48fac57b0b4c6b3ea59b6f4368eac0bd28
diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.0.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.0.ebuild
new file mode 100644
index 000000000000..8aaf31fcdd16
--- /dev/null
+++ b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.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
+
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
+HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
+SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-ml/sexplib:=
+	dev-ml/ppx_sexp_conv:=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES README.md )
diff --git a/dev-ml/ocaml-re/ocaml-re-1.5.0.ebuild b/dev-ml/ocaml-re/ocaml-re-1.5.0.ebuild
index aebbbab00859..d60583026288 100644
--- a/dev-ml/ocaml-re/ocaml-re-1.5.0.ebuild
+++ b/dev-ml/ocaml-re/ocaml-re-1.5.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-OASIS_BUILD_DOCS=1
+#doesn't build: https://bugs.gentoo.org/show_bug.cgi?id=574572
+#OASIS_BUILD_DOCS=1
 OASIS_BUILD_TESTS=1
 
 inherit oasis
diff --git a/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild b/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild
index e7bfd54fc746..26c995440509 100644
--- a/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild
+++ b/dev-ml/ocamlgsl/ocamlgsl-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,8 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-lang/ocaml-3.10:=
-	  sci-libs/gsl"
+	  sci-libs/gsl
+	  !dev-ml/gsl-ocaml"
 DEPEND="${RDEPEND}
 	  test? ( dev-ml/fort )"
 
diff --git a/dev-ml/pa_test/Manifest b/dev-ml/pa_test/Manifest
deleted file mode 100644
index bce7a98869f7..000000000000
--- a/dev-ml/pa_test/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pa_test-111.08.01.tar.gz 50614 SHA256 c9933e1e76bae36e4aff020c7a12105d944c47cf219ada823e97b1f999b0e921 SHA512 472205f5e35084ccdd3e29362388a4f559c631b805d8ca67273f4139f8fcdaa6ac37a8547916c2c2edbe253cdc9adf03078149ee3f925698a19f285675bbd0ea WHIRLPOOL 7ee720c1ba016d48d9674cb9381c7faae487d83c25095b6d38bd3d08145cda89b5d193c19e461180aeb4bbaa9dae65ad81602bf1ad2a0c286e014c721945b4a3
-DIST pa_test-112.24.tar.gz 51922 SHA256 b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6 SHA512 3606c583bfe0c3cb633dbe467561740a55070c5ea689c95ea74f44038d91c0007bf4978a232104fbc9378441070e9cff7e0f58b193e06dffb2ff4f17ed3282cf WHIRLPOOL 253e0c7877e3a0090f36f3f83e1b7d32ed43349658f7a9d85ebcf7300436966c643492d3e3204731b377832b5590fd31b9de77e3df76c8c89d85490a2dc80dc6
diff --git a/dev-ml/pa_test/metadata.xml b/dev-ml/pa_test/metadata.xml
deleted file mode 100644
index ffac4d7ebc01..000000000000
--- a/dev-ml/pa_test/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ml/pa_test/pa_test-111.08.01.ebuild b/dev-ml/pa_test/pa_test-111.08.01.ebuild
deleted file mode 100644
index 368cf65e10f3..000000000000
--- a/dev-ml/pa_test/pa_test-111.08.01.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"
-
-inherit oasis
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Quotation expanders for assertions"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-ml/type-conv-109.60.00:=
-	dev-ml/sexplib:=
-	dev-ml/comparelib:=
-	dev-ml/camlp4:=
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/pa_test/pa_test-112.24.00.ebuild b/dev-ml/pa_test/pa_test-112.24.00.ebuild
deleted file mode 100644
index 803e263521e6..000000000000
--- a/dev-ml/pa_test/pa_test-112.24.00.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit oasis
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Quotation expanders for assertions"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P%.*}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-ml/type-conv-109.60.00:=
-	dev-ml/sexplib:=
-	dev-ml/comparelib:=
-	dev-ml/camlp4:=
-	dev-ml/herelib:=
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 28841103f479..8779dc0162a5 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,2 +1,3 @@
 DIST pcre-ocaml-6.2.5.tar.gz 60724 SHA256 f1774028a4525d22d1f4cf4ce0121c99d85a75aed7a498c3e8ab0f5e39888e47 SHA512 9665643165beea8515f22d90a6a0f079108826ec46ce89248c795e982f9b4ddecc0e882a32a9893acac1001d810aad7f3bc7d7b6162ab1260fa4f698c91e04b9 WHIRLPOOL c99da092f8e78de19ea624a021a088b3e19b1accd2b33bc084179f7c1b88e8ac2b51c143321a792067e325568d6ea4c059fc57ac9da477e998cda3936140567c
 DIST pcre-ocaml-7.1.6.tar.gz 88104 SHA256 7f88d1fb44a394026f20c692170d36f7331cbeea20ca95b841334b8c188efbef SHA512 604bf27324eab3548c8320bee91cd8c8d0c6459aa7c02b576149b6a2beb43ddd9733e7e344c20c100241cabc84be61ef8c4a5515cdd994a7c3105dd3da74782d WHIRLPOOL 25ba4642e4d10300d849993dd5cb18cb9c8216ba17b07756bca866b46460b8cc7399c91cc6390e44250765d40aa81a5ff3c0372bb3ead614c27c9b4a4f3da3d2
+DIST pcre-ocaml-7.2.2.tar.gz 88275 SHA256 64b2956c638f3428e72c481de766d977a86cab9e7f158bb745469b740f2db786 SHA512 99d8f9fce7d7e05a86dc1c6280dd0718d904ccbfaa0a858a2d97c2cbff94156c39b3875c29032582dafae3b11c01ee13af3896181dad1d8843843d8625721083 WHIRLPOOL eb4e1734478c5037efe72dddd6b8903d8ff29848218808c2ad54bcad1869e8897cf746c65c365f9cb523f36feb70d5191865d255fd5dbc913b13c9f3c7249b23
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.2.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.2.ebuild
new file mode 100644
index 000000000000..4eea14f760aa
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/libpcre-4.5
+	>=dev-lang/ocaml-4:="
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+	oasis_src_install
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-ml/pgocaml/Manifest b/dev-ml/pgocaml/Manifest
index 80c64cdafee7..97c8a308c5fa 100644
--- a/dev-ml/pgocaml/Manifest
+++ b/dev-ml/pgocaml/Manifest
@@ -1 +1,2 @@
 DIST pgocaml-2.2.tgz 88613 SHA256 3027ca823f9f3db24475bd36e5628ee259605d72048d889be3b7e32c3e850d74 SHA512 1358e377d46aeb8fa00f44ba47dcc61097919584accc96264ae751cd2d6b8380dd2135109d5f6bf7963f3b448ee59046210c6335a3750deed4ad0ce5fc0a9d8d WHIRLPOOL 53da87c02670d493ff0dd12c467d69bac630aa9fe5141be074f328722c305611ad951d14fafe941961dd40d4b6af012ef4e3a305bb6df96734c13f01473c4520
+DIST pgocaml-2.3.tgz 90383 SHA256 ef8ec253a752eb31e535d845440185b95c4de31db8c5c955e79638b669af9ea2 SHA512 f42ca8ccf31f9e03cfa9f81a9cd19c2a6010c33f5a578e76924683fd10ab4acf2727b09b71c5a8f200bc39765a5d876a289976fea367b49ae54335c007fd3ff7 WHIRLPOOL 48a8adb944db6bce29f818f287d47b35d0b776f3eb5bb68e0e835a4ac451405d46bbd3fcdc14c1ee9542f9b0afecd5e7b98a2f74d32fdbb7efe61c232414a0f7
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
index 76bbff93b8c7..5916b25a8911 100644
--- a/dev-ml/pgocaml/metadata.xml
+++ b/dev-ml/pgocaml/metadata.xml
@@ -5,4 +5,7 @@
 			<email>ml@gentoo.org</email>
 			<name>Gentoo ML Project</name>
 		</maintainer>
+  <use>
+	<flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ml/pgocaml/pgocaml-2.3.ebuild b/dev-ml/pgocaml/pgocaml-2.3.ebuild
new file mode 100644
index 000000000000..c9e22b4b42ac
--- /dev/null
+++ b/dev-ml/pgocaml/pgocaml-2.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="PG'OCaml is a set of OCaml bindings for the PostgreSQL database"
+HOMEPAGE="http://pgocaml.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1597/${P}.tgz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="camlp4 doc"
+
+DEPEND="dev-ml/calendar:=
+	dev-ml/csv:=
+	dev-ml/pcre-ocaml:=
+	camlp4? ( dev-ml/camlp4:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "CHANGELOG.txt"
+	"doc/BUGS.txt" "doc/CONTRIBUTORS.txt"
+	"doc/HOW_IT_WORKS.txt" "doc/PROFILING.txt"
+	)
+
+src_configure() {
+	oasis_configure_opts="$(use_enable camlp4 p4)" oasis_src_configure
+}
diff --git a/dev-ml/postgresql-ocaml/Manifest b/dev-ml/postgresql-ocaml/Manifest
index ccc5365ee0ea..465975e7cb5c 100644
--- a/dev-ml/postgresql-ocaml/Manifest
+++ b/dev-ml/postgresql-ocaml/Manifest
@@ -1,2 +1,3 @@
 DIST postgresql-ocaml-2.0.5.tar.gz 79123 SHA256 e786c46edbd63aacd82e008098a2c801f445d59a29bd49713eae5cf5c157eaa8 SHA512 1d4b09b9135e1d6a98295bd51175ac44e6b51219703ad8ba5c0d429d81534989b43ed8922eff6511de4fc31b6dde1e6ca4f7bea91981e3d8c025d151258e41c7 WHIRLPOOL 04ae6fb1865fea75f286faf366ba4a976f260c502de1f898b48c8fb93b70ddedfdeeb9383e54efb2dd3b15e9b6d5302e1a5e0009188d8d83bbd69d4448774eef
 DIST postgresql-ocaml-3.2.2.tar.gz 85697 SHA256 51348110f06e7d17f68894fd91f91b3e1f935647355a94a79b8c16f923ce9e81 SHA512 c41c6feed76d8d49932399a080d2e2fa9227b742e0cab5efdf849315ae1b633369e035bee3fd1d94c6a61e533f23d3881e9de650d1b4ec01946660f39c245917 WHIRLPOOL c314346cf113c87ceec3ded469505952a7717f06bdc6099e5fab84d4b5911927b611036bf924c9fdadb35c545ad3fc8ab06d115fd24ad78e045580ba8e02a04f
+DIST postgresql-ocaml-4.0.1.tar.gz 85871 SHA256 07d8fdb5c161b30809876375c43ebf29e5b99a475ee6b019b6fee3a80c18a4cb SHA512 baecd1b3b98f790131972dbd2eba563b43dec6e13e37ab904ee38b2b1168b03533272532887a42a2536806951c9e543306c6eccfb441de517ee860383ea5df36 WHIRLPOOL 71562d46b8688b4319f6fae06aeaea866e397cf6ce9f533b096d8d9f0850b2746fdffca6f4f234cc23cfb433d8124f559f89971d32554a756e88234c5a311e6d
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild
new file mode 100644
index 000000000000..3f2ac2fec70b
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
+SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
+IUSE="examples"
+
+RDEPEND="
+	dev-db/postgresql:=[server]
+"
+DEPEND="${RDEPEND}
+	>=dev-ml/findlib-1.5"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+	oasis_src_install
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-ml/ppx_assert/ppx_assert-113.24.00.ebuild b/dev-ml/ppx_assert/ppx_assert-113.24.00.ebuild
index 92e351d92e35..03abed663fb0 100644
--- a/dev-ml/ppx_assert/ppx_assert-113.24.00.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-113.24.00.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit oasis
 
-DESCRIPTION="Optional compilation for OCaml"
+DESCRIPTION="Assert-like extension nodes that raise useful errors on failure"
 HOMEPAGE="http://www.janestreet.com/ocaml"
 SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
 
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 58d9aa2ca430..7ddb5a2dcd65 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1 +1,2 @@
 DIST ppx_deriving-3.0.tar.gz 38560 SHA256 1998607e68b35b6c61e1fb33c03b523f3bf88f802df6d5bf180dc6932317179b SHA512 1b8ef40fd1b85df0d5307edcc46c16ae1834aadb1419d92dced4b2b542f51bb24999abcdf725647f1f7033ca2df4dc88ab156002b1e6a7a6a83a5e0e4854d833 WHIRLPOOL cda0c6afc31c6d39dd4974c2ce63d28ddea2019bb8bc1c50338c1005880a0a0ef66c2ceb00e86a6a7040c042778f1216321cda3d1dcfc2327c6e084f0ab45b53
+DIST ppx_deriving-3.1.tar.gz 40720 SHA256 19babff7706753d24d4859a24d7303555dd1af125d6ca8a0589b8fac3c110fa7 SHA512 ef3174f4fbecea9c613deb62aebb45de2b2abf640d557973f0621575a391cc11fc4135c782dc3d202012ddbeaadb3c7dd84f42d08aef0ba668bd169dedfeedf0 WHIRLPOOL cdace363540346f3660811c57f7c10757dd09011fed1300fe29e3746297cae9ed3567e2b865c20dda6061404bb10c5b1e3350acfa8ad7f92bb20199f0a8052ea
diff --git a/dev-ml/ppx_deriving/ppx_deriving-3.1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-3.1.ebuild
new file mode 100644
index 000000000000..0099ce56db76
--- /dev/null
+++ b/dev-ml/ppx_deriving/ppx_deriving-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"
+
+inherit findlib
+
+DESCRIPTION="Type-driven code generation for OCaml"
+HOMEPAGE="https://github.com/whitequark/ppx_deriving"
+SRC_URI="https://github.com/whitequark/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +ocamlopt test"
+
+DEPEND="dev-ml/ppx_tools:=
+	>=dev-lang/ocaml-4.02.3:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	test? ( dev-ml/ounit )"
+
+src_compile() {
+	cp pkg/META.in pkg/META || die
+	ocaml pkg/build.ml \
+		native=$(usex ocamlopt true false) \
+		native-dynlink=$(usex ocamlopt true false) \
+		|| die
+	use doc && emake doc
+}
+
+src_test() {
+	ocamlbuild -j 0 -use-ocamlfind -classic-display \
+			src_test/test_ppx_deriving.byte -- || die
+	if use ocamlopt;  then
+		ocamlbuild -j 0 -use-ocamlfind -classic-display \
+			src_test/test_ppx_deriving.native -- || die
+	fi
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+	mv "${ED}/usr/lib/ppx_deriving/ppx_deriving" "${D}/$(ocamlc -where)/ppx_deriving/" || die
+
+	use doc && dohtml api.docdir/*
+
+	dodoc CHANGELOG.md README.md
+}
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index d3cccdee6dee..de71dd1260bf 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1 +1,2 @@
 DIST yojson-1.3.0.tar.gz 26610 SHA256 80e26e6d902c57bbacf44467f2a5cc30e4e189260093c66a3269fb1b1cc37094 SHA512 65e2d5bb7649cad3d395ec8fead11b18fd0ca5e59e87194a39a77561bcdaa04cecdc71f0da32ac268a36c0e7b21f56e9f40a08610f84cf7f81d0da20daf90fc0 WHIRLPOOL ed5ba5a5c397d47616282272573f9940d02035698a45dc7bc377c1fb2918d4a72fc789a4332ff7c09113d6bdcb223e2321f46f21f9576ff85197825bdc661d0d
+DIST yojson-1.3.1.tar.gz 26725 SHA256 ea97f150bb8270730165f7727518aa533c784b84f17016d339060161250124b8 SHA512 f0fb6dad88f75d279a4341384238d4b6fd63c7b34a5a7892fbf278604a4011ea744c355377246e92595696fc5a5298968802c40a12a3ddcd89412ee1ce1e1402 WHIRLPOOL 558cc3258ee4e27a4507c1383d5e2fc6542d2f8178430d73020b37184624df2879a56cee30cc9844d0531f2f1199613591500cf888f606b1788dd3c166e0b7dc
diff --git a/dev-ml/yojson/yojson-1.3.1.ebuild b/dev-ml/yojson/yojson-1.3.1.ebuild
new file mode 100644
index 000000000000..cab42fda852b
--- /dev/null
+++ b/dev-ml/yojson/yojson-1.3.1.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 findlib
+
+DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
+HOMEPAGE="http://mjambon.com/yojson.html"
+SRC_URI="https://github.com/mjambon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
+	dev-ml/easy-format:=[ocamlopt]
+	dev-ml/biniou:=[ocamlopt]
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo
+"
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	findlib_src_install BINDIR="${ED}"/usr/bin
+	dodoc README.md Changes
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild
new file mode 100644
index 000000000000..bab1c2ac3387
--- /dev/null
+++ b/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MARKSTOS
+MODULE_VERSION=4.81
+inherit perl-module
+
+DESCRIPTION="Validates user input (usually from an HTML form) based on input profile"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="dev-perl/Image-Size
+	>=dev-perl/Date-Calc-5.0
+	>=dev-perl/File-MMagic-1.17
+	>=dev-perl/MIME-Types-1.005
+	dev-perl/regexp-common
+	>=dev-perl/Perl6-Junction-1.10
+	dev-perl/Email-Valid"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build"
+
+SRC_TEST=do
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild
deleted file mode 100644
index 015acb4e75ba..000000000000
--- a/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MARKSTOS
-MODULE_VERSION=4.81
-inherit perl-module
-
-DESCRIPTION="Validates user input (usually from an HTML form) based on input profile"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/ImageSize
-	>=dev-perl/Date-Calc-5.0
-	>=dev-perl/File-MMagic-1.17
-	>=dev-perl/MIME-Types-1.005
-	dev-perl/regexp-common
-	>=dev-perl/Perl6-Junction-1.10
-	dev-perl/Email-Valid"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST=do
diff --git a/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild b/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild
index 5c7e95aa6b91..c7fc79bea868 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 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=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Filter/Filter-1.540.0.ebuild b/dev-perl/Filter/Filter-1.540.0.ebuild
index c9bb02bc9188..4a911b579667 100644
--- a/dev-perl/Filter/Filter-1.540.0.ebuild
+++ b/dev-perl/Filter/Filter-1.540.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/GStreamer/GStreamer-0.180.0.ebuild b/dev-perl/GStreamer/GStreamer-0.180.0.ebuild
deleted file mode 100644
index 3d89292945c4..000000000000
--- a/dev-perl/GStreamer/GStreamer-0.180.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=XAOC
-MODULE_VERSION=0.18
-inherit perl-module
-
-DESCRIPTION="Perl bindings for GStreamer"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/gstreamer:0.10
-	>=dev-perl/glib-perl-1.180.0
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-Depends-0.205.0
-	>=dev-perl/extutils-pkgconfig-1.70.0
-	virtual/pkgconfig
-"
-
-SRC_TEST=do
diff --git a/dev-perl/GStreamer/GStreamer-0.200.0.ebuild b/dev-perl/GStreamer/GStreamer-0.200.0.ebuild
index c7cc58232793..b3e5a7c5570e 100644
--- a/dev-perl/GStreamer/GStreamer-0.200.0.ebuild
+++ b/dev-perl/GStreamer/GStreamer-0.200.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl bindings for GStreamer"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/GStreamer/Manifest b/dev-perl/GStreamer/Manifest
index f11e27975d57..3bf7a73e4530 100644
--- a/dev-perl/GStreamer/Manifest
+++ b/dev-perl/GStreamer/Manifest
@@ -1,2 +1 @@
-DIST GStreamer-0.18.tar.gz 69782 SHA256 de3482441577c07cd6b65ec3b87b49dbcd8661af53ca260110f0e1cc1d8ae6b9 SHA512 277edae589e1e21146efac87d2e78c2c9989fc5e3732d5fd8bc0102c63db9591beaeb3af9e12e689607ba5f8a0f5a448fbe8ba2e8732509262f1560c6d9ed2e3 WHIRLPOOL e13369cac1c9cfc78f1eef7d0d66f94fa4eb75e094ae8ca53c5f7e985635ab4b69a9d87995b3d8ed4882918fbb6759444bf381186c7f239a3e42c5ae7aa43c5a
 DIST GStreamer-0.20.tar.gz 70641 SHA256 5469e0433481cecef67d988eb039d719a229bfd6884d0d90cda69fef7f4bf8b7 SHA512 70615f1b49851861ea1a2f4f9f944e0fde5b04bd4bb15f365e27d9c4976367f89a5855c73035812cf25c1cea45601631eb3b1b6f993b9ecc07dca4f2e54d3b95 WHIRLPOOL 4a1dbe57b046bfc4a45bc6bb02c5a4f7e1c29b7e27162442151f111883605d57291c25e6727bb441ad6a0299bb536643009f920a669b1ef7b54001b5a745d6e3
diff --git a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild
index 1603a7d36466..9eee62ebfc9c 100644
--- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild
+++ b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
index 439aa3bf00a5..c992f96c5648 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Long with usage text"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.99.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.99.0.ebuild
new file mode 100644
index 000000000000..3f6a12deb3a5
--- /dev/null
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.99.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.099
+inherit perl-module
+
+DESCRIPTION="Getopt::Long with usage text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE="test minimal"
+
+# File::Basename -> perl
+# List::Util, Scalar::Util -> perl-Scalar-List-Utils
+# Sub::Exporter::Util -> Sub-Exporter
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Getopt-Long-2.330.0
+	>=dev-perl/Params-Validate-0.970.0
+	>=dev-perl/Sub-Exporter-0.972.0
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		dev-perl/Test-Fatal
+		>=dev-perl/Test-Warnings-0.5.0
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index 160e429f7a6b..4ddb4a6ac8ff 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,2 +1,3 @@
 DIST Getopt-Long-Descriptive-0.093.tar.gz 23954 SHA256 4c79d7b81c95ae94d65f060db10c9bd6d17b0ed18f7b5f223255322a81be8c45 SHA512 acdb1f2f04cad0cd6a17bd00dd455613dcbb20e849fa0b351be52c35fb209289b10a2e0067cbc3dc1f5680091c38ab8083730b9d4e95e63da80b389e71eb5083 WHIRLPOOL d0e2e818f4750c333cfb45d5f8bdfe34701c59c0c5a94b15d7e682ae006a0e910341cb3ff8a9ccc5dcac7656c1d274727ddfe35c14a323e41d6fdc6c1d8f5c46
 DIST Getopt-Long-Descriptive-0.097.tar.gz 26399 SHA256 a6e484962727ae2d882d5d35c5bedd48bc13730a7e4c739a7daa74f525422883 SHA512 9b1a11bce5a64b0dbae93d410593c6411790db8eac1169eb1703fdd4b0bffc0cb0ce12fd02c3de0b4fea98151bcc98af55cf46d84d658c8292291bf3baf5d28d WHIRLPOOL 19c2185574a3cadc8d1ca01ca4ab7c9dbb5c7938573a471f464fa5f937379248fc0ff3da71ef23b0a14fc67409e3268858b4e5ea65e71798b042802ef6e81854
+DIST Getopt-Long-Descriptive-0.099.tar.gz 29651 SHA256 fc4d1ed0bf12abc3d01ba38b0376c1b0fe6c6e59152b61b5f500a1e3f7c8c5e9 SHA512 3b6fdf06eab25f53c5624e42a8024d059d1ee1c33361184a1d45fc5f0f9b521ad0749916ca7ec7d9561bc2c297adba520ff1fd5efa6706ca480697fad71290da WHIRLPOOL 938e7585b014fd08b88e492b1168aaef4810f7e1906bf0a2825c47048e0f92237ed6bd55bd4f0deb2244b0b3f25c8495add77a3a33a6c43503087beab3a902cb
diff --git a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
index de96d8463a31..d835aed3f111 100644
--- a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
+++ b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Mixed is used for parsing mixed options"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Graph/Graph-0.960.0-r1.ebuild b/dev-perl/Graph/Graph-0.960.0-r1.ebuild
deleted file mode 100644
index 1253dd030187..000000000000
--- a/dev-perl/Graph/Graph-0.960.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=JHI
-MODULE_VERSION=0.96
-inherit perl-module
-
-DESCRIPTION="Data structure and ops for directed graphs"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="virtual/perl-Scalar-List-Utils
-	>=virtual/perl-Storable-2.05"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Graph/Manifest b/dev-perl/Graph/Manifest
index 7c6fc79834a1..fd8a7596ebcd 100644
--- a/dev-perl/Graph/Manifest
+++ b/dev-perl/Graph/Manifest
@@ -1,2 +1 @@
-DIST Graph-0.96.tar.gz 147629 SHA256 832efa8d483a484f2543a001a3996fcc04c9b37cfc2178d63f603fb0cf8f9727 SHA512 afcaa154473696e51310a9b0e1b1a48c29ce60fa3462d25c9fba1a5080a8205e2a734a6870a2d1770e3df88ffd5cde144861ea7ab794313df8c2a715e1540c67 WHIRLPOOL 23439672add86bc32646db4b295e67fa8a7e3982acf3482735a39b45008a5a2f828c6ab09bd83ab2a2d9861872ece61ac3d380f6e51ed26eb76f79cab8390327
 DIST Graph-0.9704.tar.gz 146930 SHA256 325e8eb07be2d09a909e450c13d3a42dcb2a2e96cc3ac780fe4572a0d80b2a25 SHA512 1eed5049577112cc2e41a83f6b3b6a22a08170597b5cb89e2eab6cc68386bfd989d3953d7ceab85bcfbd7d097a6925bd8eb43f48eed1ac07469ea4b2432149da WHIRLPOOL bdb8b1361140aa3d7726b158996ca46f731037b472c4c44cb7142720d8ea3217cd49d662ff1480895c2e024c9cb16199fdde855c22637d0ec4835bb9f63c6826
diff --git a/dev-perl/HTML-FillInForm/HTML-FillInForm-2.200.0-r1.ebuild b/dev-perl/HTML-FillInForm/HTML-FillInForm-2.200.0-r1.ebuild
deleted file mode 100644
index 24bf53345918..000000000000
--- a/dev-perl/HTML-FillInForm/HTML-FillInForm-2.200.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MARKSTOS
-MODULE_VERSION=2.20
-inherit perl-module
-
-DESCRIPTION="Populates HTML Forms with data"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-perl/HTML-Parser"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-FillInForm/Manifest b/dev-perl/HTML-FillInForm/Manifest
index 1d9ce0cfd97c..9647ed5fc011 100644
--- a/dev-perl/HTML-FillInForm/Manifest
+++ b/dev-perl/HTML-FillInForm/Manifest
@@ -1,2 +1 @@
-DIST HTML-FillInForm-2.20.tar.gz 17309 SHA256 75e1125e32fb218d5aceddb7f6ffdd49edf16ff438571ab0fd4866a52fc7ec5b SHA512 d00955fae1d9602ccda79e42e4a2863cb04b7070d72bdfe383b3b68ac56cf0a629bf2cbea35aaa042a379fe1c9679d7905407454d0e6c19433f6821dfbd27ebd WHIRLPOOL d60f5118b2e16115e5e1316c72b41a9583334261e18fa1299ba78b9d5fa641fa775283ae734e11f099e43a850fba403d817f679b183332dbc48a47f04e4d82b3
 DIST HTML-FillInForm-2.21.tar.gz 17823 SHA256 d3af183cc8327614f1192929f4f0919b6e9725fc19c6f3730ce556a8daea6cf6 SHA512 05a755635478a797c4711e812a7fbd0428e61b4a4dbb3f8b62ed929122bb4b138aa3d86f2d99ace01d9e7f9486663e64b2c50490d0084c861cbdf8c25645be96 WHIRLPOOL 2f89df5e337e11ea9c327de5afaeca18b845b77d437f1fa139681ccb3be1495fe58852728a94debedee3f36483a2b30f3f5a14733b7f3c90b391a021a416ec0e
diff --git a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
index 7ef67719f29f..ae68e0774cc1 100644
--- a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
+++ b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="HTML Formatter"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
new file mode 100644
index 000000000000..3a3a061bd81a
--- /dev/null
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=2.07
+inherit perl-module
+
+DESCRIPTION="Convert plain text to HTML"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+IUSE="test"
+
+# Email::Find::addrspec -> Email-Find 0.09
+# HTML::Entities -> HTML-Parser
+# Scalar::Util -> Scalar-List-Utils
+# test: File::Find -> perl
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Email-Find-0.90.0
+	>=virtual/perl-Exporter-5.58
+	>=dev-perl/HTML-Parser-1.260.0
+	>=virtual/perl-Scalar-List-Utils-1.120.0
+	>=virtual/perl-Text-Tabs+Wrap-98.112.800
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/HTML-FromText/Manifest b/dev-perl/HTML-FromText/Manifest
index 9e2a98aca449..daf19f5ac4be 100644
--- a/dev-perl/HTML-FromText/Manifest
+++ b/dev-perl/HTML-FromText/Manifest
@@ -1 +1,2 @@
 DIST HTML-FromText-2.05.tar.gz 13875 SHA256 6510e5c817aae9c1414e418fa853daa7f9835736df60a658db6fd1c65ad0a15e SHA512 69263aa7aca3ce002e2e0db9553b15f01e5e6d7d148a410846b170cf19d3fcfbbfd9b7cc52d9264de081b9292cec89ec1ed17e3069552dc27a83620e901602cb WHIRLPOOL 95d8441d260850c710b4835cd1dc6a51fbb281210e73f047283586674ef91ef319e5f14ecca184b1b37913a93165d4625cca5a57cb83c8c4324bc5ae668db6bc
+DIST HTML-FromText-2.07.tar.gz 23596 SHA256 c5e010324105be707fb5746bb5f2d30ccbc8e4f78d2a6e159b4147a462fe23ad SHA512 4aacb6be9d1c860c1e758201be40a9c966cb43f1593714e65964bce4bf5d72c86028290ec584321365de36909b6e44e8851f5c2a417b6e38da984ec9c5c30112 WHIRLPOOL 0f2b23fdc64085fffe16b838075d5776268ec72fe8dd5e2a05c091d8c24c395c7def8578fb097804071c612cfd213b203cd583c1da7491fef6b5e438fe805896
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.540.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.540.0.ebuild
deleted file mode 100644
index f9ec1b99e80e..000000000000
--- a/dev-perl/HTML-Mason/HTML-Mason-1.540.0.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
-
-MODULE_AUTHOR=JSWARTZ
-MODULE_VERSION=1.54
-inherit depend.apache perl-module
-
-DESCRIPTION="A HTML development and delivery Perl Module"
-HOMEPAGE="http://www.masonhq.com/ ${HOMEPAGE}"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="modperl test"
-
-RDEPEND="!modperl? ( dev-perl/CGI )
-	modperl? (
-		www-apache/libapreq2
-		>=www-apache/mod_perl-2
-	)
-	>=dev-perl/Params-Validate-0.7
-	>=dev-perl/Class-Container-0.08
-	>=dev-perl/Exception-Class-1.15
-	dev-perl/HTML-Parser
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-File-Spec
-	>=dev-perl/Cache-Cache-1.01
-	dev-perl/Log-Any"
-
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( dev-perl/Test-Deep )"
-
-want_apache2 modperl
-
-SRC_TEST="do"
-mydoc="CREDITS UPGRADE"
-myconf="--noprompts"
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	perl_set_version
-}
-
-src_prepare() {
-	# Note about new modperl use flag
-	if use !modperl ; then
-		ewarn "HTML-Mason will only install with modperl support"
-		ewarn "if the use flag modperl is enabled."
-	fi
-	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	export APACHE="${APACHE_BIN}"
-	perl-module_src_prepare
-}
-
-src_install () {
-	perl-module_src_install
-	mv "${ED}"/usr/bin/convert* "${ED}"/usr/share/doc/${PF} || die
-}
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 1dbb9faaaac4..e09419851a1d 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,2 +1 @@
-DIST HTML-Mason-1.54.tar.gz 302498 SHA256 a7657205a16e17049da9c9e0f8fac4a3c5fef23965e635372cbff6f2b8452219 SHA512 341548326391331b22d4adb60363b63149d13406bfe79683f5f69965811e9b6e43e36336b3503eca42792e70db589b264c093074635ea01860598cd90c6e1dc6 WHIRLPOOL c00d01bcbb48e55fd02b11235e6acba06389f5a11f5e6213b741c054e93663ff77dfa4a78481e7dce931ab41a5cb93323f8b4f2fcc8113813df81a2bc3a1648f
 DIST HTML-Mason-1.56.tar.gz 314167 SHA256 84ac24fb1d551f998145435265e5b6fd4a52ec61e4fadd3d7755eb648be2c4b2 SHA512 3492a37b8289209a2215b42be71db242ca150f4364d8422e46ca4762f2cdbddf96a56f44a3462d1f1eb23ef3bbe1cb36b8322106f4050404b988c6d90a05911c WHIRLPOOL bccf39f71a76fd54bf57a12f2da676611657fff7f28db73d5e7192f920ac5b3a124e0720ef094b697043e602ebf7320774cc0599944e2d00015a956e50b5f315
diff --git a/dev-perl/HTML-Quoted/HTML-Quoted-0.30.0-r1.ebuild b/dev-perl/HTML-Quoted/HTML-Quoted-0.30.0-r1.ebuild
deleted file mode 100644
index 95d49c844633..000000000000
--- a/dev-perl/HTML-Quoted/HTML-Quoted-0.30.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RUZ
-MODULE_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Extract structure of quoted HTML mail message"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/HTML-Parser-3.0.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-"
-
-SRC_TEST=do
diff --git a/dev-perl/HTML-Quoted/HTML-Quoted-0.40.0.ebuild b/dev-perl/HTML-Quoted/HTML-Quoted-0.40.0.ebuild
new file mode 100644
index 000000000000..db1f6b8afa8b
--- /dev/null
+++ b/dev-perl/HTML-Quoted/HTML-Quoted-0.40.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=TSIBLEY
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Extract structure of quoted HTML mail message"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/HTML-Parser-3.0.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+"
diff --git a/dev-perl/HTML-Quoted/Manifest b/dev-perl/HTML-Quoted/Manifest
index 5ce8e265a9ea..9090e7bdd7af 100644
--- a/dev-perl/HTML-Quoted/Manifest
+++ b/dev-perl/HTML-Quoted/Manifest
@@ -1 +1 @@
-DIST HTML-Quoted-0.03.tar.gz 20836 SHA256 ec5eedcbbbf8fd0a91e95c2bf35fe6efe0e1faa4f64f18063b4c240c29d08175 SHA512 7d471740cf71483180088c36b9ca867d8cd5e242e0fbc0b6a1060f0ab7b420131a65654dd941ed6047d5944f954990cbeb8d323a6a5a4bd61add91dc99db7bba WHIRLPOOL 721e05cb1cf33b702dfdced3c725214494d5b4ab12c09f02231a3a179829c49a7a0e678f42623f70c16508630617ba6199e10658e72df4f95a2c66862fe62b0f
+DIST HTML-Quoted-0.04.tar.gz 23106 SHA256 8b41f313fdc1812f02f6f6c37d58f212c84fdcf7827f7fd4b030907f39dc650c SHA512 a13fb07d683741ec32679780d7183c849c534fb79e2b5f5613f9142e2b877938712d8bf20bb1e540ad5f4532cd7f2fcbf42bc3be5e931d7a4a2ae12bd0af0cc0 WHIRLPOOL 1af8d20e045be9f6296338eadaaac7ae9c839a35fa9b78c11cb56bfbe96e6210d05ae51dd5b9326b671205151f5b2da53438a3bb4b38525d63c6cb65f4a64e5b
diff --git a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.150.0-r1.ebuild b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.150.0-r1.ebuild
deleted file mode 100644
index 128e22a788ed..000000000000
--- a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.150.0-r1.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=OVID
-MODULE_VERSION=3.15
-inherit perl-module
-
-DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-perl/HTML-Parser-3.25"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	virtual/perl-Test-Simple
-	dev-perl/Sub-Override"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild
index 2d4766d05a0b..ad8dd04c138e 100644
--- a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild
+++ b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild
@@ -8,7 +8,7 @@ MODULE_AUTHOR=OVID
 MODULE_VERSION=3.16
 inherit perl-module
 
-DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions"
+DESCRIPTION="Easy to use HTML::TokeParser interface"
 
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
diff --git a/dev-perl/HTML-TokeParser-Simple/Manifest b/dev-perl/HTML-TokeParser-Simple/Manifest
index 9fb21a7bf54c..daa88b31068e 100644
--- a/dev-perl/HTML-TokeParser-Simple/Manifest
+++ b/dev-perl/HTML-TokeParser-Simple/Manifest
@@ -1,2 +1 @@
-DIST HTML-TokeParser-Simple-3.15.tar.gz 16302 SHA256 ab006c808f4607ecdeed1d54ba997167281d97cc7d1dc968d0971f7802e72146 SHA512 917dd3f33260981b3c52bda0f1791ef41ff4084eb3cfcb1f8bbd25d0b7cfd65c41bcd1b4e48f7098dc7e4291051c45a4cfd87190e1e2e4aab16958a65c0ea61c WHIRLPOOL b69f66d528b2a64f3a3b9dde98235c793c58c880e42c84b0962c250d32c97d9c3b87a69c3f547d8c0a84ec0fc6ee452a6ec35d76a1c0ef26a76ded741ddfb4f7
 DIST HTML-TokeParser-Simple-3.16.tar.gz 19952 SHA256 ed11135c6839e6e0eaf96952e6ac353a2f22ebb40a721659671e5d2dcc0e4a9d SHA512 d13487cc86af7c7e90aa5b9006b989faedd6a8e06279aaf6a0f13bad613a1672b3fa280bf8f369236033104d3c092e62efa177595cc5e5c74cb966e0b12a205a WHIRLPOOL 75fdfd365a560741f62bd1ce00047c4ad034aa2f935f0c0fbc75f199bac09201694782ead2a75a4290bffbaafce4c2bd91db27e584b416bd63f9d3f94a41dbea
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-2.80.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-2.80.0.ebuild
new file mode 100644
index 000000000000..2f6af08dafc2
--- /dev/null
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-2.80.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=2.08
+inherit perl-module
+
+DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-JSON-PP-2.273.0
+"
+DEPEND="
+	>=dev-perl/Module-Build-0.280.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Path-Tiny
+		dev-perl/Test-FailWarnings
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+		dev-perl/Test-NoWarnings
+	)
+"
diff --git a/dev-perl/HTTP-BrowserDetect/Manifest b/dev-perl/HTTP-BrowserDetect/Manifest
index 35b1d08bd92c..aa48266e159b 100644
--- a/dev-perl/HTTP-BrowserDetect/Manifest
+++ b/dev-perl/HTTP-BrowserDetect/Manifest
@@ -1,3 +1,4 @@
 DIST HTTP-BrowserDetect-1.50.tar.gz 40890 SHA256 8bc62a2e06cc22b7ade8fab11cad277257de9ec9367d44db79930da162dc301f SHA512 1ee8c542f67eda2a5fbcbedcaeeabff8164ec36ed914889fbaf95f94e87141a9acdd3ba7d4f3fe8c63b2d05e6c824ee057309096c1fdb9bd16be02df65592a49 WHIRLPOOL bda4e9bb49c35bc0a61d1213ebffa59be72ec82c9c3e6c159a21cca257a633fb9009b11914300b8057774a44e4535faa0b693b2131fdf5f0f8d5e61bf095886e
 DIST HTTP-BrowserDetect-1.77.tar.gz 57028 SHA256 5f93fa6f8a5b07fca7786fc7bfabdedd12535ae8aa303a030fec856228a3f7fd SHA512 4d9ecfbd9afda84910e58b2a8ad969f24f2b343d0d547bdbb327f33e41338591a0511ffa61244380329d2045db23ac2f203158bc9520e5099015e97e01a2bbf7 WHIRLPOOL 99a4cf09e7ca35df36e2cce3c13a360d356b8810b7e1e7463e4b07ad780d02c18b2e33cf432373d2427fdc49df2bac73fb3299c579c0c4d5625a0e4bf3597b61
 DIST HTTP-BrowserDetect-2.04.tar.gz 90485 SHA256 b21e0e4c9d81c37a12973e5857302dbcea54def1eea8bad9ca3ae39478a6879d SHA512 f8f957b02b33ba8cdfdab7c3b0b1975b6818fe58f47e344cc8f2b8475dfd7a0e101068c80cd38cb953ba74b43cfc44d7b295145bae252b10b088704169f3eca3 WHIRLPOOL c1d96df9140a779898f36668846b8e04b426d0537c3fa283991e06440567d53f301dbc17c340b5caccf28f4920be04c8be8d525c63d7c80eb12500f5402b997d
+DIST HTTP-BrowserDetect-2.08.tar.gz 86331 SHA256 2f0b2f3f9bceb57b19eea2306929ee5d12795978d8f589ebbd45db8d0576542f SHA512 109cfec695435b9803b1d5e424720967087a958276844a368e36815170aee5b1f98d870d33d1477b10e7e8a1290996b45fb0705afeca2e7ea280ecf1da3a9a86 WHIRLPOOL a02ab5331847473d76ea079f401f51dfe997ec7a8e17cd361c5bfd115a9ea3647a546f3602fc809c3b463cd4639e8e323c34fd0b3b4beea378040d883b438ab0
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.0.1-r1.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.0.1-r1.ebuild
deleted file mode 100644
index 447a5ff18f98..000000000000
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.0.1-r1.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=GAAS
-MODULE_VERSION=${PV/0./0}
-inherit perl-module
-
-DESCRIPTION="Storage of cookies"
-
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	>=dev-perl/HTTP-Date-6.0.0
-	virtual/perl-Time-Local
-	>=dev-perl/HTTP-Message-6.0.0
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=online
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.10.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.10.0.ebuild
new file mode 100644
index 000000000000..b7daf7e54a7a
--- /dev/null
+++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.10.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=6.01
+inherit perl-module
+
+DESCRIPTION="Storage of cookies"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Date-6.0.0
+	virtual/perl-Time-Local
+	>=dev-perl/HTTP-Message-6.0.0
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=online
diff --git a/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.200.0.ebuild b/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.200.0.ebuild
new file mode 100644
index 000000000000..93983e1e62a8
--- /dev/null
+++ b/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.200.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=TOKUHIROM
+DIST_VERSION=0.20
+inherit perl-module
+
+DESCRIPTION="Faster implementation of HTTP::Headers"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/HTTP-Date
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+		dev-perl/Test-Requires
+	)
+"
diff --git a/dev-perl/HTTP-Headers-Fast/Manifest b/dev-perl/HTTP-Headers-Fast/Manifest
index 0fea376e077b..8e56999ea5cf 100644
--- a/dev-perl/HTTP-Headers-Fast/Manifest
+++ b/dev-perl/HTTP-Headers-Fast/Manifest
@@ -1 +1,2 @@
 DIST HTTP-Headers-Fast-0.19.tar.gz 19214 SHA256 6f4c63e1e45af7aa605e4958ef08c13172fd07aa26c831f2e6db907477e5a2c5 SHA512 6feeaa9eca47e48310ae77c857615db24b0ad99e6678b959cc9eb439ed4f4fcb82c1d20318105716b4a15705d368f8f4b5f6ebdb5aabea25e6bf46facc99be9c WHIRLPOOL 354c6acc825ff1b490d8e782a07a0c90951377db43968fecab9797a57102834c5c2fce8bea5d6c20b06448a768f1cfadedd1db8ec7d0b60d2424147165a1395e
+DIST HTTP-Headers-Fast-0.20.tar.gz 19913 SHA256 d2f4c9724618e74f300fc746498fb5849692ef0cfc4af47fe499c4063969e520 SHA512 45d8260bf03e0cea50b2cd8cff0ac373ee1aeadf880e77949cf48089014aa3a6668cbffcf3852d470f967e68ae3f403e1c2a5dc1a93b04fa4ab69148b3ce9b1b WHIRLPOOL 153f615bc80fcb1c9113114968712a9556368435959f1f69cad329ecaefe9fb2c7fbf69ddad1c7b9845610342c22f4a0a3136ccf5d03e5016b9f720713f6e903
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild
new file mode 100644
index 000000000000..51c46e1e809d
--- /dev/null
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=6.11
+inherit perl-module
+
+DESCRIPTION="Base class for Request/Response"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# MIME::QuotedPrint -> MIME-Base64
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Compress-Raw-Zlib
+	>=dev-perl/URI-1.100.0
+	>=virtual/perl-Encode-2.210.0
+	>=dev-perl/HTTP-Date-6.0.0
+	dev-perl/IO-HTML
+	>=dev-perl/Encode-Locale-1.0.0
+	>=dev-perl/LWP-MediaTypes-6.0.0
+	>=virtual/perl-IO-Compress-2.021
+	>=virtual/perl-MIME-Base64-2.100.0
+	>=virtual/perl-Exporter-5.570.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/HTTP-Message/Manifest b/dev-perl/HTTP-Message/Manifest
index c0eee270e99a..29778ec24517 100644
--- a/dev-perl/HTTP-Message/Manifest
+++ b/dev-perl/HTTP-Message/Manifest
@@ -1,3 +1,4 @@
 DIST HTTP-Message-6.03.tar.gz 49711 SHA256 c736e083bdf0eea1bb73e2dc3b66db0a8283942c0f69063afadb9a7cfa80011b SHA512 3926305b028178820f6f52faf2fb7614cb7bc0ba32928e7fe38652f295006499cd820f6a8dc0be7c1e68b6c37820987f4fc64a6e3d075bc4591b4f1ba819aac6 WHIRLPOOL 958770f626243fcaf24b01d62dcaa39b3606cc8cad0d2122ad198bc9a2656be9129d751f66e30d5dce47593670b9e8d3cb039526fe31a45b84c0bf785df98940
 DIST HTTP-Message-6.04.tar.gz 50288 SHA256 6c061f22a90b460ed7b052e2a8739bc079108db86337c257765646870377a198 SHA512 d9d0fdb066dd0efec33ab162760912dde0483d442a7c3bdce85f25b0659156812d6046def22a906d3d7c796390588f8e201ecfadea313499cc2463db4520833a WHIRLPOOL 62c0b907b6db2aa7cc7643e85d56d24843b4397c1f92f1971ca4d01d74e8fa0a4a3809c7ea5cdc5fdf7e9a1ecbb5f0eb4485ebb6fd5bef8a3051362e7cabb03d
 DIST HTTP-Message-6.06.tar.gz 50806 SHA256 087e97009c5239dca4631cf433d836771b3fc5ba5685eef1965f9d3415cbad63 SHA512 38cc8931cc42f7af8b1c491e098eab4f2cb0dd56249be7a081999194c0d5f15d2b556ced1af15481f50c69dcf4a8deebe6c26c94e7e6f0e0b08f84f8953aa746 WHIRLPOOL 0c89910b6201ecd77440dc3953662dcf7cc403225e7d348fa33d143ff1b3fd09d6e735c4c6bdbd39d89ecebacdb1a066dd6e458b349aaba89804996632754a5c
+DIST HTTP-Message-6.11.tar.gz 59981 SHA256 e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b SHA512 6fc923b7dbdcce7269a03700a8776fe85522287f409fffac40936a77d951a70d957642eda8d2a0367af60d176c89654b3bb6249c23f458c0cd9d44031e6b6dc2 WHIRLPOOL ac85ed398dc28ea498ef63fdd19b2016bf48b33f14fd9ae73e9776bc9c77f71fe1022dbf5d58573dcd488762acb80d01a76ea2a3b7471a23fb30d865ec0270f0
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild
deleted file mode 100644
index 19f3d5e3988c..000000000000
--- a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.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=GAAS
-MODULE_VERSION=${PV/0./0}
-inherit perl-module
-
-DESCRIPTION="HTTP content negotiation"
-
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	>=dev-perl/HTTP-Message-6.0.0
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=online
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.ebuild
new file mode 100644
index 000000000000..e31e71d2be64
--- /dev/null
+++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=GAAS
+MODULE_VERSION=6.01
+inherit perl-module
+
+DESCRIPTION="HTTP content negotiation"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Message-6.0.0
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=online
diff --git a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.50.0.ebuild b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.50.0.ebuild
new file mode 100644
index 000000000000..ac91292febfa
--- /dev/null
+++ b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.50.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=0.05
+
+inherit perl-module
+
+DESCRIPTION="Provide the stuff missing in Hash::Util"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.420.0
+	test? ( >=virtual/perl-Test-Simple-0.900.0 )
+"
diff --git a/dev-perl/Hash-MoreUtils/Manifest b/dev-perl/Hash-MoreUtils/Manifest
index 3ad611956096..3b5b6829bb42 100644
--- a/dev-perl/Hash-MoreUtils/Manifest
+++ b/dev-perl/Hash-MoreUtils/Manifest
@@ -1 +1,2 @@
 DIST Hash-MoreUtils-0.02.tar.gz 5372 SHA256 df3e073c57132075100bc4d9f7ff4adf5980f6727cf16339db94b2a65f176b64 SHA512 a0716e1cda6b10f1fe3196c480d6a19190cf89a668aa4f2f2ffa6f04842bc16c7a71062dc9bc64a2583e6c5e566a78ddaabd0d4edb7f7a037f922025591433b0 WHIRLPOOL 68fdc00bec644b9dde8e717b163a69003de67da98b2b4c628318e3ff2ce9773af56bd9cbe098c7f94061bf42adc1651e9698fed0547ef852fac79f800c57954d
+DIST Hash-MoreUtils-0.05.tar.gz 5809 SHA256 5e9c8458457eb18315a5669e3bef68488cd5ed8c2220011ac7429ff983288ab1 SHA512 7e53dfda0336198b5981be772a0aeb3aa1fdbfa5885bf866032bcd168a73ceb03f92db6de92874d5812f062ab9c03e1fed27732f60a7004944da568c3cb04845 WHIRLPOOL b06c31aac9a6ac73a45de548fac2545878a18c1e02741591714fca3ad5f2c23d5d1a680695aed37e8ffffc28e8498f969613e7824ceb93ddadc2ac5ae9e86797
diff --git a/dev-perl/IMAP-BodyStructure/IMAP-BodyStructure-1.30.0.ebuild b/dev-perl/IMAP-BodyStructure/IMAP-BodyStructure-1.30.0.ebuild
new file mode 100644
index 000000000000..46912842df9a
--- /dev/null
+++ b/dev-perl/IMAP-BodyStructure/IMAP-BodyStructure-1.30.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=KAPPA
+DIST_VERSION=1.03
+
+inherit perl-module
+
+DESCRIPTION="IMAP4-compatible BODYSTRUCTURE and ENVELOPE parser"
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=">=dev-perl/Module-Build-0.380.0
+	test? ( dev-perl/Test-NoWarnings )"
diff --git a/dev-perl/IMAP-BodyStructure/Manifest b/dev-perl/IMAP-BodyStructure/Manifest
index 2441ac77429b..37721b0f5453 100644
--- a/dev-perl/IMAP-BodyStructure/Manifest
+++ b/dev-perl/IMAP-BodyStructure/Manifest
@@ -1 +1,2 @@
 DIST IMAP-BodyStructure-1.01.tar.gz 11350 SHA256 50995f67a62262c94ab09bbfe32d344c560348f0986667cd1a42745f39950247 SHA512 04b48432cc43e1d1d881f32c7b3769796c3af9351bed0cafb15c01fbf8e8447467d36bfa0bd7feceb72901e6327c21336d63e0febee0dbde082e1c988254d533 WHIRLPOOL ffcfdaeef79e151c9a53ef78777610b9a5f572eb292367e2423e7aca96c308a736f34221ba3ee558575fb8119c6c912b323f937ba5b4ebf95195ad5d7dd1f029
+DIST IMAP-BodyStructure-1.03.tar.gz 25541 SHA256 9f903b9297ca943081c4dac1c23f8706069225eebcb2f707dfb5738779692536 SHA512 fc02346442d08be0b77580c19fc7d941555ec4cdfa82005f8a67cc6d2863a0e3b8ce16d6265eadd273833107f29b7251027a96199c2070b4abbd1468e6370c43 WHIRLPOOL 8507aeb10fb4ca6e46a1b37a948947b118c724d71cb19063471dca0833e63cb5559753655f51a722e4d22cd3a9b1048b22d0b25133e381e025eadb52894da091
diff --git a/dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild b/dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild
new file mode 100644
index 000000000000..8b9894245484
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=4.33
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+# Tests trigger stack overflow in sandbox code, see bug 553918
+RESTRICT="test"
+
+RDEPEND="dev-perl/common-sense"
+DEPEND="${RDEPEND}
+	>=dev-perl/Canary-Stability-2001
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
diff --git a/dev-perl/IO-AIO/Manifest b/dev-perl/IO-AIO/Manifest
index ff915978fe16..1e10b33a0758 100644
--- a/dev-perl/IO-AIO/Manifest
+++ b/dev-perl/IO-AIO/Manifest
@@ -1,2 +1,3 @@
 DIST IO-AIO-4.31.tar.gz 149718 SHA256 b68582588e2c89035cad19c1b0ee84d331ee801f0b4fb521ec23aa1e1010a09e SHA512 f1e564595201ba46506d9aea4f8e54d8aae55b8b018ad8fddcd3eeba3b3a5f6814df21f5dee68a3a30cee7509de22a4440afcec73d6df15d20f44ef5e5496a27 WHIRLPOOL 6a265606d4609b67812382bbcf1f804ba1477634bdec198770245015ff854e3fd48b37967cc2c5563db85a4f316319dd23a93db08bdcb1d932013fd603942291
 DIST IO-AIO-4.32.tar.gz 150475 SHA256 1cee61f494a6390c43e5768818d80e3aee65151df4a1fdda16ca52e6260e2f75 SHA512 fd0e4e047f5e2ba735758fb8ab32608c4a2dc1c2e9e6498484e2fc6bbf2357bc53ec0054f79c15f61b0e310ad0764ef0abfb1f5c6e7c81ba720faec479b371d7 WHIRLPOOL 5360ba49284c470d0311f68389f3459e3abc623ec2afb8015f1115ee93bd25fbb718b768614aa2b85f712858a6428da0211d3651906fdf8220e2f0e8c7d3440d
+DIST IO-AIO-4.33.tar.gz 154120 SHA256 7590320a1c47bcf0b7daf37a756c61501de71f001e50cf74338610d418f66bb0 SHA512 9d59d9ad511bb07178ed760a0387357ade961f9b0e73cdc64861fa3b5674fb4cdb07b44a0c0810cc364909c1bc4fb012c2975269c1e3035cd37ba21a8a029df9 WHIRLPOOL f2ee84da781fae31df183c0c94bf586601306b3b32d97d98cfdc90d5f7a077232a4962d08ce8589a5b3e2b4fef833cf88bf1422c2bb6f8bf35caeee55dc2a1ae
diff --git a/dev-perl/IO-Interactive/IO-Interactive-1.21.0.ebuild b/dev-perl/IO-Interactive/IO-Interactive-1.21.0.ebuild
new file mode 100644
index 000000000000..d9eeb11c47b7
--- /dev/null
+++ b/dev-perl/IO-Interactive/IO-Interactive-1.21.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=BDFOY
+DIST_VERSION=1.021
+inherit perl-module
+
+DESCRIPTION="Utilities for interactive I/O"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-version-0.780.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	virtual/perl-File-Spec
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+src_test() {
+	perl_rm_files "t/pod.t" "t/pod-coverage.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/IO-Interactive/Manifest b/dev-perl/IO-Interactive/Manifest
index b799dece2207..d8631dad6a69 100644
--- a/dev-perl/IO-Interactive/Manifest
+++ b/dev-perl/IO-Interactive/Manifest
@@ -1 +1,2 @@
 DIST IO-Interactive-0.0.6.tar.gz 6487 SHA256 9cc016cbd94b500027e137cb5070d19487e4431bf822f0cb534c38b6b2c1038c SHA512 beee3f3c9c6ad9c9ca34e313a36312a62520c98914c9c405beacee1c2b3bf05ad2b2fe5a53b43abff8dec1dcbccada4718dd8b7b31a98755d96a6ef0f9863863 WHIRLPOOL 6ff16ee09485007d022c5d1a5a9c28ac72bd4540535f37d5093d9dfdde30bc15aa26f50832e1a2ea11a9014c6d553b7ad0322172bb2205f9492bd590ac6c60c7
+DIST IO-Interactive-1.021.tar.gz 11751 SHA256 915bd642142649e23f0078341b2c095061c8b6dfa43050ff90f92d3d916234c0 SHA512 16307148e762b6c382dcecef653eab581563fefabd5289d7f3f66a439d17fb496982e24f7e74494f5710749eb11654d366001e016bf50b2e43b1dca7564c24ae WHIRLPOOL d1817af8e69f770cac743eacf7faafc10a94a5b38b687cbb11db0071f305f907a9874230043213259138b79b2cadc1af5545145785c92c7c89fb888d04d1cb08
diff --git a/dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild b/dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild
new file mode 100644
index 000000000000..d75e45dc1c1b
--- /dev/null
+++ b/dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=LDS
+DIST_VERSION=1.09
+inherit perl-module
+
+DESCRIPTION="Perl extension for access to network card configuration information"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	>=dev-perl/Module-Build-0.420.0
+	virtual/perl-ExtUtils-CBuilder
+"
diff --git a/dev-perl/IO-Interface/Manifest b/dev-perl/IO-Interface/Manifest
index 8410f24a756c..b46da4810e8b 100644
--- a/dev-perl/IO-Interface/Manifest
+++ b/dev-perl/IO-Interface/Manifest
@@ -1 +1,2 @@
 DIST IO-Interface-1.06.tar.gz 10339 SHA256 6c07bc9cebcec2ec58a6e6969a14c8d4f4959869332d53eab3b65079541cdf77 SHA512 d5a07b4df1614d4a0ca8462b3e343e1a65bed6f5282c6a368aa233e0d9f0f2d89475d1c5c0fa8fac1e495393bc164215a39af0f388c384e3c904ebf11f0a2460 WHIRLPOOL f7b6d7b950665db7fcdddd793e7a63de8783e490df059d7de87943d02d871317ca64602ad423bb75bf95db8b119847d14a82e3cb2900134f69ccc6a74d75f379
+DIST IO-Interface-1.09.tar.gz 16414 SHA256 e63e81c52eb1e0e60ec2d983f5552d2493e117179925c96757f23c4bd9fa713a SHA512 a23a4793e23ba0fbb0583c6692d7138e4a9b0a6959c9fa81489954090fa51ca6edfe79841a8f69ab7f7a52aec31a477cb01705f6d66d5c7e8b69f76301360cd5 WHIRLPOOL 42f7d82d9b01845bc3039880fa6e46e35ef54aadf04413f9c47817bacac7641ecd4df6530e560ac0f9e53481eb51ae982d93e8d78a8d7fe1eff9b1543dafa34c
diff --git a/dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild b/dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild
new file mode 100644
index 000000000000..51a756707cbc
--- /dev/null
+++ b/dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_A_EXT=tgz
+DIST_AUTHOR=JPIERCE
+DIST_VERSION=0.35
+inherit perl-module
+
+DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+PERL_RM_FILES=(
+	"t.pl"	# Useless test-only file gets installed to SITE otherwise
+)
+RDEPEND="
+	virtual/perl-File-Spec
+	dev-perl/File-Which
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-Test-Simple
+		virtual/perl-File-Temp
+	)
+"
diff --git a/dev-perl/IO-Pager/Manifest b/dev-perl/IO-Pager/Manifest
index 4bfcc305f429..a638e8a8b6cf 100644
--- a/dev-perl/IO-Pager/Manifest
+++ b/dev-perl/IO-Pager/Manifest
@@ -1,2 +1,3 @@
 DIST IO-Pager-0.31.tgz 15406 SHA256 e5a61ecae2e81f1349293e2246543da42e8ff61c23bf773e87db561f2e83b939 SHA512 c6e66fc59b951d041d19b3bb57c73860e601732e24c4d3e78e84f6532089b511fc11d071aef21c2f46344813479b592c5ead4438aec47dba487e94ae3452b6a3 WHIRLPOOL 8b798f54e4d730e442eee8016b49f21a2255d66dd0085e69bafe83560831b7eb3aa8e2081f33c8b04bb6c108890e98f702f204ca09733f17f5982bdec4377157
 DIST IO-Pager-0.34.tgz 17100 SHA256 31569ca0af93139e3ca7ce8aae38992930df95b047cffec2db165befca3ce00b SHA512 ee1145d40cb2b851fd2531c6d5d3e88e9c3d2a79303e682f3ce4bfb7a629293a3983a895026baf678ce5053ed09bfcc2b8dba3cdc816acc38f0b1473ab44897e WHIRLPOOL e2f52d454cd13e545057b57a46dc3e13a908cc61112552c4e0c420c2048b396a50d3dfa4274e6bf99a7c76d7ed99fa4a7bc2296b504fe04e2c67446fd25beccd
+DIST IO-Pager-0.35.tgz 17298 SHA256 3aa529089be7a93014cd03ebf469271d6d333eae2d34e3bfd127826a38aa8d45 SHA512 adfb9e7d65941115f3d6376996c3c41682079a02346e1cddda0df2bfa93d46a0deeea42a0109697dd327e19ebf9ed869adc2827f0ea9acf28c69885afa6cd962 WHIRLPOOL 531ee9fc77d95bbe5df7c6ddddd52aed455446cc21ac3fbf419d971d01641bf19859e08560b5e7eb616ef87a528e565fae726d51e750be806900f02704ddbe74
diff --git a/dev-perl/IO-Socket-Timeout/IO-Socket-Timeout-0.320.0.ebuild b/dev-perl/IO-Socket-Timeout/IO-Socket-Timeout-0.320.0.ebuild
new file mode 100644
index 000000000000..4d3758a53a36
--- /dev/null
+++ b/dev-perl/IO-Socket-Timeout/IO-Socket-Timeout-0.320.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DAMS
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="IO::Socket with read/write timeout"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/PerlIO-via-Timeout-0.320.0
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.39.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+		dev-perl/Test-TCP
+	)
+"
diff --git a/dev-perl/IO-Socket-Timeout/Manifest b/dev-perl/IO-Socket-Timeout/Manifest
index 5d7d62b377ae..20203ffb2ddf 100644
--- a/dev-perl/IO-Socket-Timeout/Manifest
+++ b/dev-perl/IO-Socket-Timeout/Manifest
@@ -1 +1,2 @@
 DIST IO-Socket-Timeout-0.27.tar.gz 18399 SHA256 2d5f7d78b0827c0fc3f2d63e22aa6b29a17f6b487e61b10a1e233868de92b529 SHA512 bd8c7e428fbf5e0a1f35a14acd5f3281d6fa7a84f1d6eb4c07712aa3c2601635fc832433f72c5470d60828ac774fc9f148649c0bc1ac20f0d93bab1c487114a9 WHIRLPOOL feca7cd0c3125d9c0515f641588ae0e3abfaede09c1004ffffab00732b2f4d3dd0083f055e2cf144f3d8aab56c8ea18f18a18dba9f35ed26ecddfaef93c2b6fb
+DIST IO-Socket-Timeout-0.32.tar.gz 16294 SHA256 edf915d6cc66bee43503aa6dc2b373366f38eaff701582183dad10cb8adf2972 SHA512 013ad036c796880ab464b18f642260609095cf40c74f3127abaf3c8a596ba8ee85746129dc84d2d1e6f1bbfc86d75969e99c5a9b67736fa3e5e8bc7f5ddf83a6 WHIRLPOOL b4b9d8a3da2a3a48b2e6a931ab1d877b4b8d6f90c6bc92c664353922754eb3c0bad8f23a3397bcb63a0462f98c857bdc99def5d1582627ff6f7e548841048d5a
diff --git a/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild b/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
new file mode 100644
index 000000000000..c5fa644784fb
--- /dev/null
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.048
+inherit perl-module
+
+DESCRIPTION="Run a subprocess in batch mode (a la system)"
+
+LICENSE="|| ( BSD-2 Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Time-HiRes
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)"
diff --git a/dev-perl/IPC-Run3/Manifest b/dev-perl/IPC-Run3/Manifest
index 82a53e7ac3b1..c67ff7c33d74 100644
--- a/dev-perl/IPC-Run3/Manifest
+++ b/dev-perl/IPC-Run3/Manifest
@@ -1 +1,2 @@
 DIST IPC-Run3-0.045.tar.gz 20017 SHA256 658971b13f837c9c760df1959ac6471d5e48265d0a44d1d524cb4d0ab81881da SHA512 966657fb3b6b3db02b00017f3f77a76610e848dc119d61dc28eb5b72dfe2d691fb2e210336127a2e4520ea465e4d9e412c980795e8e5c354b9874761c4123944 WHIRLPOOL e33001f06a551961e9ed9b2648a2ed3df267700785c77614b0f07b8978cbaf871bfa6f376377d1c9c091c1209a7f309b479e55f438e1e1d96396773197836aca
+DIST IPC-Run3-0.048.tar.gz 20312 SHA256 3d81c3cc1b5cff69cca9361e2c6e38df0352251ae7b41e2ff3febc850e463565 SHA512 50432850d8dccd2e59aa6684d34f3e3242fd7df3eb4d9a5eb02dae389aa46b5fd68cc54114a157c3fe99956e68e74d575ab3db5009b7bf7d5c325f1f109b1262 WHIRLPOOL dce2ad7963f62462a655b8dc9b1d6f52a3272b6741634b7cd1085b1bff189a1905ea84db61eafa51785a2165d59fb83fa05ffcc4abc2d11142d7f63c3413ec6e
diff --git a/dev-perl/Image-Info/Image-Info-1.340.0.ebuild b/dev-perl/Image-Info/Image-Info-1.340.0.ebuild
new file mode 100644
index 000000000000..c93c2e10fec7
--- /dev/null
+++ b/dev-perl/Image-Info/Image-Info-1.340.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=SREZIC
+MODULE_VERSION=1.34
+inherit perl-module
+
+DESCRIPTION="The Perl Image-Info Module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/IO-String-1.01
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Image-Info/Image-Info-1.360.0.ebuild b/dev-perl/Image-Info/Image-Info-1.360.0.ebuild
new file mode 100644
index 000000000000..338422ae9726
--- /dev/null
+++ b/dev-perl/Image-Info/Image-Info-1.360.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=SREZIC
+MODULE_VERSION=1.36
+inherit perl-module
+
+DESCRIPTION="The Perl Image-Info Module"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=">=dev-perl/IO-String-1.01
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Image-Info/Image-Info-1.380.0.ebuild b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild
new file mode 100644
index 000000000000..8abac59b8913
--- /dev/null
+++ b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=SREZIC
+MODULE_VERSION=1.38
+inherit perl-module
+
+DESCRIPTION="The Perl Image-Info Module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/IO-String-1.01
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/ImageInfo/Manifest b/dev-perl/Image-Info/Manifest
index 575b91b2b8ca..575b91b2b8ca 100644
--- a/dev-perl/ImageInfo/Manifest
+++ b/dev-perl/Image-Info/Manifest
diff --git a/dev-perl/ImageInfo/metadata.xml b/dev-perl/Image-Info/metadata.xml
index 6211c439fa65..6211c439fa65 100644
--- a/dev-perl/ImageInfo/metadata.xml
+++ b/dev-perl/Image-Info/metadata.xml
diff --git a/dev-perl/Image-Scale/Image-Scale-0.110.0.ebuild b/dev-perl/Image-Scale/Image-Scale-0.110.0.ebuild
new file mode 100644
index 000000000000..11c98b979c43
--- /dev/null
+++ b/dev-perl/Image-Scale/Image-Scale-0.110.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=AGRUNDMA
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Fast, high-quality fixed-point image resizing"
+
+LICENSE="|| ( GPL-2 GPL-3 )" # GPL2+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gif jpeg +png test"
+
+REQUIRED_USE="|| ( jpeg png )"
+
+RDEPEND="
+	png? (
+		media-libs/libpng:0
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	gif? (
+		media-libs/giflib
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-NoWarnings
+	)
+	virtual/perl-ExtUtils-MakeMaker
+"
+RESTRICT="test" # https://rt.cpan.org/Ticket/Display.html?id=112217
+PATCHES=(
+	"${FILESDIR}"/0.80.0-disable_autodetect.patch
+)
+src_prepare() {
+	use test && perl_rm_files "t/04critic.t" "t/02pod.t" "t/03podcoverage.t"
+	perl-module_src_prepare
+}
+src_configure() {
+	local myconf
+	for useflag in png jpeg gif; do
+		myconf+=( $(usex $useflag "" --disable-${useflag}) )
+	done
+	perl-module_src_configure
+}
diff --git a/dev-perl/Image-Scale/Manifest b/dev-perl/Image-Scale/Manifest
index 2bda6b4b537a..928c376dd04f 100644
--- a/dev-perl/Image-Scale/Manifest
+++ b/dev-perl/Image-Scale/Manifest
@@ -1 +1,2 @@
 DIST Image-Scale-0.08.tar.gz 1009824 SHA256 e2dcc90b9954a43dafc7f61bc6dc472382eb719b1046247da5a93cfdd7c3b3e0 SHA512 4f79c6accea63fd4a641d9d6acaa6cb68f3d495c660e839b8ac394cb2445b126bc683c351c37c74d8654ce78875bb4f4a777928463774bc15fe6a4c038959212 WHIRLPOOL c6adf31d02dcd50eaa9ec13a384ce0dbbb4ed1e6e77759402f27b78f0a5e3c09f6d3665352940e01040195ed094a0a5b603192b578e9e6ec9ed1768498b3f164
+DIST Image-Scale-0.11.tar.gz 1012273 SHA256 6b8e0cb71f4d04d4c5a568e30d5eda8c01bac3479f10bd8235d69124a61336ca SHA512 f9da139b72c8be4f99d426cec15913fcb4558b6839ad40454916c7e6242194a23b1cdf7d0a9745ce7806c4eaf0e0af8dba9cd409cd00a8fb61ac40c4c4abdb5c WHIRLPOOL 167bcc901e12d04977798dced955fdf61a1f0b90b3cc2c0826de70ad081ef8b08b74095fc02af29d00bc877d602b0ecc72f4fc527211454660391715e0ec2ea9
diff --git a/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild b/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild
new file mode 100644
index 000000000000..e7f1021e1d44
--- /dev/null
+++ b/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=RJRAY
+MODULE_VERSION=3.232
+inherit perl-module
+
+DESCRIPTION="A library to extract height/width from images"
+
+LICENSE="|| ( Artistic-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-IO-Compress
+	virtual/perl-File-Spec
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
+mydoc="ToDo"
diff --git a/dev-perl/Image-Size/Image-Size-3.300.0.ebuild b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild
new file mode 100644
index 000000000000..7b8b7003b362
--- /dev/null
+++ b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=RJRAY
+MODULE_VERSION=3.300
+inherit perl-module
+
+DESCRIPTION="A library to extract height/width from images"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-IO-Compress
+	>=virtual/perl-File-Spec-0.800.0
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.420.0
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
+mydoc="ToDo"
diff --git a/dev-perl/ImageSize/Manifest b/dev-perl/Image-Size/Manifest
index 9bfccbde85dd..9bfccbde85dd 100644
--- a/dev-perl/ImageSize/Manifest
+++ b/dev-perl/Image-Size/Manifest
diff --git a/dev-perl/ImageSize/metadata.xml b/dev-perl/Image-Size/metadata.xml
index 9ed74ee07ebb..9ed74ee07ebb 100644
--- a/dev-perl/ImageSize/metadata.xml
+++ b/dev-perl/Image-Size/metadata.xml
diff --git a/dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild b/dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild
deleted file mode 100644
index 03bc559ec397..000000000000
--- a/dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Image-Info
-MODULE_AUTHOR=SREZIC
-MODULE_VERSION=1.34
-inherit perl-module
-
-DESCRIPTION="The Perl Image-Info Module"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/IO-String-1.01
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild b/dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild
deleted file mode 100644
index e2b26231e90a..000000000000
--- a/dev-perl/ImageInfo/ImageInfo-1.360.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=5
-
-MY_PN=Image-Info
-MODULE_AUTHOR=SREZIC
-MODULE_VERSION=1.36
-inherit perl-module
-
-DESCRIPTION="The Perl Image-Info Module"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=">=dev-perl/IO-String-1.01
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild b/dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild
deleted file mode 100644
index 344487b23864..000000000000
--- a/dev-perl/ImageInfo/ImageInfo-1.380.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
-
-MY_PN=Image-Info
-MODULE_AUTHOR=SREZIC
-MODULE_VERSION=1.38
-inherit perl-module
-
-DESCRIPTION="The Perl Image-Info Module"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/IO-String-1.01
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild b/dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild
deleted file mode 100644
index af889f2fd0b0..000000000000
--- a/dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Image-Size
-MODULE_AUTHOR=RJRAY
-MODULE_VERSION=3.232
-inherit perl-module
-
-DESCRIPTION="A library to extract height/width from images"
-
-LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-IO-Compress
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
-mydoc="ToDo"
diff --git a/dev-perl/ImageSize/ImageSize-3.300.0.ebuild b/dev-perl/ImageSize/ImageSize-3.300.0.ebuild
deleted file mode 100644
index b9891a81703d..000000000000
--- a/dev-perl/ImageSize/ImageSize-3.300.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
-
-MY_PN=Image-Size
-MODULE_AUTHOR=RJRAY
-MODULE_VERSION=3.300
-inherit perl-module
-
-DESCRIPTION="A library to extract height/width from images"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-IO-Compress
-	>=virtual/perl-File-Spec-0.800.0
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-SRC_TEST="do parallel"
-mydoc="ToDo"
diff --git a/dev-perl/Import-Into/Import-Into-1.2.5.ebuild b/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
new file mode 100644
index 000000000000..a57844cf8936
--- /dev/null
+++ b/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=HAARG
+DIST_VERSION=1.002005
+inherit perl-module
+
+DESCRIPTION="Import packages into other packages"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Module-Runtime
+"
+DEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Import-Into/Manifest b/dev-perl/Import-Into/Manifest
index b6f0b2c6cc9f..d424bf80e01f 100644
--- a/dev-perl/Import-Into/Manifest
+++ b/dev-perl/Import-Into/Manifest
@@ -1,2 +1,3 @@
 DIST Import-Into-1.002000.tar.gz 6483 SHA256 122277b33b42a1232681b457440309a031489bdb73a97d3c33b6bda9b1d8adbf SHA512 a36a59850adccd8cd2e25d4565627695c129a8e2a4097accb8afa90144c26f3f2e214679c35ac5ee269a672b352c9c9f1e1f49e35d17f08da257eef5e528bedd WHIRLPOOL 91571abc0e8f1dd4abb4020b8cb25d658bc68dd7c0771a1e6201259745b83bdd0ae4820d5a56ba3f1290b6f299926e99398221af7e323e435dd0077db57618d8
 DIST Import-Into-1.002004.tar.gz 7847 SHA256 decb259bc2ff015fe3dac85e4a287d4128e9b0506a0b2c5fa7244836a68b1084 SHA512 387fb6302417bda94fffe7215e22774d9345af0f2df9f39dc089abcf4a0e164521d2223ddaeed7179a341720e1ae399ada6ff02b5aef75c9a00a74e2cf752005 WHIRLPOOL 7a10872355a29bffd96fefe446562670dcc19f1a7c0a88e6e5f8803aacfe12c6b2c1759777da5b2934117df70015f029a199f608e927c139703cd4ed6bfdcdf7
+DIST Import-Into-1.002005.tar.gz 7748 SHA256 bd9e77a3fb662b40b43b18d3280cd352edf9fad8d94283e518181cc1ce9f0567 SHA512 d356307072da18bc40b25f11583018ed416cb87178f080982e14e98e53d42bc1e04aebda56d595e707c05065eaa6ad7a6b059920e8b5b8e1589bfd68e26900fb WHIRLPOOL f4180667c6c6ce5919bdebb13ea2820c427f470b0c77767723d265bea92315b65320f33bfd00927ef82603685fd6c0e7d8fff0bec18349e763f53f68d10335b1
diff --git a/dev-perl/Inline-C/Inline-C-0.760.0.ebuild b/dev-perl/Inline-C/Inline-C-0.760.0.ebuild
new file mode 100644
index 000000000000..e182933529cf
--- /dev/null
+++ b/dev-perl/Inline-C/Inline-C-0.760.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=INGY
+DIST_VERSION=0.76
+inherit perl-module
+
+DESCRIPTION="C Language Support for Inline"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DIST_TEST="do" # parallelism thwarted by race conditions
+
+RDEPEND="
+	>=virtual/perl-ExtUtils-MakeMaker-7
+	>=virtual/perl-File-Spec-0.800.0
+	>=dev-perl/Inline-0.790.0
+	>=dev-perl/Parse-RecDescent-1.967.9
+	>=dev-perl/Pegex-0.580.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		dev-perl/File-Copy-Recursive
+		dev-perl/IO-All
+		>=virtual/perl-Test-Simple-0.880.0
+		>=dev-perl/Test-Warn-0.230.0
+		dev-perl/YAML-LibYAML
+		virtual/perl-autodie
+		>=virtual/perl-version-0.770.0
+	)
+"
diff --git a/dev-perl/Inline-C/Manifest b/dev-perl/Inline-C/Manifest
index ee9608dde6a3..9ccddd528023 100644
--- a/dev-perl/Inline-C/Manifest
+++ b/dev-perl/Inline-C/Manifest
@@ -1 +1,2 @@
 DIST Inline-C-0.74.tar.gz 72931 SHA256 ae28324d85ffcf372d464ff7960141df09b7050f9b0f1571d24f8791ebd4d7ba SHA512 dc062d802d057375769ab388647e7628b2c1d28df4c7a169ebf3e93aee87c6dc3187b94acd88051fd323a76ef1a9858f364805935df0dcba574b92fb26fecc18 WHIRLPOOL 0b5e22829f939be3d8be1f4dd8cc1321067e9b85747ac0fcb25c4c84d1bbe1e468b131883d8d276f315c2d6264b82e80ff89c4021945654185bfb5dbcf735832
+DIST Inline-C-0.76.tar.gz 73384 SHA256 22e9713b4d331d3c49e4a9a9f012dbf84cec25a01e5da4f57091be287f1a9a35 SHA512 43bf0bc6addf08c4c3347b074babdc514b1d6cee052d1124c5d9d4a4b52bd0e92ac79f8393f35252a98ef337fb18a9da47cdf545b1010b3f0d9c4b7fd9eb8c6d WHIRLPOOL 097f51fde1e1b51879b04fe78d2bf2172a207c4ef8c28e3773613cb006320aeb938127fe362e3b71dccee6b52928bb281c905a768c698ab56579b4e8879a426a
diff --git a/dev-perl/JSON-RPC/JSON-RPC-1.60.0.ebuild b/dev-perl/JSON-RPC/JSON-RPC-1.60.0.ebuild
new file mode 100644
index 000000000000..c9062b770f40
--- /dev/null
+++ b/dev-perl/JSON-RPC/JSON-RPC-1.60.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DMAKI
+DIST_VERSION=1.06
+inherit perl-module
+
+DESCRIPTION="JSON RPC 2.0 Server Implementation"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+
+# Plack::Request,Plack::Test -> Plack
+# CPAN::Meta::Prereqs -> perl-CPAN-Meta
+# HTTP::Request,HTTP::Response -> HTTP-Message
+# LWP::UserAgent -> libwww-perl
+RDEPEND="
+	!minimal? ( dev-perl/JSON-XS )
+	dev-perl/CGI
+	dev-perl/Class-Accessor-Lite
+	dev-perl/HTTP-Message
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Plack
+	dev-perl/Router-Simple
+	dev-perl/Try-Tiny
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	virtual/perl-CPAN-Meta
+	test? (
+		>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/JSON-RPC/Manifest b/dev-perl/JSON-RPC/Manifest
index 967788d3d4f1..237dbfd28f99 100644
--- a/dev-perl/JSON-RPC/Manifest
+++ b/dev-perl/JSON-RPC/Manifest
@@ -1,2 +1,3 @@
 DIST JSON-RPC-0.96.tar.gz 14206 SHA256 043624b5bd8a9eef18fd03082a1d99b45e3c5202786752a32e051590b565ba15 SHA512 2137d8d645c672fc176acc7c8b8dc50f6fc7215fcecc8c6465ddac9e1c4cffdf8f04d0a8222267cfb5ac79c04448444d6aa7ca1beac96c809986569f79cec6c9 WHIRLPOOL c2f2b9ff91d533b09c2fb151acb7ea9eadcd622623ec8af9154b9b41e866942d1f31fd05f55b86f77f217ed7b2bbdb600771f97fcb264e7faa2ed3aae3bf89e4
 DIST JSON-RPC-1.03.tar.gz 37495 SHA256 b564005ab9b74309e10fca7fc14cf133d3b5c38a8a9f63d8f4d50eef45033290 SHA512 5fc0a63a35ab6162d3ae70bbc9f26e556a270fe5c1225ff614f8bdd6d9bf0095fcc85ff3b942d4e09ee35ed52c2f5bfbfb25f28a885192c230d5a35cd9446103 WHIRLPOOL dcc4bb79d899b3a2e0e68b5e37f1e1214c5a9c745c3816d382c36fa3ac74b134b5ca291d89d52314ab5da939af0c30a70d5c1b40129a40127b742393e24ab4cb
+DIST JSON-RPC-1.06.tar.gz 36034 SHA256 d75ba8b558988b3fdffa12ff62a55f0f1aaff8aa73b708bff3701ff88a2b8757 SHA512 541d4e7045d7ae86d1f061976c4c1b4e501de5712dcdc2de63e3a317a0d6ee4d2a8461a4af61f855e533cb22bd90953ad6192e58dcdab36978e25cb9fea5869c WHIRLPOOL 153dda32d241abc9528e2ca384dc60b01c820926d8ab51fadbf0b4a33861fb8668962c0a72ba68a6c11ecac395fb677d046b3cf937ebbdc0590ecd3099bf8e7c
diff --git a/dev-perl/JavaScript-Minifier/JavaScript-Minifier-1.140.0.ebuild b/dev-perl/JavaScript-Minifier/JavaScript-Minifier-1.140.0.ebuild
new file mode 100644
index 000000000000..5b58000ddf2b
--- /dev/null
+++ b/dev-perl/JavaScript-Minifier/JavaScript-Minifier-1.140.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ZOFFIX
+DIST_VERSION=1.14
+inherit perl-module
+
+DESCRIPTION="Perl extension for minifying JavaScript code"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/JavaScript-Minifier/Manifest b/dev-perl/JavaScript-Minifier/Manifest
index d0b4fdd853a5..a78589fbe4c0 100644
--- a/dev-perl/JavaScript-Minifier/Manifest
+++ b/dev-perl/JavaScript-Minifier/Manifest
@@ -1 +1,2 @@
 DIST JavaScript-Minifier-1.05.tar.gz 7314 SHA256 83b0ce3d9aa21b9e9328ab4ffcf6ba57d0a13b2ef80d4bdb7888a804dfc236ae SHA512 5df234a07e29897ee6996f669e8193a2b7269667e0d90aa8080d22994d237ba5693e6cc3b9fa7b82cdeb25408c1c2bff026c6c347614b30f0b9ea190b7a5dbaa WHIRLPOOL 5a19cd6f9f7c2b78f61aac0efcceaca49d58c2c386f4dea0ba2438b282f8d4c26c3a7d33d7d809f867a2a94c32c69f2dcb1c450fc58a0ff025c91e6f046f788e
+DIST JavaScript-Minifier-1.14.tar.gz 22368 SHA256 35f2e4679bb18ccfa4637b0a142dea8df641a12fe9a107c8a376f6261ca72482 SHA512 191dbf81672ea438c8c045c2fb0ebaeecee088630f77d91cb0518d800d815768d4695e8c32c5001492af1ab6b31f0bf69052701bf15e2b9a4981c4694620e251 WHIRLPOOL 10163f45495a8342f468d86ed464fb2eafc21d7b588e4eb802ba1c9f4b59683537b01bf102d9cd779fbebec663f2ada45ea7f5045bcdc92fd1df6a6cdd54ae9b
diff --git a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
new file mode 100644
index 000000000000..196375d6d5f0
--- /dev/null
+++ b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ALEXMV
+DIST_VERSION=1.07
+inherit perl-module
+
+DESCRIPTION="A virtual browser that retries errors"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-perl/libwww-perl"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/LWP-UserAgent-Determined/Manifest b/dev-perl/LWP-UserAgent-Determined/Manifest
index 75a167c0263b..34c483c43d35 100644
--- a/dev-perl/LWP-UserAgent-Determined/Manifest
+++ b/dev-perl/LWP-UserAgent-Determined/Manifest
@@ -1 +1,2 @@
 DIST LWP-UserAgent-Determined-1.06.tar.gz 6874 SHA256 c31d8e16dc92e2113c81cdbfb11149cfd19039e789f77cd34333ac9184346fc5 SHA512 05c85e923b7e2a643455242da2785743be6a1889200a1a922e81fd882943ad136cd4050d96e24af1b60000e264272e5b1fd04e95e8113923f412494adceb4f66 WHIRLPOOL b694f28313d4df40538f7a024665061c4ad91a86752005efafc88bc96f365737262ba5dbbed96ab0ecc085ee6abaaaf79967eadcd88469a8bbc454c36b1cfb63
+DIST LWP-UserAgent-Determined-1.07.tar.gz 6822 SHA256 06d8d50e8cd3692a11cb4fb44a2f84e5476a98f0e2e6a4a0dfce9f67e55ddb53 SHA512 bed056468366bf86f0711a23c5bdb502a614efa2fd80d632f8d43d33295309d0ee88e439933cb3eda99192ad7d7025d0a7f6f0a53a45e79e70512771bb58ae7d WHIRLPOOL 849d33ce3a8c5d2a5ae5d773524daa88ede216be52f99b7c71ac3460aad21af753b6680abe8867b6bab5f772877e3d994b8ff27e3a837503a4ae46d409f11184
diff --git a/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.100.0.ebuild b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.100.0.ebuild
new file mode 100644
index 000000000000..62fc239115ae
--- /dev/null
+++ b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.100.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_SECTION=lwp
+DIST_AUTHOR=SAXJAZMAN
+DIST_VERSION=1.10
+inherit perl-module
+
+DESCRIPTION="Subclass of LWP::UserAgent that protects you from harm"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Net::SSL 2.85 -> Crypt-SSLeay 0.58
+DEPEND="dev-perl/libwww-perl
+	dev-perl/Net-DNS
+	virtual/perl-Time-HiRes
+	>=dev-perl/Crypt-SSLeay-0.580.0
+"
+RDEPEND="${DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+	local my_test_control
+	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+	if has network ${my_test_control}; then
+		einfo "Enabling ONLINE_TESTS"
+		export ONLINE_TESTS=1
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/LWPx-ParanoidAgent/Manifest b/dev-perl/LWPx-ParanoidAgent/Manifest
index cf7b6131a093..0db62946833e 100644
--- a/dev-perl/LWPx-ParanoidAgent/Manifest
+++ b/dev-perl/LWPx-ParanoidAgent/Manifest
@@ -1 +1,2 @@
 DIST LWPx-ParanoidAgent-1.07.tar.gz 14244 SHA256 bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a SHA512 12221010cee50b3cbbc016bb19c664fa5b1af4c27e97d32c173423b8dca586933ebefdf5ee1b293258646eb753ca478b8e1ec9a22ee7931617d675a77551ef0c WHIRLPOOL 1e81722aed7b7d41ac3293b5a82a835f36a5eea6299c2dbf11837290a5465673710d5cc5791e233ff2f9eac8e5cdf49ccff64dfa941b16aed24d450ecf3141f7
+DIST LWPx-ParanoidAgent-1.10.tar.gz 17665 SHA256 84130aa89cba829fe6a25c9356474e3bf15eaccd6319a71d4ea0e356cf356044 SHA512 8a1a1cdc4ab826b66abedfbbe7baee694d1083fc6dce2c2f6b69bf5e369ef0212ffdcd2afc9fadafa9977e3be9f7a4e4b1ea092e6c6773c1f9fc356c87c5434d WHIRLPOOL 398140fd71d5908812011c5ce81e6ad661c35b6042538a650c96777dbe985e215bb92cdda1441db85d24a50d9a0a33249d019aad9b48c8ead267b3a792933401
diff --git a/dev-perl/Lexical-Persistence/Lexical-Persistence-1.23.0.ebuild b/dev-perl/Lexical-Persistence/Lexical-Persistence-1.23.0.ebuild
new file mode 100644
index 000000000000..e67f1d058093
--- /dev/null
+++ b/dev-perl/Lexical-Persistence/Lexical-Persistence-1.23.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=1.023
+inherit perl-module
+
+DESCRIPTION="Bind lexicals to persistent data"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+# constant -> perl
+RDEPEND="
+	>=dev-perl/PadWalker-1.960.0
+	>=dev-perl/Devel-LexAlias-0.50.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		>=virtual/perl-Carp-1.260.0
+		>=virtual/perl-Scalar-List-Utils-1.290.0
+		>=virtual/perl-Test-Simple-0.980.0
+	)
+"
+src_test() {
+	perl_rm_files "t/02_pod.t" "t/03_pod_coverage.t" "t/release-pod-coverage.t" "t/release-pod-syntax.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Lexical-Persistence/Manifest b/dev-perl/Lexical-Persistence/Manifest
index 57db080b11a3..0fc6aea3caa8 100644
--- a/dev-perl/Lexical-Persistence/Manifest
+++ b/dev-perl/Lexical-Persistence/Manifest
@@ -1 +1,2 @@
 DIST Lexical-Persistence-1.020.tar.gz 12228 SHA256 972cd0c175947f8789927eb32bfa01d21b3bb981d8841f7e0c74c26c2fd59172 SHA512 fc39877eab0f99fd7500540f12fb2db769ae8150569298d70b968701e82d9fbd46970fabd9bd0270fe42894d84788a3b1248fd2da14a180f55d6ef18970076e9 WHIRLPOOL a8812481b235f62f7623da924766b469bb19dfa513e22506f5976e532b083f721430f16376a546e42cb557cc0e81be04f2215d07f926f31d39fb31d1332eba8f
+DIST Lexical-Persistence-1.023.tar.gz 27609 SHA256 94d2fa4a743885ca9cea9f7042d9e7a3a69f5bd7cc18aa630c7f7f5e8ae36944 SHA512 b67e17bde4f6fc6209516ee6ec74aa273367f83b3bb9d9fe2be3ea2e8a574c1b7bbf751f370a54e1e8de4c845f07cb3de4f142f48e3234efdb13ea11176000db WHIRLPOOL 3acd32a1ca34c84d9d2d54230e241ddb94b9f5421b5ab80eb9a6f70970e377ae8c1d3cf60b787ef25b9cefe3c529bd5a0a1a9c3a22482ee17665a93109564758
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.40.0.ebuild b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.40.0.ebuild
new file mode 100644
index 000000000000..9e6eb819f7e5
--- /dev/null
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.40.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="Convert cardinal numbers(3) to ordinal numbers(3rd)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
index 03798c5a0489..864df9ec4564 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
@@ -1 +1,2 @@
 DIST Lingua-EN-Numbers-Ordinate-1.02.tar.gz 5564 SHA256 350a6de884a6295974f2919c5af76d4103368e855ac8fe739460f4d55aee7719 SHA512 8c17341de354484a49204335f680da0eac6992f152978277ee204f42e8a97cf12e30d908b1797d86a09fc95dc3f0a821014f9ee976380807bdea6cf94f88c296 WHIRLPOOL fd4865e0cbcec6324b74021c93cee722635e6d80dd6dbbd85fb5fe6fe5009cad19bec2392dd5498a8dbeca68297e31e5bd35756786293542876d99743f67bf91
+DIST Lingua-EN-Numbers-Ordinate-1.04.tar.gz 12019 SHA256 26973c2eb43672c3f61ad7d3fef12ef1c64a034da494a0ee0d910c3e0808019f SHA512 f8f5cbfc9ae1d7b4e5e134c8fb089f6ec4ecfd90e0168ece874b007ae8b74936e5aecc38344c036c0845ab7a8c192d07c5a2cdad8f96176c71e89e2e4ae1211e WHIRLPOOL f4e9bb389866e0aa45920142ee5c92b51288a2a17846cff6215c76d1680515874429f00e3c2bcb2a6071cc7023f9188782176de1ca5bfaa4e41439f9a53b77e0
diff --git a/dev-perl/Lingua-PT-Stemmer/Lingua-PT-Stemmer-0.20.0.ebuild b/dev-perl/Lingua-PT-Stemmer/Lingua-PT-Stemmer-0.20.0.ebuild
new file mode 100644
index 000000000000..b59e2bb7ba89
--- /dev/null
+++ b/dev-perl/Lingua-PT-Stemmer/Lingua-PT-Stemmer-0.20.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=0.02
+inherit perl-module
+
+DESCRIPTION="Portuguese language stemming"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test )
+"
diff --git a/dev-perl/Lingua-PT-Stemmer/Manifest b/dev-perl/Lingua-PT-Stemmer/Manifest
index 4962bf592651..d4605989b2bb 100644
--- a/dev-perl/Lingua-PT-Stemmer/Manifest
+++ b/dev-perl/Lingua-PT-Stemmer/Manifest
@@ -1 +1,2 @@
 DIST Lingua-PT-Stemmer-0.01.tar.gz 4864 SHA256 45912ab6d465cb975f86cccc212f888c04ad7c84511fbf4760894e8b6f613887 SHA512 601a6acc594fc73d153986b744807e56ce116e265c34403b0646681416ec482bb4bf9d2196eb3d463e4c3928c56c3f6fbd3ec971646b89008fa20965313a26ee WHIRLPOOL d35cf3e5697c6e0d81b52a5f298e14ec3f8d1fb9d854ff4d68f684a0889cac0f245b1df1f37154b2d597fc50dc12b4b949728bf0390486fb86608024880fb3a1
+DIST Lingua-PT-Stemmer-0.02.tar.gz 12747 SHA256 596df01f8ab79ffffd450e94836a544371d8a4c93a15f7e88ea2f1b79c46849d SHA512 3537d947b9deeab15376502beb5540fe6afdabc1cd5fd18ec399d12f4dc715def15eb5c9cb052eb5be4b3c03731fd0f0d25ef84bec797f38c3e0f0785c4859b5 WHIRLPOOL 2da1a16c1572eed9a7ce4d77b0a5a1e5308271fb0a0325c35cae4028d5f11089f48b68cc7a1d0f23d8dc8f0b8add908d35f5af43f19b29c576a38341a1874dd3
diff --git a/dev-perl/Lingua-Stem-Ru/Lingua-Stem-Ru-0.40.0.ebuild b/dev-perl/Lingua-Stem-Ru/Lingua-Stem-Ru-0.40.0.ebuild
new file mode 100644
index 000000000000..dd647eee9fa1
--- /dev/null
+++ b/dev-perl/Lingua-Stem-Ru/Lingua-Stem-Ru-0.40.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Porter's stemming algorithm for Russian (KOI8-R only)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Lingua-Stem-Ru/Manifest b/dev-perl/Lingua-Stem-Ru/Manifest
index ff975ac3f1f1..4ffa47170cb6 100644
--- a/dev-perl/Lingua-Stem-Ru/Manifest
+++ b/dev-perl/Lingua-Stem-Ru/Manifest
@@ -1 +1,2 @@
 DIST Lingua-Stem-Ru-0.01.tar.gz 209087 SHA256 0606a3d93dfa582f4a0e2898a44dc711f48491baf5b904bd12c14d2708790f5f SHA512 871aa32bfaf9c922c1208d82922c617bd21c4586d9f26f1f37d32f4d5250109b4c4ab652fb69c59dee7edb5e5cb3ebb82ed85e86daf600bb863d55842fdfd692 WHIRLPOOL 7b80aa19dffefb163981bb7007f4f80627ac71bcc44b2dacaebc92514b6ac151cc6bb4198214065c969ed5f2da1f4f60f91d509d08c0b626bc234a4327023fe5
+DIST Lingua-Stem-Ru-0.04.tar.gz 217502 SHA256 1270ceb74764fdb958370a808834af976e87f69a85470f8bc46258797eab5228 SHA512 30ad7e74cbc065d3a9534f099a7c08b7aef5ec2290609e72704d1ae4ae0ea1a3622dfd0a4012fb169903fe7ef959d24d38e51cd330bc1c38ac09a1d50a76962e WHIRLPOOL 7fca56b6f3ae7e489ce6384da9cc59b283d48b59f5bb830f1b9c8a44916e3e0afa31fa224325418b9c36327ab78da11d8de4d16e88b739c3d6c7085486e432a6
diff --git a/dev-perl/Log-Any/Log-Any-1.38.0.ebuild b/dev-perl/Log-Any/Log-Any-1.38.0.ebuild
new file mode 100644
index 000000000000..d8fdbf381b9d
--- /dev/null
+++ b/dev-perl/Log-Any/Log-Any-1.38.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=1.038
+inherit perl-module
+
+DESCRIPTION="Bringing loggers and listeners together"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="test minimal"
+
+# Test::Builder needed for Log/Any/Adapter/Test.pm
+# constant -> perl
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Exporter
+	virtual/perl-IO
+	virtual/perl-Test-Simple
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+	)
+"
diff --git a/dev-perl/Log-Any/Manifest b/dev-perl/Log-Any/Manifest
index fd10cb3560c4..3e311ad501ed 100644
--- a/dev-perl/Log-Any/Manifest
+++ b/dev-perl/Log-Any/Manifest
@@ -1,2 +1,3 @@
 DIST Log-Any-0.15.tar.gz 17537 SHA256 fbb24743d1b61debc490cb41f8f3f1e865379c8b52dacb419f10ff03d02b1cb2 SHA512 4f1919c64ca5bbb2773369ab44ef972272926554b37f95d31a8dbd1f11da730307b55023eba1396c608ce194c70a83afe59034c116fa2c5817b7037222948869 WHIRLPOOL 66624c84f20458500393a521a7f618fdecef016e74af727c09189f1708793a3aaba76ca645ef19fa4648de27c2531f2c8fb7e9f10d148c9b6ad3d104249a5521
 DIST Log-Any-1.032.tar.gz 39824 SHA256 808558fa42aa96365ed0af773973a5618b4ad50511d81fc7548f67133efdb956 SHA512 e7539f402c30637cb5b3935b7967130c4ecadb0bfdc35252740ab9f626c0c7752323f0bc0eb3b0530458570a5710ac8d845e48b8ea8e0517dc10b41077ac5184 WHIRLPOOL d54f1476b2a4676525d728811f02d2340a9945dee38ba3b5038d3ced9232e4cb1f89dc19e0f219f01a701aac60624c9051d4241b5e33266b304d59deff45e365
+DIST Log-Any-1.038.tar.gz 41707 SHA256 09a07da9b797efa114096e2ea26287d19f22cfae5ac4d135c1be7ab5da94e220 SHA512 36c8370d3924ee9cc85f2be5fe9d8212e7148b98392df90ef8e5566aedf12050115029434d9d969c1582c43a755fb540268dce73390ea53e8918f2901e25e62e WHIRLPOOL 055df7a42d7424eca9162da656b65c0f37cf16c3c355836aefcaf0357afdf2450f63b500db350a86facae291fa9c00314b5d5681e12a35818713dcbf624282c3
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.540.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.540.0.ebuild
new file mode 100644
index 000000000000..0bd55d53cb18
--- /dev/null
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.540.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=2.54
+inherit perl-module
+
+DESCRIPTION="Dispatches messages to one or more outputs"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix"
+IUSE="test"
+
+PERL_RM_FILES=(
+	"t/email-exit.t"
+	"t/release-cpan-changes.t"
+	"t/release-portability.t"
+	"t/release-pod-coverage.t"
+	"t/release-tidyall.t"
+	"t/author-eol.t"
+	"t/author-mojibake.t"
+	"t/author-no-tabs.t"
+	"t/author-pod-spell.t"
+	"t/author-pod-syntax.t"
+	"t/author-test-dependents.t"
+	"t/author-test-version.t"
+)
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Devel-GlobalDestruction
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-Encode
+	dev-perl/Module-Runtime
+	virtual/perl-IO
+	>=virtual/perl-JSON-PP-2.273.0
+	>=dev-perl/Params-Validate-1.30.0
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Sys-Syslog-0.280.0
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-Getopt-Long
+		dev-perl/IPC-Run3
+		virtual/perl-IO
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Requires
+	)
+"
diff --git a/dev-perl/Log-Dispatch/Manifest b/dev-perl/Log-Dispatch/Manifest
index fc8c1449141e..8f613179deb9 100644
--- a/dev-perl/Log-Dispatch/Manifest
+++ b/dev-perl/Log-Dispatch/Manifest
@@ -1,3 +1,4 @@
 DIST Log-Dispatch-2.41.tar.gz 35285 SHA256 3f81fa068a2d68b0d13243a874da765ffb728a9d26ed44ef088ca627faa4556f SHA512 5ce6c1d9549583d6e8927a3e3bc1f4b2d37e7705edd10ea05039ea5fc12ea3b01b49cb9d863bccadb373e6522b973b5189125e2a91a824fdb5dbec2b5d9c6d7c WHIRLPOOL 92d6313adae51a1da0533638da0eb9e4e569aa2d6601d9b372e3eccc69bcb20fa1853e726548a663aa7cfc1251d9a2951ad83f66903a2cfdfb16409d51db82fe
 DIST Log-Dispatch-2.45.tar.gz 52537 SHA256 707fc17d1f072150b87d400e5994b46ae2083a7120a9d21d37680ade08084bd6 SHA512 c4b82c408ffa8b5b9681b8b3eea90dc2cb95639a65f568ca977068bf30b087f7e29fdc2a80216770e07774c39744fbf6810faeac4786a3a183764bbe15d70f76 WHIRLPOOL 6e9043477bed42afa6412e2cfc2c0330ad2971edd88fb781f8c4a1b27254bd1162d651e752aab6c0563786721975ac0c4a8ce42a93d536925b882eda08149141
 DIST Log-Dispatch-2.51.tar.gz 56576 SHA256 c7dad8cdb7f242f5663fd49ee848c4345dd35fc609ed98a2c00c75d23ca6fac8 SHA512 5dcd37c48a58e9c2dfe3f18108c4d902a9e46c710eb519958f1f3347e8794bda2c7f34895bf54e47695f77a89bfd96ca887b72f05173dc7e70ee2698f8e3c313 WHIRLPOOL 064d359c6891b9c9fcbec4ec351a1c34c61b2800761ac43b33c2db8505b2482d41911f6df5857f29b804385e133237367258d230e36a09d28ce794295681b609
+DIST Log-Dispatch-2.54.tar.gz 59316 SHA256 7c365b8cdd2712cb642421773665d67a0a190cc6b44d19b804671c7631193f81 SHA512 67dd4bf15899fa441ecd725305b443873c77fcf8eeff44e53408637f81dc14c3375bdf52514214c111d1692a7087efb929ecdc411771dd413fef10bb034dc45b WHIRLPOOL fb0a86477f31e27db217e238fe9b27f923e1cfef71861969093e6bdd55b1bfb9acb5ac01a2372b771257311d85ad3ab82d668baeffe3150efb33a5f2690966e6
diff --git a/dev-perl/Net-IRR/Manifest b/dev-perl/Net-IRR/Manifest
new file mode 100644
index 000000000000..06a56133eab3
--- /dev/null
+++ b/dev-perl/Net-IRR/Manifest
@@ -0,0 +1 @@
+DIST Net-IRR-0.08.tar.gz 5622 SHA256 b3865d63ac1a5412f83b0c67cf2f278858eb12a4d22d246613ae7e06d6f8f228 SHA512 1713451dd65b44c6e87bd8cc29228c898c3790be9d0b7d8adbebbf69b91c1557eb6fef47262fc40bc543f258087ceb87903fc7faf2a3d5059b8735c686fb5823 WHIRLPOOL 8bfcbc13bddd5ffcaefe70a6fd2a087c49af255d43ed4c49d84b8c4c78bd7ea5080fd39ea6cc86fbbb6718fdb237b465b71894a78a95950425dcf75b99695cd8
diff --git a/dev-perl/Net-IRR/Net-IRR-0.80.0-r1.ebuild b/dev-perl/Net-IRR/Net-IRR-0.80.0-r1.ebuild
new file mode 100644
index 000000000000..fd3530c5ae95
--- /dev/null
+++ b/dev-perl/Net-IRR/Net-IRR-0.80.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR="TCAINE"
+DIST_VERSION="0.08"
+inherit perl-module
+
+DESCRIPTION="Internet Route Registry daemon (IRRd) client"
+
+RDEPEND="virtual/perl-IO"
+DEPEND="virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+	${RDEPEND}"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
diff --git a/dev-perl/Net-IRR/metadata.xml b/dev-perl/Net-IRR/metadata.xml
new file mode 100644
index 000000000000..60e2ef836b97
--- /dev/null
+++ b/dev-perl/Net-IRR/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Net-IRR</remote-id>
+    <remote-id type="cpan-module">Net::IRR</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/POE-Test-Loops/Manifest b/dev-perl/POE-Test-Loops/Manifest
index 28588821f5cb..71464a225f01 100644
--- a/dev-perl/POE-Test-Loops/Manifest
+++ b/dev-perl/POE-Test-Loops/Manifest
@@ -1 +1,2 @@
 DIST POE-Test-Loops-1.353.tar.gz 70248 SHA256 9f4d0c2431393889dba7fd9a66c8ab412b17a38d95c939e309cbf7d5cfead4a9 SHA512 516973b21ebb86c47c25ee69f1335788b9245852501d665d3a9a9c0f775ad2dd26a24a80794414dfdb853846e904a18d3f7c390cd39a6edb7bcbd5a930faebe3 WHIRLPOOL d73030037d00449fdb2ecc0f34594619516f731ef6b52604818d9f5c0f5112e027e0e609beaa3f700c44a742ea0d95c7e27020f690976837a3ea9ffdc7879aac
+DIST POE-Test-Loops-1.360.tar.gz 72063 SHA256 bed0c96fe91c98fd37e6eb59a804aaac9cc4a9e928450b76d4bf5527a9e6a47b SHA512 713eb8a7ba304f6aaadbfb7a03c84961e623b87010124aa096d1044fd9922966a02482d7f12095a44bc6933147dad971007743ca9fe05070aa50bc79a398edb6 WHIRLPOOL beab90007ccf822cb3f9e704ad4bd366f9f3d890b111e5d8f484b54113e77cf0125bf490cb0104c97bf1103ca226545295be70ea74b7a8fb7f114d2d7c586b70
diff --git a/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.ebuild b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.ebuild
new file mode 100644
index 000000000000..81acbe95a2af
--- /dev/null
+++ b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=RCAPUTO
+MODULE_VERSION=1.360
+inherit perl-module
+
+DESCRIPTION="Reusable tests for POE::Loop authors"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+SRC_TEST="do"
diff --git a/dev-perl/POE/Manifest b/dev-perl/POE/Manifest
index bed716a695db..7001d91a3c1d 100644
--- a/dev-perl/POE/Manifest
+++ b/dev-perl/POE/Manifest
@@ -1 +1,2 @@
 DIST POE-1.356.tar.gz 367309 SHA256 9a3ff1ce40929dec74f6b3fed31cfd05b1d72085d2d3d15bbbcc1a737f17d47b SHA512 e3107e107859f6b2384971efeec8e3fca0cd0577e082ba41691d4d26e6a300d939a34df5d6401b4e5917331cf371e56265f8042139002dd2d7533712cfa5ff5d WHIRLPOOL 1151f8a7c8f42ae0f382dc72d4818b398946961d23000264ca9916b3a246db9083806f0e25108dba4b7d0923caba0b7ca09a42caa4762ff6caa9b896a1ee36b2
+DIST POE-1.367.tar.gz 381473 SHA256 b772720ba99bf3cd03dbad8536c6a7674ac7fcf32f2f53a2ff8f0aa5ba3f3a2d SHA512 94a3ece46a7e573018fdb3151110b1ed7604389d030227169685d38afdfa69603ef55fe8493368645a9f6f1be432fb253cb4568c55190eea33652881a0b4a4fb WHIRLPOOL d757bb5cf229fcfc223461a1be5f790201751026bea825525778944796a210d992698ce68ef77de2b837b6486f2d053274b23645d71108bbe4aa1b5c6c2ce569
diff --git a/dev-perl/POE/POE-1.367.ebuild b/dev-perl/POE/POE-1.367.ebuild
new file mode 100644
index 000000000000..37860b9f6404
--- /dev/null
+++ b/dev-perl/POE/POE-1.367.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+POE_TEST_LOOPS_VERSION=1.360
+MODULE_AUTHOR=RCAPUTO
+MODULE_VERSION=1.367
+inherit perl-module
+
+DESCRIPTION="A framework for creating multitasking programs in Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ipv6 libwww ncurses tk test"
+
+RDEPEND="
+	dev-perl/yaml
+	dev-perl/Filter
+	dev-perl/IO-Pipely
+	dev-perl/FreezeThaw
+	>=dev-perl/Event-1.09
+	>=virtual/perl-File-Spec-0.87
+	>=virtual/perl-IO-1.23.01
+	>=virtual/perl-IO-Compress-1.33
+	>=virtual/perl-Storable-2.12
+	>=dev-perl/IO-Tty-1.08
+	>=dev-perl/TermReadKey-2.21
+	>=virtual/perl-Time-HiRes-1.59
+	ipv6? (
+		>=dev-perl/Socket6-0.14
+	)
+	tk? (
+		>=dev-perl/perl-tk-800.027
+	)
+	libwww? (
+		>=dev-perl/libwww-perl-5.79
+		>=dev-perl/URI-1.30
+	)
+	ncurses? (
+		>=dev-perl/Curses-1.08
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/POE-Test-Loops-${POE_TEST_LOOPS_VERSION}
+		>=virtual/perl-Test-Harness-2.26
+		>=virtual/perl-Test-Simple-0.54
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST=do
+
+src_test() {
+	# Disable network tests
+	rm -f "${S}"/run_network_tests || die
+	perl-module_src_test
+}
diff --git a/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild b/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild
deleted file mode 100644
index 9fd221c4fc49..000000000000
--- a/dev-perl/Panotools-Script/Panotools-Script-0.280.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=BPOSTLE
-MODULE_VERSION=0.28
-inherit eutils perl-module
-
-DESCRIPTION="A perl module for reading, writing, and manipulating hugin script files"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-RDEPEND="dev-perl/URI
-	dev-perl/libwww-perl
-	>=dev-perl/ImageSize-2.9
-	>=media-libs/exiftool-6
-	gui? ( gnome-extra/zenity )"
-DEPEND=""
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	if use gui ; then
-		domenu "${S}"/desktop/*.desktop || die
-	else
-		rm "${D}"/usr/bin/*-gui || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "Some of the scripts require 'nona', 'freepv', 'enblend', 'autotrace', and"
-	einfo "ImageMagick command-line tools which are available in the following"
-	einfo "packages: media-gfx/hugin, media-gfx/freepv, media-gfx/enblend,"
-	einfo "media-gfx/autotrace, and media-gfx/imagemagick."
-}
diff --git a/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild b/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild
new file mode 100644
index 000000000000..e59dff2a7d98
--- /dev/null
+++ b/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=BPOSTLE
+MODULE_VERSION=0.28
+inherit eutils perl-module
+
+DESCRIPTION="A perl module for reading, writing, and manipulating hugin script files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+RDEPEND="dev-perl/URI
+	dev-perl/libwww-perl
+	>=dev-perl/Image-Size-2.900.0
+	>=media-libs/exiftool-6
+	gui? ( gnome-extra/zenity )"
+DEPEND=""
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	if use gui ; then
+		domenu "${S}"/desktop/*.desktop || die
+	else
+		rm "${D}"/usr/bin/*-gui || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "Some of the scripts require 'nona', 'freepv', 'enblend', 'autotrace', and"
+	einfo "ImageMagick command-line tools which are available in the following"
+	einfo "packages: media-gfx/hugin, media-gfx/freepv, media-gfx/enblend,"
+	einfo "media-gfx/autotrace, and media-gfx/imagemagick."
+}
diff --git a/dev-perl/PerlIO-via-Timeout/Manifest b/dev-perl/PerlIO-via-Timeout/Manifest
index c72ef79f1ea0..d52e3eb0cb66 100644
--- a/dev-perl/PerlIO-via-Timeout/Manifest
+++ b/dev-perl/PerlIO-via-Timeout/Manifest
@@ -1 +1,2 @@
 DIST PerlIO-via-Timeout-0.29.tar.gz 13404 SHA256 0f9dc6f540671039c74254f5e081cf55c569820448c9929861e66ab66f93f5ca SHA512 824e99209e8c0ff93b3cff97139f27170a3034c98866a34b9dd80d6a938cfaa8db39ab5dacc20bd87aa94b0411f100b8744ac3f00672049d23d2324430b77f7c WHIRLPOOL ae69a8520862ebb41e2eb8fde96db69ecd8a8386d3a0ab31d6df88cbc4ef189edc7c2d73ae9cce28c6be4a67a1981698a379cde327eeb40824006991a773b9da
+DIST PerlIO-via-Timeout-0.32.tar.gz 13560 SHA256 9278f9ef668850d913d98fa4c0d7e7d667cff3503391f4a4eae73a246f2e7916 SHA512 52200c0d19da7a19b9b328473b0e7b57a1a3102fd3ace947af8fef8f670aaebe37811daaa2e2b6cf2f6397855a4cfb2424af053322146a8acefd71e1bb30f681 WHIRLPOOL 89f5e21150f4631f621ea40f54501ae4516b6efa5739c77cfa3c75a7aae7caf967d3db40ee0e97e91abd8c946eb7920fc41ed64a5410efa2e7de2534eba41cf0
diff --git a/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0.ebuild b/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0.ebuild
new file mode 100644
index 000000000000..36df715aaa9b
--- /dev/null
+++ b/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DAMS
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="PerlIO layer that adds read & write timeout to a handle"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+"
+DEPEND="
+	>=dev-perl/Module-Build-Tiny-0.39.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+		dev-perl/Test-TCP
+	)
+"
diff --git a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild
deleted file mode 100644
index a8dee6fc0f01..000000000000
--- a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SBURKE
-MODULE_VERSION=1.11
-inherit perl-module
-
-DESCRIPTION="RTF::Writer - for generating documents in Rich Text Format"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/ImageSize"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild
new file mode 100644
index 000000000000..4cdc9b6145d0
--- /dev/null
+++ b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=SBURKE
+MODULE_VERSION=1.11
+inherit perl-module
+
+DESCRIPTION="RTF::Writer - for generating documents in Rich Text Format"
+
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="dev-perl/Image-Size"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild
index 3a1c0d52e784..bfcf6a72fafb 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/xapian:0/1.2.22
diff --git a/dev-perl/SpeedyCGI/Manifest b/dev-perl/SpeedyCGI/Manifest
deleted file mode 100644
index 5179c46541b1..000000000000
--- a/dev-perl/SpeedyCGI/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST CGI-SpeedyCGI-2.22.tar.gz 151946 SHA256 9021a5c6d8ed205422f091209addf7d1be27222adbcbd17bc52fbc527bcc6f98 SHA512 e29112c2dcc2d7494bd06a92ec80ba8b424b66fba78148e2e8dfc7aa3c51379f9cbc5aabc146199ce9190815de6f0da5da1d0d68e1ff499a663384523235fb38 WHIRLPOOL d7ea153a5b1c7b0e341fbed7e19178e3eb3fb2e588c26aaeb2b58f6616e8996edfb0ec16874d90dc81080c428e9a6a0e0ffb39fa55872ee461b799470c10c2d7
-DIST speedy-error.patch 3087 SHA256 9da44c9c7c5068c214e52076e011d5485f077e26080ddabd1ab1eda854605c6d SHA512 d58b31732a285f518040440a8dfa26f590a68ccef0ad7f9083b8752643477a3bd2ef5ec6833e6d1f331d72096ffa25a1840d9e2aab4732cf818b5fcbcb96de52 WHIRLPOOL d87a5cc6ea301037e0a460a32222505660325c2a46e04fa1c4a413cae11c5ae2c78831d0de072c6cbdaf6bb95e282bf70cb1f781f71dd01291de0e7d9b5a5283
diff --git a/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild b/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild
deleted file mode 100644
index daafc8d3121f..000000000000
--- a/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.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 perl-module
-
-DESCRIPTION="Speed up perl scripts by running them persistently"
-HOMEPAGE="http://daemoninc.com/SpeedyCGI/"
-SRC_URI="http://daemoninc.com/SpeedyCGI/CGI-${P}.tar.gz
-	http://oss.oetiker.ch/smokeping/pub/speedy-error.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/CGI-${P}
-
-PATCHES=( "${DISTDIR}/speedy-error.patch"
-"${FILESDIR}/${P}-makefile-manpage.patch"
-"${FILESDIR}/${P}-empty-param.patch"
-"${FILESDIR}/${P}-strerror.patch"
-"${FILESDIR}/${P}-apache-docs.patch"
-"${FILESDIR}/${P}-apache2.2.patch"
-"${FILESDIR}/${P}-strip-backend-libs.patch"
-"${FILESDIR}/${P}-test-timeout.patch"
-"${FILESDIR}/${P}-speedy_unsafe_putenv.patch"
-"${FILESDIR}/${P}-perl5.10.patch"
-"${FILESDIR}/${P}-perl_sys_init.patch"
-"${FILESDIR}/${P}-uninit-crash.patch"
-"${FILESDIR}/${P}-big-socket-buffers.patch"
-"${FILESDIR}/${P}-ldflags.patch"
-"${FILESDIR}/${P}-parallel-build.patch"
-)
-
-# Actually fails 1 test
-SRC_TEST="do parallel"
-MAKEOPTS="${MAKEOPTS} -j1" #348065
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache-docs.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache-docs.patch
deleted file mode 100644
index 45d35176a0ec..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache-docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Documentation for bug #204461.
---- a/src/SpeedyCGI.src
-+++ b/src/SpeedyCGI.src
-@@ -250,6 +250,13 @@
- be Speedy followed by the option name.  For example to set the
- Timeout option, use the apache directive SpeedyTimeout.
- 
-+Note that these variables are global. There is currently no way to run
-+different scripts with different SpeedyCGI options when they are run
-+from the Apache module. Any <Directory> or <Location> contexts
-+have no effect on the scope of the SpeedyCGI options. When the
-+same SpeedyCGI option is set several times, the last one overrides
-+the others.
-+
- =back
- 
- =head2 Context
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache2.2.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache2.2.patch
deleted file mode 100644
index 3cd754674379..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-apache2.2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Apache 2.2 compatibility fixes (#393017):
-* APR_BRIGADE_FOREACH macro removal
-* apr_filename_of_pathname() rename
---- a/src/mod_speedycgi2.c
-+++ b/src/mod_speedycgi2.c
-@@ -340,7 +340,10 @@
-     const char *buf;
-     apr_size_t len;
-     apr_status_t rv;
--    APR_BRIGADE_FOREACH(e, bb) {
-+    for (e = APR_BRIGADE_FIRST(bb);
-+        e != APR_BRIGADE_SENTINEL(bb);
-+        e  = APR_BUCKET_NEXT(e)) {
-+
-         if (APR_BUCKET_IS_EOS(e)) {
-             break;
-         }
-@@ -380,7 +383,7 @@
-         return DECLINED;
-     }
- 
--    argv0 = apr_filename_of_pathname(r->filename);
-+    argv0 = apr_filepath_name_get(r->filename);
-     nph = !(strncmp(argv0, "nph-", 4));
- 
-     if (!(ap_allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r))
-@@ -436,7 +439,7 @@
-     if ((rv = default_build_command(&command, &argv, r, p)) != APR_SUCCESS) {
-         ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
-                       "don't know how to spawn child process: %s", 
--                      apr_filename_of_pathname(r->filename));
-+                      apr_filepath_name_get(r->filename));
-         return HTTP_INTERNAL_SERVER_ERROR;
-     }
- 
-@@ -445,7 +448,7 @@
-                             command, argv, r, p)) != APR_SUCCESS) {
-         ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
-                       "couldn't spawn child process: %s",
--		      apr_filename_of_pathname(r->filename));
-+		      apr_filepath_name_get(r->filename));
-         return HTTP_INTERNAL_SERVER_ERROR;
-     }
- 
-@@ -465,7 +468,9 @@
-             return rv;
-         }
- 
--        APR_BRIGADE_FOREACH(bucket, bb) {
-+        for (bucket = APR_BRIGADE_FIRST(bb);
-+            bucket != APR_BRIGADE_SENTINEL(bb);
-+            bucket  = APR_BUCKET_NEXT(bucket)) {
-             const char *data;
-             apr_size_t len;
- 
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-big-socket-buffers.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-big-socket-buffers.patch
deleted file mode 100644
index a67d9b6954b3..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-big-socket-buffers.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Niko Tyni <ntyni@debian.org>
-Description: fix the detach test on systems with a large socket buffer size (#584344)
---- speedy-cgi-perl.orig/speedy/t/detach.t
-+++ speedy-cgi-perl/speedy/t/detach.t
-@@ -6,9 +6,22 @@
- 
- use strict;
- use IO::File;
-+use Socket;
- 
- my $smbuf	=   8 * 1024;
--my $lgbuf	= 512 * 1024;
-+my $lgbuf;
-+
-+# find out the size of the socket write buffer
-+# see http://bugs.debian.org/584344
-+my $s;
-+if (socket($s, AF_UNIX, SOCK_STREAM, 0) &&
-+    (my $packed_size = getsockopt($s, SOL_SOCKET, SO_SNDBUF))) {
-+    $lgbuf = $smbuf + 2 * unpack("I", $packed_size);
-+} else {
-+    warn("socket() or getsockopt() failed: $!");
-+}
-+
-+$lgbuf = 512 * 1024 if $lgbuf < 512 * 1024;
- my $scr		= 't/scripts/detach';
- 
- use vars qw(@open_files @pids %children);
-@@ -23,7 +36,7 @@
-     $| = 1; print ""; $| = 0;
-     my $child;
-     if (($child = open($fh, "-|")) == 0) {
--	open(F, "$ENV{SPEEDY} -- -B$sz $scr |");
-+	open(F, "$ENV{SPEEDY} -- -B$sz $scr $lgbuf |");
- 	print scalar <F>;
- 	close(STDOUT);
- 	sleep 60;	# Simulate slow drain of output
---- speedy-cgi-perl.orig/speedy/t/scripts/detach
-+++ speedy-cgi-perl/speedy/t/scripts/detach
-@@ -1,3 +1,6 @@
- $| = 1;
-+# the data should not fit in the socket write buffer
-+# see http://bugs.debian.org/584344
-+my $size = shift || (512 * 1024);
- print "$$\n";
--print 'x' x (500*1024);
-+print 'x' x int(500 / 512 * $size);
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-empty-param.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-empty-param.patch
deleted file mode 100644
index 0b9b7fa3c56d..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-empty-param.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Allow empty strings as command-line parameters
---- a/src/speedy_frontend.c
-+++ b/src/speedy_frontend.c
-@@ -535,7 +535,26 @@
- 	    ADD_STRING(b, s, l);
- 	}
-     }
-+    /* Terminate with zero-length string */
-+    ADDCHAR(b, 0);
-+}
-+
-+/* Copy a block of strings into the buffer, including empty strings */
-+static void add_strings_with_empty(register SpeedyBuf *b, register const char * const * p)
-+{
-+    int l;
-+    register const char *s;
- 
-+    /* Add strings in p array */
-+    for (; (s = *p); ++p) {
-+	if ((l = strlen(s))) {
-+	    ADD_STRING(b, s, l);
-+	} else {
-+	    /* add a 1-byte long string containing just '\0' */
-+	    l = 1;
-+	    ADD_STRING(b, s, l);
-+	}
-+    }
-     /* Terminate with zero-length string */
-     ADDCHAR(b, 0);
- }
-@@ -560,7 +579,7 @@
- 
-     /* Add env and argv */
-     add_strings(sb, envp);
--    add_strings(sb, scr_argv+1);
-+    add_strings_with_empty(sb, scr_argv+1);
- 
-     /* Put script filename into buffer */
-     add_string(sb, script_fname, strlen(script_fname));
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-ldflags.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-ldflags.patch
deleted file mode 100644
index 7eb8c9171fc1..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'src/SpeedyMake.pl'
---- src/SpeedyMake.pl	2010-08-30 20:08:42 +0000
-+++ src/SpeedyMake.pl	2010-08-30 20:09:18 +0000
-@@ -328,7 +328,7 @@
- sub remove_libs { undef }
- 
- sub get_ldopts {
--    $_ = "$LD_OPTS " . &ExtUtils::Embed::ldopts('-std');
-+    $_ = "$LD_OPTS " . &ExtUtils::Embed::ldopts('-std') . " " . $ENV{LDFLAGS};
-     $EFENCE && s/$/ $EFENCE/;
-     return $_;
- }
-
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-makefile-manpage.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-makefile-manpage.patch
deleted file mode 100644
index 8e1d4b73acba..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-makefile-manpage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Makefile.PL tries to be too smart, make it generate a manpage.
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -34,9 +34,9 @@
-     VERSION_FROM	=> 'src/SpeedyCGI.src',
-     EXE_FILES		=> [qw(speedy/speedy speedy_backend/speedy_backend)],
-     CONFIGURE		=> sub { return {DIR=>\@dirs} },
--    PM			=> {'src/SpeedyCGI.pm'=>'$(INST_LIBDIR)/SpeedyCGI.pm'},
-+    # PM			=> {'src/SpeedyCGI.pm'=>'$(INST_LIBDIR)/SpeedyCGI.pm'},
-     MAN1PODS		=> {},
--    MAN3PODS		=> {},
-+    # MAN3PODS		=> {},
-     dist		=> {DIST_DEFAULT => 'mydist'},
-     realclean		=> {FILES => 'README README.html lib'},
-     %write_makefile_common
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-parallel-build.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-parallel-build.patch
deleted file mode 100644
index f85b0f57d43e..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-parallel-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'Makefile.PL'
---- Makefile.PL	2010-09-16 06:16:42 +0000
-+++ Makefile.PL	2010-09-16 20:24:41 +0000
-@@ -64,6 +64,12 @@
- $test_install_extra .
- '
- 
-+speedy/speedy: subdirs
-+	$(NOECHO) cd speedy && $(MAKE) $(USEMAKEFILE) $(FIRST_MAKEFILE) all $(PASTHRU)
-+
-+speedy_backend/speedy_backend: subdirs
-+	$(NOECHO) cd speedy_backend && $(MAKE) $(USEMAKEFILE) $(FIRST_MAKEFILE) all $(PASTHRU)
-+
- mydist: README README.html lib/CGI/SpeedyCGI.pm readable tardist
- 
- readable:
-
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl5.10.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl5.10.patch
deleted file mode 100644
index 8445dad26683..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl5.10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Niko Tyni <ntyni@debian.org>
-Description: Fix build failures with Perl 5.10.
-Pod::Text::pod2text() calling conventions changed
-use Newx() instead of New()
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -71,7 +71,7 @@
- 	chmod -R u+w,go-w,go+r .
- 
- README: src/SpeedyCGI.pm
--	cd src && $(PERL) -e "use Pod::Text; pod2text(-80)" <SpeedyCGI.pm >../README
-+	cd src && pod2text -80 <SpeedyCGI.pm >../README
- 
- README.html: src/SpeedyCGI.pm
- 	cd src && pod2html SpeedyCGI.pm >../README.html && $(RM_F) pod2h*
---- a/src/speedy_backend_main.h
-+++ b/src/speedy_backend_main.h
-@@ -38,7 +38,7 @@
- 
- #else
- 
--#define speedy_new(s,n,t)	New(123,s,n,t)
-+#define speedy_new(s,n,t)	Newx(s,n,t)
- #define speedy_renew		Renew
- #define speedy_free		Safefree
- 
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl_sys_init.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl_sys_init.patch
deleted file mode 100644
index e8da0b9d0f92..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-perl_sys_init.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Niko Tyni <ntyni@debian.org>
-Description: Properly call PERL_SYS_INIT3() to fix lockups on hppa with perl 5.10.0. (Closes: #486070)
-
-This was always buggy but didn't bite until now. From 'perldoc perlembed':
-
-The macros PERL_SYS_INIT3() and PERL_SYS_TERM() provide system-specific
-tune up of the C runtime environment necessary to run Perl interpreters
---- a/src/speedy_backend_main.c
-+++ b/src/speedy_backend_main.c
-@@ -170,6 +170,8 @@
-     int i;
-     SigList sl;
- 
-+    PERL_SYS_INIT3(&argc, &argv, &_junk);
-+
-     speedy_util_unlimit_core();
- 
-     if (!(my_perl = perl_alloc()))
---- a/src/speedy_perl.c
-+++ b/src/speedy_perl.c
-@@ -405,6 +405,7 @@
- 
- 	perl_destruct(my_perl);
-     }
-+    PERL_SYS_TERM();
-     speedy_util_exit(0,0);
- }
- 
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-speedy_unsafe_putenv.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-speedy_unsafe_putenv.patch
deleted file mode 100644
index c4adb7b8c6ec..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-speedy_unsafe_putenv.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: banb@yahoo.co.jp
-Description: Debian #418447, CPAN #13521
-http://rt.cpan.org/Public/Bug/Display.html?id=13521
---- a/src/speedy_backend_main.c
-+++ b/src/speedy_backend_main.c
-@@ -176,6 +176,10 @@
-         DIE_QUIET("Cannot allocate perl");
-     perl_construct(my_perl);
- 
-+#if defined(PL_use_safe_putenv) || defined(PL_Guse_safe_putenv)
-+    PL_use_safe_putenv = 0;
-+#endif
-+
- #ifdef SPEEDY_DEBUG
-     dont_fork = getenv("SPEEDY_NOPARENT") != NULL;
- #endif
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strerror.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strerror.patch
deleted file mode 100644
index 608ac39c566e..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strerror.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Don't crash while printing a fatal error.
---- a/src/speedy_util.c
-+++ b/src/speedy_util.c
-@@ -96,13 +96,42 @@
- }
- 
- static void just_die(const char *fmt, va_list ap) {
-+    /*
-+     * All this strerror_r() stuff is here because
-+     * including perl.h in some cases (Perl 5.8?) replaces
-+     * strerr() with a wrapper that needs an embedded perl
-+     * interpreter running. Otherwise we get SIGSEGV when
-+     * accessing interpreter-specific global variables for the
-+     * strerror buffer
-+     *
-+     * Furthermore, there are two implementations of
-+     * strerror_r() out there, with different prototypes.
-+     */
-+
-     char buf[2048];
-+#ifdef HAS_STRERROR_R
-+    char errbuf[256];
-+    int errsv;
-+#endif
- 
-     sprintf(buf, "%s[%u]: ", SPEEDY_PROGNAME, (int)getpid());
-     vsprintf(buf + strlen(buf), fmt, ap);
-     if (errno) {
- 	strcat(buf, ": ");
-+#ifdef HAS_STRERROR_R
-+#ifdef _GNU_SOURCE
-+	strcat(buf, strerror_r(errno, errbuf, sizeof(errbuf)));
-+#else /* ! _GNU_SOURCE */
-+	errsv = errno;
-+	if (strerror_r(errsv, errbuf, sizeof(errbuf))
-+	    sprintf(buf + strlen(buf), "(errno = %d)", errsv);
-+	else
-+	    strcat(buf, errbuf);
-+    }
-+#endif
-+#else /* ! HAS_STRERROR_R */
- 	strcat(buf, strerror(errno));
-+#endif /* HAS_STRERROR_R */
-     }
-     strcat(buf, "\n");
- #   ifdef SPEEDY_DEBUG
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strip-backend-libs.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strip-backend-libs.patch
deleted file mode 100644
index 537af4188be5..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-strip-backend-libs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Use the automatic 'remove extra libs' feature with speedy_backend too.
-These unnecessary linking flags get removed: -lm -lcrypt -lpthread
---- a/speedy_backend/Makefile.PL
-+++ b/speedy_backend/Makefile.PL
-@@ -29,6 +29,10 @@
- sub am_frontend {0}
- sub my_name {'backend'}
- 
-+sub remove_libs { my $class = shift;
-+    'BIN=speedy_backend ../util/remove_libs';
-+}
-+
- use ExtUtils::Embed;
- 
- my $tmp = "xsinit.tmp$$";
---- a/util/remove_libs
-+++ b/util/remove_libs
-@@ -3,7 +3,11 @@
- # Remove extranaeous libs from the linking command.  Reduces shared-library
- # overhead at exec time.
- 
--BIN=speedy
-+# allow testing other binaries too
-+if [ "x$BIN" = "x" ]
-+then
-+	BIN=speedy
-+fi
- TMP1=/tmp/remove_libs$$
- TMP2="${TMP1}2"
- 
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-test-timeout.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-test-timeout.patch
deleted file mode 100644
index 62bbc4ea30d2..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-test-timeout.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Increase the time for the backend to start so slower buildds
-have a chance. (#418717)
---- a/speedy/t/killfe.t
-+++ b/speedy/t/killfe.t
-@@ -9,7 +9,7 @@
- my $cmd = "exec $ENV{SPEEDY} -- -M1 $scr </dev/null |";
- 
- my $pid = open (RUN1, $cmd);
--sleep(1);
-+sleep(3);
- kill(9, $pid);
- wait;
- open (RUN2, $cmd);
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-uninit-crash.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-uninit-crash.patch
deleted file mode 100644
index 767fb8de8fe6..000000000000
--- a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-uninit-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Niko Tyni <ntyni@debian.org>
-Description: Closes: #537996
-The SvIV call crashes in on Perl 5.10.0 when warnings are
-enabled and the value is undef.
---- a/src/speedy_perl.c
-+++ b/src/speedy_perl.c
-@@ -818,7 +818,7 @@
-     my_call_sv(get_perlvar(&PERLVAR_RESET_GLOBALS));
- 
-     /* Copy option values in from the perl vars */
--    if (SvIV(PERLVAL_OPTS_CHANGED)) {
-+    if (SvTRUE(PERLVAL_OPTS_CHANGED)) {
- 	int i;
- 	for (i = 0; i < SPEEDY_NUMOPTS; ++i) {
- 	    OptRec *o = speedy_optdefs + i;
diff --git a/dev-perl/SpeedyCGI/metadata.xml b/dev-perl/SpeedyCGI/metadata.xml
deleted file mode 100644
index 51930499ab60..000000000000
--- a/dev-perl/SpeedyCGI/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-perl/Test-TCP/Test-TCP-2.130.0.ebuild b/dev-perl/Test-TCP/Test-TCP-2.130.0.ebuild
index c39d173eb9ac..c30322032521 100644
--- a/dev-perl/Test-TCP/Test-TCP-2.130.0.ebuild
+++ b/dev-perl/Test-TCP/Test-TCP-2.130.0.ebuild
@@ -15,8 +15,6 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
-
-
 	>=dev-perl/Test-SharedFork-0.190.0
 	>=virtual/perl-IO-1.23
 "
diff --git a/dev-perl/glib-perl/glib-perl-1.314.0.ebuild b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
index 4e237df2ffd5..480275cc6baf 100644
--- a/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/gnome2-perl/Manifest b/dev-perl/gnome2-perl/Manifest
index adf0a150221e..ded44c389774 100644
--- a/dev-perl/gnome2-perl/Manifest
+++ b/dev-perl/gnome2-perl/Manifest
@@ -1,2 +1 @@
-DIST Gnome2-1.042.tar.gz 80062 SHA256 f4a183bf17ae8de5e27bb9b98e14cd3e960cf6a194e54a712c5783700b37c379 SHA512 0d3b2995ba0542dd4b0eee9eec10dfb3de9259ec3d8d1002bd90bdff71372766ac6fdb67819bb1db42e0340e3cca46c38e5cbaf10844ebeb582131a59abac544 WHIRLPOOL 4668e8fb07b4e140da12e4c6ae19af43f16785fdde345f8c70820e4ade178608b3f48c9fcd19b0cd7e59ddc5f85d3541a80b2c93002117468bad40b8b14479bd
 DIST Gnome2-1.045.tar.gz 79262 SHA256 1426044de3ab4900e0a7cb0cc27aa2213c6ad29ed0676b018dce2eee832692f7 SHA512 fa4ac02dbc3d96e6790cff964968f86b9eaf5bb79bbdd2fb3e967e4e8f4bcad25bf1308d25b26ae0298303dfaab7aaa5b49028336d25648614208e622a848316 WHIRLPOOL 54d747c44d06fa7324f3234d9849e400dedd9a0dbfff35834ad754bc74638df83dafd3dca5dab6de13832c533fdd19186765e301d004a03951f4cfad8be2ba6d
diff --git a/dev-perl/gnome2-perl/gnome2-perl-1.42.0-r1.ebuild b/dev-perl/gnome2-perl/gnome2-perl-1.42.0-r1.ebuild
deleted file mode 100644
index 7c41c07b58d1..000000000000
--- a/dev-perl/gnome2-perl/gnome2-perl-1.42.0-r1.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
-
-MY_PN=Gnome2
-MODULE_AUTHOR=TSCH
-MODULE_VERSION=1.042
-inherit perl-module
-
-DESCRIPTION="Perl interface to the 2.x series of the Gnome libraries"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=dev-perl/gtk2-perl-1.0.0
-	gnome-base/libgnomeui
-	gnome-base/libbonoboui
-	>=dev-perl/gnome2-canvas-1.0.0
-	>=dev-perl/glib-perl-1.40.0
-	>=dev-perl/gnome2-vfs-perl-1.0.0"
-DEPEND="${RDEPEND}
-	dev-perl/ExtUtils-Depends
-	dev-perl/extutils-pkgconfig"
-
-SRC_TEST=do
diff --git a/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild b/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild
index 4ca74a9215a4..b0c31ce7a012 100644
--- a/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild
+++ b/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild b/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild
index c82194db07e6..4b5c1dc7faad 100644
--- a/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild
+++ b/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Perl bindings for GTK2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/local-lib/Manifest b/dev-perl/local-lib/Manifest
index cd323f95b630..7c3f25e892a4 100644
--- a/dev-perl/local-lib/Manifest
+++ b/dev-perl/local-lib/Manifest
@@ -1 +1,2 @@
 DIST local-lib-2.000014.tar.gz 51593 SHA256 ae63356ab780c5a3aa46287b48daea748a3dd021d9b52dff8bf480b43787fa2b SHA512 3a7bb68af992215eb6787082fea7c09d5468aabe5c6478d028ce99ae878f6efdd8982804ba2c396af1fc0a5b46a4fa7f0e4831d9c32f1abd41ef631976c5efe8 WHIRLPOOL 990e3ca60a88544a0394fbb994832aff9c50988dde0372d8d7e437a72c28d30bf27438acfb8423aa57965bf58140e7a3284d6151a80cbd51bffc4ed201b6e6c1
+DIST local-lib-2.000018.tar.gz 59350 SHA256 9ba8f5d55a03e029c3e18799942b89d2c457bb4414b9dce912dc1c8797d94894 SHA512 d94672b623de5c4e99270733a4de59f95c01b3c89cd552da05b04892893696cf57c9988b695cca2eda624a2c48bb392fe51d17eb842ed09e0824d71fcb4eb80e WHIRLPOOL df53e7ae77cf6758b69bfc3291c7b4a77c030c2ae428123a93ce3a4fcd460d70be33f2b8bf8bfa6b20f12eb109707a58863adcf44c7bfeddafdec6f06557bb70
diff --git a/dev-perl/local-lib/local-lib-2.0.18.ebuild b/dev-perl/local-lib/local-lib-2.0.18.ebuild
new file mode 100644
index 000000000000..22265b4ddd04
--- /dev/null
+++ b/dev-perl/local-lib/local-lib-2.0.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+DIST_AUTHOR=HAARG
+DIST_VERSION=2.000018
+inherit perl-module
+
+DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-CPAN-1.820.0
+	>=virtual/perl-ExtUtils-Install-1.430.0
+	>=virtual/perl-ExtUtils-MakeMaker-7.0.0
+	>=dev-perl/Module-Build-0.360.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-php/PEAR-PHP_CodeSniffer/Manifest b/dev-php/PEAR-PHP_CodeSniffer/Manifest
index ff10dcccedd7..cefdc889b878 100644
--- a/dev-php/PEAR-PHP_CodeSniffer/Manifest
+++ b/dev-php/PEAR-PHP_CodeSniffer/Manifest
@@ -1,4 +1 @@
-DIST PHP_CodeSniffer-1.3.5.tgz 345113 SHA256 deb28c23ae83962aaefaeb022b55de4045c83ab962a430f603464564f4e8fb5e SHA512 2502636bf9273fee02d8b7ed26ef80754672f1d07418b5337c6e814ed783ed73ab2f1fc14d6c9192d15ef4260b8bb54e68ce6d028cc7167da88a8b4b9bcf5a28 WHIRLPOOL 7dba786a1cfb1f66587a26c0961c68f63226b2d8e1a5a22126691635ab3314e387d94985f6f30b06c4e009b9014726fd2d594a8edf2830010e30f4cc44633998
-DIST PHP_CodeSniffer-1.4.7.tgz 406387 SHA256 c3f44b80d7853f521f333486c3c1d6cda5caea6b1f14b0679c41b1c7169bf550 SHA512 5cef6054190f65f8ec8750b00bf1c5c4e14ee6c3174cc98202722b84834b0367c2c7657fdc9e33f4311278f1d37738ab8f9579b730a1db30c0196ad53dbfa285 WHIRLPOOL b63c369ac1b6126f7abff969a4d9061b39cce9856c9b2a729bd5e73c5b9cbe27c150679a7649775d90fc8a008a693f201bf984b4c63b4410377b357c16cd2829
-DIST PHP_CodeSniffer-1.5.0RC4.tgz 404735 SHA256 02677d8ceb82a88332fb9748fcd16e588c58a1e7584d53713a37d29a0214a7ce SHA512 495b69ddfa73ebc7b78966a81f3e529d33729170e383bb2ec241e6c711fc1b7d80f46221a015b7b5e8ef0524e76ee667a98de604333a095c4a2045784202e8cc WHIRLPOOL ab0960bcc7c38ffdfd70a8beb34cab188e0f013b23c121165760e9796db4528354bd1feb6da4c080e974039910afe036333c0907ccbfdac0405f5a8514e36bc1
-DIST PHP_CodeSniffer-2.3.0.tgz 464453 SHA256 ee4774d96da65d907c36ceabdefc2a8dbc95cabcee0457b78a418357553c5611 SHA512 c0f8ec79e41301619b2c9f5c4145bbc6705b01c9cf6f954448679e8d2bee2ce6cb759a0cd799f925f70e43304e7f2dc9f412cc51fd7a25fd002d56bf408b6ba2 WHIRLPOOL 33358e1631099fbafa4ac77f3a7e5a6c10186aa6e43fd231e22c51c94d70c1c2dddde2621b5435c23e06a9392c0e68b71f899de301eeca23f4da41944f04e5a2
+DIST PEAR-PHP_CodeSniffer-2.5.1.tar.gz 294006 SHA256 bd38bddea81eb9b13413fb09c382a10bbd3c3d8bf82539ac4cc3f1e6a334e5ca SHA512 20221e45da087bbd4e34817086e67ec87016d24a0f14bafbcd7b2a82d4ead9ecf18f2053685e7eee33b5cb4ae2a6d19588b2ca35908b01b75fa79589bbf46671 WHIRLPOOL 0e3b6fe239a6a6e653bf0478edc3eadd05fad456e69785d6f893890cd0a00c066f3eb186c5081142579e0df1a21d7e89f089c93ba4d9810fa235532c318f6a6a
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild
deleted file mode 100644
index 11191d21c11d..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.4.7.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.4.7.ebuild
deleted file mode 100644
index 11191d21c11d..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.4.7.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.5.0_rc4.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.5.0_rc4.ebuild
deleted file mode 100644
index b81d24579590..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.5.0_rc4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.3.0.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.3.0.ebuild
deleted file mode 100644
index 462a782d15e2..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.3.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=dev-lang/php-5.1.2:*[cli]"
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1.ebuild
new file mode 100644
index 000000000000..8710e75a87ea
--- /dev/null
+++ b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Can go if we ever drop the "PEAR-" prefix.
+MY_PN="${PN#PEAR-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+SRC_URI="https://github.com/squizlabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( >=dev-php/phpunit-4 )"
+RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
+
+# Can go if we ever drop the "PEAR-" prefix.
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r CodeSniffer CodeSniffer.php
+
+	# These load code via relative paths, so they have to be symlinked
+	# and not dobin'd.
+	exeinto "/usr/share/${PN}/scripts"
+	for script in phpcbf phpcs; do
+		doexe "scripts/${script}"
+		dosym "/usr/share/${PN}/scripts/${script}" "/usr/bin/${script}"
+	done
+
+	einstalldocs
+}
+
+# The test suite isn't part of the tarball at the moment, keep an eye on
+# https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+RESTRICT=test
+src_test() {
+	phpunit || die "test suite failed"
+}
diff --git a/dev-php/pecl-drizzle/Manifest b/dev-php/pecl-drizzle/Manifest
deleted file mode 100644
index 566ff8eea748..000000000000
--- a/dev-php/pecl-drizzle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST drizzle-0.4.2.tgz 24106 SHA256 5e9abd5200d840249003112e7d658eda06e2591e4c6bcf1c97194b4e274f0c66 SHA512 39b4d4fd7f68fba0c13e947c5b93179c3d7a4fd563b60c5ae9f7f175a095e16d2344a924cecd8c921892b33d7fe6cb4f95cfccbfbec40be14b1f46b534cba76e WHIRLPOOL 7ff5b373738a755a9ac90b5028eafa5f98a42bd47999e78fda3174c7361929d2d316b46fa28bfb4a2c5a0e370ce211895905605254b9d44999abf53881e138a0
diff --git a/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch b/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch
deleted file mode 100644
index 42c27103a67b..000000000000
--- a/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -aurN drizzle-0.4.2.orig/php_drizzle.c drizzle-0.4.2/php_drizzle.c
---- drizzle-0.4.2.orig/php_drizzle.c	1970-01-01 04:13:08.000000000 -0500
-+++ drizzle-0.4.2/php_drizzle.c	2014-10-22 21:38:21.882838493 -0400
-@@ -1314,9 +1314,13 @@
- 	}
- 
- 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- 	              (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- 	               sizeof(zval *));
-+#else
-+	object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
- 
- 	value.handle= zend_objects_store_put(obj,
- 	                   (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -1582,9 +1586,13 @@
- 	}
- 
- 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- 	               sizeof(zval *));
-+#else
-+	object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
- 
- 	obj->value.handle= zend_objects_store_put(obj,
- 	                  (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -2505,9 +2513,13 @@
- 	}
- 
- 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- 	               sizeof(zval *));
-+#else
-+	object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
- 
- 	obj->value.handle= zend_objects_store_put(obj,
- 	               (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -3017,9 +3029,13 @@
- 	}
- 
- 	zend_object_std_init(&(result->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- 	zend_hash_copy(result->std.properties, &(class_type->default_properties),
- 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- 	               sizeof(zval *));
-+#else
-+	object_properties_init((zend_object*) &(result->std), class_type);
-+#endif
- 
- 	value.handle= zend_objects_store_put(result,
- 	              (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -3382,9 +3398,13 @@
- 	}
- 
- 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- 	               sizeof(zval *));
-+#else
-+	object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
- 
- 	value.handle= zend_objects_store_put(obj,
- 	             (zend_objects_store_dtor_t)zend_objects_destroy_object,
diff --git a/dev-php/pecl-drizzle/metadata.xml b/dev-php/pecl-drizzle/metadata.xml
deleted file mode 100644
index 288a5dd45bc9..000000000000
--- a/dev-php/pecl-drizzle/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>pavel.stratil-jun@fenix.cz</email>
-    <description>Proxied co-maintainer, assign bugs to him</description>
-  </maintainer>
-  <maintainer type="person">
-    <email>flameeyes@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild b/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild
deleted file mode 100644
index 8d1be77b215f..000000000000
--- a/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.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"
-
-PHP_EXT_NAME="drizzle"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2 eutils
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="PHP extension using libdrizzle library to provide communcation with Drizzle and MySQL databases"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/drizzle"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local slot orig_s="${PHP_EXT_S}"
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		epatch "${FILESDIR}/${P}-php54.patch"
-		#Fix tests
-		mkdir ext || die
-		mv drizzle_*.phpt ext || die
-	done
-	php-ext-source-r2_src_prepare
-}
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
index 5bb39e354566..b4982d7a8fc2 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-4 php5-5 php5-6"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
index fb7f83860439..c06d9fa342e1 100644
--- a/dev-php/pecl-radius/Manifest
+++ b/dev-php/pecl-radius/Manifest
@@ -1 +1,2 @@
-DIST radius-1.2.7.tgz 35779 SHA256 c4b229b4ee016c13bad326f4eb6b9f3698daed3c559a2d9e7fe05b459334bb34 SHA512 76d8fe4722a25b912e5fcfb3df79027384ce5037c6abec038abdb398698345463bdd17163294dd2734e440a6350380a27d2d2eba525bfc7285b953f726ac4ed5 WHIRLPOOL a8c6b58a166c1763bd5335ef79dfefdec270b6440646f9311200bd375f03fda6693792bdd39504247df16fff05e263fdc1f6e3cca9520a46f820ffd589691a11
+DIST radius-1.3.0.tgz 43060 SHA256 b0431ec6769ff1ec564d95782f7b91de06a7ac3297745bbbc9d1c274bfc4de15 SHA512 79126a852701e77f782283b0cf2ad99cb05418c69ed39d70608f62021f3da06f5e5867ac5b09cc75806feeb3d1a06f24eeb6ff4e56cb2fde5f05bcd198b5a661 WHIRLPOOL 767056aaed97fb46ac9b4cf603b9e2b0ae111079d7be5cf2fd262a1f166d195e1fb46877d0f4b21cf0251db2500dc5d63c4506f61762cc0304816ebf8c7f2f1b
+DIST radius-1.4.0b1.tgz 50953 SHA256 97dcf2e497131a20804cc508873a123012b773f42d077af398334f3caf86ee54 SHA512 db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664 WHIRLPOOL cf6663dc1bcf4b7cb9d5e3cac0f8e44107c56634598611d042b98e46b467de5ebbdb999a16a2974ee0b455cbeb77191944366dc6c16ba5c50d58fb7caab381a2
diff --git a/dev-php/pecl-radius/pecl-radius-1.2.7.ebuild b/dev-php/pecl-radius/pecl-radius-1.2.7.ebuild
deleted file mode 100644
index f0ea5fa46b2c..000000000000
--- a/dev-php/pecl-radius/pecl-radius-1.2.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="radius"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Provides full support for RADIUS authentication (RFC 2865) and RADIUS accounting (RFC 2866)"
-LICENSE="BSD BSD-2"
-SLOT="0"
-IUSE="examples"
diff --git a/dev-php/pecl-radius/pecl-radius-1.3.0.ebuild b/dev-php/pecl-radius/pecl-radius-1.3.0.ebuild
new file mode 100644
index 000000000000..1904c19234a0
--- /dev/null
+++ b/dev-php/pecl-radius/pecl-radius-1.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="radius"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php5-5"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1.ebuild
new file mode 100644
index 000000000000..309b85772048
--- /dev/null
+++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="radius"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-0 php5-6 php5-5"
+MY_PV="${PV/_beta/b}"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
diff --git a/dev-php/pecl-syck/Manifest b/dev-php/pecl-syck/Manifest
deleted file mode 100644
index 5f19764c1189..000000000000
--- a/dev-php/pecl-syck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST syck-0.9.3.tgz 12407 SHA256 2ce1c34856cc8826d9e75f4b885636b109e06e9739146997354db4086a35cc43 SHA512 a19371f888184d154174be71fef020119938c193e6f880ed39ecae9bdb68b7f89b6d55a9a60cce0c586a6f71a4a6efe59ac0892e4d6be6bd94deb544d6bab5d6 WHIRLPOOL b4210be0a49ba1bb709b1999cf1d57a93a21220e0872fd8f8158ee2582de96d846917e4a5157fdc4527e598e7cc57585792dc75adb4a70048b41d8b794bf87fe
diff --git a/dev-php/pecl-syck/files/fix-php-5-4-support.patch b/dev-php/pecl-syck/files/fix-php-5-4-support.patch
deleted file mode 100644
index c88fe34ff59a..000000000000
--- a/dev-php/pecl-syck/files/fix-php-5-4-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Gentooo bug 409963
-
-
-diff --git a/ext/php/phpext.c b/ext/php/phpext.c
-index a7d7500..c0b5646 100644
---- a/ext/php/phpext.c
-+++ b/ext/php/phpext.c
-@@ -198,7 +198,7 @@ static int psex_determine_array_type(HashTable *myht TSRMLS_DC) /* {{{ */
- 
- 
- 
--function_entry syck_functions[] = {
-+zend_function_entry syck_functions[] = {
- 	PHP_FE(syck_load, arginfo_syck_load)
- 	PHP_FE(syck_dump, arginfo_syck_dump)
- 	{NULL, NULL, NULL}	/* Must be the last line in syck_functions[] */
-@@ -403,7 +403,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
- 
- 				strncpy(classname, n->type_id + 12, classname_len + 1);
- 
--				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
-+				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
- 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
- 					efree(classname);
- 					break;
-@@ -439,7 +439,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
- 
- 				strncpy(classname, n->type_id + 11, classname_len + 1);
- 
--				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
-+				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
- 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
- 					efree(classname);
- 					break;
-@@ -511,7 +511,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
- 
- 				strncpy(classname, n->type_id + 10, classname_len + 1);
- 
--				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
-+				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
- 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
- 					efree(classname);
- 					break;
diff --git a/dev-php/pecl-syck/metadata.xml b/dev-php/pecl-syck/metadata.xml
deleted file mode 100644
index b86acf66c756..000000000000
--- a/dev-php/pecl-syck/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-syck/pecl-syck-0.9.3-r3.ebuild b/dev-php/pecl-syck/pecl-syck-0.9.3-r3.ebuild
deleted file mode 100644
index c1bce4b3cd53..000000000000
--- a/dev-php/pecl-syck/pecl-syck-0.9.3-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="syck"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG TODO"
-
-USE_PHP="php5-6 php5-5 php5-4"
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-
-DESCRIPTION="PHP bindings for Syck - reads and writes YAML with it"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/syck
-	>=dev-lang/php-5.3.1[hash]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		epatch "${FILESDIR}"/fix-php-5-4-support.patch
-	done
-	php-ext-source-r2_src_prepare
-}
diff --git a/dev-php/pecl-syck/pecl-syck-0.9.3-r4.ebuild b/dev-php/pecl-syck/pecl-syck-0.9.3-r4.ebuild
deleted file mode 100644
index 8994fbefd915..000000000000
--- a/dev-php/pecl-syck/pecl-syck-0.9.3-r4.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
-
-PHP_EXT_NAME="syck"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG TODO"
-
-USE_PHP="php5-6 php5-5 php5-4"
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP bindings for Syck - reads and writes YAML with it"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-for target in ${USE_PHP}; do
-	slot=${target/php}
-	slot=${slot/-/.}
-	PHPUSEDEPEND="${PHPUSEDEPEND}
-	php_targets_${target}? ( dev-lang/php:${slot}[hash] )"
-done
-
-DEPEND="dev-libs/syck
-	${PHPUSEDEPEND}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		epatch "${FILESDIR}"/fix-php-5-4-support.patch
-	done
-	php-ext-source-r2_src_prepare
-}
diff --git a/dev-python/Djblets/Djblets-0.7.31.ebuild b/dev-python/Djblets/Djblets-0.7.31.ebuild
deleted file mode 100644
index 84b479f6ed61..000000000000
--- a/dev-python/Djblets/Djblets-0.7.31.ebuild
+++ /dev/null
@@ -1,32 +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 versionator
-
-DESCRIPTION="A collection of useful extensions for Django"
-HOMEPAGE="https://github.com/djblets/djblets"
-SRC_URI="http://downloads.reviewboard.org/releases/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.4.13[${PYTHON_USEDEP}]
-		=dev-python/django-1.4*[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.1.2[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/django-evolution[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# use pillow, not PIL
-	sed -e 's/PIL/pillow/' -i setup.py Djblets.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/Djblets/Manifest b/dev-python/Djblets/Manifest
deleted file mode 100644
index 732f56a82c88..000000000000
--- a/dev-python/Djblets/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Djblets-0.7.31.tar.gz 430369 SHA256 c6bdb1fed30ec1c77a8b07d670a170ecc55404363adf09b2860903a328909e12 SHA512 d0defd2a6e0caecd807e156d968b0128266d60aaf336303ec9ea3e01be1f01455bc763da02d639e677f1122f8eda8e039054ae16222879392eff332ec7b49969 WHIRLPOOL 7063209e5d3e55d89d4cc6fcfea584e24712d2427870448141eefedd29a94af0f4eb41df6097962d513ba09fa56b7cb1a1e5cf17a13646a2c3f046407b4f9977
diff --git a/dev-python/Djblets/metadata.xml b/dev-python/Djblets/metadata.xml
deleted file mode 100644
index 983dd1920208..000000000000
--- a/dev-python/Djblets/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="github">djblets/djblets</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 5918ed64da24..609c04e55905 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,3 +1 @@
-DIST PyGithub-1.25.0.tar.gz 2514171 SHA256 bea24a94b8450161efb258257342617617e5582b70419224ee0e436c6a410110 SHA512 02245bf3f75a6144d1632f1eb27b13e719042ed66eaf8540a966b75ec880322a062490d6c3cd0e65599af613add59862201964955f2ff0e3fee75ea46f1f35b1 WHIRLPOOL 5ed09fa21d633e4ca07c5c71870948c1ab90fccfb2caf73178af183b81cfcc45ca95ae4050e3c9ea39fffc9efbca559042d730a8ac2348952cfa49ea5bbcb9e6
-DIST PyGithub-1.25.1.tar.gz 2514716 SHA256 6c39a6077e08f2f266039c5184911fc30c7b90a42f875fe98d7cef52a7aa8afa SHA512 5e17de013465ec2452d0c3018d83c000e3cd90d3a9a0590e409769438321035140fccc2aa10468a116573b374552232dac69b96189ae3627f2399289fba77287 WHIRLPOOL a8aef2edad109edbe8b0ab3272ad39f235b90f425b18ec7ac5e822a9d05838f6514320e2fdc46195cf4a5dbb0141b044e0fc2a2ebbd5aa03ae87c68edcbbbbdd
 DIST PyGithub-1.25.2.tar.gz 2624603 SHA256 3afce80516998ce4478424797f341d961d1c251958859c70b8d3986d00faafd7 SHA512 24b8370552889e748de1f51e6d5a14f11e2f77a9b1f920743f90ffbadc849cb887bf6d84c1c251b7a86ee454d919004255fc3046b199792cd078ce49d892cec0 WHIRLPOOL 56d7989c63f0b0943da3c88e38ec266277659f124566ab20c9a9f30ceec74c792d4f13cc201d7b7851ac3074c05f5608280674803597652913f0a1b71f430505
diff --git a/dev-python/PyGithub/PyGithub-1.25.0.ebuild b/dev-python/PyGithub/PyGithub-1.25.0.ebuild
deleted file mode 100644
index c09c5b9eaf62..000000000000
--- a/dev-python/PyGithub/PyGithub-1.25.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/jacquev6/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/PyGithub/PyGithub-1.25.1.ebuild b/dev-python/PyGithub/PyGithub-1.25.1.ebuild
deleted file mode 100644
index d292169d4fc9..000000000000
--- a/dev-python/PyGithub/PyGithub-1.25.1.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=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/jacquev6/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index 1d7cc79c3995..ebcc3c2aac2e 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -3,3 +3,4 @@ DIST aniso8601-0.83.tar.gz 58487 SHA256 1153cfe2599da556c6ce664b12c0e39659340cc6
 DIST aniso8601-0.90.tar.gz 64577 SHA256 2c0ec72a4185c2dd05eac0b2faa8d47a0477a17ca0784e1a547e544777116226 SHA512 b238461b5fa10236a9f6e9af5befff88b263fea872655dfb479b00045f4da07b7ec6ead9822f49b19ea0bc105d33db76a99efb4dec04fe85761bb0dcdc2a7d44 WHIRLPOOL 6c6df3d4cb1a2484050ff29113ad7f5a45c5dc2efd49aed50cb2286541c3cf562cee777fca3845108f7dd19f3281f720b32a7bafe337f01b13dc59978f0b768c
 DIST aniso8601-0.92.tar.gz 17810 SHA256 60860b5a13bf3c60ab5bc849ac5c55a1cb4113434eff032281ceb47578cc9da9 SHA512 4c962d42d4a09cb7b2625338489a76dd998201e9f12c86b81ca166113741837941a3b0287dbb13fb3bb42ef95a86c0f28816553556d283b85114b1ce705059d5 WHIRLPOOL 0d39a2309e4687ce1699db2a23bfd3a35ae15e65c056c3823dd77d74f6e863b0c2243bb2284fdb0c2f9d56e30f1e50110c857fcf5183967509efb0091f9458bc
 DIST aniso8601-1.0.0.tar.gz 44260 SHA256 f0bf0108bb24f7c7cb0b0408721a52bee9ac2fd838082c135cd8da87f4d951f4 SHA512 d1275420ece5323c176dd7a21767cb3c4126dcd94a8aa7f4334f1ba8223aecd9a7510cf5edd62990bd8dae505a3fa4fd2eb18178cfafbf28fae9dd857cc2cee3 WHIRLPOOL b4b13f2d05f24a6172619ecc197a820bc72e699b7e6ca93c789fd1b15db4696b5afb47d796fa496e8db482e19db392ffc321812ccc06129078c6628fc158cdac
+DIST aniso8601-1.1.0.tar.gz 49417 SHA256 4fc462db59811f541bc25d865b86367153d8ce773ae75b16d54e2e1cd393b5cc SHA512 c8e634ae00bb1eb465c48f1f5a4df2aef48ba8a868abbd0bd158c435646a43b681908a25361c9f916333b9e92ab321389b1b2be89320f37b8ce3c7238d86b1c8 WHIRLPOOL 0b455b0fb92abe13f5aa2bb1aaba3e87a4e529cf54360d2759ccab5eb65d88e04d92261c7786c2ca2de40cd18e4913af7aab29551e1156e640651137db2e2243
diff --git a/dev-python/aniso8601/aniso8601-1.1.0.ebuild b/dev-python/aniso8601/aniso8601-1.1.0.ebuild
new file mode 100644
index 000000000000..ea7701711b67
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-1.1.0.ebuild
@@ -0,0 +1,22 @@
+# 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="A library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/aplpy/Manifest b/dev-python/aplpy/Manifest
index f6a8ac76b340..75d52df94ba1 100644
--- a/dev-python/aplpy/Manifest
+++ b/dev-python/aplpy/Manifest
@@ -1 +1,2 @@
 DIST APLpy-0.9.14.tar.gz 1095547 SHA256 0313a91523b6a32a40e5b97da55243d5e59722cd8fa2e6642915edd26d464d69 SHA512 9cf12aa30d3c4540c2cc33907be3a12e78247a8880720e4de7e513842ef437f616b2c63a345a63e7a7081676aff56032840dc1528ed10438f7729cf2acb9da9f WHIRLPOOL 55c25aa11065b741e89b1538d96e57974bcb6b80f5708e5ee5f975742f7e04cbfe6df3da7b030c67a54bbcc929eaec46e2d2e34551d8f9e7365e2f2c4d5b3a0d
+DIST APLpy-1.0.tar.gz 1169280 SHA256 09a8a24b46b93a1eacdbc0e6fd480fa38e4dd890a24963136d76185924602ff0 SHA512 658b626c2a94c73cc8ba45fde86409659555ed3ec065d07313f08b67c0bcdc596c8dc94562c924de2f3f32d6884051e6756e22384d9594c4538578b482fa7590 WHIRLPOOL 0c884cecbbc9a7cd4ca4ba48cee4e03f039fa2edf4aa5aa4ac945b58c889084acb762f9cff2014911b383b0b14ebd2e51d2ce28b01b87eb0053ba06c3cc6c5c3
diff --git a/dev-python/aplpy/aplpy-1.0.ebuild b/dev-python/aplpy/aplpy-1.0.ebuild
new file mode 100644
index 000000000000..5d0cd8a3f517
--- /dev/null
+++ b/dev-python/aplpy/aplpy-1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+MYPN=APLpy
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Astronomical Plotting Library in Python"
+HOMEPAGE="https://aplpy.github.com/"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pyavm[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0-mark-known-failures.patch"
+	"${FILESDIR}/${PN}-1.0-fix-dependencies.patch"
+)
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile --use-system-libraries
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}" || die
+	virtx "${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)" \
+		|| die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch b/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch
new file mode 100644
index 000000000000..b5708c8971bc
--- /dev/null
+++ b/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Change requires to install_requires
+--- a/setup.py
++++ b/setup.py
+@@ -94,8 +94,7 @@
+       version=VERSION,
+       description=DESCRIPTION,
+       scripts=scripts,
+-      requires=['astropy', 'numpy', 'matplotlib'],
+-      install_requires=['astropy'],
++      install_requires=['astropy', 'numpy', 'matplotlib'],
+       provides=[PACKAGENAME],
+       author=AUTHOR,
+       author_email=AUTHOR_EMAIL,
diff --git a/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch b/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch
new file mode 100644
index 000000000000..cf1aa92190d4
--- /dev/null
+++ b/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch
@@ -0,0 +1,121 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Mark tests that are known to fail with matplotlib-1.5
+--- a/aplpy/tests/test_images.py
++++ b/aplpy/tests/test_images.py
+@@ -61,6 +61,8 @@
+ 
+ class TestBasic(BaseImageTests):
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for showing grayscale
+     def test_basic_image(self, generate):
+         f = FITSFigure(self.filename_2)
+@@ -68,6 +70,8 @@
+         self.generate_or_test(generate, f, 'basic_image.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_ticks_labels_options(self, generate):
+         f = FITSFigure(self.filename_2)
+         f.ticks.set_color('black')
+@@ -84,6 +88,8 @@
+         self.generate_or_test(generate, f, 'tick_labels_options.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for showing colorscale
+     def test_show_colorbar_scalebar_beam(self, generate):
+         f = FITSFigure(self.filename_1)
+@@ -96,6 +102,8 @@
+         self.generate_or_test(generate, f, 'colorbar_scalebar_beam.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for overlaying shapes
+     def test_overlay_shapes(self, generate):
+         f = FITSFigure(self.filename_1)
+@@ -112,6 +120,8 @@
+         self.generate_or_test(generate, f, 'overlay_shapes.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for grid
+     def test_grid(self, generate):
+         f = FITSFigure(self.filename_1)
+@@ -125,6 +135,8 @@
+         self.generate_or_test(generate, f, 'grid.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test recenter
+     def test_recenter(self, generate):
+         f = FITSFigure(self.filename_2)
+@@ -135,6 +147,8 @@
+         self.generate_or_test(generate, f, 'recenter.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test overlaying contours
+     def test_contours(self, generate):
+         data = np.arange(256).reshape((16, 16))
+@@ -144,6 +158,8 @@
+         self.generate_or_test(generate, f, 'contours.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test cube slice
+     def test_cube_slice(self, generate):
+         f = FITSFigure(self.filename_3, dimensions=[2, 0], slices=[10])
+--- a/aplpy/tests/test_rgb.py
++++ b/aplpy/tests/test_rgb.py
+@@ -6,6 +6,7 @@
+ 
+ import numpy as np
+ from astropy.io import fits
++from astropy.tests.helper import pytest
+ 
+ from .. import FITSFigure
+ from ..rgb import make_rgb_image
+@@ -17,6 +18,8 @@
+ 
+ class TestRGB(BaseImageTests):
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_rgb(self, generate, tmpdir):
+ 
+         # Regression test to check that RGB recenter works properly
+--- a/aplpy/tests/test_vectors.py
++++ b/aplpy/tests/test_vectors.py
+@@ -1,4 +1,5 @@
+ import numpy as np
++from astropy.tests.helper import pytest
+ 
+ from ..core import FITSFigure
+ 
+@@ -15,6 +16,8 @@
+ 
+ class TestVectors(BaseImageTests):
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_default(self, generate):
+         f = FITSFigure(IMAGE, figsize=(4,4))
+         f.show_grayscale()
+@@ -22,6 +25,8 @@
+         self.generate_or_test(generate, f, 'vectors_default.png', tolerance=2.5)
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_step_scale(self, generate):
+         f = FITSFigure(IMAGE, figsize=(4,4))
+         f.show_grayscale()
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index bcfa66aeae56..c39b11dcb542 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1,4 @@
 DIST argcomplete-0.8.1.tar.gz 30272 SHA256 12e36f784160547ca855a2c9d753cf60cd3f87cab72b1e4993ceffb6ba51443b SHA512 faf37f5a5c3f619066503b6fb53570e8c084d2f28895da6bfe38db58b06447dd3aee00d6073a33000486ba9c3c12b784276a57c625ed02f4bfcc78319bee0ea4 WHIRLPOOL 7c55337ca8bafb2779ee4e5cd3c42b0df0e3953bef548ceed516bc65c64870ea62c29914b9ad140dbab446bcec286e611ea82356b0a9c0e6c92a020986f4b161
 DIST argcomplete-0.8.9.tar.gz 30575 SHA256 98f04fa2ca22479459d8ba04583dca653a41c2d7a57648ba7f3b4d7e19ea82be SHA512 21b7d267f2d5a43a299841ca05b3b4dc38587e9ac90db8634d8e13d089e58483b88506376eff16d8ea2d03a169e118a5be32549b74c5168a337e6a6d22a01f7f WHIRLPOOL 336d7096a0dbfd3fa2beeacee6189fe375586ddec7dfe5277687149701bb52befcc83234de6ea59c06f662c20e44de00420b51fc640517055d5505374f0fcd26
 DIST argcomplete-0.9.0.tar.gz 35214 SHA256 f97577332d19aea09583ecb426a49e85dc7bbc9822ab345b9c790d923413af0e SHA512 e127a8d2e7914f2601d649963115595db40ed612d352c134c5b68acdcbcd52477728e6e1edddd405562b28329f960d87d1418fa8fe3b3f1dcb9c3ad10c42a65d WHIRLPOOL 03c5f4eac0aeac9887d8ba1d21b585854b91c7399c95260ecf58f92d709b9194f801b730ab26435e329e003f8041c96d11410983a83c21f262cd2ad68a32a100
+DIST argcomplete-1.0.0.tar.gz 35480 SHA256 2cba862e5ce5b0057a33169484544c38bfdc17a1dd865c197adb7ce07800e36e SHA512 9f974833d4e699d87e575a51c024ae7782f51f6e085be291bbac645b6e72873597be6da3c75b0461a8ef5a33311ce3d1fcb6e58f999ad043099331e269f5e9a6 WHIRLPOOL 52ce076077cb4dca8777e55a265351e817b9369af66635dd89b9b2dd3c6ef27e8329864f6024be70d786c42139ccd784d1e3535700a4bea304b2ce8611f1c407
diff --git a/dev-python/argcomplete/argcomplete-1.0.0.ebuild b/dev-python/argcomplete/argcomplete-1.0.0.ebuild
new file mode 100644
index 000000000000..153dded379f6
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.0.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
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# purge test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} test/test.py || die
+}
+
+python_install_all() {
+	sed \
+		-e "/complete /d" \
+		-i argcomplete/bash_completion.d/python-argcomplete.sh || die
+
+	distutils-r1_python_install_all
+	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
+}
diff --git a/dev-python/asset/Manifest b/dev-python/asset/Manifest
index daad6ed0cec7..49fe7e2aa42d 100644
--- a/dev-python/asset/Manifest
+++ b/dev-python/asset/Manifest
@@ -1,4 +1,5 @@
 DIST asset-0.6.1.tar.gz 20613 SHA256 071fcbf93b03d791b4e301c1459dc6bd1779407f9c0326fa136f03449c4bb4c4 SHA512 6fa20888220e83a0a122b8ab63e531551724c64476c3fce8f47f784731710fa3328fa4ac3855bde5fb4caed47274f0492e14df438cf7857c0e5437f33217b672 WHIRLPOOL ca266bb9969e7b4f1b8a7940928ac3dac169374b5c7e44af091f112dcee975ed8d699bcf864645c2122ca3b503e54357a25884d7d2f97c32ae6ad67d67354fc9
+DIST asset-0.6.10.tar.gz 27844 SHA256 0fe8b24f095c7bc6700e94df99eef91ab7135ce665056b45f8e17316d2019142 SHA512 61018e86f8b75a9567ab6c3007c4753c52444e73307b92d51a37cd3841ac3d06c76d41326008f19c7f7911338eebd56f2dff637e0e1b44347cf66dee3470173f WHIRLPOOL d0f579d11b800c618e87bb099ae4a6de475d202f97321293e93f1796eee11b913fe6f0c03b257584b522e111faee0628f87bde215c0522c9e5d2c8ee8bd52b80
 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
 DIST asset-0.6.4.tar.gz 23956 SHA256 54bdeb133100335f169cd6a586ccfa7619673cb6015e32d9a882e4d778d1225e SHA512 14992a6db2a4ec2bcf2c6624998e1cbed4c956cd5a97092e8453236c0ea15d071d8d1e7098933f7d15467269047fdad88f4c4970fac27691b195147147c9d643 WHIRLPOOL 6e454cf38748b8c92af1670478504cac468d4f462ae71ae29718b68706a7eafb37fddabb47435f1099dce1d41d17a82b8987e6c4835c6283b8295e6aacd2e356
diff --git a/dev-python/asset/asset-0.6.10.ebuild b/dev-python/asset/asset-0.6.10.ebuild
new file mode 100644
index 000000000000..ebc0aa4839b7
--- /dev/null
+++ b/dev-python/asset/asset-0.6.10.ebuild
@@ -0,0 +1,33 @@
+# 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/aadict-0.2.2[${PYTHON_USEDEP}]
+	>=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/astropy-helpers/Manifest b/dev-python/astropy-helpers/Manifest
index 22741646926f..388867c4abf2 100644
--- a/dev-python/astropy-helpers/Manifest
+++ b/dev-python/astropy-helpers/Manifest
@@ -1,4 +1,2 @@
-DIST astropy-helpers-0.4.1.tar.gz 98477 SHA256 0b4e47e535e7226d8795efb9e9453cac9343759058970a20734e66f443074577 SHA512 85975268372624bec4024dfbe560ef820bda308db898919c4d29643f10df11636f4996a8ff3f2fb7deece44f88963ddb0c8ca231e030713cf17db7503ceae42e WHIRLPOOL b37fa02ebe3e750052a9681e1e8a3a0aa9eede1909e69c70e2004ba738139707e1a0c21797681454ee782a6543bc8808b8de574d60aba601d228966c8659bb9f
-DIST astropy-helpers-1.0.3.tar.gz 127177 SHA256 0733f3081db46ec02faa08595dad9a72d79d0ed73e54fe3404620703d737594d SHA512 74d4f191290914cf51f91b9cc1a9ed168799a47f586c33505a4ebdef554b7e4cdc90625fbd9b8c9e29b44fc2a988fdf0f50446ce9461017a9755c7ec2a2b1ed4 WHIRLPOOL 43a00a990b3caabeeecefac90bbb91e2b42a7f184c66887855ea188b123f0b74125fb9b694e7d503e78dbed720769329b95aaddd17c16d65807113ec7253b448
-DIST astropy-helpers-1.0.5.tar.gz 127951 SHA256 b872547580861564023f31a201dcb63d5e9f134f47f4224eb3904a6341b42507 SHA512 31e0c858f126d1e02167faaed2395529ade4e484d0c9c53f809d15de2fda68a4ce9dcd36951546c071d3556feb6f64ca4b0ed5678405af57cb80f3e0cf8de13d WHIRLPOOL 1481eff853e04c94dd95f689c148a68f83cc18d7026f766d2af7d6c4ffc5c0f9eca107c3403b9295f245aed3dea562377ba59cf2bbb303d4653fb4712f6a037c
 DIST astropy-helpers-1.0.6.tar.gz 126274 SHA256 3651a854fafd0184252639775aab9776331f8ae1bbadd920169d6dc1914095e3 SHA512 c3fa2e329094c5e319b493d2c8889b1158dfdcb8845dc978274a4333167b5069228d9c9ac585e0759b1002776d4597b2a23cf5d276d9c971122919afddb8f277 WHIRLPOOL 83467c958a762fb3b045b6e8e168572012ef308b6aaac7f92c5992e5207cd26efb6cbb5ce617e5701ab2c8d23f169af939052dc2bd50195b9163f3a8db5d6b3f
+DIST astropy-helpers-1.1.1.tar.gz 132083 SHA256 2da74e8e6b08f3c378fc5f863460bc5c45f4f08e47ed2887cff0a26692aadd4b SHA512 432580de37583b6195b6827dae46516553ceba71bfc038bb609bd59f158f3eb082925dc03f7d9b8ef10d9da68e0d40ee0fa0dc915d72ee0391d58d851a7114bf WHIRLPOOL a64b950acb452307e2f43206c2ff6d102856c0c60a7d4058a59ab8c82338692fee4e432d7dea78b865dea2401536a101713615079c3a1eafbfb4b8c034f57047
diff --git a/dev-python/astropy-helpers/astropy-helpers-0.4.1.ebuild b/dev-python/astropy-helpers/astropy-helpers-0.4.1.ebuild
deleted file mode 100644
index 509beacbedfa..000000000000
--- a/dev-python/astropy-helpers/astropy-helpers-0.4.1.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
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers for Astropy and Affiliated packages"
-HOMEPAGE="https://github.com/astropy/astropy-helpers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-python_prepare_all() {
-	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.0.3.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.0.3.ebuild
deleted file mode 100644
index 509beacbedfa..000000000000
--- a/dev-python/astropy-helpers/astropy-helpers-1.0.3.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
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers for Astropy and Affiliated packages"
-HOMEPAGE="https://github.com/astropy/astropy-helpers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-python_prepare_all() {
-	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.0.5.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.0.5.ebuild
deleted file mode 100644
index ef256068ccaa..000000000000
--- a/dev-python/astropy-helpers/astropy-helpers-1.0.5.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers for Astropy and Affiliated packages"
-HOMEPAGE="https://github.com/astropy/astropy-helpers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-python_prepare_all() {
-	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.1.1.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.1.1.ebuild
new file mode 100644
index 000000000000..fd6805588b1a
--- /dev/null
+++ b/dev-python/astropy-helpers/astropy-helpers-1.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers for Astropy and Affiliated packages"
+HOMEPAGE="https://github.com/astropy/astropy-helpers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+python_prepare_all() {
+	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index 461d0b29b06c..f32eecc24a33 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1,2 +1,2 @@
-DIST astropy-1.0.4.tar.gz 7693852 SHA256 c64be72f3246ef699d2e0627a757afc0d59701fc9533088a8be0de23e16595a9 SHA512 5f66f61c93ad88afd2f24fedf96d553688de3c9f2a926dca9b1037ff24b4fd83bd486b870a0abf3c9810ad4e3e902c64f8dfb7f023363d0677e233a21667dfcc WHIRLPOOL ab10edec3650cc39d82e0f023ab107e5b23e75a03cbf8e24b0e902f3700c78921f86983f89ff533c56d9f4bc3b9d0109d8ee57cd6450ab239845b8a403bc5c26
 DIST astropy-1.0.6.tar.gz 7632331 SHA256 1a0190ad420323b9bd8f7b29995a39580d7d59c5329c825bb5abb52e2f7b936d SHA512 84e02204bc55d3bd6e0e891dc56ab218d1deb65882d5d771b3f80c2a11790f77c103b0c0d5537f1842d98f0d3ded19039c82482c15147edadac89e9707537b40 WHIRLPOOL b20e5c2e3677485eaf22c71c7e3461443d4a92bf7b0e649f5e0153e0b1d46741958e983b743aa30bf07ad971a0c865e53211963653ddf814a5d4362f36f07b02
+DIST astropy-1.1.1.tar.gz 8157305 SHA256 4d2e7a8bd5191a66d7e1a52beefb4a0b6f496a1e9e8212422613219cb514769f SHA512 bc3c370da32d5f0098dbfc2808dba9d4d4424d3dcfba4d7ffd84b39569387b79ad93086e10678c259237f9cfe1229725501d0dc4eba51c9d01a4cd8a72024fb4 WHIRLPOOL 5b40955f56e6f080ad93b224eabd345565ef9f5e7f5ccb00e2737bd714117bc9b35922a044fe4ccaddb9d30fa72e13dd560577392120bfbd0a9d10c8aaa5aa01
diff --git a/dev-python/astropy/astropy-1.0.4.ebuild b/dev-python/astropy/astropy-1.0.4.ebuild
deleted file mode 100644
index a9ca39d03ede..000000000000
--- a/dev-python/astropy/astropy-1.0.4.ebuild
+++ /dev/null
@@ -1,84 +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="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-libs/expat-2.1.0:0=
-	dev-python/configobj[${PYTHON_USEDEP}]
-	<dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.2:0=
-	>=sci-astronomy/wcslib-4.25:0=
-	>=sci-libs/cfitsio-3.350:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable_helper.patch"
-	"${FILESDIR}/${P}-system-six.patch"
-	"${FILESDIR}/${P}-system-pytest.patch"
-	"${FILESDIR}/${P}-system-configobj.patch"
-	)
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	rm -r ${PN}_helpers || die
-	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-
-	echo "[build]" >> setup.cfg
-	echo "use_system_libraries=1" >> setup.cfg
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_export_best
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-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/astropy/astropy-1.1.1.ebuild b/dev-python/astropy/astropy-1.1.1.ebuild
new file mode 100644
index 000000000000..656fb4aaa6a9
--- /dev/null
+++ b/dev-python/astropy/astropy-1.1.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://astropy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-libs/expat-2.1.0:0=
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-astronomy/erfa-1.2:0=
+	>=sci-astronomy/wcslib-5:0=
+	>=sci-libs/cfitsio-3.360:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	>=dev-python/astropy-helpers-1.1[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		media-gfx/graphviz
+	)
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.4-system-six.patch"
+	"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
+	"${FILESDIR}/${PN}-1.1.1-fix-wcs.patch"
+	"${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
+)
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	export mydistutilsargs="--offline"
+	export ASTROPY_USE_SYSTEM_PYTEST=True
+	rm -r ${PN}_helpers || die
+	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
+	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	cat >> setup.cfg <<-EOF
+	[build]
+	use_system_libraries=1
+	EOF
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup "python2*"
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
+	fi
+}
+
+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/astropy/files/astropy-1.1.1-fix-wcs.patch b/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch
new file mode 100644
index 000000000000..efb12737c19b
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch
@@ -0,0 +1,15 @@
+Author: Kacper Kowalik <xarthisius.kk@gmail.com>
+Description: Copy keys to a list, since orignal map is modified
+Url: https://github.com/astropy/astropy/issues/4477
+Bug:  https://github.com/astropy/astropy/issues/4460
+--- a/astropy/wcs/wcs.py
++++ b/astropy/wcs/wcs.py
+@@ -988,7 +988,7 @@
+         """
+         # Never pass SIP coefficients to wcslib
+         # CTYPE must be passed with -SIP to wcslib
+-        for key in (m.group() for m in map(SIP_KW.match, header.keys())
++        for key in (m.group() for m in map(SIP_KW.match, list(header))
+                     if m is not None):
+             del header[key]
+ 
diff --git a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch b/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
new file mode 100644
index 000000000000..2e2c82af5416
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
@@ -0,0 +1,99 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Mark all known test failures as xfail.
+ These failures have been discussed with upstream.
+--- a/astropy/io/fits/tests/test_connect.py
++++ b/astropy/io/fits/tests/test_connect.py
+@@ -136,6 +136,8 @@
+         # while reading is to check whether col.null is present. For float columns, col.null
+         # is not initialized
+ 
++# see https://github.com/astropy/astropy/issues/3415
++    @pytest.mark.xfail()
+     def test_read_from_fileobj(self, tmpdir):
+         filename = str(tmpdir.join('test_read_from_fileobj.fits'))
+         hdu = BinTableHDU(self.data)
+@@ -172,6 +174,8 @@
+     def setup_method(self, method):
+         warnings.filterwarnings('always')
+ 
++# see https://github.com/astropy/astropy/issues/3415
++    @pytest.mark.xfail()
+     def test_read(self, tmpdir):
+         filename = str(tmpdir.join('test_read.fits'))
+         self.hdus.writeto(filename)
+@@ -189,6 +193,8 @@
+             Table.read(filename, hdu=0)
+         assert exc.value.args[0] == 'No table found in hdu=0'
+ 
++# see https://github.com/astropy/astropy/issues/3415
++    @pytest.mark.xfail()
+     @pytest.mark.parametrize('hdu', [1, 'first'])
+     def test_read_with_hdu_1(self, tmpdir, hdu):
+         filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
+--- a/astropy/wcs/wcs.py
++++ b/astropy/wcs/wcs.py
+@@ -84,6 +84,8 @@
+ if six.PY3 or platform.system() == 'Windows':
+     __doctest_skip__ = ['WCS.all_world2pix']
+ 
++# see https://github.com/astropy/astropy/issues/3380
++__doctest_skip__ = ['WCS.all_world2pix']
+ 
+ if _wcs is not None:
+     WCSBase = _wcs._Wcs
+--- a/astropy/tests/tests/test_socketblocker.py
++++ b/astropy/tests/tests/test_socketblocker.py
+@@ -66,8 +66,8 @@
+ def _square(x):
+     return x ** 2
+ 
+-
+-@pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
++# see https://github.com/astropy/astropy/issues/4193
++@pytest.mark.skipif(True, reason="Blocks on Debian CI test")
+ def test_multiprocessing_forkserver():
+     """
+     Test that using multiprocessing with forkserver works.  Perhaps
+--- a/astropy/coordinates/tests/test_api_ape5.py
++++ b/astropy/coordinates/tests/test_api_ape5.py
+@@ -319,7 +319,8 @@
+     # coordinate object, and one that returns a cartesian matrix but does *not*
+     # require `newobj` or `fk5frame` - this allows optimization of the transform.
+ 
+-
++# Temporary mark until scipy/numpy is fully on 3.5
++@pytest.mark.xfail()
+ def test_highlevel_api():
+     J2001 = time.Time('J2001', scale='utc')
+ 
+--- a/astropy/visualization/tests/test_histogram.py
++++ b/astropy/visualization/tests/test_histogram.py
+@@ -50,6 +50,8 @@
+     assert patches2[0].axes is ax[1]
+ 
+ 
++# see https://github.com/astropy/astropy/issues/4329
++@pytest.mark.xfail()
+ @pytest.mark.skipif('not HAS_PLT')
+ def test_hist_autobin(rseed=0):
+     rng = np.random.RandomState(rseed)
+--- a/astropy/table/tests/test_info.py
++++ b/astropy/table/tests/test_info.py
+@@ -6,6 +6,7 @@
+ import warnings
+ import numpy as np
+ 
++from ...tests.helper import pytest
+ from ...extern import six
+ from ... import units as u
+ from ... import time
+@@ -225,7 +226,8 @@
+         t.info(out=out)
+         assert out.getvalue().splitlines() == exp
+ 
+-
++# see https://github.com/astropy/astropy/issues/4336
++@pytest.mark.xfail()
+ def test_ignore_warnings():
+     t = table.Table([[np.nan, np.nan]])
+     with warnings.catch_warnings(record=True) as warns:
diff --git a/dev-python/astropy/files/astropy-9999-system-pytest.patch b/dev-python/astropy/files/astropy-9999-system-pytest.patch
deleted file mode 100644
index 19b321d2a019..000000000000
--- a/dev-python/astropy/files/astropy-9999-system-pytest.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- astropy/tests/helper.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
-index 97d2617..a75db15 100644
---- a/astropy/tests/helper.py
-+++ b/astropy/tests/helper.py
-@@ -42,7 +42,7 @@ __all__ = ['raises', 'enable_deprecations_as_exceptions', 'remote_data',
-            'pickle_protocol', 'generic_recursive_equality_test']
- 
- 
--if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
-+if True or os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
-     import pytest
- 
- else:
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
new file mode 100644
index 000000000000..c6b6afaee07f
--- /dev/null
+++ b/dev-python/atomicwrites/Manifest
@@ -0,0 +1 @@
+DIST atomicwrites-0.1.8.tar.gz 14440 SHA256 3274adb52bd3ae91d87ba923e0f21fd86c05b71bbaefe2ec0d6679c01f98dc8e SHA512 51c03f875adec409663badb94e3214858e6cd190aa07b8ffb4c35be1f3acaa8b5a341f62b45f814308dbfbd391fd32df24618df70c36f27737853852963af25a WHIRLPOOL 036304b72b6b7d45bf109f6c46a2eb4249c25cbd4aabeda93fc1c4761b13acf7a00c7b4be57990f5d9167a6851cde4bc5c98b4249411e4e361f1ea653b0aed16
diff --git a/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild b/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild
new file mode 100644
index 000000000000..49c982fad290
--- /dev/null
+++ b/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 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="Atomic file writes."
+HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/atomicwrites/metadata.xml b/dev-python/atomicwrites/metadata.xml
new file mode 100644
index 000000000000..9733c2c2dc5d
--- /dev/null
+++ b/dev-python/atomicwrites/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
new file mode 100644
index 000000000000..15ff29ae40a0
--- /dev/null
+++ b/dev-python/attrs/Manifest
@@ -0,0 +1 @@
+DIST attrs-15.2.0.tar.gz 36766 SHA256 9f895d2ecefa0be054e29375769f1d0ee88e93ce820088cf5c49390529bf7ee7 SHA512 f34f70acbd01dc94c6f994ce7c764e169e26f5d71454522f4f88859b67309556e88e20504e2a6a63590e4ad8e55f04ba7cc9a90c024364c1bf932bfadd5a4491 WHIRLPOOL b2eb25ff59faae2d71965f9a8292372be6a02db42333bb8b0d04b9a6eae2924b2f363e4b486db8864ad0a9031968ada8edb3e1f3b8bbf8c2ca5be2c2b0972834
diff --git a/dev-python/attrs/attrs-15.2.0.ebuild b/dev-python/attrs/attrs-15.2.0.ebuild
new file mode 100644
index 000000000000..8a9201a840b7
--- /dev/null
+++ b/dev-python/attrs/attrs-15.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	http://pypi.python.org/pypi/attrs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/attrs/metadata.xml b/dev-python/attrs/metadata.xml
new file mode 100644
index 000000000000..bb6f59e10a0f
--- /dev/null
+++ b/dev-python/attrs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">attrs</remote-id>
+    <maintainer status="unknown">
+      <email>hs@ox.cx</email>
+      <name>Hynek Schlawack</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index e6a9769ed0a4..7c1f30f70c6e 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,3 +1,4 @@
 DIST autobahn-0.10.4.tar.gz 148147 SHA256 3dd7a7793cead942cb0c06bef5a9f69e64edc174e47fb822702eafd41085933d SHA512 1eb43df9b0c986f1788c6463875765266cfc562155399c326b4e9bf447119fbfc967dcc53f8f8844700d21ebf37df6c596ead8c105918af5c6a8ec09585ce797 WHIRLPOOL b5be6d7f6348dc627fcbd2c60699cbd60e3e14e6494f787275d3890c30bca5804783b7a010faab5d19d19097ac90ddfdfdb1a3aaf6d37e4daef943916bf5422f
 DIST autobahn-0.11.0.tar.gz 149680 SHA256 e7aea216e2a3bb41a4fec235399ece8bfbc0be4ef9567e1ed6927db7fa35f851 SHA512 9f53e2ef7637ddf9aec263fa2db8977c5b7a0d8a1bea6b21c030660d5d17e343cab5f84ebda8b0f97d55e1e4a77a0313805294a3a1487fce004c10a4cddfdc86 WHIRLPOOL f5ade4fc98a14585a8ee9a3e4141a6739668d402ff8c4fd42854062c01de33492093752e08a000f708bef232ce30039b51e0c53553f779da898ef526c861315f
+DIST autobahn-0.12.1.tar.gz 163311 SHA256 664223879e159c88221f42d8d1ac6b8c4268d8b9316d8ab69a02761c5744cd79 SHA512 2d944ce6849017f75542b5f33cd2c4a7321c5a70ce01b24480fb17aa34c3a7dec826073261af1133e1611233dbe958e5c7d2a10b1586f6b7e5b32ce4f4e7db06 WHIRLPOOL 2d1d78ae0f468e80a7ffe44dc8f1891082adb97319d3cedad575f74ebafa3318a1b0ed1f9cd4187dc097d9a8c2cf2b0ca761c39511a6bbd490e8d30bcbb7d933
 DIST autobahn-0.9.4-2.zip 175894 SHA256 5bb64191cfdd1cbdd90d8e359b389ef62c0acdffd2f68d16ec01fa0a287262f0 SHA512 7e0d4246b8b1c552b25c2ae36f1923ed9931e3d3ca684039a422773fecd92ca04734a0b24394a9bbc787f245c72b5552522351a7c1c8e500128e7c46c740a3d5 WHIRLPOOL aa0f06b82acbebb97ca2e3c424429ada7169dca5b39237ce082a17440ec9701a307e9fc7f162f957023cfc4c067f8e8b82b9923cb056ffcab7b3e64a61a4aae8
diff --git a/dev-python/autobahn/autobahn-0.12.1.ebuild b/dev-python/autobahn/autobahn-0.12.1.ebuild
new file mode 100644
index 000000000000..4df31003b5e1
--- /dev/null
+++ b/dev-python/autobahn/autobahn-0.12.1.ebuild
@@ -0,0 +1,48 @@
+# 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} )
+
+RESTRICT="test"
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep 'virtual/python-asyncio[${PYTHON_USEDEP}]' 'python3*')
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/trollius-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-11.1[$(python_gen_usedep 'python2*')]
+	>=dev-python/txaio-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/ujson-1.33[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/axiom/Manifest b/dev-python/axiom/Manifest
index 7845fd94a814..fa943d4505ae 100644
--- a/dev-python/axiom/Manifest
+++ b/dev-python/axiom/Manifest
@@ -1,3 +1,4 @@
 DIST Axiom-0.6.0.tar.gz 197148 SHA256 0c3e5586c91df966f2c1b2031db870ee6b73bdd0517f9a7dab764ef0943e548c SHA512 493aa981d6bfa4ee12cd57fe6272bb00b123f6eed9d6a07923e5f391fd7d5fc4cc1c1025fe6eaf67d1e0da75e8293695abd2e4e9895ef06f02eff6517357a0d6 WHIRLPOOL d2c5c465ae80e0265c44c19b02b6cf7cca97f0f244f8271a296b3274ef87532ec2ea29aba8b5262a46ecf9813cee666280bc045af42f2687aba5a8472027242a
 DIST Axiom-0.7.2.tar.gz 201850 SHA256 a9e82a2288ac8b465bbeb2b97b567f5eea7d4856924c3e9bb74dcbad466e2ff6 SHA512 b8aba9b1b69141ad93759255f8eb169d815565d4b5b5f813b9afadb1158960ead859c896c2f26797fa1953c5cc35729dfbbb942077530402372030f85e85f3a5 WHIRLPOOL 9dd38b9f2d1f7fb3c245c6f829c6075ed09515dc9b5b88ba4ad881ad633a91ef24b021a2bbab198d77ed58f19a2ce9e89e5846b6865ede8adb7844cf3a18f1ed
 DIST Axiom-0.7.3.tar.gz 202110 SHA256 f6607717c0ac812eedcbca45927099cd998626bbd7fc6a9cb075295cdc6a403f SHA512 c7c87333bd421dd6f618f3a0bce2a7f27f50e6ceaba0eced811c0244d1e471e65582220c561aec78ca460065862a0fa283047f80d19a653664db55d7da464863 WHIRLPOOL ca41671bb025bc4b3a57a725e4561ea2c809467c3669b992cfa5ee91a14178e3b0d042cf51371ff6571991c50887ff40fd0ae07807acd56bb3325f4fc9161705
+DIST Axiom-0.7.5.tar.gz 203526 SHA256 82b227cb8ab270d8132416ddfe2c98c662cf548f3f741d73ac077c52aa08af8d SHA512 6a868fce245c64f791b8340e5f04a87e18ee1b528ff248b0b3f54f5ddf8a3b68903946dfa7291c4d902b76e7240abd864166463949cfd913a9d38b1439fa2f9f WHIRLPOOL 8f18bfee60e4446296cebe1c07e138b04a7570f031b59e4e2b903de03b9f73b23d17370fdf86003351c67ada9f8ff1cad4c30043885f89a49f08edc18cf85c4c
diff --git a/dev-python/axiom/axiom-0.7.5.ebuild b/dev-python/axiom/axiom-0.7.5.ebuild
new file mode 100644
index 000000000000..10cca0b2c6d1
--- /dev/null
+++ b/dev-python/axiom/axiom-0.7.5.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 )
+PYTHON_REQ_USE="sqlite"
+
+inherit twisted-r1
+
+DESCRIPTION="Object database implemented on top of SQLite"
+HOMEPAGE="http://divmod.org/trac/wiki/DivmodAxiom https://pypi.python.org/pypi/Axiom"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/epsilon-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.30-sqlite3_3.6.4.patch" )
+
+TWISTED_PLUGINS+=( axiom.plugins )
+
+python_install() {
+	distutils-r1_python_install
+
+	touch "${D}$(python_get_sitedir)"/axiom/plugins/dropin.cache || die
+}
diff --git a/dev-python/batinfo/Manifest b/dev-python/batinfo/Manifest
new file mode 100644
index 000000000000..9261aaa8a19a
--- /dev/null
+++ b/dev-python/batinfo/Manifest
@@ -0,0 +1 @@
+DIST batinfo-0.3.tar.gz 3951 SHA256 2991715439e7b48300eb539e2cf3faffe3c9d8a876197078c68616b97f9fdf3f SHA512 822e8e70f14a7f08713028ebc8b41aef6d9256984a6a381af11e5b36980a355636bc21d8b21753f4dabd20e38becf6152c623134a65109593ccba019afe3f3f3 WHIRLPOOL 85ce789aca7806ae07856b1e3a64afd07c2ab3a91627a7266ddfc1bde49068d62a1b970dd9dc329d6d696f923d3b019e83047329a0686ae8b26907b70d4b2883
diff --git a/dev-python/batinfo/batinfo-0.3.ebuild b/dev-python/batinfo/batinfo-0.3.ebuild
new file mode 100644
index 000000000000..0a6fd0666b54
--- /dev/null
+++ b/dev-python/batinfo/batinfo-0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python lib to retreive battery information"
+HOMEPAGE="https://github.com/nicolargo/batinfo http://pypi.python.org/pypi/batinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/batinfo/metadata.xml b/dev-python/batinfo/metadata.xml
new file mode 100644
index 000000000000..af930ad1e998
--- /dev/null
+++ b/dev-python/batinfo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">batinfo</remote-id>
+    <maintainer status="unknown">
+      <email>nicolas@nicolargo.com</email>
+      <name>Nicolas Hennion</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index afb230807a8d..7cb4060c11b8 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -1,2 +1,3 @@
 DIST Beaker-1.6.4.tar.gz 54480 SHA256 5b06dcc9f7b1921bc962235c4051aa5f3f5d3609f42faa6064dc614ace031a3a SHA512 5a6835d01d0b1bee57844525f1223d74edd26f07cc769df6a8cfa77f44dda4435eb96639175928a1caf7c4f927ac3a674c0fd0e7f50f1aea91da7880de3a6704 WHIRLPOOL 13162d6733b69966133c17171b6725e0a2e7c2f56942bbc591ff3992dee50d7a5e91cc11a6a4ae775a9ec3dab805c2ae352982f0b1670190325b11d06a2e52a9
+DIST Beaker-1.8.0.tar.gz 36436 SHA256 740165bb2d86b17460ea759ae075d82b52313860357393675d765bbf67b5c3fb SHA512 1344e7f5db15ac75640f284a2f915d5e34d52988684a25bdf4b2c29ccc963a85e369462a3da7171e4cac6d2209a561ad2b75153bd6dfba6da0d0889b642ab91a WHIRLPOOL 634c4493a6462dcb19566e4ac4b77261e1aaa9e1689d2b8a0519b93a2c4a81c76a173d1daa0f67f744eada4c73c3e35969dff432447c65af8a2f59d0184718e3
 DIST beaker-1.7.0.tar.gz 73768 SHA256 ee8492fb3e218855ec51751d58d95296d029489ea4ec64af0c2f3e57bd776be2 SHA512 3e6ca976974bcc43c9291fab40192f91b16d73d11417adb4dc98d0e289e2af8658dc49905a3ab0dc08abfa92c8e0f8b58ec23425e451ef22d1f573aa8ab0c992 WHIRLPOOL 20538e7a9463ba09707148273a372a02f6c121f7d3f9cf6b0c3df65b1dd140da7e7830adb8def88bbd14e041a2ba0fa2578f977422fc45421d37d8293faf8bef
diff --git a/dev-python/beaker/beaker-1.8.0.ebuild b/dev-python/beaker/beaker-1.8.0.ebuild
new file mode 100644
index 000000000000..6ff6c3c4ff5b
--- /dev/null
+++ b/dev-python/beaker/beaker-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+MY_PN="Beaker"
+
+DESCRIPTION="A Session and Caching library with WSGI Middleware"
+HOMEPAGE="https://github.com/bbangert/beaker https://pypi.python.org/pypi/Beaker"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# webtest-based tests are skipped when webtest is not installed
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+# Py2.7 fais some tests without this
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Workaround for http://bugs.python.org/issue11276.
+	sed -e "s/import anydbm/& as anydbm/;/import anydbm/a dbm = anydbm" \
+		-i beaker/container.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "beaker also has optional support for packages"
+	elog "pycrypto and pycryptopp"
+}
diff --git a/dev-python/biplist/Manifest b/dev-python/biplist/Manifest
index bc9379d77f2c..13c2e5b5e5b8 100644
--- a/dev-python/biplist/Manifest
+++ b/dev-python/biplist/Manifest
@@ -1,2 +1,3 @@
 DIST biplist-0.8.tar.gz 14306 SHA256 d8a9c6dff4d2a45fb3e9f27d19ea63da0a82ed59c758c34f6342badaccf6ea71 SHA512 7b2fe9b0c4080ae690f1d856a0fc7ca3bbabfed81aa4c06509d584041be4802e4e1b004bef83326f518baf1cbc147dc36b0c55e769a6b5c170fee278f7b1d9d8 WHIRLPOOL 024a283e536c6e56275d48232f3b7a134c15169ff853821e4050fb8bddc6381827e526ac107c352bb9d45bc8965b15cb0a9528580340f03efde416a70c0c8c5a
 DIST biplist-0.9.tar.gz 14591 SHA256 b57cadfd26e4754efdf89e9e37de87885f9b5c847b2615688ca04adfaf6ca604 SHA512 d0999f6f4d23a4f4e1eaabb831750cb8d51a452b7896ed85409bb8614ba3e89e1e558688de5f5259a86503a55886887c6364d37a886d2ad5699fd067f0be7230 WHIRLPOOL 5d7a757c151737939a1759817d396a200b52074dc317fc14bb751b54b74fd36fae1f4d01036f5bb39859c6312da4ff5f438b2d0e120b1aa45cffe4c76edfd468
+DIST biplist-1.0.1.tar.gz 16251 SHA256 41843579a531958bf0df88b471cf8d446723e640c73c469374e4ac313c33b6a8 SHA512 017bbea254f74d2c647322044a7b9a6006a0d69ecd44d1cd0281a3f30b38fd0feeef1b07272b9495440d3cd4434e2d4802681959b4185e2c354999884605a657 WHIRLPOOL d533fcfb05f52682bd309128463adb876a99d803c86118bdf92a90e6155b56a012b7bc60b7e1a309bca7169a560d500b2508e7b43bd5272f6780bc209ca96eb3
diff --git a/dev-python/biplist/biplist-1.0.1.ebuild b/dev-python/biplist/biplist-1.0.1.ebuild
new file mode 100644
index 000000000000..a4bc079514dd
--- /dev/null
+++ b/dev-python/biplist/biplist-1.0.1.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=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A binary plist parser/generator for Python"
+HOMEPAGE="https://pypi.python.org/pypi/biplist/ https://github.com/wooster/biplist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		${RDEPEND} )"
+
+python_test() {
+	# This failure still occurs, after 18 momths
+	# https://github.com/wooster/biplist/issues/8
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
index b5bb86f49806..ca6928b99b0b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index b5bb86f49806..ca6928b99b0b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 495381d82b40..884411d7f0e2 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,3 +1,4 @@
 DIST cffi-1.2.1.tar.gz 335778 SHA256 eab571deb0a152e2f53c404c08a94870a131526896cad08cd43bf86ce3771e3d SHA512 26ab695d34ef1895f38c735b2c6400cbf6325d622ce93799513130791365bb71d656288e991b86861ac8e899872504c1f4368d27104c4ac9b881c83c7f8dad88 WHIRLPOOL a8bbe3c24be660946c1f31fbb8b1f50810f78b9485a32aadfb091a624b5386641bde71981c58792f8e95e8e77cfce7d9959eb197c417464cf5351e568aa6336d
 DIST cffi-1.4.2.tar.gz 365490 SHA256 8f1d177d364ea35900415ae24ca3e471be3d5334ed0419294068c49f45913998 SHA512 cdb265c4ae390b6498fab34a2f0920ee6eca65e6b543dfb92a0e64825bcef26e8bd4c9f1f43a15e7696128f38026e467fcdda057e00e939311a465b2b585fc34 WHIRLPOOL c3bad7b0bf27f6994bc21472f4ebadae2453e91a2e714b4801d3fb642bfdfbe838a84bc5c74a446a988629811857a28d49f3e08859c9914a385eebcf39e62f7f
 DIST cffi-1.5.0.tar.gz 385496 SHA256 44f76f6c3fc654860821785192eca29bd66531af57d09b681e6d52584604a7e7 SHA512 229b1472a54d2758ed39340a9b9d87b7d4b9d562cdb0b64276d013f11f8499c67db12e8818a3b1ff5ec0f30818a95f4c54939839d240b9545aaf4728f01c3429 WHIRLPOOL b7c7962bdde535b0be35db85525595c22d1a83bd6b35906a6f2020cc262eaa920413ae99621a784865eacf6a02f08120b9bd82301f40b3838b1afff8564e21b5
+DIST cffi-1.5.2.tar.gz 388793 SHA256 da9bde99872e46f7bb5cff40a9b1cc08406765efafb583c704de108b6cb821dd SHA512 3c707db85032bc13287beec0211d85a7b9f9dfcb87844adba3a86b23211acd495e88072ec23f22e7c7626d25cadd5b9843c34255d4080eefb171020ad0a2d552 WHIRLPOOL 35cfd86d06dcc2bb2a0e8e196f06d5df0eeaa6dd65d13dc4489284108fa596a88f46918c5b70e38584965290d141f5cbf0e2bcb469c3316cd1962109d77889dd
diff --git a/dev-python/cffi/cffi-1.5.2.ebuild b/dev-python/cffi/cffi-1.5.2.ebuild
new file mode 100644
index 000000000000..c54b5e66ab4c
--- /dev/null
+++ b/dev-python/cffi/cffi-1.5.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
+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 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 97fe410ad79b..097921542ddf 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -2,3 +2,4 @@ DIST Chameleon-2.16.tar.gz 200838 SHA256 87c82d657fbc1b47decbe605a6f6105d9190cb1
 DIST Chameleon-2.19.tar.gz 202197 SHA256 744070535f8e85a277aef07b0a98256aec5bf6a0d9b909686ce571eb26914491 SHA512 7e90ccf5f53000b94452b8c343cf232d4bc48857dd33ea19bf44e6732033851459a0761cc0f2af5851b11f5c1cd698679ef541cbaa895373f59d66717b3fc267 WHIRLPOOL 6c24d006a707f2b3e2a0b2df5ee2fc52314a5c830fbb8096429ac40dc43e932ddcc38fbeef5886066f848f10076ea8a171a557f995c7b1df16bdf709a858ee4f
 DIST Chameleon-2.20.tar.gz 202396 SHA256 557deb604cc2fb235441f449f44feb3942258fcf233c7e75fcae6adeb886ced4 SHA512 805189e49c6b326f82ffaefdb1d734e3959167a0e3523531f9c9c554fc8412ab4ae401aacae023a3ba43d18019a6fccebafae87f2c6bed6c1c2f5b1aff080153 WHIRLPOOL 1c84afca8e7eb6231f9caea4934351d347bfc6cb52025754b197595eac368fb9e5a6ae9888809aca99f80ca8f0544e54426bc284a2314033b07771156011e597
 DIST Chameleon-2.22.tar.gz 201994 SHA256 6eef8c58d1c58b94f6502d4213c92b2037f5ab66386b3da5b117213faa0bf7f7 SHA512 f81b52a8463d1f4619580b2d51bb9e2f67bb752b95382d7ffd0357b9e2d05854ce6539a3e518ed32e6df4d35ee3d247771ff47d8039e2bdfc4c0a732fb7885c2 WHIRLPOOL 66a289cf0ae33fc9b5d935623ce7de3227582518918e420078436669c52660e0053a7ffb0f65dccde95203591ce4626e52c6d4a030650c83c6f48efaf9f5be69
+DIST Chameleon-2.24.tar.gz 193359 SHA256 452e9580040ed8541062b16e21eaef4231dd5ed8da3ad9548246b9eef5c9787a SHA512 78b8d1d67745d335d733feecb3779dd73cd79ec0cab1f6c6ddf2b830ea798765c43e1cd93e685d0e7096435a364a125b35a7db77782e290d125c8e37824290a1 WHIRLPOOL b6b4a1443e1976e2d5b4749a898b9618e9bf0ef582afa41840e90c6e7c49f4a7a9db8702c9f6aa39c48c21264fe79d2b20272a5063b0c797f3767dc48f62a4bd
diff --git a/dev-python/chameleon/chameleon-2.24.ebuild b/dev-python/chameleon/chameleon-2.24.ebuild
new file mode 100644
index 000000000000..ca028f7e397a
--- /dev/null
+++ b/dev-python/chameleon/chameleon-2.24.ebuild
@@ -0,0 +1,41 @@
+# 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
+
+MY_PN="Chameleon"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="http://chameleon.repoze.org https://pypi.python.org/pypi/Chameleon"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
new file mode 100644
index 000000000000..af2dc15fc482
--- /dev/null
+++ b/dev-python/click-log/Manifest
@@ -0,0 +1 @@
+DIST click-log-0.1.3.tar.gz 3377 SHA256 fd8dc8d65947ce6d6ee8ab3101fb0bb9015b9070730ada3f73ec761beb0ead4d SHA512 7accdd5be62c7c76ec9b862d8dc91710473a46669778f39cb7e8e5fa56020ce0bd619fbe30453338a05d87cef971916f2c4f6d5c9cb9e4982ae32e7a885bd722 WHIRLPOOL 0c21711ced16b4263470e43765fd5787a0e3776150e7f0188a0eddc005c9d9d330c196565c273974a1e8b65d7ba42ca99b24ce3a4000bb5aeab431d7ecb78f90
diff --git a/dev-python/click-log/click-log-0.1.3.ebuild b/dev-python/click-log/click-log-0.1.3.ebuild
new file mode 100644
index 000000000000..a745f6d54cfb
--- /dev/null
+++ b/dev-python/click-log/click-log-0.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 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="Logging integration for Click."
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/click"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/click-log/metadata.xml b/dev-python/click-log/metadata.xml
new file mode 100644
index 000000000000..9733c2c2dc5d
--- /dev/null
+++ b/dev-python/click-log/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
new file mode 100644
index 000000000000..292d2057b927
--- /dev/null
+++ b/dev-python/click-threading/Manifest
@@ -0,0 +1 @@
+DIST click-threading-0.1.2.tar.gz 3232 SHA256 85045457e02f16fba3110dc6b16e980bf3e65433808da2b550dd513206d9b94a SHA512 4612c5314800a76e65468fb80c9495e14605bbda8b5e25e8d78e8baaa9392e424d673d942bd7d0f3955e0241ddc4b87aa348dcb7f3b9516ba94fb8352c0400b6 WHIRLPOOL b821aaca4566cdb6e58ae3eb9dd5892521dd393c8e472399193aa12d9e8754930e778595fe80f3ea6dacc61e4a2ff8f3e68c2f3cbfd0226ecf103309b02ed6eb
diff --git a/dev-python/click-threading/click-threading-0.1.2.ebuild b/dev-python/click-threading/click-threading-0.1.2.ebuild
new file mode 100644
index 000000000000..b2ce4253af39
--- /dev/null
+++ b/dev-python/click-threading/click-threading-0.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 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="Multithreaded Click apps made easy."
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.python.org/pypi/click-threading"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/click-5.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/click-threading/metadata.xml b/dev-python/click-threading/metadata.xml
new file mode 100644
index 000000000000..9733c2c2dc5d
--- /dev/null
+++ b/dev-python/click-threading/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index ba2cf3057c7f..265666a9e3f6 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,3 +1,4 @@
 DIST click-2.0.tar.gz 47342 SHA256 33a984fe73aa8c6bf69c38098b69dd38405529db54baf4c8cf64c50b2dee644f SHA512 4c703ab4b5c76e393420b0edf9af9e8ddb301ccfef5f8117d3408eaa8a94abe6b7b5c7a8b61b7774a3b459b153c10438e8934f21ceb73697199828cce2c2887c WHIRLPOOL bf599395245319b31c189df297a1ec35ca69723ed24e2d3e9aa9231a3cfebdb80e1f43a0b010865b6fbecf09f23dc1121cca232aec26f09bdb455f41da5261c4
 DIST click-5.1.tar.gz 275592 SHA256 678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a SHA512 b860b0227644f5d1cc24d41e66985421ec971f11f3f596fb46508fdc787200b949e7ef29b2035421ebb0115384688da03c3c95a0d6acc58dd3b566b32a2b7c6a WHIRLPOOL 8bda8de886a272972595bf51af3881962063daaa4fc9e104af59b4798008a2f780c3fb4a758d7fe14ef075b92aecc43415b08bb213cbd6ac4ab92a56e405276e
 DIST click-6.2.tar.gz 281717 SHA256 fba0ff70f5ebb4cebbf64c40a8fbc222fb7cf825237241e548354dabe3da6a82 SHA512 3950bd4e05823dbd526b3e3d17f9eb6871e1591342bdc4d21b7d4cea8f66791b1ab1d79ec664dae55cfbeaa5086fabb0db596bc88593251002c6584eae823477 WHIRLPOOL a53c5be5510e485f51682de0f13abadadc6627eda1ef0a9e55d2e7fe78a1fe79ba200c4172d47674d08d103b9b83dacb18da3ff8ddc09ad8e781503b87d5ceaf
+DIST click-6.3.tar.gz 283062 SHA256 b720d9faabe193287b71e3c26082b0f249501288e153b7e7cfce3bb87ac8cc1c SHA512 c7518b9c595fe35efb6be4391006a471cdc909f6725b9b3c45b06ec7b8b24560543ee151ff3afabc76ea23f4367795c4e5ace9b4b780c18c48a3e512474e3bf8 WHIRLPOOL 252ddf31265a2ed4eecc616ac94a7e0c32438c204729bff7e57b0ec850dd02004c76751934202f9de3bb4dc5811dfd10cb05f50d7e4a465dcc752438176c8ecc
diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild
index 1cf3c66b6696..102ce0100b45 100644
--- a/dev-python/click/click-5.1.ebuild
+++ b/dev-python/click/click-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,11 +17,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc examples test"
 
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_prepare_all() {
 	# Prevent un-needed d'loading
 	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
diff --git a/dev-python/click/click-6.3.ebuild b/dev-python/click/click-6.3.ebuild
new file mode 100644
index 000000000000..6c9a3dcf7389
--- /dev/null
+++ b/dev-python/click/click-6.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc examples test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
new file mode 100644
index 000000000000..d3b949810b7d
--- /dev/null
+++ b/dev-python/cloudpickle/Manifest
@@ -0,0 +1 @@
+DIST cloudpickle-0.1.1.tar.gz 14479 SHA256 3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74 SHA512 685972288689219e33bb655abb26fc509b3fc5bb26f5dc8715c3ce544835c7ceab79cb6cc3decfee75a5b846a7e283125c8040901038a25c9d55d965c74a7714 WHIRLPOOL 96ed0ef9112d25538a9a3516946067e6a1997592d246019593c2957b8dff093bf8593ed03289fd5e0b9dfe47a54e556aaed0c8558b65be57e4e263cb6105a371
diff --git a/dev-python/cloudpickle/cloudpickle-0.1.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.1.1.ebuild
new file mode 100644
index 000000000000..2cf49dc9eaa0
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-0.1.1.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_3,3_4} pypy )
+inherit eutils distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cloudpickle/metadata.xml b/dev-python/cloudpickle/metadata.xml
new file mode 100644
index 000000000000..82e3626e0383
--- /dev/null
+++ b/dev-python/cloudpickle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cloudpickle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/colander/Manifest b/dev-python/colander/Manifest
index 7e61f3280592..45cce47d0d3c 100644
--- a/dev-python/colander/Manifest
+++ b/dev-python/colander/Manifest
@@ -1 +1,2 @@
 DIST colander-1.0.tar.gz 113800 SHA256 7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3 SHA512 f361520a12ebec4271580fe5be002bfbdd38fcd4cfb29fa41b9c37308636343dd25595f2e0bd8099bc96583d25644d2039996efefd9c0060fe39f3c46394a4f7 WHIRLPOOL c1ed492781ab276fc5c6cf7d0ce6a9393981c86ed06c9b113c2e37e01748595e8b5422fa24eaac3d3c2a68cd99f337ea9c65b8f0f536f955e2b9b621101278a5
+DIST colander-1.2.tar.gz 117130 SHA256 528f406cd1bf65cfd08958c9c8b839f37e96a65696a8f213ce81a59aae33dae4 SHA512 09bea3b0b4d2a5bd9539d36d0c43fe0d4042fd945d2e74a01c2c9639d19175f73356f006e69a22765ebffeb01310de7e73ee165826081afa14a46e1cd93995a4 WHIRLPOOL 372ad6050f017f534cd3cdaa3a499e766582da5346627517b8f05f080e3aff215f0363440fd0d7e1fb3f1d5855338aab347bbf757c70a7ca0978928fd027f219
diff --git a/dev-python/colander/colander-1.2.ebuild b/dev-python/colander/colander-1.2.ebuild
new file mode 100644
index 000000000000..c83a3589ff12
--- /dev/null
+++ b/dev-python/colander/colander-1.2.ebuild
@@ -0,0 +1,57 @@
+# 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="A simple schema-based serialization and deserialization library"
+HOMEPAGE="http://docs.pylonsproject.org/projects/colander/en/latest/ https://pypi.python.org/pypi/colander"
+MY_P=${P/_beta1/b1}
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+# MIT license is used by included (modified) iso8601.py code.
+LICENSE="repoze MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Depend on an ebuild of translationstring with Python 3 support.
+RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}] )"
+
+# Include COPYRIGHT.txt because the license seems to require it.
+DOCS=( CHANGES.rst COPYRIGHT.txt README.rst )
+
+python_prepare_all() {
+	# Remove pylons theme since it's not included in source
+	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# https://github.com/Pylons/colander/issues/38
+		emake -C docs html SPHINXOPTS=""
+	fi
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index 3fa7ed79227d..578364e24585 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,6 @@ inherit distutils-r1
 
 DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
 HOMEPAGE="
-	https://code.google.com/p/colorama/
 	https://pypi.python.org/pypi/colorama
 	https://github.com/tartley/colorama"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/colorama/colorama-0.3.5.ebuild b/dev-python/colorama/colorama-0.3.5.ebuild
index 9ce4094085d6..ae0dd9954b91 100644
--- a/dev-python/colorama/colorama-0.3.5.ebuild
+++ b/dev-python/colorama/colorama-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,6 @@ inherit distutils-r1
 
 DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
 HOMEPAGE="
-	https://code.google.com/p/colorama/
 	https://pypi.python.org/pypi/colorama
 	https://github.com/tartley/colorama"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/colorama/colorama-0.3.6-r1.ebuild b/dev-python/colorama/colorama-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..7cc88846d36b
--- /dev/null
+++ b/dev-python/colorama/colorama-0.3.6-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.python.org/pypi/colorama
+	https://github.com/tartley/colorama"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+python_install_all() {
+	use examples && local EXAMPLES=( demos/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.6.ebuild b/dev-python/colorama/colorama-0.3.6.ebuild
deleted file mode 100644
index c3dda578db5b..000000000000
--- a/dev-python/colorama/colorama-0.3.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://code.google.com/p/colorama/
-	https://pypi.python.org/pypi/colorama
-	https://github.com/tartley/colorama"
-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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_install_all() {
-	use examples && local EXAMPLES=( demos/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/colorama/files/colorama-0.3.6.patch b/dev-python/colorama/files/colorama-0.3.6.patch
new file mode 100644
index 000000000000..65a9476d175c
--- /dev/null
+++ b/dev-python/colorama/files/colorama-0.3.6.patch
@@ -0,0 +1,32 @@
+diff -r -U2 colorama-0.3.6.orig/colorama/ansitowin32.py colorama-0.3.6/colorama/ansitowin32.py
+--- colorama-0.3.6.orig/colorama/ansitowin32.py	2015-12-14 09:09:52.000000000 +0100
++++ colorama-0.3.6/colorama/ansitowin32.py	2016-02-23 13:52:37.230415139 +0100
+@@ -14,4 +14,8 @@
+ 
+ 
++def is_stream_closed(stream):
++    return not hasattr(stream, 'closed') or stream.closed
++
++
+ def is_a_tty(stream):
+     return hasattr(stream, 'isatty') and stream.isatty()
+@@ -65,10 +69,10 @@
+         # should we strip ANSI sequences from our output?
+         if strip is None:
+-            strip = conversion_supported or (not wrapped.closed and not is_a_tty(wrapped))
++            strip = conversion_supported or (not is_stream_closed(wrapped) and not is_a_tty(wrapped))
+         self.strip = strip
+ 
+         # should we should convert ANSI sequences into win32 calls?
+         if convert is None:
+-            convert = conversion_supported and not wrapped.closed and is_a_tty(wrapped)
++            convert = conversion_supported and not is_stream_closed(wrapped) and is_a_tty(wrapped)
+         self.convert = convert
+ 
+@@ -146,5 +150,5 @@
+         if self.convert:
+             self.call_win32('m', (0,))
+-        elif not self.strip and not self.wrapped.closed:
++        elif not self.strip and not is_stream_closed(self.wrapped):
+             self.wrapped.write(Style.RESET_ALL)
+ 
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index a2aa4e4db776..4317aad9de2c 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1 +1,2 @@
 DIST contextlib2-0.4.0.tar.gz 18741 SHA256 55a5dc78f7a742a0e756645134ffb39bbe11da0fea2bc0f7070d40dac208b732 SHA512 622762c5490f0ff3e4b421a63bccce8fe0753977112ee0db9640dad31093c40c8a331f3d7cade9925f17903eaeaa376925ef607d7a440170c7c5ec1c8e04f56a WHIRLPOOL b1b2b753b15cb5124ebc378acf6b959839e727a53d3a096eea5b04404fc059f6a1b49b9fa23cc6310ad1b9bcfa655a82088af0906a74f8326d7bf57f3793440c
+DIST contextlib2-0.5.1.tar.gz 25186 SHA256 227c79e126e8a8904a81d162750581ed3d49af2395a3100be7067b7296d33d45 SHA512 da3a954a52a0f036e0b2d949bf4e73f4551eb637944eae5f6f421a1c22b2177dcfa56984a6c77692bb92713cf73a0df02b9159268b428550651fb7be97074613 WHIRLPOOL b970100478d107ce89ea9a21d670767cae8921acc095922fb82a3b1c19eeecb98bc326888e97ac9fd5b9dec71f2a69b769693f2a07ecb48060b3b76353ad1ade
diff --git a/dev-python/contextlib2/contextlib2-0.5.1.ebuild b/dev-python/contextlib2/contextlib2-0.5.1.ebuild
new file mode 100644
index 000000000000..5d90531dfab7
--- /dev/null
+++ b/dev-python/contextlib2/contextlib2-0.5.1.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,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports and enhancements for the contextlib module"
+HOMEPAGE="https://pypi.python.org/pypi/contextlib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2.4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
+}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild
index 399ceaa6ccd8..f1c6f5469d4e 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild
@@ -17,7 +17,7 @@ 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 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/cryptography-1.1.2.ebuild b/dev-python/cryptography/cryptography-1.1.2.ebuild
index 3bf4fa08ce59..0556b6ae6d28 100644
--- a/dev-python/cryptography/cryptography-1.1.2.ebuild
+++ b/dev-python/cryptography/cryptography-1.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/dev-python/cssutils/cssutils-0.9.10-r2.ebuild b/dev-python/cssutils/cssutils-0.9.10-r2.ebuild
new file mode 100644
index 000000000000..1c74279ae29f
--- /dev/null
+++ b/dev-python/cssutils/cssutils-0.9.10-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils"
+# Missing test data
+# https://bitbucket.org/cthedot/cssutils/pull-request/11
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+HG_COMMIT="6fbc1877f6089610b733a92d21c2bbf25dc1ca28"
+SRC_URI="https://bitbucket.org/cthedot/cssutils/get/${HG_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Disable test failing with dev-python/pyxml installed.
+	if has_version dev-python/pyxml; then
+		sed -e "s/test_linecol/_&/" -i src/tests/test_errorhandler.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
+	set --  nosetests -P "${BUILD_DIR}/lib/cssutils/tests"
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
index d585a639942d..3553d268297c 100644
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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 )
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-1.0.ebuild b/dev-python/cssutils/cssutils-1.0.ebuild
index 1e5aa368739b..1a0487d349ee 100644
--- a/dev-python/cssutils/cssutils-1.0.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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 )
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 6b92f8285f2a..1613634b4349 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1 +1,2 @@
+DIST cycler-0.10.0.tar.gz 16553 SHA256 cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8 SHA512 b7d2ba19861ffaf4dea0444bfe68b5a6264a022d7b3f02c9ff5e5859e3901de12a90f8dc7469e995e09c418515b3df55dbf05a0cfe5368d40790a2c878a74819 WHIRLPOOL 59c42f5b1d3fcf917cd19d8a9365614f07257d74135d8ee7dc231599bc600d1cf9e0c9a6e822c8aa1a932a31603e2a044b61143d648138e7e549d46a2f1b58f6
 DIST cycler-0.9.0.tar.gz 3472 SHA256 96dc4ddf27ef62c09990c6196ac1167685e89168042ec0ae4db586de023355bc SHA512 fc48d432eeeff4eb2f148cc3a07ac6affb422481d4d1405fbcb505442d64929ce1cfcbf4cac7e64ce3192b24991dadee591cd01ae8a6118e45d11d316064e6cb WHIRLPOOL 46cba5b7fe4a634ed1e847df90038da4fdeb0ce55ecc811a6adcb71f999417c862c79ff6499984c8bb6403e84f382984ffed6008fdd1b1807491adccc4d5499e
diff --git a/dev-python/cycler/cycler-0.10.0.ebuild b/dev-python/cycler/cycler-0.10.0.ebuild
new file mode 100644
index 000000000000..0e19cb15e404
--- /dev/null
+++ b/dev-python/cycler/cycler-0.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+MY_PN="Cycler"
+
+DESCRIPTION="Composable style cycles"
+HOMEPAGE="
+	http://matplotlib.org/cycler/
+	https://pypi.python.org/pypi/Cycler/
+	http://github.com/matplotlib/cycler"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Not shipped
+# https://github.com/matplotlib/cycler/issues/21
+RESTRICT=test
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/cytoolz/Manifest b/dev-python/cytoolz/Manifest
index 5945fe6d870d..d937ad251662 100644
--- a/dev-python/cytoolz/Manifest
+++ b/dev-python/cytoolz/Manifest
@@ -2,3 +2,4 @@ DIST cytoolz-0.7.1.tar.gz 250988 SHA256 297b3cf8606afc3332e0d0b0da707b306f8cec6f
 DIST cytoolz-0.7.2.tar.gz 281930 SHA256 0800949df710aa487f52b1a9f97d8844e81e07067d6ec95581b1b792c098c159 SHA512 3423b25687b143e5c80bafbb20c1220f3030348844dc753c25e5aebd9ce0b0d3c571b386138c9f6d6546c22cd5a3f1ff73e0c2ae6ee5ad1f7607d90cc7e2da3c WHIRLPOOL bffb53e662aac32eacb7222103f79c89b8708628508e5fd6326a2bffbc30cd2a422b554c18acb537e7803cb80d1f9e6aee4501505f905358af9b19d4adf15ec1
 DIST cytoolz-0.7.3.tar.gz 304597 SHA256 202eb77cf2405c702c2172e5c2e66e3e2611f866640c99b38f24f96ad680dea8 SHA512 a9e83cb22b3b9af0c28754696c59a081e74e03b23f63eaf7bf31526d33b9d645bb82ec98e650e1a6c17d367951cbea6417c6b8c69ff3d80e2d45a8a44c97ed16 WHIRLPOOL fd16958c1158be3265c22a27d8c5a12510e20038cb846dac13ce6f24060096b64030bc4aea5f0c48bff6464b8fab048c3e3b0aef604e69693b38d5c9b7056051
 DIST cytoolz-0.7.4.tar.gz 335433 SHA256 9c2e3dda8232b6cd5b84b8c8df6c8155c2adeb8734eb7ec38e189affc0f2eba5 SHA512 bf79ea175567bfbc438019a53fa94e2a38ab635cca9169043d1362487ba9ac15f350530bbdf409f666e3cc6a8b0a9bc63db25ba5f77bcbe75bc8528a6a367ecb WHIRLPOOL e3e0805d6e507dd08269b2fd8b97701d133cef0487cf2d0cb55820289c48ad5d2cb3cc6f7a881fc95436df02518abcda6b0e16865e3ee062564caeb2fe46b7c5
+DIST cytoolz-0.7.5.tar.gz 334818 SHA256 329b29cf0fca3978a875f802fc9045e6a18c1702d8c55b30ccc34e137d271d5a SHA512 0db30dfdacc98300b58da492679ffb34f5601281d146a21f3165b862eefd1752a509935378d2fbbfde5d1bfa0448c5d175e356fdec82919c6afd85993c6a7116 WHIRLPOOL 2e2bb4b77c6334a9159f6409cc51d8b85b4a2a017322ff3750d04b79c014e2fd70a43fb3d224bd526950648c71e7385e16b17f5588692f2ece98582492e854ec
diff --git a/dev-python/cytoolz/cytoolz-0.7.5.ebuild b/dev-python/cytoolz/cytoolz-0.7.5.ebuild
new file mode 100644
index 000000000000..eaa2e9af3bff
--- /dev/null
+++ b/dev-python/cytoolz/cytoolz-0.7.5.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,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
+HOMEPAGE="https://pypi.python.org/pypi/cytoolz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Informed by author the dep in toolz is not only required but the
+# tests are version sensitive.
+# https://github.com/pytoolz/cytoolz/issues/57
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/toolz-0.7.1[${PYTHON_USEDEP}] )"
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib/ > /dev/null
+	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
+	popd > /dev/null
+}
diff --git a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
index 62e738abd025..4a3f788c82fc 100644
--- a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
@@ -21,7 +21,8 @@ IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
index 6ccd353f2198..7da5f61c35fa 100644
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@@ -2,3 +2,4 @@ DIST datashape-0.4.2.tar.gz 79106 SHA256 56ca27c5eb090d3670d3f59d2cd4a9855c48849
 DIST datashape-0.4.4.tar.gz 80923 SHA256 c4142eadbdb986a350941e5427d35a2aa106934f9197e91ccb53809c4c79e394 SHA512 047127e070b1cbecd241a888a8b2d773ee149d05e08556644ae0add79f774be9795caab8b8c6de146dc9281ebfd93aadbcb54c2c08fc8fa7f1612834cecf9753 WHIRLPOOL 8294278a940f2a89e525e1133d5870c320b37d1cf1f48f24b267fa792c1599695e8b72cdda6a455500cd8d6d008d394791ba5ea71c7ff42d71da9059bcf47268
 DIST datashape-0.4.5.tar.gz 93549 SHA256 34d4922fa924ef474de2ef8b69833fe2d5da51703d74426f8c4354c9bb209d0f SHA512 f8fcaf923640e42d0ceb6cd607e89b74145443f33ec1d4c0018dc0093518d572ae890bf582487b0c2de6c9d793e96ebb7dc901a330150f2ef2f203b329db5968 WHIRLPOOL cb78a9fd8337d9047c473914f216a06ff3797cc3fc494982696ba8c379d3e50e7cc194f84557eada06fe8459d3711589ad6e1404eb2ae9e389e81e104d447ce0
 DIST datashape-0.4.6.tar.gz 94083 SHA256 872929d992929ee23ea939984d43d726458ddaa3367503bb4678edac81a4b854 SHA512 596b997ebf9f3b05d5c7d686514408630a987b5933ded24e5cfe1321ea32b1cb4b2f99b820c3e2ec608fdf5fcb1ec795f256bbc14c0ec2e6e8f21b61b083d696 WHIRLPOOL e85917492996b81d01f6c3c5577f5a446ce141c3518d332709a95d40584a77898b59264f3d03bd87a33d39df63854225020e604ca06341e090eeacd541a14047
+DIST datashape-0.4.7.tar.gz 92581 SHA256 1028378bb56e8546a07cd3ad09247672516468ab395aa87646c4791488ba1794 SHA512 c5e4f9ef36456d6673c7cb50297d36cf0080cb08d9da81ff044853cc9bb52d659bc6c0beeb6d95d47ff6924aab50b67ac28eb906e7049624fe5d923a304c0ad0 WHIRLPOOL 7bfc2491a8598cc5a3574ced486d6b19308f45155002a0703e4d57fdc23f2ad270cde500ed65af9520a69c6538bf3622f733a19d56509bd65e5bb981d64118ec
diff --git a/dev-python/datashape/datashape-0.4.7.ebuild b/dev-python/datashape/datashape-0.4.7.ebuild
new file mode 100644
index 000000000000..9a7769308fcd
--- /dev/null
+++ b/dev-python/datashape/datashape-0.4.7.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="Language defining a data description protocol"
+HOMEPAGE="https://github.com/ContinuumIO/datashape"
+SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+		>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || 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/ddt/Manifest b/dev-python/ddt/Manifest
index ce34b0340ed8..f98d68cdd2f3 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1 +1,2 @@
 DIST ddt-1.0.0.tar.gz 5535 SHA256 e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a SHA512 4afec9fca19479acefb4f01bd550d696f437e53bf8e63cbb9dc16aa0b7f6c0214f5c7dc8118044b2d6e794de54ce3bac539f8de58202df74619eee1d8c7f85c1 WHIRLPOOL 0c6d54566147ce9fe9d2a0a3004f1bc053854b97048264442573102494fd8185f4d0f60127ca576b3a066d25756902538400944620745144e6042d4c72c25e71
+DIST ddt-1.0.1.tar.gz 5530 SHA256 4d9b43149db1047696018feefcb8d01ae3a121335d8290a0bb72fe63814ba427 SHA512 16fd6b1fbe2105976ef416c61fc6375ddb9fe619fa47e953c95bb0aedaa065c47efe2b801a16d0c30e25b7adbd9ec3f2e3483560cd170a78da7dd99513adcc8c WHIRLPOOL bcfc6f67fb9d1e085b6f885c3a61ec1a795aab76af8718710fbb4105ac26f17bd691bd632fd6c83bbd641e2da3fe081234ea4df583f1ec7130ccd9e23c5d92a5
diff --git a/dev-python/ddt/ddt-1.0.1.ebuild b/dev-python/ddt/ddt-1.0.1.ebuild
new file mode 100644
index 000000000000..c906ec6bbac7
--- /dev/null
+++ b/dev-python/ddt/ddt-1.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to multiply test cases"
+HOMEPAGE="https://pypi.python.org/pypi/ddt https://github.com/txels/ddt"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/demjson/Manifest b/dev-python/demjson/Manifest
index 212052419072..cd1cc12fc736 100644
--- a/dev-python/demjson/Manifest
+++ b/dev-python/demjson/Manifest
@@ -1,2 +1,3 @@
 DIST demjson-2.2.2.tar.gz 130874 SHA256 5114563dd3a0324b6c9c74250528660adbb6a095b2a015038149e31a9b5727d5 SHA512 c5df57fdc286b33fbceada0ff8531d559fb183b29ca114fbfef7dfd0615ad5bae3882da91b6818ad58be5e20d3c2091db7cb75b1c31285b8ed5f466984b5fc15 WHIRLPOOL 6ca4e599128a896df098514d2b1983b025122ac07ee5ffa2f673c2d441482e32b7fa013a3896c2efedfcea9114dbe2049927b1754d4db9127bdf1ab9f32ddda3
 DIST demjson-2.2.3.tar.gz 131263 SHA256 9fb0f3c02fe500104680af2889a64d1637b395aebdb37341ae2309d77854f40c SHA512 058f8429967e21b30a9e28ec7790c372f5eb3126d7ab05c17d6f0548002650314048bf2f4eb3e2c8f75bb91169722c90eeeddb815ca166dfb14b2d1385504b14 WHIRLPOOL b665e19c5c28afd4636b2f33959f7a14d04706c8e8d7c77ef790fb12e3aff56a1cea35420caf7eceb06de8b001cab07a3e38d4252b7f67a3dbba99fcc4f1d476
+DIST demjson-2.2.4.tar.gz 131457 SHA256 31de2038a0fdd9c4c11f8bf3b13fe77bc2a128307f965c8d5fb4dc6d6f6beb79 SHA512 d8a1cde062d0b062bdae29b6d79ad69fb9cc185428718a0009ccbed544ed37bd354fbb86edadb56bd98183ac8636b2edae322ed19aa5f07a7b6df668c7aa0029 WHIRLPOOL 70e826739bc2ae7ca040e54fe651f021a1c7f08357d985a560a8560f5da694da0068d32e7a972525ba215a6fcda93abdebdf4d99c8e3f156a9f17600aa283973
diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild
new file mode 100644
index 000000000000..f2ed84f4162f
--- /dev/null
+++ b/dev-python/demjson/demjson-2.2.4.ebuild
@@ -0,0 +1,36 @@
+# 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="encoder, decoder, and lint/validator for JSON (JavaScript Object Notation) compliant with RFC 4627"
+HOMEPAGE="http://deron.meranda.us/python/demjson/ https://pypi.python.org/pypi/demjson"
+SRC_URI="http://deron.meranda.us/python/${PN}/dist/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	cd test
+	if python_is_python3; then
+		2to3 -w --no-diffs test_demjson.py
+	fi
+	"${PYTHON}" test_demjson.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Docs are .txt files
+	if use doc; then
+		dodoc docs/*.txt || die "Installation of documentation failed"
+	fi
+}
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 130842346f2c..4f200abd9a7c 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,2 +1,3 @@
 DIST discogs-client-2.0.2.tar.gz 25486 SHA256 7de2166ee4f7f5dc4cf1709b7a6abe6211a0046f2341874d2c67e5c6466351a8 SHA512 00634eb95018ccb2ece0adf4b7e3ea96674f0c8dd63d9bd151cdf9c871898fa24379f78065ebb677cc87eaffa31e91ba60051622a38c6bd774e010c20229b16e WHIRLPOOL ae54cdbb93d7fdfb26301f57a4ee3f0ec925a55a29c377c875221d62a0c54e54d957075ab04800fcc39aa3152317511ec775a66e6a5e25300558437c730faed5
 DIST discogs-client-2.2.0.tar.gz 27484 SHA256 b31e3fd8f17f46b9c7221182ed6be96774a334ac8be4e434ee99943d27170945 SHA512 e1f894cabab6c8162f0195164cd68fca7806149112d065c007991a4fb93de6bd4baa16230eaccde1e1d9d842930f6bb8ba64bd618352bc85051f64d3e7b13c0b WHIRLPOOL c903dc0348eddbd5c097972313cd04e7c9714f89ef8baac129b20ca01269b5be070f850f1d78b733bf408fb11ba40d26cae6b945bfb33bbdba16f8f9d5509a92
+DIST discogs-client-2.2.1.tar.gz 24645 SHA256 9e32b5e45cff41af8025891c71aa3025b3e1895de59b37c11fd203a8af687414 SHA512 fa339b14d5655a36fdf252fd94c729ecb97e195c1f7eb2e5207355dc5f4fd89d0b738218ffbac71acab4f143870bdba5cf5ea02dff70166014f14c30481ae1e5 WHIRLPOOL 7eda6665ac149b96317b516f30ef5fa164422f46d0eb0e4281914b40346360c72e2db23b6bbf4891c555c2c18baffdc405144c7532c11577091634390d8f0e67
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
new file mode 100644
index 000000000000..0419dcd41846
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+# Not py3 capable due to oauth2 supports py2 pypy only
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Python API client for Discogs"
+HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.python.org/pypi/discogs-client"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	"
+# It's either this or make a test use flag to add RDEPEND behind it. Both work
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index f3db6803fd41..8395788d07e4 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1 +1,2 @@
 DIST dj-database-url-0.3.0.tar.gz 2747 SHA256 f2e273ed34acbb560962d5cf12917936d8df02297df09bd3089b8546d4584138 SHA512 a27fa974edcc0fcfb99f8b74b25324a7afbf70ae4161576ec72733a3b305e170b23677106b85dbc075c5888330d6187ad9e95fbecc41cf7455c26ebf6f3f86e3 WHIRLPOOL 60e0c50f353ea314c6562a05d5a39042e3db15aca4018e8b35646c991a15fda59ed72b213fcbdef303d3eb47a2cff856b1c1d3d80c3e7868bc619794cf0330f3
+DIST dj-database-url-0.4.0.tar.gz 4015 SHA256 858312abb7b330ea875733a65806a36ad04d7b8451c6ce8835118a2fa10d6870 SHA512 eea9a095f135adf7a197db949cb1ca067ff920c73fe62f510da4decd92aad7e0051bbabee4b92f0848ffc23ce6ee87ddaf0fb284b0cfba78ba0e3b5a367cccf6 WHIRLPOOL ff56f7666aee983286a1faeabcbb4815e88857f1f10d2919963f7ac07b95916f363859ea22f284180e9828eb95e3a3c70c3e25eb614450c1ef0e463ee924a892
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild
new file mode 100644
index 000000000000..e9320c52bb5c
--- /dev/null
+++ b/dev-python/dj-database-url/dj-database-url-0.4.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="https://pypi.python.org/pypi/dj-database-url https://github.com/kennethreitz/dj-database-url"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not contained in the tarball
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" test_dj_database_url.py || die
+}
diff --git a/dev-python/django-annoying/Manifest b/dev-python/django-annoying/Manifest
index 6383e75f787b..85aff83c25f7 100644
--- a/dev-python/django-annoying/Manifest
+++ b/dev-python/django-annoying/Manifest
@@ -1,3 +1,4 @@
 DIST django-annoying-0.7.6.tar.gz 7355 SHA256 7cc80ef00d63c3863e03ed97a197f8b71c67b00a5bd9eaf0383a90dcc6117003 SHA512 86ceb5ae10fafb6e273c2ff31b25489482da3ded6eaf3fdade3d148563251e00f4c9af3ce7420ae68124709a6f8e1a8960824e2b170d77fc5d57f2364b8c7e31 WHIRLPOOL d6f451f21db9ee1415392cfb2d18037bfd39306f0a0301f4bc393a9c158754894cd7e7d3345ee30b071832980939820742e44defcaa6056c11df9984887a8c85
 DIST django-annoying-0.7.7.tar.gz 7277 SHA256 498ba1ab00da56b939772913f7d5b3a29997990b63518acfa5305e8bf03fed7b SHA512 37435fb08110bc0e06a2a8b35d4f45d96d7fed3c03b87a541fcd96a76ed2e36281f1f7632654f3f5f64597203097ac7b5def1e8dc32e500e973fd81686a208ab WHIRLPOOL 14df887e05b9d1d47f80982a89ab719a2244dc38fa02ec9f0666484d79923ad7a1df047e261b5f70be8b408df30def2f70b9ca93ab7637278b5302e1eeb5e2f9
 DIST django-annoying-0.8.2.tar.gz 9135 SHA256 5e394ebb65819b9d6b44389e0d0f107b3504921293b784ab7cabaa73045f6b2c SHA512 5d8475ccc8f20291218f8302c90b70c01488361924bf7ad142403f6dcb9d51c9d8558c0dc3b0686585aa2f80b8a5ec2875ffc6f940a5a4bd8750de8653815f0a WHIRLPOOL 468b4bc3a1688e35cb2005e3f65fb49bb168092915c49c3d624909a93a65f017b76bb1ce83778b2396dbec12f92cd9da400f12d07b4b807e107bb64024020d0b
+DIST django-annoying-0.8.7.tar.gz 10170 SHA256 dd15478a686c64edd1829d2f2c0f1203167c1670fc19da0bbe101b0343913f9a SHA512 4654083ef0076837bc2cacec82c51faa3746cfb2f27002692c7552079e0f0e8d59e064ec4119366e0c452c102309513ff8bf12ec5d9785485e580b989c96517a WHIRLPOOL c76db9e2e50a26b7bf3c2e2d8099066cef8d40681b1544479d0a3ba9a10de08994a90ac21cfb8292482735f7bb20d81fba40228a34ad7818ff9428c0f11fe683
diff --git a/dev-python/django-annoying/django-annoying-0.8.7.ebuild b/dev-python/django-annoying/django-annoying-0.8.7.ebuild
new file mode 100644
index 000000000000..cc4499c26113
--- /dev/null
+++ b/dev-python/django-annoying/django-annoying-0.8.7.ebuild
@@ -0,0 +1,20 @@
+# 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="This is django application that try to eliminate annoying things in Django framework"
+HOMEPAGE="https://bitbucket.org/offline/django-annoying/wiki/Home"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
index 7e5638dd9ebf..0cbd83562bdc 100644
--- a/dev-python/django-appconf/django-appconf-1.0.1.ebuild
+++ b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
+IUSE="doc"
 
 RDEPEND="
 	>=dev-python/django-1.4.1[${PYTHON_USEDEP}]
@@ -23,9 +23,7 @@ RDEPEND="
 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 )
 
@@ -33,13 +31,6 @@ 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-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index a2e1627574ec..9f8570f3f871 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,2 +1,3 @@
 DIST django-auth-ldap-1.2.2.tar.gz 131086 SHA256 faa067b073f6ea73c1ceeb5e244187ae1b3cf4ec79846ff366fa996428434264 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3 WHIRLPOOL ae84405b4855ad9701244ab6cbd5e5154d2e173e04896c27e0869680bb4e030b6847293bcc59ef4f7f56969778c7d403721bae0d7099e2f3724186908c7abbbd
 DIST django-auth-ldap-1.2.6.tar.gz 131385 SHA256 17671e1f0f1ef5c1242291f710956ba9446bf804ff907eab1fe533031b9411b5 SHA512 59d6d18ad2f890e26a728b9f45885d98d08d85a36bce0a28cd52e02f7c4a52def79d668c1948be37915fd0c3be72d50de983bf4a4b622ce7bbff7d3e040b63b7 WHIRLPOOL 5e673bc686f222e6704ca98f0ae8a7472bd85b6c33f3182f4a087d9a8b3174cdcd76521ce42033874979d00dee94cbdc2db5da32b8bdceb474edf3e8b498d1ee
+DIST django-auth-ldap-1.2.7.tar.gz 131431 SHA256 ff6af43d5429fbd918f62c25a07e2bff916b053b46990c1b60e60de63d5f3f80 SHA512 2ca29bdceb4b2540f7c90c9dfdfd7a02f91e72cd44ae062cebff84199dab737ee69ada56269189ec0dd70ee7916c3373acba50866280ad080c4c68dd69dffb09 WHIRLPOOL 785f1155e03f80e1c84f62bd565455c079ccf326210ff45c5597d7ac344e362b54ffb4196b1bbbdb5568a1288c053ae0dc2531489c33da95511323ea345be399
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
new file mode 100644
index 000000000000..7d9afb28a589
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+# Although setup.py claims to support py3, python-ldap does not
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="https://pypi.python.org/pypi/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/mockldap-0.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docs.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" test/manage.py test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 067258365260..ed8be0686209 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,2 +1,3 @@
 DIST django-tables2-1.1.0.tar.gz 966103 SHA256 46bdcae04087a20911dc10e30383743bca464696448e9351424efe2582a90499 SHA512 d7386df7651a3cdab42e40963d26594cd776614846fa7eda9208f0795b1f8c6270910904f44782480f0b782d0b139153805e41cdecd43f5bc2d30b67acb3fc6c WHIRLPOOL 11a4a573f96a198cd09b57a136bac1eaded18f704e1b117c7b4b49da26716447b31b1866d5da7058b3eb88e5372d5c9f6e0602a08ee221d03f20d617070c03a5
 DIST django-tables2-1.1.1.tar.gz 965847 SHA256 5432506927d9a1b882afafbe6eaa9cd63ad207af89c42f18b8750de93baf95f4 SHA512 3fd92bf296cf081c43c31b415d7cc89ac7f0d60525d0320169ca3eb4a230d81a10162c33d5dec649044cd14eca243cfbca4ff62cd1b86cdca0a2e219abc36bf4 WHIRLPOOL 52d8416fc110e0ea77df94892130c1385dc12b988dba1c5ce779e771d1d352125ed269cd94a621a9fec2e94a7f5dcb836ba1ca1132b5d2bcdbda9716f2d1dea8
+DIST django-tables2-1.1.2.tar.gz 966053 SHA256 804d8a6037b1a1c75064dc8bcc77fead031ba1885e644b9662d2996b6a683113 SHA512 b82d9a4fdd27e37056effc68b361dbb708d558fbc5aa0f90a09850a20f0bca34ac7965000e72368e1a792fc6a893f83c64910dfb6569b6016ef1e5b20be0e5f5 WHIRLPOOL 52c1ad71288ce97d1bd4e92cae08d618359f52ec310b1d77b1b0428246dc4e65ce49d4ca52704b6ae6e4f9aa9d5f873cc117f3da636d2fa9d3bbde8b7389823e
diff --git a/dev-python/django-tables2/django-tables2-1.1.2.ebuild b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
new file mode 100644
index 000000000000..7e5e12c668df
--- /dev/null
+++ b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Table/data-grid framework for Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index edfc2f0dfed5..924928f75a2d 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,7 +2,5 @@ DIST Django-1.4.22.tar.gz 7802249 SHA256 d0e2c9d772fcab2cf9c09e1c05e711cf5fe5eb9
 DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d39b0241e62c1f03c668ddd6ced SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d WHIRLPOOL a3d17e364b0f90ff3a059afbfb57fdb9988ad777048f3caa30244d7ae6b0c87f42e1e5af5bdcda8f09c713518e0fb2471e1e4da3a988f37e45e6bca7678ecafa
 DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
 DIST Django-1.7.11.tar.gz 7586798 SHA256 2039144fce8f1b603d03fa5a5643578df1ad007c4ed41a617f02a3943f7059a1 SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee WHIRLPOOL 8797862021c6acdfcba5752f6f5f2d567a564812fc5089678a9d00b9d8f1cb13c03bd0cb9b369b68ce1d1f1dc1522f05d41778f5181aef9c7d49783afc280e7c
-DIST Django-1.8.7.tar.gz 7276831 SHA256 17a66de5cf59b5ee81c3dc57609b145bb45adddc0dc06937b998597d6e7b4523 SHA512 74b89efd4fd2d19542a30e0fa0648652aa85ea309804afadae1162b1cac3492e599beaf5ea868d67bcef5f016283952dcc869726cbf6f15141f0816a0377b041 WHIRLPOOL adae3d00ceab8bb3e526107068270d53de968b782d5e37a64f59ecaf75e8933d3895dc6de5c934ea180c8436a88acb4949f7f4f8bba56c13c92d08874596c784
-DIST Django-1.8.8.tar.gz 7286780 SHA256 8255242fa0d9e0bf331259a6bdb81364933acbe8863291661558ffdb2fc9ed70 SHA512 d7775ffb05840a73a99bf67d234580e135bc3d1b4c033ab3bf557e9bee42001fd309da7a8cf13cb99cac34cef0c4ef954903b5c90d2b4b40d084cfcaf05ba701 WHIRLPOOL 5952df1be91fbd4a68268f11600822ed682e2c4a5b12192ff0af86cffa6cfa9dca0038397baccf11b165aa71b4ffad955d8233cfacaef9b4fb229635e014cd66
 DIST Django-1.8.9.tar.gz 7288701 SHA256 fc012d8507201a628e877202bb7800799152285f69aa0d42a7c506a96fbbd2e3 SHA512 3423d11a6f97ca4518a7105fabfc872783d92f2ce4733739bc6dd7d53c97d7450c7343a8e77c2094ce6342b1647445d2ddef5deb2d3b35b5c0ba4679726f0a48 WHIRLPOOL 96cdd8cb557c8ae75d40516e2c88a4a63fb0f070e3614732786a4e7904f22404a1d189ae00b03527be9242c4b61646ce5093cb6535567ba0f23042a1b6e9a320
 DIST Django-1.9.2.tar.gz 7419200 SHA256 7a233322eeb35da5fd8315f9e5dd48f2171de43ca2cfb11b138607daa4bf8a2f SHA512 931fe067b366bf3868d1f66536b19f7dce4f3ea9e117e65175369ef2f625b925fedb6923aeb9bae94cb1887711951af30cac1c7992a984cdcbfd54fa0ef775e9 WHIRLPOOL b31053459222fcb46a731ab67879b581a8cba5421097037d263afebfd7a2b26a5026b99ec0d82bcd52ef6a09f272c16bae2445c7b41eeadc7270da4529b3c759
diff --git a/dev-python/django/django-1.8.7.ebuild b/dev-python/django/django-1.8.7.ebuild
deleted file mode 100644
index f62d9fbb4922..000000000000
--- a/dev-python/django/django-1.8.7.ebuild
+++ /dev/null
@@ -1,107 +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,5} pypy )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.8.8.ebuild b/dev-python/django/django-1.8.8.ebuild
deleted file mode 100644
index fe194bb2106a..000000000000
--- a/dev-python/django/django-1.8.8.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 748d464e2cdc..a1c88feb9aaf 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -3,3 +3,4 @@ DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a
 DIST docker-py-1.3.1.tar.gz 71456 SHA256 4a980c55f22b97573b68f720ebc0b6f2a01cd9ec454d305bd13d2b83109a0bfa SHA512 f027a44cd15aa0a9d47a748c6f593e940ee4b6db0d8a933591e148bc9b0e6801c9ece3f81fc3a21eba762eff838ef40bf04fda299f28ba508e029b67658ee228 WHIRLPOOL 57d7429d58610bbef4473d5aabfe7f1771b2e3d4f083d44d6aba8f144bf44afeff9a0bcf458754f2787b54e1a1e07fddb9e66a42c16a6b1f20a8e1f9be3aa558
 DIST docker-py-1.4.0.tar.gz 75336 SHA256 81e2a7cd59b25c3df63ec47458c8a019ed7e11355ea0cfeec1f38df8c93f3179 SHA512 c4ea0a4a43063c90aa212952b3aeaa1a7c574dfcf7e8223c3fdb24216d0939c80258fe4ad2b6bba24d9d5fcde27332106860baf463482119b382670ed57c0da2 WHIRLPOOL f085dc4c59ce5b4b8c22695c90e054f3875dfa7553a600e025f089b3f5da34f91b5de3fb4106e737150b3e558319a5ae4bd1a6448f4bcafc9f9d45fa1a826d3a
 DIST docker-py-1.5.0.tar.gz 84712 SHA256 a7b437aa9bfd2ad1e9b3eeed57e376d28a93acb852bac2aaf01dd70a304d439b SHA512 948f63f48a1994f90041c7d2e2982a313ccc0c9aea0dc1cec03bcd9afd855459088b36d052ab061ada270c8fe06c0c18115910b40740c78f58258782791180ab WHIRLPOOL a34f3f896e5e3722fb9fed520e0f776875fd869f4dbd10ee922a73332dcd46b00c608c1a65f28eb9e53ba4a343b430a83ccacf7fd211113ee4dabde6dbf7963b
+DIST docker-py-1.7.0.tar.gz 95003 SHA256 13193dff1e29e0f3bfa8a51751a08eac8d56b3b7d14c4c2c9b7a56647303166b SHA512 98296c2bcc567caae6178599470999ee97b6e9648096a09790912e92191b88b2affaec5fb8dbe3b9070015ddb198fe8b9c3210d1a450ce91e620793d19da7b0c WHIRLPOOL 483f85e598d601346e933645819c78639adff1f1c2d0d65e7f22c71412d85442c74e1690b8457a372b4ab2dc0d1c56e4a30b44edc67bb150a16f2bb95aae1462
diff --git a/dev-python/docker-py/docker-py-1.7.0.ebuild b/dev-python/docker-py/docker-py-1.7.0.ebuild
new file mode 100644
index 000000000000..bb34232ef74b
--- /dev/null
+++ b/dev-python/docker-py/docker-py-1.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+		mkdocs build || die "docs failed to build"
+	fi
+}
+
+python_test() {
+	py.test -vv tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
index af6c54f5da99..9c5c481700c6 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@@ -10,6 +10,6 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-	  <remote-id type="github">docker/docker-py</remote-id>
+    <remote-id type="github">docker/docker-py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index b2c8982b240b..71e61393f53d 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1 +1,2 @@
 DIST doit-py-0.3.0.tar.gz 16151 SHA256 af015e61b1aade838d299a508e72b35d714b67a9b903c65c2863427f5c3883fc SHA512 c6cbb326a7635b78d0c22ff7db8a722aedf8d66b85db4017e1a2566f1d8f1f96d4e00407cfec2180d20091addaf731a916da1a3970553cb4bebec87df90fc609 WHIRLPOOL becc06fd65d0afcf2b9034f7943f5cb01362ad06dabc154051dd5c5d0bf0b4cc35b94e5ee0a54b873ac1c32c82cd122b78e274fda597252ebdda1f5b78ef09dd
+DIST doit-py-0.4.0.tar.gz 16534 SHA256 46896bbb592ecb954397de5dc525e74f46dfb578ecfb53b7c57d7f798d57e2be SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33 WHIRLPOOL 0c9180a92e29d4bf2338c33af6e4fa3f23cfe6b5a35ee3c8eb060961a311796b8d1c342074a917bfc373f068e28a3c883fcb9bcb9be45057d44c35ef9838b6a6
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
new file mode 100644
index 000000000000..086f6e19046f
--- /dev/null
+++ b/dev-python/doit-py/doit-py-0.4.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
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="doit tasks for python stuff"
+HOMEPAGE="http://pythonhosted.org/doit-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/singledispatch[${PYTHON_USEDEP}]
+		app-text/hunspell )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="
+	virtual/python-pathlib[${PYTHON_USEDEP}]
+	dev-python/doit[${PYTHON_USEDEP}]
+	dev-python/configclass[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 65364978172c..8e27362af04e 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,4 @@
 DIST doit-0.23.0.tar.gz 316588 SHA256 5d0421be6e5528e3be11bd0ede5c232e0c91f2b98b55688d7db1ce0638e1efbb SHA512 f2298d76d9ce3e7ed5f356bfdeeef8d5d99ebae74571666a3d2b3843fc63f5a8f76cd6cdedcfe8fc81bc653ecf04951c11f50abd16e9aa8fc7539e3c224b0e4c WHIRLPOOL cfb09484e25cfbc9618ef5b4a750010d16281a13772a37a8da59f2f6e1ebed77bbc40c06f263062c0464e6689415aeac695c0ef9e5cfe561349efea61f8be8e3
 DIST doit-0.27.0.tar.gz 193700 SHA256 06662c8677fb3e925c262559b7d3c5d8e08a10320be3386a7d348702e8e3ed8a SHA512 afca1029873c9fca0632ef43bc75762eed0738b7e4c1b8e9babf10543b15f78c526794462a83fa2fac1b35f2ff9152afbce8660b1dfbd86ce9dd73d47c70a9f7 WHIRLPOOL 60c022977b6dfe9e3e66d206315ac23a291c4df58bc07b4f8120622f257b636b80340dc267e5615de5876d40a500cf0fbaf3f531c6f41dce53d91ebdc6d65d7e
 DIST doit-0.28.0.tar.gz 213582 SHA256 12a2febde2566728344acbdb6ad92f82417228cd548f0f467187d1e67047513f SHA512 ff1eeb1819ad8a962b98c6d96aef8173bc9793a3afd6e2086f1f80fa60eba73c71e16c1467be89f2f78c9c9516f3c780bf57d7f461df96940f2feb51afd2ad3a WHIRLPOOL cf759118284c8e7b74299bf7fa92e99bdf5302e7f1dacd86c301a14d13eca5a5611d2cd57b0411a76439df64add439627040dcc6902b2d43ffd95a3c942441da
+DIST doit-0.29.0.tar.gz 222341 SHA256 fcb479482644de3e83d6faed9b29373f1f38942b79b991a7432943a84416d5cd SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1 WHIRLPOOL 64e5cedb8d3ce0b99287713c05041da477182d63f745c7abc10cb72fd3d856fee62514cfa97c4ae6a433e12dd43d70bf4dea751eff99b91430b538dbf0ab7012
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
new file mode 100644
index 000000000000..eedd1cd8d542
--- /dev/null
+++ b/dev-python/doit/doit-0.29.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 eutils distutils-r1
+
+RESTRICT="test" # can't work as it imports nonexistant modules from coverage
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/cloudpickle[${PYTHON_USEDEP}] )"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Disable test failing due to impact on PATH run in a sandbox
+	sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
+
+	# Test requires connection to an absent database
+	sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	local -x TMPDIR="${T}"
+	# disable tests where pypy's treatment of some tests' use of a db is incompatible
+
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
+		sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
+		sed -e 's:test_not_picklable:_&:' \
+			-e 's:test_task_not_picklabe_multiprocess:_&:' \
+			-i tests/test_runner.py || die
+	fi
+
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_src_install
+}
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 4d207513040f..ed38cc8662ae 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,4 +1,4 @@
-DIST elasticsearch-1.7.1.tar.gz 28500556 SHA256 86a0c20eea6ef55b14345bff5adf896e6332437b19180c4582a346394abde019 SHA512 88786d277cb3228a5e477068fc5ff723e0b5aa47411cea5c55d15ae769f2fb123d274e29c592a9e0f655deedb9db62f296af5aff4e8b56539928025a3375daaa WHIRLPOOL 2218ec3603314a60b38e903b3f00681512306efe1892350ced71c060a24924391d66cb9273d6db5ebb781d60808a2f3ab4c77c57baa03714db143c3718602bf5
 DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
-DIST elasticsearch-curator-3.3.0.tar.gz 85260 SHA256 e55ec74df61b8afc05a27bb1791cf07131b54d0fccede6bd5ce8815f350c9a7b SHA512 030644137f2065d89ea44d19f71a5b54d2a216891f9f83984e131cd0c29d348a8a38dc292a076e13c2b87e6a25c30b6ed85780878f5bcaae1f4f0d57f4f6df24 WHIRLPOOL 80f2b6ad95e3f34b5adb6c55fc2ca7c8b31108bedc474735b5023d40c49930ab33993cb087c9d5928e67e907d2ed87a99b7fa4b5951ff91638bc4da7b725820b
+DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227b6ad8e7457dcb75ddc97a2cc6e054d30 SHA512 b1c9d10ba6c778fe1a440c058b4968bae1cfb81cff9e00508e406ce02ec5eb889b6d7caf8fb69ef132a2e681b127fbe3b71c6298ee0c9f047aeaeec29cdc1cc6 WHIRLPOOL 1e57b2cca97d90756d592ca96ceb4e1fc026e1c9deaeceb3df3a59937a9cd8710222d6c74ece2883dd425aeb1bfde034413d2f04ea0f4a4c276c0d7de3671cee
 DIST elasticsearch-curator-3.4.0.tar.gz 96741 SHA256 86e542886d83ad4c499437e42f4ff69d6602314a75c0c156d1c8dd838ab5e605 SHA512 23cab700acb8afe7967d3e024a293a765ba1823015006c2856c3967ba33ec8a21d214fe7e0b2840e9fc3adb4cc15c889dba955c849036850ed67d689285f9871 WHIRLPOOL 01828a116a11d41666fb21c967375055114ff050650ab329f5aded441aa98743b0c62bcbb98f7f5a2335b844d44e1f3020d6f36e0f2f24acbf357f69b056062e
+DIST elasticsearch-curator-3.4.1.tar.gz 91420 SHA256 38d3c576c1a714d3e4defd78c43d898908ac563aa93018afd47702b5ae1e01c1 SHA512 63cee7e7778cf9cc5484a5e2a5a7cb379c8ba84f194d44758bf6e7a468492c27f41dbf5df42d964c060761e61166d3eba056c59b4d44e0df6a75052c5f9b42d8 WHIRLPOOL 2aa54a725b5cf1b5db0e3a8b069bd9d0f6d791f7750311676d25bcb7fba233316d38980c68e2ad2bfd7ae7ea82cc69ccbc7746e40f95e6ce19562ed577e32228
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild
deleted file mode 100644
index 2aa52fc98f21..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild
+++ /dev/null
@@ -1,103 +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} )
-
-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-1.0.1[${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/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
index 9d58368ed2b7..6e46527e3141 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -56,7 +56,7 @@ python_test() {
 	# start local instance of elasticsearch
 	${ES}/bin/elasticsearch -d -p ${PID}
 
-	for i in `seq 10`; do
+	for i in {1..10}; do
 		grep -q "started" ${ES_LOG} 2> /dev/null
 		if [ $? -eq 0 ]; then
 			einfo "Elasticsearch started"
@@ -75,7 +75,7 @@ python_test() {
 	done
 
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test
+	esetup.py test || die
 
 	pkill -F ${PID}
 }
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.1.ebuild
new file mode 100644
index 000000000000..5e7893ad2264
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_PN="curator"
+ES_VERSION="2.2.0"
+
+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.8.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-2.4.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-1.0.1[${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: my-application/cluster.name: gentoo-es-curator-test/g" \
+		${ES}/config/elasticsearch.yml
+
+	# Elasticsearch 1.6+ needs to set path.repo
+	grep -q "^path.repo" "${ES}/config/elasticsearch.yml"
+	if [ $? -ne 0 ]; then
+		echo "path.repo: /" >> "${ES}/config/elasticsearch.yml"
+	fi
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID}
+
+	for i in {1..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 || die
+
+	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/empy/empy-3.3.2.ebuild b/dev-python/empy/empy-3.3.2.ebuild
index 62e123ea3548..0f8dca33da41 100644
--- a/dev-python/empy/empy-3.3.2.ebuild
+++ b/dev-python/empy/empy-3.3.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/epsilon/Manifest b/dev-python/epsilon/Manifest
index f78f3c15e9b4..934b196d23f9 100644
--- a/dev-python/epsilon/Manifest
+++ b/dev-python/epsilon/Manifest
@@ -1,2 +1,3 @@
 DIST Epsilon-0.6.0.tar.gz 96243 SHA256 2be3a6ef877c4e17ca9dadd6b484fe31bdf16c20b949ec6a8b15677e08c512fa SHA512 0ce7ba2eb86811dc50a0e86b9f3d85be1a4f930f86659c2381a1d80455e1e86362b8719c92ae2ad951a34264e5d0649ec5de96f1179734c7fab6c3abc6fb037b WHIRLPOOL 6aa363b44a42f29ec836cf46b2fdfe3bb57541a9fe282b57ea888f4906b9c438c9eb99d5a0876cb11108b7337a0691c45810a3e44579023f0b660e8752952120
 DIST Epsilon-0.7.0.tar.gz 81218 SHA256 81419d50b17a20efd75440d43e4b07fe3c2a5e6d619f39318dab9031a0680032 SHA512 d1927ca431df3233a94296ca9e1f5dd70d6d61091d23f77df2222c6472d9a5f7b55c5c8dd2a75d0fead41af862c9e3a6a0ea9a31e21447459d5182f0d677d9b2 WHIRLPOOL 8cbab28e5e05b44b521c5f66494de1e2f4bee7713487cfb9d87bfcc108dc05b6534919934fd53cb1b0dc7aee633187351973b78cfdabf0584d6b294104a05a57
+DIST Epsilon-0.7.1.tar.gz 96820 SHA256 419ab2de80e6b201455775a939c158259af90695e59474a4a7bb3cd522a7193b SHA512 ecf34a402208e514c430b4b3785df9b29f3708026ceba1301a2db8760b55111f59e7c40f868f4b642e4c7dd6c78735edbc32b2ef96ec3582e90aa2d978f06842 WHIRLPOOL 69de1d74457ce6f376537c1a8ba3adbf8cae7b2e7325d8a61ba1a1a83e1b2cc88794b5016fa37b1808e32ff61834cb215b30146d93a0e6416623afd6a4609c08
diff --git a/dev-python/epsilon/epsilon-0.7.1.ebuild b/dev-python/epsilon/epsilon-0.7.1.ebuild
new file mode 100644
index 000000000000..75b56bef484a
--- /dev/null
+++ b/dev-python/epsilon/epsilon-0.7.1.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=( python2_7 )
+
+inherit twisted-r1 eutils
+
+DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
+HOMEPAGE="http://divmod.org/trac/wiki/DivmodEpsilon https://pypi.python.org/pypi/Epsilon"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )
+		${DEPEND}"
+
+PATCHES=( "${FILESDIR}/epsilon_plugincache_portagesandbox.patch" )
+
+# epsilon doesn't install any plugins, so override the default
+TWISTED_PLUGINS=()
+
+python_prepare_all() {
+	# Rename to avoid file-collisions
+	mv bin/benchmark bin/epsilon-benchmark
+	sed -i \
+		-e "s#bin/benchmark#bin/epsilon-benchmark#" \
+		setup.py || die "sed failed"
+
+	#These test are removed upstream
+	rm -f epsilon/test/test_sslverify.py epsilon/sslverify.py || die
+	#See bug 357157 comment 5 for Ian Delaney's explanation of this fix
+	sed -e 's:month) 2004 9:month) 2004 14:' \
+		-i epsilon/test/test_extime.py || die
+	# Release tests need DivmodCombinator.
+	rm -f epsilon/test/test_release.py* epsilon/release.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	dodoc NAME.txt NEWS.txt
+
+	distutils-r1_python_install_all
+}
+
+#Lets run some tests, having prepped them
+python_test() {
+	# No testrunner seems stipulated within the source; pytest and nosetests both work
+	nosetests ${PN}/test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a28398c4ad57..a2433eb8fb16 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -2,3 +2,4 @@ DIST eventlet-0.13.0.tar.gz 276599 SHA256 d98118f01c064a6d256a264d4b939b2c6ad081
 DIST eventlet-0.15.2.tar.gz 301581 SHA256 eaec368ce7b819f8615dcb51f63dcb5c910538cdedc99e4bba4c90ed0bf70fdc SHA512 1166d480ecca9ba01b3c660b79168895c938ace33f1b8244f184c306de6e99302a1b131cc0ad6c363d65b04ccd7fb58107a39a669b9817ec43c5c167e12c3ec5 WHIRLPOOL 1754607a5702404a71b8698fefe9f399b9761ed3b22b9ff5ed85b358c6354f4e280b2861e3537d927daa279eaa09b3b760da0de85a1a1bcbe9d1633427e4f2ae
 DIST eventlet-0.17.1.tar.gz 277110 SHA256 de9c23eb94e55150b25150822a28f91656028987353fef3f687cc285d018dd5a SHA512 c39158c9b60d2bc615abfaf93fc76e32017e57c389f148080ec30ac0fdb090a53fbb6bf24a361845772e02d330fc5b9e6682d77228b811f499b9a8c86452c2eb WHIRLPOOL c6fe8d5abb83fd304887281614b87d59125be7bfd478ab76bd882dd1e9fca16a64acab60b7012bb6283d99d88937a313b84bf818728839d320e8f537421bc83f
 DIST eventlet-0.17.4.tar.gz 284480 SHA256 8721e9714eaff8d20f2407e0d3a80069db6b57c9226c26ee9db25c541d06556d SHA512 fee3ef0ebe7aaf8cb87283af71ca8902c4480b47cf2109be96e6fcbcf25a743e411715fa73b31e820b152ef4403ccbd5a45117e69565e8e49fd1795a5cc19e3d WHIRLPOOL e78344ac9e7f7f1c4bd6fc65f0a35dec317c10b12821a73dc875d79a94e36f16ddda5551e3326c600ea553ef05382b4cd2f7a88b6600899ae74a8b4556eb155e
+DIST eventlet-0.18.3.tar.gz 288867 SHA256 c188cc0f186892fb9c77846c0e669fde4a3d263938e3c8a76cb1108cbdf0cc9a SHA512 8e132ada9392170c5d915699b414eb55a2738259e4a49f1d79c41e7820e33c2aefc2057f0b50a126554a47911051104d4c038fbee48790f0b73a67d74c02f756 WHIRLPOOL b2adc594c0a62540874ffff6c716c725f0ca9b102ea618c651027459fae95fc70506c7c420db470c46a0109558d9c327b27f08506fad3844018f8761f2cfdd94
diff --git a/dev-python/eventlet/eventlet-0.18.3.ebuild b/dev-python/eventlet/eventlet-0.18.3.ebuild
new file mode 100644
index 000000000000..5b99da100772
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.18.3.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=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+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}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || 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/flake8/Manifest b/dev-python/flake8/Manifest
index b9f1fc5405ba..94dd1f377bec 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -4,3 +4,4 @@ DIST flake8-2.2.5.tar.gz 28333 SHA256 285e8bd730c0b6fdfbe23c32d2936bffba401f23ca
 DIST flake8-2.4.1.tar.gz 50324 SHA256 2e7ebbe59d8c85e626e36d99f0db2f578394313d3f7ce9dc9f1da57ef6cd7537 SHA512 8ddd07d6be53b06efcf7dd9aa2daa070ab209f7177e46f32a3bcae545acbb5e020aa27aeab54426798ae6c3722b38928b06dc3e53115cc624a16fa0fa97f4840 WHIRLPOOL 9a653900523eded448c5cbeca0b111ba220be39ad307e46ded35a1454904cb59f5e0765425d90e99ae0c853b2931fbe910c4412e73771098bb0a3543adb8cabb
 DIST flake8-2.5.0.tar.gz 82600 SHA256 8216c8c6ee092ae93d51f89bc91045648c88cd9be77d60cf47df7ca26ee4f88c SHA512 6f55ae237fb834fa9376760eddf77553f9edb1b7328175c5f07232b160e4d5ea9d65caa91241f7d1db90845f9c02b8d41129cd453c1b09a4d6870e0e53ba0f8d WHIRLPOOL d08e5c2d2c488e558e02a272c1753defa2a200d37b2b113f1f1523dc06f6ee5dc7f37c60f598eff91c4aeb47a76bd0dd60c0fdd7d2a6b7fa0a7bbec2b60a88d2
 DIST flake8-2.5.1.tar.gz 83692 SHA256 448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603 SHA512 030d2464717f62e3c5501631e7bc4482321086ca3e7f7dfe845dab66aaf38be94565c1e147792ba7e7d2850fd5290e61a24fe1006daf18c3be2ff81348c5731c WHIRLPOOL 63a6915eeb32be4aa51f3b69c5c6918c3a2953a4dff203515d20a10e58dc12cf7732a5e715b279c17d2a0e4b77f6879dc9f489395ddbcb6d0c340a21be39f9e4
+DIST flake8-2.5.4.tar.gz 81663 SHA256 cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28 WHIRLPOOL 2547b78092b1a85edd2a0d03d9e0bc31e7d3b7cb3958cf5dea9947377851a69d5c37f64c0d65a5d7e88ab9573597729adbe07ae758b0510e455b26bf62292f47
diff --git a/dev-python/flake8/flake8-2.5.1.ebuild b/dev-python/flake8/flake8-2.5.1.ebuild
index 4a5fc3b8bf33..f52a4537ec20 100644
--- a/dev-python/flake8/flake8-2.5.1.ebuild
+++ b/dev-python/flake8/flake8-2.5.1.ebuild
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 	test? ( ${PDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	        <dev-python/mccabe-0.4[${PYTHON_USEDEP}]
 	)"
 PDEPEND="
 	>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
new file mode 100644
index 000000000000..a6d01b7b8797
--- /dev/null
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	!=dev-python/pep8-1.6.1[${PYTHON_USEDEP}]
+	!=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	        <dev-python/mccabe-0.5[${PYTHON_USEDEP}]
+	)"
+PDEPEND="
+	>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.5[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# This tests requires / assumes this version is already installed.
+	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
+
+	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
+	sed -e 's:, != 1.6.2::' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index fdb457838118..d0dd96098b8a 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -2,3 +2,4 @@ DIST flaky-2.4.0.tar.gz 27157 SHA256 6446e186674db9d67be5e85857b6e98a68a6491d5d3
 DIST flaky-2.4.1.tar.gz 27430 SHA256 e8e94450c7c5d56bd30e0634fc6c725936e7585322d60469195dfa416c0ab2ea SHA512 2c4736ee370a9462bed29239a525a8a0296ebbb0abc6f194ac36db1fa6fab78d41c3927f1cd3d5c50649f374406e3203c16f0d2f4e3fac6a458392db110ed0f9 WHIRLPOOL a5665b1ae1e8f82ac96ca07675e719f3c5f29a0347c5c5dc1b1badcfc2454b3fa97e9606299f2b23ef30f61a6342d399eedbafb02931b6f9746af6dcc73f53e2
 DIST flaky-3.0.1.tar.gz 21683 SHA256 9004f24832130835a89c1d767b1353f867b1e6aae434cde13749485d377a515e SHA512 4774d53cfc4b32f6555a00605c4ccb776811e04baf1de3a96dcb4029eefe83d3f2534f97f8021a0bf2fadf3bb041a863833dc4ef08c782fe979ac52cd4e9a1c6 WHIRLPOOL a32734fd09b88e9889062574bdf6c1c4f179ecbd7381e8964183ada06a53c0669db81edf16f0096cd4a4a7c1df49917ffd97387a8f0c7c92587b0f0697fd0d6b
 DIST flaky-3.0.3.tar.gz 29055 SHA256 24da4483ff313171e5ecbc341c50b8b7fb481850259c44628e2c90f726407770 SHA512 b8f7b858281a9dba6deaed3f5616945a57855165a9ad20520a0c6e514e93d2a73cd66cb5597482d8845d65ee30e0fd62cd5c6e8d7e111e8d5688d27b41729e5e WHIRLPOOL df6848fefbbeb5a18a64d225b1359dfb61dd3469e257d87103095ab8f3ebcbe3b1c318f82b48e9aa50d906df6007e7f89d5f8dea8d2927602b51d543b50af6f7
+DIST flaky-3.1.0.tar.gz 29063 SHA256 8168823da71a415a8fa437807e719b4dc9337780da72d4459112f3a366ec31f5 SHA512 ac97f829ecf1e8e3b48571b0c895de149ee2fbe92c3cfd9e53e8521684a16e8d32c7f2cda2b92dd504b65127b67a8eaf1e91fb54d0db0a5d61be912b5fa0e824 WHIRLPOOL 194ede5eaf61e4180247f44d213508eeca8b9a0b3aee9f189122d7762dbd8b135b9e79e3752586b37624004ce899b4ea92d6bb085cc0674c7721985c46aa8b54
diff --git a/dev-python/flaky/flaky-3.1.0.ebuild b/dev-python/flaky/flaky-3.1.0.ebuild
new file mode 100644
index 000000000000..1dd7db044ad0
--- /dev/null
+++ b/dev-python/flaky/flaky-3.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.python.org/pypi/flaky https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	cat >> test/__init__.py <<- EOF
+	# coding: utf-8
+
+	from __future__ import unicode_literals
+	EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
+	py.test -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	py.test -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
+	py.test --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
index d0d803e02bb1..d73affe50f01 100644
--- a/dev-python/flask-admin/Manifest
+++ b/dev-python/flask-admin/Manifest
@@ -1,3 +1,4 @@
 DIST Flask-Admin-1.0.6.tar.gz 235842 SHA256 c16d1bb1b6c2b6ac8db8486b9a5e1919d1a073252e3fb0c0c226406470113a54 SHA512 a30e2678a063d45d55ccf41cfec07fd16973cc8c770b1e7f16d11b9aba693049b1d9d4cff81d8ae8f2548d019f977f0906728e98d23d229d76bf135a079abc8f WHIRLPOOL 9851b8f7e59c5b7bf99e2e58a0ad72076578f12564146a282b9e3e0e79bd31bec7a1fd394dc807b8152165fce617c6a7b025cfaa987680a649412a3d1c3f8e8c
 DIST Flask-Admin-1.1.0.tar.gz 735408 SHA256 28380393143a9b209e22c256494ba3ab1b6aea86f183962451896e26e75a8609 SHA512 35e21cda38ba8658940356240df7b3feec7619a5ab7c31c70c8a962b385d391d78d6440716c7dfce00fb48bf1243799de2a3d53b3cd0b7eee45137e2ebd3273d WHIRLPOOL d2790169dd3711864ee190c328bc5502622706af6a3c306b7d8c00459a0859af4b527b0dec449a824459361f4602fd1c1f7a96212e2585c3d46df3beb48197ec
 DIST Flask-Admin-1.2.0.tar.gz 790881 SHA256 beb4b3edc25319e8848889ff2460f489cf85a457a46d1f1cbc09f332452d0260 SHA512 77be8cabfde74ccaef4818e914d792583b54dcdeedb15f89bcc89e074e18333a9a40d9ea03bef6c3409c24a18cd9ede06fbf9f3a7529c63ef28affd705a2d42a WHIRLPOOL abf61615f724586a3074b3ca546be96d9d332c8ffb1cf15111b9c837c7c2b9495a6664eb7cdc6ba9b4cbda6694ea2219547e302b621aa170a1d6c6355191d6aa
+DIST Flask-Admin-1.4.0.tar.gz 868807 SHA256 f2d58448985cf25d757be8e4764a46134a6d0a6ec7fcddc584050a6cc8732d6f SHA512 19b65e594821164cd80f0665bd3052865ada4d4676f3deb15ef32e040d3ed519a50cab53fac958d8efb26f6b2056f820a2116a34d73119d120a7eaf813a69712 WHIRLPOOL d4443241f4ccf3fb588264656d6df019ec3790a84ecb96a461d073d75ad2be739229a230d88ee48a1b73a5fe21ffad6caeba76271877ea6b0776a4f67b2452c1
diff --git a/dev-python/flask-admin/flask-admin-1.4.0.ebuild b/dev-python/flask-admin/flask-admin-1.4.0.ebuild
new file mode 100644
index 000000000000..f98ad9148dab
--- /dev/null
+++ b/dev-python/flask-admin/flask-admin-1.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
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+#RESTRICT="test" # we're still missing some of the dependencies
+
+MY_PN="Flask-Admin"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and extensible admin interface framework for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	>=dev-python/flask-0.7[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/flask-pymongo[${PYTHON_USEDEP}]
+		dev-python/flask-peewee[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed \
+		-e 's:find_packages():find_packages(exclude=["*.examples", "*.examples.*", "examples.*", "examples"]):g' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 0ee2118fc8e3..fa8f4c2a78e0 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1 +1,2 @@
 DIST Flask-Security-1.7.4.tar.gz 41467 SHA256 f0b8ee98ab983d96b808c97d4bc0d6ede9fd7adf88f436dde7f38fb66aa1e2ed SHA512 9d0f7db3250f6cab5af4e60cdffd2fffe28ef2dc30e38a479eb91f04c559308b5c530784fc4d9bbf410fd3f6060830f150b8cdb56a3a2d650c4873a14e09b622 WHIRLPOOL b747c9e9e73eb82c4c4ebd6d61289e09e383f5055ec2dcee12af74117119431ef341f01917ab108e19fa02b7e84a10fd03c33c8407c00f1668b86ef3236267c2
+DIST Flask-Security-1.7.5.tar.gz 42261 SHA256 988952dba451896fd7e9dbf838d0e843844f1cbd27a8e15594a9e1d9432f435f SHA512 41fd806d35746bdc212aa4ab01af678d39765a6d4df42cd19c87b8a2060374112d3e8a5f2fc243e88906505d6a942b9a824cf19a29b2c0eebacde9299534ffc9 WHIRLPOOL 1f106bf2339bd3d5b84bf9071c5c67564bbc2d7433f5271bb39dff663011019c3e04073fd4887eebfb95dfcb43e8f99fa8ba17158b6366fa54dd9d42cdb6975c
diff --git a/dev-python/flask-security/flask-security-1.7.5.ebuild b/dev-python/flask-security/flask-security-1.7.5.ebuild
new file mode 100644
index 000000000000..3f7985782d57
--- /dev/null
+++ b/dev-python/flask-security/flask-security-1.7.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
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Security"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="http://pythonhosted.org/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+# packages of this type require local running  instances of databases
+# which then require connect to localhost
+RESTRICT="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.17[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-mail-0.7.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.3.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-peewee[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-socketio/Manifest b/dev-python/flask-socketio/Manifest
index 811477bee1c6..74e11d0a0cb5 100644
--- a/dev-python/flask-socketio/Manifest
+++ b/dev-python/flask-socketio/Manifest
@@ -1,3 +1,4 @@
 DIST flask-socketio-0.6.0.tar.gz 6804 SHA256 5b004bc9a74421ec3983f5167a7cab70853b132a9c9c09d808c07f96bbf6ecd9 SHA512 3093fb659e8fe86a866bf9183401995a6615b3dfc8687549fa5845747935b6cd6bfc7bb56c969489f47fdb1a5420d744817b6a7dce636ab653ef62a08d353b1e WHIRLPOOL 1ff182a51ac24a61e02a6bf46612932bfdb4121737e27c34e324c859e9fe43a6db408fa162d0ff3b3952e8cb9bfa1e9d0f7b9e57149bce8af461fe5f4e829356
 DIST flask-socketio-1.1.tar.gz 7992 SHA256 fdeefa4d3a87b789308e5144d0c58299d50d35fb97c6cc0a76f1d12e255b20bb SHA512 a7257698c32e8b57a63b86ae5bffa8c5c32d9198186b98e2d2f306562ca7b188c5eb260f2716556973e2c0902a37ec66f7809a61a83c6fab4d6a950eda963580 WHIRLPOOL 621e49ef3cdfb94cbd8042d2d1a396d47272541e06d901b6fcbc4fa83951ce7cb30d6cf065405cdb58f01be002901b3b2ab9378f26dd8664ea5949bdecbe6d58
 DIST flask-socketio-2.0.tar.gz 8730 SHA256 f6fb24762d0c6e430f215beb8d62c262816733c4d9726714f9b7badbe1058bb2 SHA512 2a3e28dce72f448dc763bfe533330a0d80aca82ee5e9b9b6538e66853f809424550a3a005d558d11ae6b89266c3946811b4c8811f04b0e2282390414a9b458f8 WHIRLPOOL 19853187d924f74b4b5d6b20e05e3f74b2198853453ea6982878625dd40c75826cb6c001c1e9f07a7a084124fcf2279ac8f5ea307b652ef027fc9fc7a919460d
+DIST flask-socketio-2.1.tar.gz 8888 SHA256 232674f2fad4b1adaf1d045f89a9688d74a77efc1d4a6a4094f2d16f711e80c4 SHA512 cc8410c20bd9ad66cd327acdd66cfa741d006c0937a4571d7a2571d0e03d93885f75e9065f2c244e06fd2add4a3997399e92530ff8618de6bad4a57e814284cd WHIRLPOOL fc1432d4df8ceb891cf02324d7e274efadc4f41fc8060870fd8a6c8efa1df2f984bd1404febc2a164f3638748251d37c3b32a322bc140623d71491d7c9f6ffdb
diff --git a/dev-python/flask-socketio/flask-socketio-2.1.ebuild b/dev-python/flask-socketio/flask-socketio-2.1.ebuild
new file mode 100644
index 000000000000..a70aef90e418
--- /dev/null
+++ b/dev-python/flask-socketio/flask-socketio-2.1.ebuild
@@ -0,0 +1,33 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Flask-SocketIO"
+DESCRIPTION="Socket.IO integration for Flask applications."
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	dev-python/python-socketio[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH="${PWD}" python ./test_socketio.py || die
+}
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index a3b927ff0396..58cf9b5de22b 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,3 +1,4 @@
 DIST Flask-SQLAlchemy-0.16.tar.gz 97968 SHA256 eaffc4252657229bb8da7447726e9e74b83087b96a3b8990121361b322985b6f SHA512 a6a8f5043aba14fb7fc2c59631d76ec0277d1a01f8b6bd4890271a59f9480ed40665747630194a43a5c19f694e932f86e56b1dfe4a3060176941c82c310ea5fa WHIRLPOOL c3f5fc30c956d39518229289cf7017b589392e18b448d2ec9d5650ed21d5d26309e1f2a60e4bc0e4e5f5cc8fc943f51f0cdc9e8f99d801ab6bfcb6c9600499c6
 DIST Flask-SQLAlchemy-1.0.tar.gz 92063 SHA256 7f0e218fa9066b34b73fdc470386a37ee117b8a862db98c1bca8236d8cffe7a1 SHA512 0ab84f4f5a0709c25d6177431787898f13543bd5a97fc67da9a376be66bfb27d1d7437d28a73e5052b5d20cab237b22a16add91159efaabdd133ca2f546fa5b4 WHIRLPOOL b0b394354975943d216d9fd690012cfd32c3b263ade0d85d92ebee856905fddbb523b3db5e6ec74574ddff0de57ec3162884db6e1563f9a5b71b1223279a7b0e
 DIST Flask-SQLAlchemy-2.0.tar.gz 93413 SHA256 990387d2cff83df7feb40e9d6b286f2679144258480249cbd47b88dc0939e886 SHA512 7a1962764a5481d0f7ce0ec0beb260dfbd930e76cc426e3f645cdd436f920ebb01ef8bb369c29d2e0bf4a4db29f4a660de8f44ea9110c95e440c0506922c8690 WHIRLPOOL f2c4966262d27f56e48a0a35f9b38595c95327eb7fa5cf6296d4d913ec2d933fc6092d6e08a705643e62210b5b03bda2857c6b9a939f9212f142bcb8b0c40243
+DIST Flask-SQLAlchemy-2.1.tar.gz 95967 SHA256 c5244de44cc85d2267115624d83faef3f9e8f088756788694f305a5d5ad137c5 SHA512 023f3dd011a57768e921928dd3df791a54c64bb8a0cc1bb545dbb8e16dda263b730da74a0d400e5a057819830dd4cd014a642098a081c956a7ea8a2d37ec112a WHIRLPOOL 8acda8985dadde8f14157e9462c3d34220e0bed8b571797aa11f3f415dfee287bfb412142a94dfe725c1d6aab17e241bead90cd1b5128d29ee9905422e58b769
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
new file mode 100644
index 000000000000..0b58296ca5e7
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.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=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Patch out un-needed d'loading of obj.inv files in doc build
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+# Req'd for tests in py3
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flexx/Manifest b/dev-python/flexx/Manifest
index f07c3efee700..44de1c1bc9f8 100644
--- a/dev-python/flexx/Manifest
+++ b/dev-python/flexx/Manifest
@@ -1 +1,3 @@
 DIST flexx-0.2.zip 195542 SHA256 ee3d755d79d7a4336e2cf4145e07881056624db9161cd1aa338402a51575bb72 SHA512 552873073ce32e39cefe466c7f1490b23b4f332594040ee4e423c08b83cb200ab11de25705b43dd95036f0d9c8ece8ae0c6042fda47fe3ab7266e3b6b0e22bad WHIRLPOOL 5dd33657e3725ae18b9e78b315ceb14440461cafd5e6d7ae3e907dd00cc8019447d550f91b58e975b91421a247696e0a517d4e3bb6d2bdf86a207c5e3985cd9d
+DIST flexx-0.3.1.zip 418280 SHA256 aa8aefca3aec283cf555a2b59aa619fdd1b595b62a881cee35e3f36794185f04 SHA512 3d98daa18e0f307ed24386fc59a59a4df1727cdc7483cb1fa7bc6c5b2eb8cba36fbc100a98d8549ac890ef8ba86b9acef77d34e26c99994b918f5344354b0bfd WHIRLPOOL c74eb8e22975c16296ade19f46364c086bcdbfd83dd5a2592033fb6ba53164dab17814a952f34db93b8170f01def4c46423f8e8bbfb6c75c620334535113f9b2
+DIST flexx-0.3.zip 525429 SHA256 6945fb3389446d30c904470dadf02528e5032f7c90fe9b6c66f06063b2faedc4 SHA512 4769ba89a1a7f48dcd044f6e301d56c11fb147e2fd5c8a2614e9099b11f76249d8f13320e7b4566971b0e56bc20bb83c4d48b8f7892b57a82763979d6458d6eb WHIRLPOOL 570e090a196472273bb5fa09dae74006a88887d314db7fd2f183842248c8478bbf210dc8b7487d166de4dc91b1dbb9c72d0621f2402a072464ba28ad01c3b0cf
diff --git a/dev-python/flexx/flexx-0.3.1.ebuild b/dev-python/flexx/flexx-0.3.1.ebuild
new file mode 100644
index 000000000000..cdc8d14dbb81
--- /dev/null
+++ b/dev-python/flexx/flexx-0.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
+HOMEPAGE="
+	http://flexx.readthedocs.org
+	http://github.com/zoofio/flexx
+	http://pypi.python.org/pypi/flexx"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/flexx/flexx-0.3.ebuild b/dev-python/flexx/flexx-0.3.ebuild
new file mode 100644
index 000000000000..cdc8d14dbb81
--- /dev/null
+++ b/dev-python/flexx/flexx-0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
+HOMEPAGE="
+	http://flexx.readthedocs.org
+	http://github.com/zoofio/flexx
+	http://pypi.python.org/pypi/flexx"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 605b70fc8f97..0be668b9732a 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,3 @@
 DIST fonttools-2.4.tar.gz 348885 SHA256 95e5d8a67e2dae3ea237f9bebc449e0af42f12f03683db34f617e5b15d9d4fb0 SHA512 d63f4d715b2af2716145e6798cfbcde5a96da0d778f1a394bf8850afb0d4643ee87399a031c1f97f67d46ec545eb548ef137e794b1b02964ad04d54e468ac570 WHIRLPOOL dfc654fb40ec8cb7f7c3767e33bcdf6a0048ff42b53f97e9df893402f8470f95ba85dda436263b3f4a5281d19f48d8b21b2be551973421a17b6ed25ff211eef0
 DIST fonttools-2.5.tar.gz 229374 SHA256 c89603f9f3346f48f4a24f786422e935423554e0a9172dcd3ec8ffbd556d2159 SHA512 03e5943dbf821563d1997de50ee3a5d46c56d22d8ec48d03211fe4c51913154da36655bce5f5b003551fbcc7daa39919f1d1d21f2dd8d61c1f6186cee74f694f WHIRLPOOL 48b75a2b7b525c46f6de9b3b258873ef2965d9b9ba10679e4958e0dcde3d031c2ded9f8d7beb0dc41233ca028bc83ea3b4f75df6b4457f6f3a8ccf6b547af45f
+DIST fonttools-3.0.tar.gz 298992 SHA256 3bc9141d608603faac3f800482feec78a550d0a94c29ff3850471dbe4ad9e941 SHA512 d0793d4c17e077e2cd308f37680d8b2ac34502542fda5a4a20e9567dff3667c8fc3f73aff8605e2e86d5486bf9a61f3f25f1f8d20d6de610477f7f8b0c7be40e WHIRLPOOL acaf145935e7f85529bdcd74edd366307482424ea68b55be96c6e51808d2364e0c6c2aba1cfef8d16b8e402a286add0785e7974998492178b3fd0ce2458207f8
diff --git a/dev-python/fonttools/fonttools-3.0.ebuild b/dev-python/fonttools/fonttools-3.0.ebuild
new file mode 100644
index 000000000000..2c5409582d66
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.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
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/behdad/fonttools/"
+SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/numpy-1.0.2[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	DOCS=( README.md Doc/{changes.txt,install.txt} )
+	HTML_DOCS=( Doc/documentation.html )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/foolscap/Manifest b/dev-python/foolscap/Manifest
index bfc91c6e8be0..58708cc2a532 100644
--- a/dev-python/foolscap/Manifest
+++ b/dev-python/foolscap/Manifest
@@ -1,2 +1,3 @@
+DIST foolscap-0.10.1.tar.gz 491548 SHA256 bd7c6ea98237a81622461398254528c9c791574fd283d1a1ed8e0e3f705b36f3 SHA512 94577c2ad95235aad955ea1bc435b23d8c460cc658179556b204333df81359e773e692befcb0546f003a62aae24cc5dcaa85c1a06fef52cb7e32cdcf820613f7 WHIRLPOOL 0b709c8d8bbb91e187f4fca7c67f7cae07df6e2c11a5b7e47e54e0abfbc06d61392b860ffbae42e9b236452e248875056b10e001eda060cc17f86856ba92444f
 DIST foolscap-0.7.0.tar.gz 478999 SHA256 fba0e016079442c9e69e2752727a1307f4110a1c62319a059650b2ab044b29d8 SHA512 b2eb5415376d4e8e4ee3fd9ecef80a02d195d6b44059e5292c2daa7dcfdea9deafd8678ff89391128244a8d41fb6a69a92f9e4f07cc599f7358783dc8cb70f15 WHIRLPOOL 58bc4b34d36e1edfa3bbcadb6a16704820af8b6448bf09d6d5e95c23edf60f41481d6792fcae808c0bd8bb3f71b18ed794c0be00e77cc67f160cb3b026567384
 DIST foolscap-0.8.0.tar.gz 475062 SHA256 6ab49e8c52ee49597148802a877593ddb6ca9a63cb32eaae8bff2900667be1c9 SHA512 4f491ac1e35e76b7fcee5994312e34696921eb7a9b0913e919142fe2807e32aad5ddbbffec3bfe5e1f4333ec38e0ee607ea9cfe5007b385ab6a15ea913c80f45 WHIRLPOOL 5b8c26eb081cf211683d6a8ed3177267793fe2aa3258b2e6b381aaa4d367ae4c0fb61b0902a186874efad9d2150303378d4468c573992047ac0994998ba2f534
diff --git a/dev-python/foolscap/foolscap-0.10.1.ebuild b/dev-python/foolscap/foolscap-0.10.1.ebuild
new file mode 100644
index 000000000000..d2ede09954a8
--- /dev/null
+++ b/dev-python/foolscap/foolscap-0.10.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 )
+
+inherit distutils-r1
+
+DESCRIPTION="RPC protocol for Twisted"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.python.org/pypi/foolscap"
+SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc +ssl test"
+
+# setup.py stipulates >=twisted-core-2.5.0 but failures occur in testsuite under -15.x
+RDEPEND="
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_compile_all() {
+	local i;
+	if use doc; then
+		pushd doc > /dev/null
+		mkdir build || die
+		for i in ./*.rst
+		do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null
+	fi
+}
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index 2de4d8c79f6b..046dcd618f4e 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -2,3 +2,4 @@ DIST futures-2.2.0.tar.gz 26786 SHA256 151c057173474a3a40f897165951c0e33ad04f37d
 DIST futures-3.0.2.tar.gz 24908 SHA256 dc3fc91508e49e0fd2f8625f0132d16e49c80f882e7e1d565c56b0d5dfbae257 SHA512 01525c16914506d1e82910c5994aacc011d1ed01e91b7e403203ed1aa22a8caa3ff759ff399dd72628bc211dcab0893852ac177f792711ee9f9037a64c7e5723 WHIRLPOOL a59740472ca7cf339beb9ed44095d7f02b5701fcb2a28e41adc4dc6da63f23e5a629602010183ed611c4f60ba1a109563bd87242adb729ece12b57d63379e160
 DIST futures-3.0.3.tar.gz 24959 SHA256 2fe2342bb4fe8b8e217f0d21b5921cbe5408bf966d9f92025e707e881b198bed SHA512 2fa14df90e583ca86c47441b170a93435eb82fd37bb2e15d98e79c32fbe40fc3f602d762805de05fa8007df4a3ce92840915be59481b94ab4863aae884da74bd WHIRLPOOL 661a1174815766717eb7b130929c7aeef08079228df8f092093ee6cf40f84041ae6729cc7c0f2b05080efd0d80c0f7885c3ae333f7e5f3d21ccf2cfc20cbaa44
 DIST futures-3.0.4.tar.gz 25091 SHA256 19485d83f7bd2151c0aeaf88fbba3ee50dadfb222ffc3b66a344ef4952b782a3 SHA512 490a42b547614e2a02fae487861ba8c8409c2e7c556ba81c6ea7a3096d06f7e083983b1e9b99dc978c4badc1dc30272f4a5cfa87c38b3d0ab8029673ee66f52c WHIRLPOOL 5f3809d710743638b8aa3afdae0125771096858c88a8b2c5c533187736dad8b6bc8c38dad327b98d36183574b072c9268751645caa16132ac8df32715262f741
+DIST futures-3.0.5.tar.gz 25153 SHA256 0542525145d5afc984c88f914a0c85c77527f65946617edb5274f72406f981df SHA512 29f366a273600924acba4b78d53e2f911379da04a7067c3bc2911c20c0fe880300fc2b8c91d8f1b6689e5732b79eeb4198fde56854ab2b7caf47382ad5942435 WHIRLPOOL af27bac5b3530bdb85987606fbce11ac8d6c426a8b7ed825c96607284e1690194a0f128d696770777ae417cba9237f7b5670587ae27c57556a80251bfbb557cd
diff --git a/dev-python/futures/futures-3.0.5.ebuild b/dev-python/futures/futures-3.0.5.ebuild
new file mode 100644
index 000000000000..360e3ad2d7b5
--- /dev/null
+++ b/dev-python/futures/futures-3.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
+HOMEPAGE="https://code.google.com/p/pythonfutures  https://pypi.python.org/pypi/futures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 2900b61d4801..0d9e20af9d7e 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1,3 +1,4 @@
 DIST geopy-1.10.0.tar.gz 69671 SHA256 d1445731b20762b4e1d13e98d6370ff39a58fb29bd526afe1a44d510e91ee815 SHA512 943eb188090597786d5df9d1dac652dda81dd85d8edc57d9ffd4197b8a9a89c54a01ae4d6263eae64f69dc8437234a1ca797e869856d978c367b8db4c2c82f54 WHIRLPOOL f996abff6aaab85b98267d39c9284cb45e0d5d636e8df14baa8bae8b67c97ca8472076fac5f30fae0f19a7a390ae6247afcac3afc91d14197f51d44249ce6eb2
+DIST geopy-1.11.0.tar.gz 72035 SHA256 4602a662855656551dec7bf86868f1557cc3435b7ff6bbb607f26a86dee5b718 SHA512 b3abbf0ce4ca08eadc03a97876a662bbda1901660ea03329aace30bfb5f8af17c82653273e4d2eab9aca5e817f50768dd742b4865083709e10b8599331d5573b WHIRLPOOL 2016a26bffc07e8c1466331f017cbdf04299aab6bf81cb715538ac766bf2beeba97d2fac42856f44f9701040807727e09fa18fcdb757b5406c4e50a9e710347a
 DIST geopy-1.8.1.tar.gz 67542 SHA256 63b805535cbe178367ee8f5e0221fab9fa691eef5797decac1e0851d16173dcf SHA512 0df2e67ed35d5cc3f796e3188df3a37d8fa101a4b6feb6b760ea08087ba44c350765a8c1032012b5e762454fa15c520f97d59ff942f07047927ef4872232a57c WHIRLPOOL 44c3f68a26ba23ca3ffae52dba5dc575a1cf54a53ea1e39d9566d97c58bcdb26b98934befc7cf012adbd266cee8a10b72d6880d1765af7f23486292b249c91a2
 DIST geopy-1.9.1.tar.gz 67158 SHA256 e95989f5baf2cc5c2cee6186355f24b3fa8ce01faabea4e2bfcb083109416462 SHA512 ad6281626a03778754bec2e776419327609b3e6e47d6641520787ed2af87106fb2842a89667da680317a6c745970ac23b66c9b0fe8e50a2d223fc3169fe013b9 WHIRLPOOL e0f6fef1a061ff2d88e6ea1a37786405b1b0cac7d0982cb7bd650582b10726a6fa682c9c6577be6cec1d90b52d3f4828d221ac07d4aff6b04b93ff95f2c69110
diff --git a/dev-python/geopy/geopy-1.11.0.ebuild b/dev-python/geopy/geopy-1.11.0.ebuild
new file mode 100644
index 000000000000..52550f3460f5
--- /dev/null
+++ b/dev-python/geopy/geopy-1.11.0.ebuild
@@ -0,0 +1,66 @@
+# 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 Geocoding Toolbox for Python"
+HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test doc timezone yahoo"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
+		dev-python/placefinder[${PYTHON_USEDEP}] )
+	timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+
+REQUIRED_USE="test? ( yahoo timezone )"
+
+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
+
+	# prevent install of test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+}
+
+python_test() {
+	# broken tests
+	rm test/geocoders/openmapquest.py
+	sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py
+	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
+	# i.e. "You should provide an api key and a username with a password"
+	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
+	# It appears it MAY stem from nose rather than geopy's suite
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 53ea9c595575..1fffb9aed488 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-python-client-1.1.tar.gz 71178 SHA256 bc88cae1c40446f22d58923fc5a8dbac77da29d6efbe4ae2276cc2f30f724617 SHA512 750c482e90f83d0b2d53f7d655db9a476686158b5e380cab7a5e92af1b521b26871dcda08a2ee946cd09035f65ca50ad8dcffa8f766d3671fceae009fbdb831e WHIRLPOOL 62d2ebb7f51f58c76b45f748fe79b031cda5f11fd6088d8ea947e7ab9b9b754688e004773f99169cc65fdd2789002faa486bed7717fc07dea0b25994cbede0da
 DIST google-api-python-client-1.3.1.tar.gz 1480269 SHA256 5137c4d6e853cda1a2e32b7f1b1ce28b66f5d62e464d91386be22492c276b1f8 SHA512 385377bd99f006154f90bed2b6f55cb25786032d28ac7f15b9859882670cc8bf94acbfbd8485c4cf89abd665908f1a7f46f74e84f05faba992a62fe4b9fd5bd1 WHIRLPOOL cda6825e502738f6d3035e524494aadc159ac8d41ae12d3f682236f8c344dc41e2ecf03aee6b247233c5b9aa8c756ac8d598c98c95333dc8a8929901c3a82327
 DIST google-api-python-client-1.4.2.tar.gz 2289731 SHA256 dfb7feab9733ae99952545927b5d87dda24cea308b2040fba2c505e7f0c57696 SHA512 ab5ce56142d96ed9b38d00294133e188dfeaf70aac78054f093f03fce7c4aee5b7b99f18ee27190aaef14b7fbe2bc8d0a4e2526ff6f166e41eb0b4b050e7c6b5 WHIRLPOOL 006e24d1a4e5d2bfabcbf2503fa163d6b0a3a28a839396014bf0a91a463454f02140f38dd179a141010a03e268711c2d22c9aa3158b594e5b465d9032997e7b9
+DIST google-api-python-client-1.5.0.tar.gz 2683924 SHA256 1558d6a6bca8c4ea775be46c6a81364739dc35b7ad2afc660c3a3102a43165bb SHA512 082a89e2e52dff449b6c4b6800503e337c5f2aa7ea2ca45a8373743a312d18d24ad87a486aed77b2e26075ba897f36e1129852dc30a139750e75cce5a1c25aa4 WHIRLPOOL f306a91fda8f241774a0b121dd8741ed5342aafb920b1bb59ca46a296ac7eaee4072839480abcd592a52d92e01811b9032545f93e8528211edf51d0cbe07644b
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
index 45576f2e3280..fd1a0b7f4ca7 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE=""
 DEPEND="
 	dev-python/python-gflags[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	dev-python/oauth2client[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/uritemplate[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
index bd55bbb1a890..cf07c4f8e4be 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	dev-python/oauth2client[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/uritemplate[${PYTHON_USEDEP}]
 	"
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
new file mode 100644
index 000000000000..aef0fa73123e
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-0.6[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all(){
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/gst-python/gst-python-1.6.2.ebuild b/dev-python/gst-python/gst-python-1.6.2.ebuild
index 880e55289764..81aee5dd3f23 100644
--- a/dev-python/gst-python/gst-python-1.6.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.6.2.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/hgtools/Manifest b/dev-python/hgtools/Manifest
index 2ac2f62165fc..b0b9645b9312 100644
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@@ -1,2 +1,3 @@
 DIST hgtools-6.0.zip 37542 SHA256 14f3f4d94827c2d45e5a05ffd6efbe2484f662354a3dce2d8d1a29df1b05dd5a SHA512 86443caa03ff5c8fe3b2f5d503c8d28ddc8e29f4818fb7d3b51233b79eb4977c98bd83ccdba0612c3c17ecddacd6d7c7b283dc6ffc935eeb7a5b1a099324e9af WHIRLPOOL d8517f2b6a769201246a5072c971880b4ae52cdfc8aec2f619cd642337eb3cfdf5abee06aa91792a8380c0d81f9a68949a9efa3f44a29a3218b8d9bea8601802
 DIST hgtools-6.3.zip 39805 SHA256 1d0ef6ceaba1673e6923b17d7f09c5ae2f4394d16ef80562812987a27e7836ff SHA512 b5654194f6fbaf37c2a63523b02371ca6af1d7b7f7a89938ba4e405076049a054fff5e6d0d4a8b53560cde7dfc4a1862c5359d710d91c208dd83611913f17a7f WHIRLPOOL efe5bca6ce0970f0199b5c757dd8fd0bd4a03ad64f4ef571e4dbae311afd22c753aa6831fc688718cbc8ef037700a3b81220dae318f82a0ea9fe4d4179cfe4e3
+DIST hgtools-6.5.1.tar.gz 22389 SHA256 638a29345707569944459b063763a00c2a3651bc489b1e0dfe0d1d6f3c3c518f SHA512 7a9cd405f4e3f49c57b89e85bca1dff6bfcce91c86a1f006f4223c23a82b13b57468c583815719b9c7e6189070381cf9345c3b7b06d9ed83cf1ed6994293c130 WHIRLPOOL 53f56ab71dca4ed824f84670b9f93e68b827453bb99075f4e2af684ef121fe27d011409819b604d233ea6660f4194c6807d2133f7f819da6d74a732952d322f4
diff --git a/dev-python/hgtools/hgtools-6.5.1.ebuild b/dev-python/hgtools/hgtools-6.5.1.ebuild
new file mode 100644
index 000000000000..46a3c5859554
--- /dev/null
+++ b/dev-python/hgtools/hgtools-6.5.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=( python{2_7,3_3,3_4,3_5} )
+
+RESTRICT="test"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
+HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
+SRC_URI="mirror://pypi/h/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-vcs/mercurial"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	py.test "${PN}"/tests || die
+	popd > /dev/null
+}
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 32b446fab42d..8d14b965c128 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1 +1,2 @@
 DIST httpbin-0.4.0.tar.gz 88000 SHA256 697e6ff51996699231782ec3519e936c57f34185d33dfadbe131536a6eced9b8 SHA512 ce239c7c2a7715dce340f04aab417b0c73773e9ff6b33edb81540abc63be9c861c4386d1310e9ae46dcdeeff24a6b71b7b93d9b2120cb1533e7da2c10f177830 WHIRLPOOL 11e9407ab88175212a66b4f47d9baeaa36ab281c5258f024e2375e5f7039fe013d246b2ac5f0a35da2a11a48e6fca91f9cdfee98cc36b21ad8cf89a57e8f7469
+DIST httpbin-0.4.1.tar.gz 88101 SHA256 3362ae9dec439912e32287e19c673a090658a4e1891f44985c1694cf81d05258 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052 WHIRLPOOL f68c97593228d354bad1acf9ee8abd88c94c9371579144ef978595891374dded4a52749f5cc936386424dea430e0112d31f1c6ebd89e2d053c471c57e292e86f
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
new file mode 100644
index 000000000000..ef603c3d12bc
--- /dev/null
+++ b/dev-python/httpbin/httpbin-0.4.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP Request and Response Service"
+HOMEPAGE="https://github.com/Runscope/httpbin http://pypi.python.org/pypi/httpbin"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/werkzeug[${PYTHON_USEDEP}] )"
+
+# Not included
+# Someone needs to file a bug upstream
+RESTRICT=test
+
+python_test() {
+	${PYTHON} test_httpbin.py || die
+}
diff --git a/dev-python/httplib2/httplib2-0.9.1.ebuild b/dev-python/httplib2/httplib2-0.9.1.ebuild
index 05c7c260f350..b00504e657ef 100644
--- a/dev-python/httplib2/httplib2-0.9.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 42ce0517e0fd..61926296d9dc 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,5 +1,2 @@
-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
-DIST humanfriendly-1.38.tar.gz 41228 SHA256 1706a6e72c28d4001d2f2c963e74d120d36b9b9047e4026c0909f37b3da5e558 SHA512 2409e00ab9a50537a9ef03216a1e3e31f503a879afdf1b642a63f68e0a839a58d90610548f5ba2db57d32ec8e7106ab160e64b212053dfbbedca00128c1f6fdc WHIRLPOOL 8d2a98dbd08381870464b0e1ff4817b34ec0ac85b321e6cf460bfded0047976c3639898bd5d3811f859fed40f368085be561dc2f61a720deb586a21c181f2398
-DIST humanfriendly-1.42.tar.gz 42222 SHA256 e64417fd2b7e9b1fa0c2264e03a289734c2c7692030059fc4d3a0440b1e87da3 SHA512 464209a84020c799282271bedd23b08c198f77cfe0e1f6175bec4d2b946a024d5fc4d550f5d79c76492f30b73a105484a84faaea4f6602905e289dc5ae5a19c0 WHIRLPOOL 50fdc7166be36df430f626fe4ba6024e2158f5a1345e3b82086e46adb4b78ca5ac861719a6c139d30096c09651f7173176a63d776f60a9cceb86badcfd9781a3
-DIST humanfriendly-1.43.1.tar.gz 42052 SHA256 f0bb35005ed6d873e62bae51edb7ecbff87b9238f9733d40e83c6cd3dda43c8d SHA512 82e6dcf9a0b715a2fc20901f1977764ca2490ed6cc647b401405766fce573c9677fbfe159a181b90ca13a6e222fcfaf52aa887bc9646e3e28ee368a1ab714fdc WHIRLPOOL e5af350534793ec745c61034072412f9203dad123e593202dea080f618d8136f97fc0f93a9955b93c844e0fbfc085296856b2899d86ab5c9742bd745ab9dd695
+DIST humanfriendly-1.44.1.tar.gz 44281 SHA256 a9c545dc284c8e310465dba0b2300d898a9dc0d6eba5852f7578e03ff3ffc4ea SHA512 d5467e75c2e84c50dacaaab1c14b71a536eda5b91f4fc2d6ca69f1f1e50fe0ac215ac6cbf91cf7df08456f3058dcf84f0e38f611022c295e90c936e3b8a77cc9 WHIRLPOOL 869f86cd719fb9f3810767a37f43742ff21e9664229ccc4525873c84288fff8e9f08530796f54f2f1bea3b2df0601a424c5a253a42940c2d6a99cdbe19b20627
+DIST humanfriendly-1.44.3.tar.gz 44682 SHA256 910a01f17d73536d53f0464c3d825e64efcb56fff80c58b383b78bfab5f934d0 SHA512 7ddba207e9946ea38ec7d4aaebe87c38ae7cec0f87d7576a8e99425f9678e7b90d830de2518ba898ba485d86e4b363022a9919dbf4fdf0b6cdd4bcf1629cd1b5 WHIRLPOOL 58683b1085e92d0d9c24a9b31c189f20a6d04f9a0eed8369ef180d0e0e66bcf878c251d61dcce905ad53223b480e1d244ff239d56b5a13d730c48952ec85007a
diff --git a/dev-python/humanfriendly/humanfriendly-1.33.ebuild b/dev-python/humanfriendly/humanfriendly-1.33.ebuild
deleted file mode 100644
index 075b98f92cae..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.33.ebuild
+++ /dev/null
@@ -1,27 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-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/humanfriendly/humanfriendly-1.35.ebuild b/dev-python/humanfriendly/humanfriendly-1.35.ebuild
deleted file mode 100644
index 075b98f92cae..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.35.ebuild
+++ /dev/null
@@ -1,27 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-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/humanfriendly/humanfriendly-1.38.ebuild b/dev-python/humanfriendly/humanfriendly-1.38.ebuild
deleted file mode 100644
index da61ac5951f0..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.38.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=( python2_7 python3_{3,4} )
-PYTHON_REQ_USE="threads(+)"
-
-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="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-	)
-	"
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.42.ebuild b/dev-python/humanfriendly/humanfriendly-1.42.ebuild
deleted file mode 100644
index 5cb6cda8b903..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.42.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=( python2_7 python3_{3,4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-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="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-	)
-	"
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.43.1.ebuild b/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild
index eef8e504f86c..eef8e504f86c 100644
--- a/dev-python/humanfriendly/humanfriendly-1.43.1.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild
diff --git a/dev-python/humanfriendly/humanfriendly-1.44.3.ebuild b/dev-python/humanfriendly/humanfriendly-1.44.3.ebuild
new file mode 100644
index 000000000000..eef8e504f86c
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-1.44.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+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="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coloredlogs[${PYTHON_USEDEP}]
+	)
+	"
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/husl/Manifest b/dev-python/husl/Manifest
new file mode 100644
index 000000000000..577e65a27a5e
--- /dev/null
+++ b/dev-python/husl/Manifest
@@ -0,0 +1 @@
+DIST husl-4.0.3.tar.gz 3880 SHA256 8a1d622565a01ca553a87f52de97244f33d04c20d9e4d0dac76ddfeccb6850b9 SHA512 1df5e08b24c3b815e4bf643d8bfc911aeeff25328565123122efb2a7042aea1e6e7709ed9d2c6a42390a0cece98863813a83952964c7df1dfcdc566671858034 WHIRLPOOL a745b12d2cac76ecdcaa7a726d2332046871dcaff9091db11d29455230350b33fd7ed07c25209341dc287b87315db9722e0fe72710b6201dc5994a70ae99501f
diff --git a/dev-python/husl/husl-4.0.3.ebuild b/dev-python/husl/husl-4.0.3.ebuild
new file mode 100644
index 000000000000..3f776a7d9871
--- /dev/null
+++ b/dev-python/husl/husl-4.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Human-friendly HSL"
+HOMEPAGE="http://www.husl-colors.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/husl/metadata.xml b/dev-python/husl/metadata.xml
new file mode 100644
index 000000000000..38858514d7fd
--- /dev/null
+++ b/dev-python/husl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">husl</remote-id>
+		<remote-id type="github">husl-colors/husl-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index ae649b117475..159cfb51d0bb 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,3 +1,4 @@
 DIST hypothesis-1.12.0.tar.gz 76679 SHA256 5e90a8fa249de9c492b4fa573f6f2dc489de9dd3ed3e2a59754b393c42624362 SHA512 107747d835dbe27fe25a429a8be66166005d3f0514d56d585505e99a4e4427afc210b7b6a7459858988f37182e6e4797ffcd1fa0511f8ae985725a1c2bbe73d4 WHIRLPOOL 0539637b819e9d3e4e96d5997299366d68a4e16f9ad5fcbf576048a761172e8568f2538de77b787f36c60ed09758ec5b8a962ae936f8f22d90ffb9551f63d008
 DIST hypothesis-1.19.0.tar.gz 86227 SHA256 0e977a3492f5488ed9dd4a872cefae0934ad4ccd0229a6c483ef5ca0aaaddd6d SHA512 3b2cd671498bd0bc88c93b2753f35b02f737533dd8dbc786420a37a417d145e4f1c579741966394f85b7df4939e61f77315e6158b29e22f9bde07d31e161e009 WHIRLPOOL 52b444e6e3fa0c514ebb9816cd489b2441b213581e241f76ab5aa5c410ca08bedef92f0b608c32c421f74ba84a0e26850a2aaf9f2d9f7229aa176d9e501175a0
 DIST hypothesis-2.0.0.tar.gz 76894 SHA256 b9bfe9884dcca0268157f015992e6cdd404d16dab18c2df403c458b6afab46d1 SHA512 7a5f5931b8f427a1cef8ef1735d995a6f5d854acec163bdedf369eb166ed289e024d70c6e5fd556bf8b1e0844d600460f97906cd43f70400995c7919bce20ab3 WHIRLPOOL c669c831c24c2dafeeead8b3e0a24bdfe69017bbf7eb94936b0ce22feac502b3ccdade37cff4b6141d97d79500578b6ef080d0f8fbe8e1c54aca7bfe4db40c42
+DIST hypothesis-3.0.0.tar.gz 59543 SHA256 a273d62efe25e004552ee4c505290992870e1d831f2ec3399d8b8811f1eba935 SHA512 ce7ee8ad6c0a4474ffddac549a1f7025eaf9393ab66154517948f7a420cdb1c18b379a52afca1901fca7ed46f7c44acde8e96632e863923a45a4782860ca6fcd WHIRLPOOL 97ffc82a69e6a3c5e2414936347328eb6d3f3994eaf41fea93314ba443362ced9906803f3195d4b68310696ac6a4e69f0035c9486ce3a6b2467dce50dce450ca
diff --git a/dev-python/hypothesis/hypothesis-1.19.0.ebuild b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
index 566a719780e6..eb87923cf9ee 100644
--- a/dev-python/hypothesis/hypothesis-1.19.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 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=""
 
 RDEPEND=""
diff --git a/dev-python/hypothesis/hypothesis-3.0.0.ebuild b/dev-python/hypothesis/hypothesis-3.0.0.ebuild
new file mode 100644
index 000000000000..839322f72dcd
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+#	optfeature "fake-factory support" dev-python/fake-factory
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index b07b5f045cc8..b5b318404ca4 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,2 +1,3 @@
 DIST icalendar-3.8.4.zip 91925 SHA256 7034e184ef3f9010f074410cea11b68fa93ef847f3fb185be41d6bd261c9cbb8 SHA512 5963112ed5d9aa16c85523c7687f5c23085171b84a3f974f5daa84d76e9af5f7171a6f1c342daddbe15531193c47191103fe0f53589aff41787d7ad58a12e0a0 WHIRLPOOL 7cb352564968a121831b82907386f328b25e718439f65bebf575f906fe00f7cfbf4b8bc578b3f201aaa1c7eaa22f9e70eca68278a81e5d802573a301ede75410
 DIST icalendar-3.9.0.tar.gz 62627 SHA256 93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792 SHA512 a937882046666212d011cbd5963f43e3c2ebc677c55f1ac425dd77a08201a204498881986208d40e2e93b163f9f51b285cb3a1250f07d01f9b6a968c4e24065d WHIRLPOOL 3cc4fd1ef6170dbb99c1f55e45082374d08931265397df422ee3439ca532f7e2704dd6ed620635b65719f509c4a84682c2f54ef12751e3cd00c4235c116d1336
+DIST icalendar-3.9.2.tar.gz 66283 SHA256 0b2d2610e039404e22a0a72fe5a59614374e7bd15ed824ead6ef6f8d36b41e2f SHA512 da50bba72f7a114263672ebd45cfcca5f7c2eca48538901f595b26ef18bb21a6290da4392c62cc27d1202083fcab7f5bfe6c9a463df38087de0ef764999f7eb1 WHIRLPOOL e5162b46f97a3b86e4e2eb75f2fdba2a3418f3b8e32a239f16f607811fbadd376619e9805336eb272f41aca2c0e6f9d724d92d4740c7910536ad64ef673de7fa
diff --git a/dev-python/icalendar/icalendar-3.9.2.ebuild b/dev-python/icalendar/icalendar-3.9.2.ebuild
new file mode 100644
index 000000000000..e664ba79fd60
--- /dev/null
+++ b/dev-python/icalendar/icalendar-3.9.2.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 )
+
+inherit distutils-r1
+
+MY_PN="collective-${PN}"
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc test"
+DOCS="README.rst"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'3.9.0':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null
+		emake text
+		popd > /dev/null
+		DOCS=( ${DOCS} docs/_build/text/*.txt )
+	fi
+}
+
+python_test() {
+	# From tox.ini
+	coverage run --source=src/icalendar --omit=*/tests/* --module \
+		pytest src/icalendar || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index dfa4c60ac55a..d0aacab59263 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -2,3 +2,4 @@ DIST ijson-1.1.tar.gz 8415 SHA256 33d10eac83d6dd757e2861b4ce06b3467a828481d60801
 DIST ijson-2.0.tar.gz 9560 SHA256 85bfc06b2bb492f205bc5dd9531ff0e64d2e18e03e64665934715d58331c1dd8 SHA512 8ea8b89766d3e3ccc3f0bf348ba9068cd80f24aa7648e7bfd2272e701430445f2ab81744280dce8dde9e18dd0582f0fde784aae61493479b4f5a44a5175d7fc7 WHIRLPOOL 495e023bc79b5ffe55e50975af3c6fb65993156b2a9a32e1b98b1891fc8235c739d854baf511625fba5b1806fcbef8944809e3de13e7feaaedfeb8489c6d7fe3
 DIST ijson-2.1.tar.gz 9859 SHA256 bc69a512399db0469f5faabe34f9f7ce21964d1993c6a6720cc4cea911fb8a45 SHA512 67773540c1d7df6aaaf22b064d0ea7660c8b69b4371a15ec9f46228f1ebbe604aa29b1d93821f62928b41841ecd411419d39c636aae7dddacffd2b8d881d865e WHIRLPOOL ede0bb85abad4023d06eeb036249ffeb2aaafb95774da9a280cb765e2ac0c5e40dfa3ca80a0f043616884391da97d95847ff727e4593ecc9c3db045606c1567b
 DIST ijson-2.2.tar.gz 10282 SHA256 58aeeeda35c9d72061a34861ca7ff7b214e701e413b65f8e9ec06589c4aa2d30 SHA512 bcfc3571ccf6b011e745a2bf84b50ba3793e999cbebb0a2d377d56fa68d5068ecf549457fd14de6849059bc909f2493d6def41c1df581e1283e2826eb1b789b4 WHIRLPOOL 72c0210500f64ec39dfffb9c6aa5f7dcb2b969981bf908af55c554666687694bf0f68912281acdb019cc1beace31ea646c3aaf6bb34330d877ac3d1d1e83aa5f
+DIST ijson-2.3.tar.gz 11800 SHA256 5db72cc5ebad786ee2cf85ae277ae068c14f965e0747fd8b65bf4d8d9c4c8395 SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038 WHIRLPOOL 0f1bef3e7f3237d259839253cd0c433bdeafdef4314cc2f50d1965abb835179a4781c39f11a8fd4cdfdec1688c53f26bec7d051a94b40fa808ef71a7df6be5f9
diff --git a/dev-python/ijson/ijson-2.3.ebuild b/dev-python/ijson/ijson-2.3.ebuild
new file mode 100644
index 000000000000..4526124f082c
--- /dev/null
+++ b/dev-python/ijson/ijson-2.3.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,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/"
+SRC_URI="https://github.com/isagalaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/yajl"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} tests.py || die
+}
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
new file mode 100644
index 000000000000..4393e81a8b1a
--- /dev/null
+++ b/dev-python/influxdb/Manifest
@@ -0,0 +1 @@
+DIST influxdb-2.12.0.tar.gz 48091 SHA256 b57f31205b4ef14aeca62dc9968c4a262ee5c29b44bff0d7fa6956d7bd4fbcf9 SHA512 2975cbf606833f56c30572cfb377f3a9b69b0e8c228419d5d1d93196ee55ee38e1455838b47c0834f7f1021da72ec721aa73d02934718848271a2287ccb281c6 WHIRLPOOL 6c6483eb759858d7139d08c59f4f9c9c8d4a0d59146825701169a355554175620070413ec5bfe0a90a48c746290fac592b43151f1fb4db003869faad258d74d8
diff --git a/dev-python/influxdb/influxdb-2.12.0.ebuild b/dev-python/influxdb/influxdb-2.12.0.ebuild
new file mode 100644
index 000000000000..a5055d5f760d
--- /dev/null
+++ b/dev-python/influxdb/influxdb-2.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="InfluxDB client"
+HOMEPAGE="https://github.com/influxdb/influxdb-python http://pypi.python.org/pypi/influxdb"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/influxdb/metadata.xml b/dev-python/influxdb/metadata.xml
new file mode 100644
index 000000000000..8e2177579127
--- /dev/null
+++ b/dev-python/influxdb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">influxdb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index df75a4d35c2b..9a3a04b5be0a 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,2 +1,3 @@
 DIST ipdb-0.8.1.zip 20522 SHA256 1763d1564113f5eb89df77879a8d3213273c4d7ff93dcb37a3070cdf0c34fd7c SHA512 515f282cb82ea989670a77956c02ac6433c125beba94c67b1eb90058c2427aac2345d02bb64b71a9593abbf7539d5ab0c20675bd24dde294b1e00544748da65c WHIRLPOOL 3e91eced09d5da6a0fc5442a6df97947fdd018bf73cd52ce0f4800e12f0a1c92f3168c3a171395e601669238b9cbebae0507cce60ca2db02a7f2610ffd73afc2
+DIST ipdb-0.8.2.tar.gz 13623 SHA256 9ac7193658c787321c79b366a3f415f968a215b4d7647508311415944762b727 SHA512 7b1f53787adffb3342f08fc55934e2e0188a990da1ec5661caae9879bb10d1678fd5f6e75268eb9125d5db648416328ae6937af8fbe097475a21751eb94f6624 WHIRLPOOL dee992900579ac68c14dcd171442541d8dcc24cccdc28b321e82d7b3b8ce3617fac7837a15db82f346717b3ac50aed166cd87985d1bac2be28c09629e31a6764
 DIST ipdb-0.8.zip 20204 SHA256 0d4a33f38e667a0c80ec1a5a0e468fe58e5cdc61cb8f4077b1024b85fe7b7117 SHA512 8d0c510a80efeb3ca9a87e4a573bbd0d75629789dec33ebd135f8c9285a276af2cfe5b6628d0bb121a3dbf9e6f248a19a341d9b475b7bfaa15bb9bdca0584dde WHIRLPOOL 376a2c872ae45e943fb99e8cc201f8d8e2a3ebcdc84dde5d1857269170ab6379d8eb2106567484d4eb2454a5c38e6c355d7a136cf74fab40b907fcabef2d6b8f
diff --git a/dev-python/ipdb/ipdb-0.8.2.ebuild b/dev-python/ipdb/ipdb-0.8.2.ebuild
new file mode 100644
index 000000000000..f37bf34ed725
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.8.2.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,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.python.org/pypi/ipdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( HISTORY.txt )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ipy/ipy-0.83.ebuild b/dev-python/ipy/ipy-0.83.ebuild
index f3027bc95b89..b5c1f0862a72 100644
--- a/dev-python/ipy/ipy-0.83.ebuild
+++ b/dev-python/ipy/ipy-0.83.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 4d02d6d6c59e..84335a48f877 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,2 +1,3 @@
 DIST ipyparallel-4.1.0.tar.gz 2271608 SHA256 c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a SHA512 19fff1ea57d9fcaec6525ce6e0c72ab63ab1245e32e485174a0691d2b48d8d2512af4055b77df82c7b30a8c071e1b6c5900d37e992f82f1597492e220e83d36f WHIRLPOOL ead35bc2166af0b221e730550689b09b7bf04148abcd754039f1c511acaa182ba50b593372f3e8bc627ae40a6117f9209cac476c1905bdc780f53de10666ffe1
 DIST ipyparallel-5.0.0.tar.gz 2286751 SHA256 ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a SHA512 ef04b717198246300ad1020eb7f9a65c40553a897653384bd839d5fb05409a276df41f933b0f023c0523fc6d8cebf6e2c6f8478c8be4fe4fdf386ad78b8f4418 WHIRLPOOL 677fd7fa2090b2b75c234c4802fab553105d2e3ce44ab4c390cadc56ba5ff3814005ab478906197d6a9f862e0d69901168d22cdc44c8063cf8e71fc8f8bdc449
+DIST ipyparallel-5.0.1.tar.gz 2350472 SHA256 48e319c16995a697c82e72dc4e5cb977be45cb0f0cdcfc482d5e8019ea6afeb2 SHA512 b7fa4f2ec5375398a533c92f07e2ab09180e537366c36ff5a7f3245d63072006ebcffc19dda28d08d5cc2e8a9044bf9101c7eeccf2857ed4a78ddd859ce23a2c WHIRLPOOL 350f67f7f341fe83bd21fb5f84714c43a426fa0d2234a532e781d0b0e9a977e2ee455184da995f5a3fbbf8e260d776dd9ac2607ac86041b5abecf41aeb9a8a9b
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
new file mode 100644
index 000000000000..8bf04a1ec2f5
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	iptest ipyparallel.tests -- -vsx || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index b938a74781ef..d899cfb86a4c 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,3 +1,3 @@
 DIST irc-11.0.1.zip 120409 SHA256 25d818003780fd6d62e93d3ff32580e74c0e527c6290ae14b47af50b58339233 SHA512 fca2fe653d921c9ec65dfb2b072c16658d88d4a22ae91568b1eaf722a90179920808db157f587afe6de0055af3a04a528eb9022122e539150e5635f05b58f466 WHIRLPOOL dd9b9e8624e6bd86d27fead1f3006a2b80832d236ad21f50c147c07a27b2cc4933d68efd951dece44398dbc0299b73ba7a98e4eff2061d0e3a8a01833518113b
-DIST irc-13.2.tar.gz 81594 SHA256 247e14fe9d7e25b41b2af39a81e5ced10bd45da44f4a86505d4f02895d710552 SHA512 e0472eea9186d549d2c3a6733d623161f94a905627d32878f02a50198b29cc5fc5a1a1636d7d1b3432b56ac42d4f48efd32285ebe80f8a7a8311a923795688bd WHIRLPOOL cec6e5505f9461c6b16c6fabc1cac406fd99e718733512112da50bb34a87b50b12d3529f09cc40ee7a4a97871bf28417f030fa418fcf415d59fcaa416eefb1ba
 DIST irc-13.3.1.tar.gz 81931 SHA256 be4b57f2fb296f0e83fe2bcfd91e886b13423d8cf4ebaf2b8077b8efa9783bee SHA512 fd82712a8446dbccdd50ba75e0ec0f45f0b327ff35e4fa172fe4a1fe92ca8dbb81afecc0aa0b3ba14b2864e7d78ce0b03496bde64181d66ebd3c4a7670e20fd9 WHIRLPOOL 7baa08a978980baf09257886b4c89e62abce9439082197549e9ffdda9acb7711fec4c2464f2c811b5c70803e43c663957bf2b38f50cfc5ec8fbbbdac8309b1fa
+DIST irc-14.0.tar.gz 82116 SHA256 e953bce286139c42de9a973db970dbf79de04817c74de0486a30b2bdc4350ba2 SHA512 6928f66bf994800e06a2f00b43bba23f36ce9bdde066ecf602d01c19cee5c79ec0a75fd858d6bb0446676681118025ebdda2312374eaf481437247b0c63b20c4 WHIRLPOOL e4af44e9269291219fb66d62b575b19a54f67b7d9cde79b7225f6bd071545488b399409c5fd0153e2dd16a3a853cc2bbeedf23c3c634097bb69ac741052c2ee9
diff --git a/dev-python/irc/irc-13.2.ebuild b/dev-python/irc/irc-13.2.ebuild
deleted file mode 100644
index de72b5b82a5f..000000000000
--- a/dev-python/irc/irc-13.2.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-	dev-python/jaraco-logging[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( scripts/. )
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/irc/irc-14.0.ebuild b/dev-python/irc/irc-14.0.ebuild
new file mode 100644
index 000000000000..4d101a44882b
--- /dev/null
+++ b/dev-python/irc/irc-14.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	dev-python/jaraco-itertools[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( scripts/. )
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 56ee04da2326..de2cc2b413ce 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1 +1,2 @@
 DIST jaraco.collections-1.3.1.tar.gz 8616 SHA256 27e3d67f94372d70be25f46a48796441ca719aedbd4a411835e71e88455bbe66 SHA512 812fbb66543e204f09f4dc35fc43888b3e8e1cbbf4a2a0e75a0589286e1ee5b303dc30b93696d8fc952bb3dddab95d8ed5ddb09ad4511ad4e12069fb87a93386 WHIRLPOOL c8730e3bd1eb1950b523ce62e31f7e2d2fd46bacdcacd7c57b9b55f95cff51e025e47813af1777d362f83401822a4015fdd386e977bbbd26f9c1a130ff7aa65a
+DIST jaraco.collections-1.3.2.tar.gz 8965 SHA256 8587fcfa89d81d639687184502cddb4868e3dc5b9a73827ee2bfe8455ab27e57 SHA512 2369e9194fba5b25294ff5977def201b14d1ae72ddce08b5163995fcb530e55046f24354a0144f9272e822c38b468f493f262d56d2d0f6edab315be90f5fca70 WHIRLPOOL adb24717b71bce2f4d4ccae216eb9fd638bd8457a6c465c73fff32e045900ca08e8cc3a2bd49e9f55f6d7897caaae2894a74c10eac343c40498e7ab2a18c712a
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.3.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.3.1.ebuild
index e54b66f95192..6412a98bd3d9 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.3.1.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.3.1.ebuild
@@ -20,7 +20,7 @@ IUSE="test"
 
 PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
-dev-python/six[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.3.2.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.3.2.ebuild
new file mode 100644
index 000000000000..300540df568b
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-1.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	if use test; then
+		if has_version "${CATEGORY}/${PN}"; then
+			die "Ensure $PN is not already installed or the test suite will fail"
+		elif ! has_version "dev-python/jaraco-text"; then
+			die "Ensure dev-python/jaraco-text is installed or the test suite will fail"
+		fi
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 9e7b9df15689..4767e5a35f49 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1 +1,2 @@
 DIST jdcal-1.0.tar.gz 5677 SHA256 133220a36c533bae02355aca7f507de7b33e57e9467d33cea7d5673ba354a3e6 SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408 WHIRLPOOL d09da7dbcaea2ae10fd992b20ce5c7203cd020443ed685e5dba6183cd1296e824ba66fb06e317f1598302cb17fe5cf914ff0e7e31dd626029ed6e8c292717c9b
+DIST jdcal-1.2.tar.gz 7059 SHA256 5ebedb58b95ebabd30f56abef65139c6f69ec1687cf1d2f3a7c503f9a2cdfa4d SHA512 cb7805229968cb9f5822e97c255b3666e50ac424725ece20ec3b980b87b84334bc13f2e772a4be2a0341b31f569edc11779796a41ae22d85cf822f9aa0a471af WHIRLPOOL 772909d027f27dc4ea2a00806f62e421ad0a0c29bb048a1d0677b8dfeffcbdf86617698cc8a8bb1e342d2b3f8ac7b310294e140d7f86b157c4c02519d3cc8dfe
diff --git a/dev-python/jdcal/jdcal-1.2.ebuild b/dev-python/jdcal/jdcal-1.2.ebuild
new file mode 100644
index 000000000000..1e7f24790ac7
--- /dev/null
+++ b/dev-python/jdcal/jdcal-1.2.ebuild
@@ -0,0 +1,17 @@
+# 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,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
+HOMEPAGE="https://github.com/phn/jdcal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 7bda4475518f..3be7303bf16b 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1 +1,2 @@
 DIST jellyfish-0.5.1.tar.gz 21766 SHA256 e297b7a5d00579b0da0474a89273fff759f305de88e05d6a1d0ebd4cb58c49e8 SHA512 2cb72651664c7314dba01659315fcdc1248e519f04171056d29fe57c6ef4a7eb9f7c8224827aa982aa52d4216a20b3ad8bd0dbb097f0e844ce292dbb3c963753 WHIRLPOOL 280b5fad06b8098c40d953ce3b524db08787ea12cb335daf6b2d627fea20bf3fdc69af60b6f4ab1a6732157716237b1b6bf5dce65812422fadf3c2228588c172
+DIST jellyfish-0.5.2.tar.gz 20802 SHA256 96a96630a1dec21e634b967b040d42d1cb316b9a54885b434e2fbe90d704b397 SHA512 1a3387738ecd64829c5bb042e4a02e9b752436e8d34d58b5493c5f8466135562c08b69e523121af4894f689a2e03a6ba33f56abfa505d709d723a24d36cb0373 WHIRLPOOL 087854519c997e4bb59e953442e5005b577cf23785270ff317e88b556b64f55221c2f3bfbc4da7d97b35c77bc96768774f5967a968b89a42762eb9dc1934f47b
diff --git a/dev-python/jellyfish/jellyfish-0.5.2.ebuild b/dev-python/jellyfish/jellyfish-0.5.2.ebuild
new file mode 100644
index 000000000000..5dd4b7250b9f
--- /dev/null
+++ b/dev-python/jellyfish/jellyfish-0.5.2.ebuild
@@ -0,0 +1,17 @@
+# 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 doing approximate and phonetic matching of strings"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.python.org/pypi/jellyfish"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jingo/Manifest b/dev-python/jingo/Manifest
index 4e90a0e9360f..f17fc384df1b 100644
--- a/dev-python/jingo/Manifest
+++ b/dev-python/jingo/Manifest
@@ -1,2 +1,3 @@
 DIST jingo-0.7.1.tar.gz 9982 SHA256 c495a8dfd0a9c1d3d8ed02121bbb28b6c9d34d4da30aa93a7e639c0f3d7b0639 SHA512 153d87f3017b34bb66bddffadb059d0089a48fbdb07bf4881499679c134232be2fe259da95de5a65f6339c1e72a3afb12f4daa1d91ef61f9294bd89899929929 WHIRLPOOL 5fa6af5c5d63766b381413147cc2a0f218693f14350e07f7d8f3e2189fceebd4f6678955aa8fda4ee09799318fc84f533dcc2af761fa0b1a7bb109fbc5dae103
 DIST jingo-0.7.tar.gz 9365 SHA256 a3bd5051dd17e9d50e8a9f2d362508e82d7063010fdc06d5e07ce3608e780fe6 SHA512 7358c20371d761ad147aaa2991056d1789d6a80d645741d816c38369abc469911ca6a1ab4324e7b1243832605fd80cdb3df89610106d2a850f634f1595da254d WHIRLPOOL 5c3c17a287a2cb1469d187387064b8c55accbd240105aa3f09f9fb671512dfb394b3be2529d227181c302070c83c73c1c0556a9885f8cf32ba4dbe31039cfb4d
+DIST jingo-0.8.2.tar.gz 10008 SHA256 f23ac2da63eb1a92ec94522034f6c34ae95b3846ee1c20758921125a82e2f358 SHA512 d5503c7a9a6f60c45081845e069ce4a95c0dbd364fb5f6e8a2632b706c7e592e048766aab570c18bca8f87e15a20168eee1eccb6456d1b3aab74a22d7b638238 WHIRLPOOL 9c21700312ba64fd8f6548a4c9e3e8498c0aaa286f8fba78f498be4908631661542dbcc119c84a33777f9aff8b0587bb3dec48db699d6f2a1fd2b42c8ed7d48f
diff --git a/dev-python/jingo/jingo-0.8.2.ebuild b/dev-python/jingo/jingo-0.8.2.ebuild
new file mode 100644
index 000000000000..b8ec7f74890d
--- /dev/null
+++ b/dev-python/jingo/jingo-0.8.2.ebuild
@@ -0,0 +1,20 @@
+# 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
+
+DESCRIPTION="An adapter for using Jinja2 templates with Django"
+HOMEPAGE="https://github.com/jbalogh/jingo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index b809778efd75..fa3ad5e68151 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,3 +1,4 @@
 DIST jsmin-2.1.1.tar.gz 9783 SHA256 582f70f5fef561c8d561271206f45258d0c420eec31a8628914e87c73a2192e1 SHA512 1f889bb6a2916da21c315b5aff468cb8c479cbaedb99dfb4bb9298de6414615f274a4f37eeaee108a5f136ceea6893bddc5f564375bb2b2e7f14836a7f1d3dc1 WHIRLPOOL 941453d4765e983ca1b6d65a7f3afc390f967070fa8962a62ac783428071f2af70b42f5e80a4aea60dc8b0e724f490281a502cb13c58653035b34715dfe2f701
 DIST jsmin-2.1.2.tar.gz 9995 SHA256 5e710e9db14f210dfd55ebec43bca5c812d34c5b6179dbcba2e61d9f965bf4e1 SHA512 9723e2ff2feb243b84d3b8d1869a6591bbf1f3224d6f706eb7264293ed083508560586ee4466a4da370bcb4a611a48e9c78d1c25ede363312cafe9189ff97e5d WHIRLPOOL 41896e65703f45bacd0793b2ffb16c12eef4d4f012aa9c12d7282566efeafd49b3c26668c9ba2157a6112bc17d35f66f9f60430618f99dddc69e2be04be45809
 DIST jsmin-2.1.6.tar.gz 11858 SHA256 c20e7f58a68207b8efdffae8d4c885e823615da3b605905fb0794a56e6aac4a3 SHA512 df0ac0b02df54411ca0cb20adb8eabc2bbfbd35f28b3cb1b6a5184ea3ffa8bdb6d091ff42a8531449a739c5d1ffc872840108bfd4e4c2d2ac98fbb59e8c4e820 WHIRLPOOL 5e0409230aad1c69d044e96ceb7333903a8859752661f6fdac8facc4618b70e5cff289e97c4c3cf09242e2194ca84a780f9444b1a1c593b4b712e7cf9ebb31f1
+DIST jsmin-2.2.0.tar.gz 12409 SHA256 8e7f19bc2cc467bccd02322dc0a6065d06a038e311f2531af1a33b410afea081 SHA512 6071c729cfef3d4610066bb279811a8e30315a922f6733f171525c3027f787936b806352b57a6e5c2209441daeacb16f6dc9826b1dc1bac775750d8068a68799 WHIRLPOOL e995aa3248451e772c4fb65e4e6c1eb488e91ba6aea19aee3d787c35abdd86522d035ef61df3041a12ca46795dda47cdf73db8f1648efb1ab0dd356026041610
diff --git a/dev-python/jsmin/jsmin-2.2.0.ebuild b/dev-python/jsmin/jsmin-2.2.0.ebuild
new file mode 100644
index 000000000000..c86327c6564b
--- /dev/null
+++ b/dev-python/jsmin/jsmin-2.2.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript minifier"
+HOMEPAGE="https://bitbucket.org/dcs/jsmin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m ${PN}.test || die
+}
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index b707bfb1cc26..285b92c8d788 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,2 +1,3 @@
 DIST jsonpatch-1.11.tar.gz 14317 SHA256 22d0bc0f5522a4a03dd9fb4c4cdf7c1f03256546c88be4c61e5ceabd22280e47 SHA512 516b6d8c32e97056af3c8d89eb49445d334ddc5588238d062476cb942d919436ea390449fa8e98332c571242a8f10aabd0fe7da3a00698ec3fd98e53f286c821 WHIRLPOOL fe1c97acf820bb72246e98728ba2be42aef4748be28abcd359966ad24220f68f6eca54de6e7a8cf27c8a2ff1538db2aa28b883130c4603468196273362942324
+DIST jsonpatch-1.13.tar.gz 15119 SHA256 9470656a08002e309632b59772b206ce0564c9a77b44c25f05f49dd2cad248d5 SHA512 23f0c92c2c8834d5e3129e9ba78ece7da2646dd60d5b0522b0f09d83e20057ef7517042e5ee8547804185d3ce23cff394c8fe78df93fad7999fae12cc5467a45 WHIRLPOOL 39a08103e5476a2ddb8fb120b61d6e99d80ff1bfe0a1b2949515d830299e99f5a41ca15b7e507b4700ca948687082ff1edce3c13ce5a161bb08fe6f57bffecbb
 DIST jsonpatch-1.9.tar.gz 14275 SHA256 e997076450992aa7af2f4ae6c3e7767d390ddb6746979c74fd2092bb8fbdf5b2 SHA512 9f27def8519677dbc6d45287b6938ccfb9179f7a315871adeb7198e1568876a391625c060c7901b7acd51af0ed10427a61d54d899719ef1a073b2e93591904ed WHIRLPOOL a7ee28b9cefa8ddebb060867b260b388cd44ce96f0f2a76698091f55d41be44cd690b32d26b1363218c474fc1dd9cfe8eed3c0d939e9e9d8d4c2214e1b08786b
diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
new file mode 100644
index 000000000000..9c5428ce423d
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.13.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=( python{2_7,3_3,3_4} pypy )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches according to
+	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index e8ca3b2b7ef7..d900395e6bb7 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,2 +1,3 @@
+DIST jsonpointer-1.10.tar.gz 7577 SHA256 9fa5dcac35eefd53e25d6cd4c310d963c9f0b897641772cd6e5e7b89df7ee0b1 SHA512 b2df5f19b14b670825b18f7da4ca50b089beb2ccbb1c69acfc904eed82b5315ad19940b4aaa8f8504c2fc7d477778d65e31f492dd30ee8b5ba95ccfd0eaeb9b1 WHIRLPOOL d333093fd6fd6f3d565200d11e5d727dfb3ac11eb8f029731915fbe47cb9c5ac915df94b77db30deac080047f5e9e7012f1ae023378e91fdacc2d41f12c9b5f2
 DIST jsonpointer-1.7.tar.gz 8187 SHA256 46b2016b5e4f2b5cd2edf07c60ca8fe7dd91204ca848f98964be61b3c4760f5e SHA512 26b25f31fb98fe7c7d926dcc492fe7889f2462430f959645e498fc47367d23243fb3b528da7af026827dffb30d7c5fe2ffb31843a8f2c9064647bebb313de9bb WHIRLPOOL 8539c4bb40cb2c1042f76d91e127da31d742ea55f8b2ba51abcc0e2d3319bf2ab2380e3ee2cd4195d8cc563b2d36a1eff56a6e72e2f3a8c171692bb66bfa3558
 DIST jsonpointer-1.9.tar.gz 7662 SHA256 39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308 SHA512 872367c1a75f8022c07a52191d3f9491dd62767f58c4fa2c2fdcd1bf139858f73e7a5ad495943f1cb35b759d7919a807f8bccc052f6c35831e8091b5fda31b40 WHIRLPOOL bfe55984774502e8e91471d00d4d63bb3bf224cc3e677c1d20ee1e060962b7c9962577bbbdaba5c18647d588878820dc1f7b21ad206da019acf79ad9ba289e84
diff --git a/dev-python/jsonpointer/jsonpointer-1.10.ebuild b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
new file mode 100644
index 000000000000..0c784a0711d2
--- /dev/null
+++ b/dev-python/jsonpointer/jsonpointer-1.10.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=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
+HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.python.org/pypi/jsonpointer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 72cfe0c04727..d55196bc8214 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_console-4.0.3.tar.gz 22090 SHA256 555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85 SHA512 da9c311d881bbf61fbcea3c79e4dbdbe00f0f713772d0da4d30e0dec36ff5a6c5cbff3b996770f532c1e9c61ade1b1bf7a6f1ed28188ffd6900f6cc2ce7c0665 WHIRLPOOL 37139a87b182b9100284766ffb6e0b4c4e44b9bc2261a2d466920b0a23cf62d55f6a68cfb77da67a2eb3c316582fa7afaddcce69074b7597122e1c858c9a6c26
 DIST jupyter_console-4.1.0.tar.gz 23319 SHA256 3f9703b632e38d68713fc2ea1f546edc4db2a8f925c94b6dd91a8d0c13816ce9 SHA512 4ab113cd4f57945519eb7df225a84b857df26f928589a109ecb9843cadc193eb75fca03574b249c9f31dceca4e03337d5fbba5a79cbc7a96ecf708c437c34fd3 WHIRLPOOL 735dd3ddce0ea682495fe9d18ee97a453c21a06db4121f329a5f6f0fc9f6cd75f9b398eb203af1ea6a552b9b9e1118e543f7d9139d659ca471c2d8eda6180962
+DIST jupyter_console-4.1.1.tar.gz 23391 SHA256 d754cfd18d258fa9e7dde39a36e589c4a7241075b5d0f420691fa3d50e4c4ae3 SHA512 40894f41b85c1b823c3d75f33427728717b75e800a08c8a6b17b1c6ca7a6543b2aadc72d7ff131a7633252ac01bb0b0142025d7a53c3f3b7f8d189e6ff14216e WHIRLPOOL 724a06b5f0bba3a3bdd14d319df09ecf0b2ce3c4b167fce20cc498737e1bbb27082911dd8c5b4027bd56e13eff523b18abb112e308d7ce8e59d098b3d9257d80
diff --git a/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild b/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
new file mode 100644
index 000000000000..983c9734cd6e
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --verbosity=3 jupyter_console || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 1ba1169161be..b7c9764a7d61 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,2 +1,3 @@
 DIST llfuse-0.40.tar.bz2 454032 SHA256 ee8b1125a6f2ab904d617d7602d86c0e3f69e40316cb1ae3abc33c218d3da857 SHA512 b568d14e181c316d592d01b7879d2b04c717759124d9462b7f848c251322a6a376881050d209d4cf3d0d6c5218ec1880cb64f19bd64b73f09fd06818447f3dfd WHIRLPOOL 3cfcd75a41ab39036b867e625248472a709ffdc61a588cbac47572455a6e3029f3d6592cbeb8e2b555a8c6f59729587a54c3373d3053e20f71a9b4f747ab87dc
 DIST llfuse-0.41.tar.bz2 397155 SHA256 58079acce2ed03305bfea998cfad7c5d1815c85c263e0a21f692d4cdb7d01bde SHA512 5c8bd2cf4bb5dec624fa3aa96aeadd2583cdfa45a9331d62e395ca2007c96f8ae667dba40568e1a17f30157b1d0ca123fe68639d78d117cd83c2405649bf166d WHIRLPOOL da876ab8502682cf77e711e9d2d8be5e74e6aa0d8bc639e7b55afa2f76d15173e5651706310b3814ef3a820c6afe45a50134cfa61e5db93fab452c222ef9394b
+DIST llfuse-0.42.1.tar.bz2 320282 SHA256 8ee9f190682d1c94e6522e77064fcdb4c7b07e71a6b9d1193ac1527972a98b59 SHA512 b87b26a3b19db954110248233f393c2c445d42b0fd89d83da3282d1f21f9ef6285721f3348e86d00d46584e3fc9896c6111d9573a103505476ab4f59d2c1b444 WHIRLPOOL c08d356e8170180aba87de9b5fb8f716a99865040582f90ec4a144c88b27f10f5e36ef4af20a29367cf3e4ae971a1a1b731e2717f7d1dece70754af49a4e535b
diff --git a/dev-python/llfuse/llfuse-0.42.1.ebuild b/dev-python/llfuse/llfuse-0.42.1.ebuild
new file mode 100644
index 000000000000..1b07f647a9c0
--- /dev/null
+++ b/dev-python/llfuse/llfuse-0.42.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"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the low-level FUSE API"
+HOMEPAGE="https://python-llfuse.googlecode.com/ https://pypi.python.org/pypi/llfuse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=sys-fs/fuse-2.8.0"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+
+python_prepare_all() {
+	# use system setuptools
+	sed -i '/use_setuptools/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index b44f97831230..59df86c40afd 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,3 +1,4 @@
 DIST logbook-0.10.0.tar.gz 107284 SHA256 ff227d9a48dcd539f25bdab26d36dd2ba1459bcc5ebce2926e92fecc917e5d26 SHA512 121fb5ed24a2c53b357d17d31c63c6d305014f5c9aa248df2b251e0c15ce1e7052be380b3032c3bdec0b767278b0b5d4a3f998ac596336f681ac6d353e0ed533 WHIRLPOOL 79700e9165b6c1f9ffe2f118c1033ce713a364b15ca3c1798f80c4f535411464fb329cd639ec0fb1887c542601554be444dd9e6f7b828f6bcc315af4d287f453
 DIST logbook-0.12.3.tar.gz 115932 SHA256 2f3a974d05f7e414bab529cbaa5a7b0faba661516df2e978995247066da86d23 SHA512 0b4242ec476b8e6bbcfaf6db75848e3d36b343c62a83e338a6d3fe7ec8029a0199a7dec783cf27cc2a5a4586a8b9ba938c939dc6121079525fbf608e34eefb7f WHIRLPOOL 877b25d9116af4e7752841abf17f14db830bc0d3d6fff87a552e04c6dcb0e9d80871e2853a3e259fb61491952ebfd46d31b406baab97dee8bbd76634fee9cdc2
+DIST logbook-0.12.5.tar.gz 115937 SHA256 87000862d9151891c24e64b38f10acdc1682408ee9f98407bfea65b1ac5eec10 SHA512 48f9f64c1c581e54c22e459f3d3e0123f2ee537e3f126f88593bc2ce0255d42712de230ab37a215afb53d047d0a1708c8eb980776014166856e873ddae8ebf18 WHIRLPOOL af020986eb85603438b3073d374c29807fb0f42464f90e956f345fb6c44cb5e83885efc690a1710bf923d36040cd4d4ea9fa2d2531325cf8c99171e4babfc5b6
 DIST logbook-0.9.1.tar.gz 106615 SHA256 e2f49e922c7836a58418b1cb2680e71492f45150cb968afced9f6a98222e3524 SHA512 d136dd5a7219a23a50db857919d794e7b721cc629443ac2bf92374aef68889d8a7146886fc4484c6d0dea56ec5c1c1ccca3f0b20310c2e12dba9d40dcac9c188 WHIRLPOOL adfb8bd28565ec97904c63631c55ee17613fdf2259d039baa0351df870bfa1658ebc52c8dbf69c8b94b0230577f287b215324d95b186cf38cc4d68bb1040d502
diff --git a/dev-python/logbook/logbook-0.12.5.ebuild b/dev-python/logbook/logbook-0.12.5.ebuild
new file mode 100644
index 000000000000..a86c3ef1c6bc
--- /dev/null
+++ b/dev-python/logbook/logbook-0.12.5.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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A logging replacement for Python"
+HOMEPAGE="http://packages.python.org/Logbook/ https://pypi.python.org/pypi/Logbook"
+SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
+
+python_prepare_all() {
+	# Delete test file requiring local conncetion to redis server
+	rm tests/test_queues.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 5ceb0d416957..e2ea80bd2608 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1 +1,2 @@
 DIST M2Crypto-0.22.3.tar.gz 74795 SHA256 6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72 SHA512 c179d3cf03ced77aed24285ca3f1527d5e05bbfe091a1522bff94a940fd390213fbb9b83d7ccd43ceae49626b427ae8790782cf93ead85be1e063bc4121c62e0 WHIRLPOOL 66a9a6e7c9b195814048a1bcecf6ef71a269bebb9dbda73801c88b3ba27330b555a46d05c53bbd0778f9c1e1bb5f9c6e7e860de443bf16baffc2072ee5996e31
+DIST M2Crypto-0.23.0.tar.gz 183590 SHA256 1ac3b6eafa5ff7e2a0796675316d7569b28aada45a7ab74042ad089d15a9567f SHA512 b1c57328c60cb82fdc196c491d9518d58a996fbae35e32b0bd20d3d38ec8f72d0981ba7dde154f7684224ce9ee38e69460328f1bd8931b16210233c8199e6c51 WHIRLPOOL a618c294e59ede845cec02cc28146fa05b8ac68959e10c19eb2d6b97b113cf87620d89226ff9453f66fc7f4592e7a106ddf75b946cd4042f754c0c6dd9759fbd
diff --git a/dev-python/m2crypto/m2crypto-0.23.0.ebuild b/dev-python/m2crypto/m2crypto-0.23.0.ebuild
new file mode 100644
index 000000000000..5700645c25a0
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.23.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
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://github.com/martinpaljak/M2Crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/mantissa/Manifest b/dev-python/mantissa/Manifest
index d3147080028d..574de1232d74 100644
--- a/dev-python/mantissa/Manifest
+++ b/dev-python/mantissa/Manifest
@@ -1,3 +1,4 @@
 DIST Mantissa-0.7.0.tar.gz 827087 SHA256 30bc3bb452810561e81e84bb73be00287d32c17fcdf4f0da837a63cbba7e7fa7 SHA512 a0ef58902d0d752f2643f0c9639d9338a0441651cc0a2c3b45493a79b81757c4b642a7adcc940e0228033280927b7dad460a345fac62da1dcb9d73babd981d8c WHIRLPOOL 283b02ebea0c7a0d6dd6a7345b473a9f9d0ab3f955c5424ed6090cf50d63f3df2a68b6ab07efe459828a75dc841e5e540a66313e9428bb8e88fb3a96762b6576
 DIST mantissa-0.8.0.tar.gz 828094 SHA256 bcc3908dfe9e8c3dd1a460b2194564d38521d53bcb601f12c9da0a8a936119f1 SHA512 8ca2b84c1c2715025db4a3cde4516c0a8604c8e40bda325d727ac28dbf1997ffb387439461d7b866ec77eb82ca192739355797123e55b7ad30c580b3c71dea9b WHIRLPOOL e4f8858940e87ef0ebbfda522e97da19024dcac18ad59a8d6bac7486aacf05ae728903e8330a845d3a9bc502f3455bb47fe1e6c742d2e09a78621e789c9b680a
 DIST mantissa-0.8.1.tar.gz 808299 SHA256 e0c536a257dad3ee231cc4e1c60bd170d2f2b54dd43cd54a57033d019755ffe3 SHA512 6c5896a0b6d07d0b3c836fcc961240625cca4fe037dd7cb0f105357762a5a5b0288438c39b0aa0521dd7b29a37bde49a739273d82f53c900692d0ea9a8e3db86 WHIRLPOOL 2c4f3c1fcd924afc929e42b74a6e54e6663a4ac82a43e2a3dfdafe2f4ecf6cbd08be96d7e012d3d4410770b0d231c75547ca69731b30e51d1ffde63ac1faa615
+DIST mantissa-0.8.3.tar.gz 839984 SHA256 c3e8faab1ee9510edc9d5c22abd848e0d29074df3aa6d4272a2a120ea779192b SHA512 2287f09b39540e4b66e0d61ab6031fc3b08af679815eca778049240b3bd298a40fc981784b61543ac68f7692a676f334753b84dcfd52f754d367502383e14fda WHIRLPOOL 5974272cae40e591a83d4951cb129d0e55fc43a130a1a1c4b3f1bc239b1b78936c55162a2b0d7039be24657592956d7e3a6f76628e272fc1066066b2cd6642ae
diff --git a/dev-python/mantissa/mantissa-0.8.3.ebuild b/dev-python/mantissa/mantissa-0.8.3.ebuild
new file mode 100644
index 000000000000..4a957d7881eb
--- /dev/null
+++ b/dev-python/mantissa/mantissa-0.8.3.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 twisted-r1
+
+MY_PN="${PN/m/M}"
+DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
+HOMEPAGE="https://github.com/twisted/mantissa"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# https://github.com/twisted/mantissa/issues/27
+# Source still missing a folder 'doc' that has required modules and
+# the fail / error rate is far higher then in 0.8.0
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/axiom-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.5[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/nevow-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-14.0.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-mail-14.0.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-conch-14.0.0[${PYTHON_USEDEP}]
+	>=dev-python/vertex-0.2[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+TWISTED_PLUGINS=( axiom.plugins nevow.plugins xmantissa.plugins )
+
+python_test() {
+	# https://github.com/twisted/mantissa/issues/27
+
+	trial xmantissa || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# remove foreign caches we don't want to own
+	find "${D}$(python_get_sitedir)" -name 'dropin.cache' -delete || die
+	# then our own one
+	touch "${D}$(python_get_sitedir)"/xmantissa/plugins/dropin.cache || die
+}
diff --git a/dev-python/manuel/manuel-1.8.0.ebuild b/dev-python/manuel/manuel-1.8.0.ebuild
index 23938d087bc5..497c62b12de6 100644
--- a/dev-python/manuel/manuel-1.8.0.ebuild
+++ b/dev-python/manuel/manuel-1.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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 )
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 9bc96804497b..d0cd90999e1b 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,3 +1,4 @@
 DIST mccabe-0.2.1.tar.gz 5031 SHA256 5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325 WHIRLPOOL 1db80033f91a24029e6757847d11528cb01c2aff2a2b40c947f969191f767fe6b93fd9adfb685eee8bcb03ba9719f852d8a5db7e1b27395acb93d973f35d09d8
 DIST mccabe-0.3.1.tar.gz 7586 SHA256 5f7ea6fb3aa9afe146d07fd6d5cedf788747d8b0c29e44732453c2b2db1e3d16 SHA512 83a5cb389343628b8a464f8f17452f116557735ed0a5f40411fe06f63af1f7c5ac4501fce2617a22fc7fb8395918deda2afba39728c1e72713930f14dddf08f9 WHIRLPOOL 2f8354395d9c291377ec8cac9f7911ffdeaf348f37ab7a0b3a87fb10ec0490e4e398963c02989de5240d54e1e4c34945fe15ad60c0b8605d5b8367f6efe7e72b
 DIST mccabe-0.3.tar.gz 6127 SHA256 3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c SHA512 3bb176d486de5e0d3de8db0bf923b4b03e5ad2fd82df079babd6e6551afe9077b956698ac335f23d340a16212d73c1c5ab5a3055d2788b7f81040f3cb0d1b4ee WHIRLPOOL bfa0480cca9cc082f60c20d07d6edac203c5e9144f2caf57576304dbf01c8a96b19e111f9e1abe5774a4de235729d69c3c89d4fddf8213f403568228e92f38f6
+DIST mccabe-0.4.0.tar.gz 7916 SHA256 9a2b12ebd876e77c72e41ebf401cc2e7c5b566649d50105ca49822688642207b SHA512 4a7158a3a28eed0a98ae64b3a0394542f263c9b4e08fc31ad47b2317ba434b1002e13d40a9766e4e39ea798aa35e83a79b81936cebdaabdae582160f1780e1a2 WHIRLPOOL d3b1ce9613ababb86f54e392fb9a5b5e96de7226ce6a3d6fd1c72ae2985c2dfe27319851ddaf8140b3b4f92f1b44f02683b88a2237539d5495199b479b267303
diff --git a/dev-python/mccabe/mccabe-0.4.0.ebuild b/dev-python/mccabe/mccabe-0.4.0.ebuild
new file mode 100644
index 000000000000..9e42e089054b
--- /dev/null
+++ b/dev-python/mccabe/mccabe-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="flake8 plugin: McCabe complexity checker"
+HOMEPAGE="https://github.com/PyCQA/mccabe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/mccabe/metadata.xml b/dev-python/mccabe/metadata.xml
index 25144a574b70..4e8535188806 100644
--- a/dev-python/mccabe/metadata.xml
+++ b/dev-python/mccabe/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">mccabe</remote-id>
-    <remote-id type="github">flintwork/mccabe</remote-id>
+    <remote-id type="github">PyCQA/mccabe</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 2769d63271fc..752af67a865d 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,3 +1,4 @@
 DIST moto-0.3.8.tar.gz 101161 SHA256 0215034a2834d86ff622c11bcba2570240a54635cda5ec83d48c1e663179b047 SHA512 f414499b6c475b3a5e69570997b0f96fc9d998f622209d48b686c1f77a33e984e95028806ae1ba1ec1d41d75e59b83f96bd66b566c8a7b664dacc910c0035edd WHIRLPOOL 13e5edd809a772c9ce955196ca268db4663c8d68959a4fa7fcaaa44ebf0f6d147d471bf00d27a6ec2d0a4e4a1a037fb09756ad92d0733601f852f522f2ce265e
+DIST moto-0.4.21.tar.gz 189132 SHA256 28b1b51ae3521370bbf01cada4431c1399241da21022577a94ffe4818f54091f SHA512 8028ec175c9bf47b5de0c49ff1ac71810e22160be0902e2bf7c9232623f24f4d7641c8439c2f612ac7034984dd8e1f886a536d0bfbf460dfb6ba3a38080a1bf3 WHIRLPOOL cd828fc1202286c4d12ed9c37160ede575763ec954d28576d9744cf7fef23e4f4d19c189cc80100f7ee04c66372ab6ab05aae677d7f0efe3e8d72d800b63aece
 DIST moto-0.4.3.tar.gz 147498 SHA256 955b0a19d466c917b5c9e97a03df6f10d184dea263efdd7796b1725b4a90a48c SHA512 3c8a2b5cf2b404f531d187adb96f03d38ec89ce147066922f8da7e71e33b2cbe01b5264d1dd7f7abddc9a94759e4ee6b3111da3838796acbd1a83ad6fbfd4a21 WHIRLPOOL 8cf88239a4c1acbfce293133e68baa05783800754a1f07c33a3643f071bcb0a0e68f7215b8696a378de71369edfead00a1708ba0b276108e0bb446f981343943
 DIST moto-0.4.8.tar.gz 154891 SHA256 d72a0427a0112a21f7009e2301ed7cc7c9fb085da1e1615fba4c5f02f6d70bd1 SHA512 e52a8fefd22983996718eec49e607a26978604e67a50523ee43fbf8c1d0ce871cc390404c7ae6951d6bff9b640f3b4dffa3a3d4425134a056e37db2ebcdcaacf WHIRLPOOL 4e0e1fb89571e53cfb1a67b6627b852b37743539917912e56bf9c596bd86981c3c2115cb7ca8b1014767db55a19363ce2604bb860aace1214eb597eea6722852
diff --git a/dev-python/moto/moto-0.4.21.ebuild b/dev-python/moto/moto-0.4.21.ebuild
new file mode 100644
index 000000000000..dcb9d700aa35
--- /dev/null
+++ b/dev-python/moto/moto-0.4.21.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=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.20.0[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/httpretty-0.6.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]"
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 0d6f3362258a..e5fd9ec5a430 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1 +1,2 @@
 DIST msgpack-python-0.4.6.tar.gz 116433 SHA256 bfcc581c9dbbf07cc2f951baf30c3249a57e20dcbd60f7e6ffc43ab3cc614794 SHA512 492246b03035cfb10a99aed59d23a7b10d1fd4cfa044cdec737b4f65fe3f7c30d3c9754389fd5efc2eb41760e4813ac246915ac7a50dc5659e65002a476bb886 WHIRLPOOL 9aa400181557c20d0b1e011424dc4b68de269942b3b7e27e24b113ee4d98f4161355d3479d7ff8c60c0017e0fe28ceb4fca06e67e881982141fa348336eaee85
+DIST msgpack-python-0.4.7.tar.gz 126251 SHA256 5e001229a54180a02dcdd59db23c9978351af55b1290c27bc549e381f43acd6b SHA512 10cc51c5f46a908953298071a46a790b9b78a577e37abd546c76f72386c3847885e36523680c86b9a13fb099fc2a17c3c7a0119c750ac5e7081c72df3ebd7a7e WHIRLPOOL 70be4cd3fc76671f311f50966ad5362ef6c94c18270f5dd10b690067fe891166f7929828874f0005ca0da8a2159a31fbd438e6be1d87c1928f845cbb37ac247b
diff --git a/dev-python/msgpack/msgpack-0.4.7.ebuild b/dev-python/msgpack/msgpack-0.4.7.ebuild
new file mode 100644
index 000000000000..05772e8b0c3b
--- /dev/null
+++ b/dev-python/msgpack/msgpack-0.4.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="
+	http://msgpack.org
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.python.org/pypi/msgpack-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	py.test test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 81b6ab929b99..8677e187538b 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,2 +1,3 @@
 DIST mysql-connector-python-2.0.3.tar.gz 210699 SHA256 b07a42c6c1d0476d47315428df89f3fd84626d1df18045babdaa182a6a331ec8 SHA512 2c9c6ee8042c3a694b7a88841176db682ae17def03e6a9628e098b5652d387eca882cbf1ec3e6d963c3b3913f66bc63e26ce7cc82a5f9fba01dfe00fcb574d7c WHIRLPOOL 41fe675d60b24a73f959117fb9ab85257d821f6f53f7f8f2ca0029aa17100ef30b7201f71dffd52bc64bca3e435f725bb9fac573078b852161507991990f6aca
 DIST mysql-connector-python-2.1.1.tar.gz 260751 SHA256 5306e982592fbd4adbdc6a89f198f175ac1a7353c7c57def59e1d2e74b954cb3 SHA512 02eef242c186ed648454225bbb75931fa7099d1286cb3425224e86c57ba5e7cca3bb2216892109c8be366596e76c671d4ebde7c6641fc39869cbffeb3738597c WHIRLPOOL 57b7390403b54727fac4cd0d92323190ac37e9f8b18bc588cef569d336b8db2fa36b5ddeaf1887ecff4e61ffab941a156c858ff626060536e8d7cdca6102e53e
+DIST mysql-connector-python-2.1.3.tar.gz 271939 SHA256 c6b5975de7117c41cb7364f2fb99c7f2e58b33c670b74a2d3c5b4a91a52720e3 SHA512 52c865beae4088bbd3b49ede15f3d2de27fa160ff2bff579d4845f32e2963213c7b31f76689cb040b370e698f63d84adebd2b178df427f472741561c70ab61a8 WHIRLPOOL f5b9cf827880dafd625d01e52525177c183a771d5ce696ac4dc5bb2859f80ed4120ca31a137098dd40a4c84334d2485ec575120edf5669a8f02936747846c318
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.3.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.3.ebuild
new file mode 100644
index 000000000000..6169fc3de7a1
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+
+DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt )
+
+python_install_all(){
+	distutils-r1_python_install_all
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index e2ebe21fac61..e2f7794bef9b 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,2 +1,3 @@
 DIST natsort-3.4.0.tar.gz 16113 SHA256 a58ea2410eedf587adda3f2a4ef93a820a99028b253b510c79ef5b4a11cd1dbb SHA512 5aa91f2cbdec3e97081cc7248e7d596437f5c0b53151eb59a95c161b35d331c80737f5ffe39c74a0233a0c20ffec7d244d9e70d6fb7263880270c8379c81bc44 WHIRLPOOL 792034fe0e266db6a508ddb9faf7a557a0e38aa8c3f10dec3c3debda917fe1f5c86f097199f42f83fe422fbbc6770c4d39adb1cff9a811fdd5dcad4dcec07002
 DIST natsort-4.0.3.tar.gz 60736 SHA256 283bfc8ce4c4d03f0a04b8d1908c747eff858d3774161074eb5b052972263b9f SHA512 abefb9226888679649fd1f4441a5016bfcbb79cf215c7be887cf1f67976ca6701f0f35424bb4ad405e9376fe3f3c38740a6f249cd233b92d7275f94e483b0b4a WHIRLPOOL afb1c78f2909128ccdb6b68c1bb2d54f400c87a1b293a06a29126db3732f9baa1bfd16d40f45097a45a3fd6be87b73973da0f3da34ff58e8967092a642128ab8
+DIST natsort-4.0.4.tar.gz 63116 SHA256 c76ba3e85fba78f276ac06e4d47f2230d1070f9c19413b2a0bfe7de6af311839 SHA512 e1c00de6fec56aeda6dedb547edfb2f819d8c129feb938be9cee64cd106485d75b2af12316d73b6e79c90694b0d489ddbdc29635e3df9569466d062cabbed461 WHIRLPOOL b410156355c3b5c5e12a982f8703fbdc7fbe079a614edc7638354b238260e6a559adf8ebccab5b3b728410a2c21c8932cff851341f5274e7bdd12d3295d8c595
diff --git a/dev-python/natsort/natsort-4.0.4.ebuild b/dev-python/natsort/natsort-4.0.4.ebuild
new file mode 100644
index 000000000000..e024ec7765be
--- /dev/null
+++ b/dev-python/natsort/natsort-4.0.4.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=( python{2_7,3_3,3_4,3_5} pypy )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="https://pypi.python.org/pypi/natsort"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pathlib[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 4c6560d961ac..e894b2c2f8d6 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1 +1,2 @@
 DIST netCDF4-1.0.4.tar.gz 521990 SHA256 99f5eaebae2fae92759d13b790dde4226b2b8c83a68f86543c41c7998cba53b7 SHA512 acebb8b721720fae8ae8347ac10b3bc213cbc6db763001292ab99db56fc20fd82abc17d5449ad8d75f40edb5bf14f24b0bece725671fcc15bf3b0cb6580c46c5 WHIRLPOOL d664d2a187b5191275bdc6fd6a456b684b4c9b1c6c0249e0299ba15ec10a6433b0859f84bf26148a7ca392e307a40f4bdfd13a7dc7ff8b059d8471f18e939b16
+DIST netCDF4-1.2.2.tar.gz 679107 SHA256 5e68d0a723ed327e53e90ac73d3dfa25e8da10db9ffba5f2aefd61356722ae9d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3 WHIRLPOOL 8fc551fbe6e1628304dd5067a22bbaffbb336c68f8315d5e929927f6ad52b0974b7a412d019b87a65e621e49d720ff1570514af66345e6c46c501ca9d862761e
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
index 4fbf56dbfcf6..b230a3c11bf8 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -5,7 +5,14 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <longdescription>
+    netcdf4-python is a Python interface to the netCDF C library.
+    netCDF version 4 can read and write files in both the new netCDF 4
+    and the old netCDF 3 format, and can create files that are readable
+    by HDF5 clients. The API modelled after Scientific.IO.NetCDF, and 
+    should be familiar to users of that module.
+  </longdescription>
   <upstream>
-    <remote-id type="github">Unidata/netcdf4-python</remote-id>
+    <remote-id type="pypi">netCDF4</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild
new file mode 100644
index 000000000000..65825e4d2255
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="http://unidata.github.io/netcdf4-python"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf,hdf5]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	cd test || die
+	${PYTHON} run_all.py || die
+}
diff --git a/dev-python/netifaces/netifaces-0.10.4.ebuild b/dev-python/netifaces/netifaces-0.10.4.ebuild
index 007ace92437b..f185ae84e10f 100644
--- a/dev-python/netifaces/netifaces-0.10.4.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.4.ebuild
@@ -4,12 +4,15 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy{,3} )
 
 inherit distutils-r1
 
 DESCRIPTION="Portable network interface information"
-HOMEPAGE="http://alastairs-place.net/netifaces/ https://pypi.python.org/pypi/netifaces/"
+HOMEPAGE="
+	https://pypi.python.org/pypi/netifaces/
+	http://alastairs-place.net/netifaces/
+	https://bitbucket.org/al45tair/netifaces"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
index ae125dd8f207..a226fc533fa6 100644
--- a/dev-python/nose_fixes/nose_fixes-1.3.ebuild
+++ b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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 )
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index e8ac3a4d3258..0ab7c3ef6fcb 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -2,3 +2,4 @@ DIST numba-0.18.2.tar.gz 786935 SHA256 5988621a8dd3609d252435c8e280bf01e2f25d9eb
 DIST numba-0.19.2.tar.gz 871394 SHA256 10bdd84a3a8dfb9b195ad7d3b11c1f52693833820268c64837dc8510e66f1e2e SHA512 9eca230b5d69890680278248365e748b2e8a7e040703e80acaed2c0e1dc3576e102bde3809eceb6e600d90e02685e66419ca3423d332620c034fe9c07995aa67 WHIRLPOOL bfba05b56ff9fa9708b67dad1f514bc35c72ac3bf76e349f2ec20c63f7cb9c1664b106898559220e796ae9cafc7a48dbb5e6e537720d6cd4f6b5ccde4903dc67
 DIST numba-0.20.0.tar.gz 895183 SHA256 62dd4eebbd8fef27a8a60b74de2f540b12223939e197877babb13bf06eba5d9f SHA512 d511ed382813471dd2b9f6d99ee7cae4b77375a3c003df44ec2954b0f16c32b0fec76b3c33df46c821f17a4d148afab6c4b2d43429548a5bc81efbebc4fb54e3 WHIRLPOOL 8345bed1965715aace541bfcde33f4a999241fac8f655d80d1bb67db5ae806924fec47e3895b2a61484474fef2d4362d15800aa5be8b1c8f1922eaeb06d432ce
 DIST numba-0.22.1.tar.gz 1101843 SHA256 2b0c95cf9c4f6390b1ff0a238499ee4cc32b3695728293e1d888cd3c15803633 SHA512 0514a04e83f800ba4dba97e5b220fd5d530e923e91769881f9df320a0eedcfb1e652fc87a1cda2d80223e38a25f85387a1930259179996bab7b7a731b86864c0 WHIRLPOOL dd554a15ea3783bfe335ed08b538eed6ec7071986ef4ad63e76e51c3d06783b38dccd0fb5b01b720eab130dbb20d8a2fe8cefd4124a6f57aeb10e74c228fad16
+DIST numba-0.23.1.tar.gz 1284771 SHA256 54359b8ef700a70f0d7a9b9aecb2c58867fd23479f556730d8b3422a132d5735 SHA512 833087ac4272d386eca0434855128773284f0f1f7cd85143088d2184781b070bf2922a7e2378ae90ba53382ffb5c547e9c2e34ec35a9423e1cf2ad9706d7c366 WHIRLPOOL 1cc91acb8acd9e14ace0be14c45e5e1abf5fc28440ad463240f8ed5b18708496b166ebb9134df32170551ac6f7e123d1dcb4897434320bb9471338c008b638ab
diff --git a/dev-python/numba/numba-0.23.1.ebuild b/dev-python/numba/numba-0.23.1.ebuild
new file mode 100644
index 000000000000..cbd0b4239074
--- /dev/null
+++ b/dev-python/numba/numba-0.23.1.ebuild
@@ -0,0 +1,68 @@
+# 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="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/llvmlite[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
+# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
+PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
+
+python_prepare_all() {
+	# Re-set them of doc build to one provided by sphinx
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
+	else
+		sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs/ html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+	# doc needs obsolete sphinxjp package
+#	use doc && dodoc docs/Numba.pdf
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index 28b5d196f211..11ea66c76483 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # It appears the docs haven't been upgraded, still @ 1.8.1
 LICENSE="BSD"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="
@@ -109,9 +109,9 @@ python_prepare_all() {
 	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
 
 	# we don't have f2py-3.3
-#	sed \
-#		-e 's:test_f2py:_&:g' \
-#		-i numpy/tests/test_scripts.py || die
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
 
 	distutils-r1_python_prepare_all
 	epatch_user
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 688ed37214df..9bee567df805 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -3,3 +3,4 @@ DIST oauth2client-1.4.12.tar.gz 109339 SHA256 f735b41a57fe46c0b170e919e81b9bbe7d
 DIST oauth2client-1.4.6.tar.gz 95325 SHA256 d4376fc0f5543612c62cdee5ea68530bd9c8542891b3f4427d8bf9a1f5a134c8 SHA512 e75e6c535ca4e427f3a869fa7e600bf7544752a100f623cbbeb117d872a2361a60d1524fc2639521393a58dc6f684d9e1452980d6a5ffb6f4dbed516911cc4ca WHIRLPOOL acb26ef17115138a8932313cbbb8c9a802e2296d20343ab746123ad0ef8a38ea8587c10c45863b56b7b4d5b052675434236a050ae64c6c05546a42fd3cdc4f6b
 DIST oauth2client-1.5.1.tar.gz 130237 SHA256 3e4ad7b3399cd9c4b8785acbbba2ca55eaefef17989f784352d2386776bf17c5 SHA512 ad228264b93ec23bfb4bbc9614a980172e3c763adde12e0b050166ccd49eece1d2464a078884ed16cbaea60a7bf88784a22314382073e360f1ec591b19a2da2f WHIRLPOOL 963b9518944dc081fdd3c32f1c6a12527a567f2c762355b109cee01b1cb1c1c35d85301bd2df6e47d2d11ac1e5b6c6a2bbc59098c10baa75ea2574567617f7ec
 DIST oauth2client-1.5.2.tar.gz 131665 SHA256 b8df20b122e4f49a5fe5bc3c825d16015f5012c171c6c81eb4048e4d8c2ffee3 SHA512 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5 WHIRLPOOL 00f3033359eceda12528ef4caffc0a9d7d6561919272fe98e09d2599114f07d9be42eb32a4038c155c621581f98ecc0eb516bcaa018d4376e30906dd4a0adfbc
+DIST oauth2client-2.0.0_p1.tar.gz 149275 SHA256 0a4a9777f5c68a28605bb8510da0b09446ec3a4cb4d6e53ec9c2e240b357eb24 SHA512 e864c8e34757fa2e72b95d556c92549359be8e65fb709300c816090440ee6466ef6e638d67aaa5c0862d1d1e34caf5e4a9f565911cac05d186ef2c71b59aaf9c WHIRLPOOL 499097e9f7de89a76f73dd6fe631647e7d4f76716d64558c3c05c5d03e33ed1ee0183c5b2202347e99bcfd388767c199a31bc990d441bfb55e5df89685bee0a3
diff --git a/dev-python/oauth2client/oauth2client-1.5.2.ebuild b/dev-python/oauth2client/oauth2client-1.5.2.ebuild
index d70153fbeff3..180ef5f4c164 100644
--- a/dev-python/oauth2client/oauth2client-1.5.2.ebuild
+++ b/dev-python/oauth2client/oauth2client-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/oauth2client/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild b/dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild
new file mode 100644
index 000000000000..74871a0ad417
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${P/_p/-post}
+
+# Needs network
+RESTRICT=test
+
+python_prepare_all() {
+	sed \
+		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/oslo-log/oslo-log-1.10.0.ebuild b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
index 8672bf191e5e..a1807caee3b1 100644
--- a/dev-python/oslo-log/oslo-log-1.10.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
 
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+S="${WORKDIR}/oslo.log-${PV}"
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 4ae1227d06ca..76e2f4887d73 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -2,3 +2,4 @@ DIST packaging-15.3.tar.gz 34359 SHA256 1e9a6b9ad621bc1dbd3aa8dfff52abc4b44f5c14
 DIST packaging-16.0.tar.gz 40167 SHA256 a32895134cd7b86ee8add60a3be5bfd7ef3f30e73e5b54221dbe67d0e0690689 SHA512 7672f0a51f73543e39ad80b021d288c0e235c2ace9add5022a1d494b2711ce55ba7d05d92245cbb96fa354d67fdfbdbdd2e1858ace3d6d2761869bc5ddaaeddd WHIRLPOOL be813ffbcc614e5be3bc9bb1e704e9c65c194b47172bb0c9bf0113ea8456256fa8263faec33b3e001b6d71ed7fd8763796afd6eeb608f3a65ea987db48304d5a
 DIST packaging-16.1.tar.gz 42929 SHA256 7792caf5bfda630c96310a84ecba5d61b17a843ab72194bb5606d81e4f44094f SHA512 f4e081be85247c989343e7532d5e4afcad68af960264b59271862799e8d63ed0b7fb733670f7446da69aa60f013fc886c8c31c6010c1157110c1a417209d9325 WHIRLPOOL 8c13ef4196633cc4c7c59aef2fa8980abc46908fd30ffbe79d565dcd6089bc1496a8b5dc6aa5968273281e8ef494ef54036c72192f36dfe30dbb0f3fcf8544c9
 DIST packaging-16.2.tar.gz 43398 SHA256 0eb4a6329c6d40a0deef725b4f510b6219ec8c365f888583babbb4454d761dd6 SHA512 2310efbd4d73498d5645d0c3a2f0cb162cd18cff28079ba2ac44b784e728363d84a8eae4d9e313c4491394841638ef01ef37ef7da3bac01e27af37a72e387dd1 WHIRLPOOL 5aff538bf5ee18474074048bb581140200c078ceb6366f5c709be931851b0835a8a725ecc17a1b2c34bae34cf79d8743a4422c6701e5c6e9ba99bfdc51aa439f
+DIST packaging-16.4.tar.gz 43707 SHA256 325db5b475511303f17e96047877bfc6ba9c895b6850df4a98d95bfbc0329cb1 SHA512 b237352589f8da122246a7222112934e53809c7a04051953c2fb49b2e8910b0ec675105a085187f608a334585d73348f180e855a2ccfa2d590dd38fa65260a70 WHIRLPOOL 4f9d0f20c7eeb0d1a9f3086c91df780bfff3d0062f69c08c6c70d4e288e83b79aa2ab38e9bbb82dbdc607c2b48e45760bbe53d390d4f431f714e63396d33c4de
diff --git a/dev-python/packaging/packaging-16.4.ebuild b/dev-python/packaging/packaging-16.4.ebuild
new file mode 100644
index 000000000000..26279ce494d2
--- /dev/null
+++ b/dev-python/packaging/packaging-16.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+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="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	py.test --capture=no --strict -v || die
+}
+
+pkg_preinst() {
+	# Remove this in the next version bump
+	_cleanup() {
+		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			echo rm -r "${egginfo}"
+			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+		fi
+	}
+	python_foreach_impl _cleanup
+}
diff --git a/dev-python/pathlib/pathlib-1.0.1-r2.ebuild b/dev-python/pathlib/pathlib-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..9f459c617bfc
--- /dev/null
+++ b/dev-python/pathlib/pathlib-1.0.1-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# In Python 3.4, pathlib is now part of the standard library.
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Object-oriented filesystem paths"
+HOMEPAGE="https://pathlib.readthedocs.org/"
+SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index fd2eb8427b28..763f11ce4a85 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,4 +1,3 @@
 DIST peewee-2.6.2.tar.gz 574383 SHA256 2e9ee19d6beef477a14436be6bc173d2472f6ddc0afb28763fd5a4e8fb287e35 SHA512 a38b46d39c04106ddc047f56cd8ebbf48218547a3d8f7dec693f99b9c9b82df505c1948f91155177a00797765d0758ffea79d5ee5da5cf9b59adcd4b2e269483 WHIRLPOOL bff5aa5ef22f08cda83a70b933a4e5734ffb5adaa5388b399694ed8246a92b89edecb78375e6d561aafa6768f7d22bcd3cab1623fd43665be5a6712893b6f9ee
-DIST peewee-2.6.3.tar.gz 574936 SHA256 f2a9ef90b80a69c5373952ef7b2495931fa1ba5fb100f0975e1e01d9aa31c1bf SHA512 d5a053ba230ad7770ceb2f500383d13356eba742af1f140ccc0974e04d271a991c74f583dad3c8a1a44a2640947f056c7e2d6bccbc3717bb67350aecc9244f2d WHIRLPOOL dff0eb13d3ceac2a4870b1b18b8e591133bb4b3e640cd6f424d3ffea09fec46393e448e4e0f0eb127667c5fa0a658edc3c6a93aeb925d9cc22fcaf722332c0f3
-DIST peewee-2.7.3.tar.gz 606213 SHA256 955e33fea0715cd444efaeddb9b8ab62c3a24c9dde8b06f620f52341e06e0b13 SHA512 491f6ac6322893e61ea8d230999a6597e1bbba84e10d3ba376089a57cdc98ad4c9f6bf5eb50823c8721fff0bb789d8ba8a668002fe3475cd345ea5d07ab39716 WHIRLPOOL 4154f42f8446766b21f08dc1087f37f3a1c478d01e1797df36ff9eafde32c4be6f8b20a28eb8cb9231cde89fbc7be0c54d97d91b91bd4a80f4550493b6659ce5
 DIST peewee-2.7.4.tar.gz 608818 SHA256 ff25784ab40d58d659bc8f24e07fe891579b09f74417fca9d8d57772e514c409 SHA512 c72391316c8bd1f712bcb26d4d6e5ef386a415da536d78cade35d42bbb9c8c6d7b0494bf329bd67e3ac5b91a2d76e97365376b0e91a5c6a5b78ab1696f7576cb WHIRLPOOL acc0862963256173b7e918f5456e10dcfb2e533a9cf213841bb42d2bbcea475f8bf329f4227311163de5e9974ea06d1ab9d78b1ab25ce762c11f1d6689556196
+DIST peewee-2.8.0.tar.gz 615679 SHA256 5ee271d4ca1b1904dd7a9d9912bdc2a5a47b7b54ac1e8e6950dba1b5b746a0d1 SHA512 12a225dc6d40838d223a7396ed138d1a82393f79b0b666f019e0c6f07c58c99e0a50ecf1ad61c10176a3f184f00fcde0a753f7ea49aa5a8e2a0e69832b654622 WHIRLPOOL e8f89b7c0a495769cb028a08e17e7e6f331f6281c6f04d056573c0c43428e99e26004fc73e76851daabbe65c8f768918eb4ac0c7f53fb6bf88b94f8ee2506c46
diff --git a/dev-python/peewee/peewee-2.6.3.ebuild b/dev-python/peewee/peewee-2.6.3.ebuild
deleted file mode 100644
index 378bd7a033ce..000000000000
--- a/dev-python/peewee/peewee-2.6.3.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} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Testsuite run using runtests.py does not require deps listed in previous ebuild
-	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-2.7.3.ebuild b/dev-python/peewee/peewee-2.7.3.ebuild
deleted file mode 100644
index ecc09195f958..000000000000
--- a/dev-python/peewee/peewee-2.7.3.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,3_5} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Testsuite run using runtests.py does not require deps listed in previous ebuild
-	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-2.8.0.ebuild b/dev-python/peewee/peewee-2.8.0.ebuild
new file mode 100644
index 000000000000..aacf223e06a0
--- /dev/null
+++ b/dev-python/peewee/peewee-2.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Testsuite run using runtests.py does not require deps listed in previous ebuild
+	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-3.1.1.ebuild b/dev-python/pillow/pillow-3.1.1.ebuild
index e3cd14393b45..7856ced1a1ce 100644
--- a/dev-python/pillow/pillow-3.1.1.ebuild
+++ b/dev-python/pillow/pillow-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/plyvel/plyvel-0.9.ebuild b/dev-python/plyvel/plyvel-0.9.ebuild
index d99b31d44abd..6925483037ef 100644
--- a/dev-python/plyvel/plyvel-0.9.ebuild
+++ b/dev-python/plyvel/plyvel-0.9.ebuild
@@ -51,4 +51,3 @@ python_install_all() {
 	use doc && local HTML_DOCS=( doc/build//html/. )
 	distutils-r1_python_install_all
 }
-
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 85d8bd52ea9d..7f00216be03e 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -7,3 +7,4 @@ DIST prompt_toolkit-0.52.tar.gz 152677 SHA256 35b8a34df8dea4cba92222dc1b8700c30e
 DIST prompt_toolkit-0.53.tar.gz 153969 SHA256 a62b861a52d2a8ff3080c4e23e529c1af8d0110f8e9d378fa3ea997d1c4ce864 SHA512 5d91527c2de5650c95b42fc202be4237d3f98e9fccb5fdf2b0360ca169c5107015394ace76b06ec19d5c8b8b6e4437c75ad3068b262d26c351910ff97e1d4e9d WHIRLPOOL b12fd7021c9229332f3863531c54a5ed2b1e5ac276d8531295d7dc83c883f4fba039375e34cf9eacdad708b5ef385b31733120a6a132fbda61006918b32ed222
 DIST prompt_toolkit-0.54.tar.gz 157151 SHA256 f06eff45c142fb4b82716593b85fabcee260dbcc5458a5680f81edd3cd1b4211 SHA512 cf5b43a52bc4dd08fcc8aafe9e45172c93ac71e8b32beee000c7f267f792b64265ef00d572e927cef05e3642e197ae1c0573c3ec0e95317f7a065807e86a44b4 WHIRLPOOL bb68c8767d96a9835b8b09607ecaeaf2b3c8a3858733ab1675093544c1a20d29b1098b016210263de781e0ca8d1a5b95b616ffc9a4b50d7e1e16d95220936684
 DIST prompt_toolkit-0.57.tar.gz 178829 SHA256 de6019e1ebe99647d1b6640f09a02961b26144a91d9964ed93a41ccada9a9fae SHA512 6ed966f2e4cd91e26aa5477205910db0e62a374c544a5f4fd052b22b5312a2bf49294a0bff6ad384a89e806e79eb8e7f3495ae6261b141c38b9c026f67d2b328 WHIRLPOOL 9eb33330002d67cfd26e10a4fab9f8ffbd44fd87bb745960acb734f9db4cf0fa95983dd6fded3e35a263b4297a26b019d113ed450a4c2781a7bbde4bb8eb75ff
+DIST prompt_toolkit-0.58.tar.gz 191691 SHA256 11b5109858bf5480a4823f1d5f4c3e45e97e6f3d1c2024b06f54ca73314eaca3 SHA512 8183e2530c6e0f67495fe078034b21f0a9b9cb6c28f6cb58c18048729a82432e543b405977ee75ca06489c7e42d26701ee303b7861fa10abea7f231c3fccdd22 WHIRLPOOL 4236a4620c8d6a63ad22db6c69761362847f9230cb5f432ab4f8d17c3d9b297bdeb7893d1c3b8ba0e3eba7635323b76be7d3cc321a8f1baa6cea44898cd868f6
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-0.58.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-0.58.ebuild
new file mode 100644
index 000000000000..6befc48c84c3
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-0.58.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 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/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${PYTHON}" "${S}"/tests/run_tests.py || die
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 775f3f90d30c..8f03bfeab241 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -5,3 +5,4 @@ DIST psutil-3.1.1.tar.gz 247284 SHA256 d3290bd4a027fa0b3a2e2ee87728056fe49d41126
 DIST psutil-3.2.2.tar.gz 253502 SHA256 f9d848e5bd475ffe7fa3ab1c20d249807e648568af64bb0058412296ec990a0c SHA512 d1649e020fe9ba093c6948252e2eb205005700ac575ec85c696d1bd995af6b3bedad3dab0054859102aa69315905ca3390b268ce4eff5014c746a5a1713a37e5 WHIRLPOOL c4a34d7b3b369d8153de180cc2187921fbd33f26d63086d4868bfc61cf7d1965ae98425a6f9f454987b5df9ff42269a76a012047e679f4387286b127db73769d
 DIST psutil-3.3.0.tar.gz 261983 SHA256 421b6591d16b509aaa8d8c15821d66bb94cb4a8dc4385cad5c51b85d4a096d85 SHA512 dd6542b8900f0884d0bdfdc6668d884f5b77f0054d3c1358d5c9d78ed54ebed7f9caf2d6c2f954f57e06931cc485d9146a3f1f1a3a1f416f66f11fa26df1f2f0 WHIRLPOOL 09905d0893b165243471ad9befd5ae7e1e2399ecbf793b19c7b8c8fa5547db24d9e843abd40bb9cf13bcd84095981a386fc9ad910d51dab426b059aa8ff3d32c
 DIST psutil-3.4.2.tar.gz 274361 SHA256 b17fa01aa766daa388362d0eda5c215d77e03a8d37676b68971f37bf3913b725 SHA512 95c246ed4ce68a476f83868312101d88dafa9d4cef96ff60af646a443c00e6cc447d37cc1ac4e85224db16c24390575174bb7ef76f48cb839fe2e93749107ffb WHIRLPOOL ce5162eaf06b831788b7647b0558e331986085a0ad98a525781206bff9c0cc07021142d619b219dab488a66bcacfb7e78f013d2eab519f58fe5ad2dc66a963cc
+DIST psutil-4.0.0.tar.gz 293800 SHA256 1a7c672f9ee79c84ff16b8de6f6040080f0e25002ac47f115f4a54aa88e5cfcd SHA512 08bd93549660e8ce5816391a1028bc3737165d060e7c12543aab6e9b3e0d8268cd31929f61bcae845d8929d6f5ecd52e2cd62708ed0c860958b78f9937e7443d WHIRLPOOL ea9c04e80a91c5805efa41e0bf8e25cfbb685b34da9c8dfd4be79f26251d4626715cfc7e0867283d2ba557255d636e661e99ab5526d59b6ccf028533d34103e3
diff --git a/dev-python/psutil/psutil-4.0.0.ebuild b/dev-python/psutil/psutil-4.0.0.ebuild
new file mode 100644
index 000000000000..1152af09316f
--- /dev/null
+++ b/dev-python/psutil/psutil-4.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/runner.py || die
+}
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index d18d3bd5f6f7..119514cf0c68 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1 +1,2 @@
+DIST ptyprocess-0.5.1.tar.gz 68474 SHA256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad WHIRLPOOL ba327a02a847f7c5e4b62e6bf8ba0f070f8a22ff584045d7ed3cc134f8a922b9d75e397992cd5df5ca4569f563d234ea2a194b5a557606978a37a4f04559ee1e
 DIST ptyprocess-0.5.tar.gz 14923 SHA256 dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59 SHA512 6619bfc1dfc7c980ffc72dba62697692eb749f19500616e8783cfdc3c35980276eb39070f4cd7932775abb5e798c921b9320c5f51b9052f526585f01cd56259e WHIRLPOOL b1bd0da485ea106a3d366ab21dc714418b8d392a32fc3386ef734362da8ee455a38f9330cedfe35687be09bea3ff622c54440119fca72d7787d9a29518717b77
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
new file mode 100644
index 000000000000..bb61a1780a2a
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.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=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test --verbose --verbose || die
+}
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
new file mode 100644
index 000000000000..62cf4a1b3d7f
--- /dev/null
+++ b/dev-python/py-cpuinfo/Manifest
@@ -0,0 +1,2 @@
+DIST py-cpuinfo-0.1.8.tar.gz 15321 SHA256 892abe41eba777c2107c54703dde0c769965c3da79d100d94e4cd5e8a9ba3e59 SHA512 62941ff0a6074c6276568994b54e6b4b12403f3524941c958cb64113ee51e47f38d05a93d5434a17e6b9487ea98f56bed137fe5d82099b4180e0032aeea498d5 WHIRLPOOL 32b81ad3fafb149985960b66fbf1d98765723f2c60794cb9151c99b94b0dda8845fbb1d3373e43761ffe7e8d40623e7634bb41693e2a6a41b2658d2ec73d6e93
+DIST py-cpuinfo-0.2.3.tar.gz 21033 SHA256 f6a016fdbc4e7fadf2d519090fcb4fa9d0831bad4e85245d938e5c2fe7623ca6 SHA512 92616d0eaddd47e3fbdad49774aa023a73eb4f9e9b88848c5e2f93540ef8b1b1b8a5011b4148be2f9817eee4d34d5f158b7e37b0f27aab09c86cd4704dd53d7b WHIRLPOOL e07fc52d444acb3fc065c2bb7067e81675d6147f8043beac4458ada5c0ded4d89e4d0091be561099687902ffd4507614c591975e52b3369c07fcefc07370023e
diff --git a/dev-python/py-cpuinfo/metadata.xml b/dev-python/py-cpuinfo/metadata.xml
new file mode 100644
index 000000000000..85c4530f50d2
--- /dev/null
+++ b/dev-python/py-cpuinfo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">py-cpuinfo</remote-id>
+    <maintainer status="unknown">
+      <email>matthew.brennan.jones@gmail.com</email>
+      <name>Matthew Brennan Jones</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-0.1.8.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-0.1.8.ebuild
new file mode 100644
index 000000000000..0cc1f2a9db8e
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-0.1.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo http://pypi.python.org/pypi/py-cpuinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://github.com/workhorsy/py-cpuinfo/issues/32
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" test_suite.py || die
+}
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-0.2.3.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-0.2.3.ebuild
new file mode 100644
index 000000000000..c6b4935a39d0
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-0.2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo http://pypi.python.org/pypi/py-cpuinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_suite.py -v || die
+}
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index f2fb3818d1c3..57a1f06dc997 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/dev-python/pyatspi/pyatspi-2.18.0.ebuild b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
index 66f9f4429bab..7e7fb8c5d16b 100644
--- a/dev-python/pyatspi/pyatspi-2.18.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.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/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index fc4defbfda64..803ea534467d 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1 +1,2 @@
+DIST PyAudio-0.2.9.tar.gz 289499 SHA256 bfd694272b3d1efc51726d0c27650b3c3ba1345f7f8fdada7e86c9751ce0f2a1 SHA512 1b1209a5ff808253c4f6edbc3cbde6a6efb99c1ee56b4f7a0e889b3936420e79fa41e1cd2a92e3ddff9bb26900527fd4b54133db0a8877ea20c99775b4f206a3 WHIRLPOOL 6e7155b53648721cca9b5f42d3c5cb0a034936a56bbab74549325f221ed004c1bab908a731d446e3731132f7c60d209d97b7da0b79d57f79857d431b661dc144
 DIST pyaudio-0.2.8.tar.gz 235900 SHA256 4f85367cf79657616684487037957ac38582ecc5389b89420fe61d901b719551 SHA512 af85291932809ceb966d1ace3c866cb6ac7e039b936ca35be668d4a3dc78c53e516070902d35fa6c829b37db376b8b512dc926ff1079e039809cae067be93069 WHIRLPOOL dae98752b6b885ce6f5247b9914fc9fcfd6264030c5f57c7276c6468de79ffdf30ea6196325ab0ff34b6997157ab97f6068ffa6ee27e137bab96c1589723550d
diff --git a/dev-python/pyaudio/pyaudio-0.2.9.ebuild b/dev-python/pyaudio/pyaudio-0.2.9.ebuild
new file mode 100644
index 000000000000..2cee820a7eb8
--- /dev/null
+++ b/dev-python/pyaudio/pyaudio-0.2.9.ebuild
@@ -0,0 +1,31 @@
+# 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 distutils-r1
+
+MY_PN="PyAudio"
+
+DESCRIPTION="Python bindings for PortAudio"
+HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="media-libs/portaudio"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/PyAudio-${PV}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyavm/Manifest b/dev-python/pyavm/Manifest
index 792d0259ef8f..c64932eb7e2b 100644
--- a/dev-python/pyavm/Manifest
+++ b/dev-python/pyavm/Manifest
@@ -1 +1,2 @@
 DIST PyAVM-0.9.1.tar.gz 99461 SHA256 5b44dc29ee595849aed94af2db4fe670851a793713b1a3063bca2dee85aa415a SHA512 e3433a44d39cd54e20abd377c5722e7157e948cfde9176cabbe5f2a63999927ef2d9e94f1eb33da6276d6fac462fad8caa5991299483ae484aa15d9b96d9dc08 WHIRLPOOL 3b47b28685f2ffa48944bd87552a3f74282daa91444eb6a0eafb245df6292ec0f51365d76da7cde33b0d304e24ff52bd2439b1a2c150925ca6715c5f4b4af2d2
+DIST PyAVM-0.9.2.tar.gz 101071 SHA256 4bfc4bcb820d239b09d1f9c5a4cd1a3e0fc63af71d96f884a020cb7cc0c800fa SHA512 5e724d023ddd74ce64c3846fdb2e6310cbf8e2b9670e2bc28dd1b7978eae76f43f48a223d8e69f805aded41c569657c874d999bcb8198e0b8de7f02dbb51e7c1 WHIRLPOOL d7bc41a4cde21651ad2e278d10825c5b568d184be394f31066369a43970e9828d751272dcfc56ca6d42a9ed9be54f57502d2f27308203c52ff9de6ef65c4ab7c
diff --git a/dev-python/pyavm/files/pyavm-0.9.2-deprecated-fromstring.patch b/dev-python/pyavm/files/pyavm-0.9.2-deprecated-fromstring.patch
new file mode 100644
index 000000000000..0e16177b887b
--- /dev/null
+++ b/dev-python/pyavm/files/pyavm-0.9.2-deprecated-fromstring.patch
@@ -0,0 +1,15 @@
+Description: Exception: fromstring() has been removed. Now frombytes() is called instead.
+Author: Josue Ortega <josueortega@debian.org.gt>
+Last-Update: 2015-12-20
+
+--- a/pyavm/tests/test_main.py
++++ b/pyavm/tests/test_main.py
+@@ -46,7 +46,7 @@
+ @pytest.mark.parametrize('filename', XML_FILES_WCS)
+ def test_to_wcs_target_image(filename, tmpdir):
+     from PIL import Image
+-    image = Image.fromstring(data=b"1111", size=(2,2), mode="L")
++    image = Image.frombytes(data=b"1111", size=(2,2), mode="L")
+     image_file = tmpdir.join('test.png').strpath
+     image.save(image_file)
+     image.close()
diff --git a/dev-python/pyavm/pyavm-0.9.2.ebuild b/dev-python/pyavm/pyavm-0.9.2.ebuild
new file mode 100644
index 000000000000..1b1c915765ed
--- /dev/null
+++ b/dev-python/pyavm/pyavm-0.9.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MYPN=PyAVM
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Python module for Astronomy Visualization Metadata i/o"
+HOMEPAGE="http://astrofrog.github.io/pyavm/"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/astropy-0.2[${PYTHON_USEDEP}]"
+
+DEPEND="
+	test? (
+		>=dev-python/astropy-0.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}/${P}-deprecated-fromstring.patch" )
+
+python_test() {
+	py.test || die "tests for ${EPYTHON} failed"
+}
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 6b41a39bacc8..31a2e75034b3 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -22,11 +22,10 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	$(python_gen_cond_dep 'dev-python/3to2[${PYTHON_USEDEP}]' python2_7)
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 29c429977b50..7971966428b3 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,2 +1,3 @@
 DIST pycountry-1.18.tar.gz 5020542 SHA256 23bb173d0281e98eb7b432d8dc6819e5fe6573e505454d228558f61e1f5ae1e6 SHA512 eab2bf1711f514b3842aee6004a904573e974b13757cf3c1a388eb8a292d92e3bdb801265a1c146df5fd510bd830297ddfcc64e41c0ed17c385335837f6721dc WHIRLPOOL c697250bbe13e9b471e0b19857d4afcfdaaf85410a07131727e75c23ac5d7f214682e993f1d799c26417e79ae78b83400e0e3401d2bcbb4afae5d40bf9456346
 DIST pycountry-1.19.tar.gz 5022557 SHA256 132ecf3343e4bde8fd0c48a4345a4a8a6144fbdcdaf190a43a7e34c99e91be4d SHA512 850d32504c984d1e2959a909fc367da402b1d1adf4f19914fbbf61784fe30487c5ea92e5579ecfd80bff040cffabc9335d55589df32f54af0de032e042a49c77 WHIRLPOOL c21da359d57573e983db9e9d6c5a556e15c4db1436624b6645af24946338d1728beac8ab7c1cc4e66e8a3571f60c1d5e7b398151a322670c1ad7caa21d6ab19f
+DIST pycountry-1.20.tar.gz 5024012 SHA256 0588efa3171e1d5e4cc96fce569ac865964285fdc8dbdc0860844f74598d1f98 SHA512 316e37b4cd800d87f010282a79e47b833b4ee836342ae0e672a5d115c543a8a0e3f508cc4498367aa254317e9747483c7026dac7273d3daa19acd2153635f854 WHIRLPOOL 2516662d06148c5fd3a10efb9715113cf13abe7183fe4b94491b473a24dc47b4d626a77489365b4f2e02a0cc7417ef59dfea21b2b142876981075fc5b05e7d62
diff --git a/dev-python/pycountry/pycountry-1.20.ebuild b/dev-python/pycountry/pycountry-1.20.ebuild
new file mode 100644
index 000000000000..d19095979b11
--- /dev/null
+++ b/dev-python/pycountry/pycountry-1.20.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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,3_5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
+HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~ppc ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	if [[ "${EPYTHON}" == pypy || "${EPYTHON}" == pypy3 ]]; then
+		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
+	fi
+	py.test ${PN}/tests/test_general.py || die
+	popd > /dev/null
+}
diff --git a/dev-python/pyds9/Manifest b/dev-python/pyds9/Manifest
index 5e55965a090e..f4e02190e2ce 100644
--- a/dev-python/pyds9/Manifest
+++ b/dev-python/pyds9/Manifest
@@ -1 +1,2 @@
 DIST pyds9-1.7.tar.gz 879882 SHA256 026a86827fa93f074e2a90b9d831ba79253f312fa331f6a6a508cfa91fa81aac SHA512 8622cf40db65228553abc2f3dea346d9c948706a2681217a9383589d4df0143c42ef859dff12689f699b0fb40806945232c336539f37eb2c78754f9779043bcb WHIRLPOOL abc2d11817519e844f61319b0ba30276a9bb48b6a3beb5e6b7c097717cc86aeeb1960f58d62a21a9ce5d4bc37c05b8cee181abc1cc12e2821a5e878d64f1f175
+DIST pyds9-1.8.1.tar.gz 899377 SHA256 86ebc33b4f493998751a2f4a1c0141c7a4a7aee2ab01b62119bcd75bb3ca7273 SHA512 6924ba2a1c1ccd0b3c068d4923c6a35127da744b91b97ece7d075bfde68ff49e6d24ae55869aa5e0e462f3f488db697dcdb33d217b33b6d63551286d9a95eec9 WHIRLPOOL 68bdbe1b10fc6c2651d20968eb8e419d1649958d4c0f70bff01ca7a9ad69fad7a8c78eaced497b6a5b0627f6de63f7390c3fdf009947faa5d25276174ea97fc7
diff --git a/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch b/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch
new file mode 100644
index 000000000000..b84994f76b08
--- /dev/null
+++ b/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch
@@ -0,0 +1,36 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Don't install and use the convienience copy provided in the
+ source, but use the one installed by the "libxpa1" package.
+--- a/setup.py
++++ b/setup.py
+@@ -21,7 +21,7 @@
+ xpadir = 'xpa'
+ 
+ 
+-def make(which):
++def _disabled_make(which):
+     curdir = os.getcwd()
+     srcDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), xpadir)
+     os.chdir(srcDir)
+@@ -86,10 +86,5 @@
+       author_email='saord@cfa.harvard.edu',
+       url='http://hea-www.harvard.edu/saord/ds9/',
+       py_modules=['pyds9', 'xpa'],
+-      data_files=[('', [os.path.join(xpadir, xpalib),
+-                        os.path.join(xpadir, xpans)])],
+-      cmdclass={'build_py': my_build_py,
+-                'install_data': my_install_data,
+-                'clean': my_clean},
+       install_requires=['six']
+       )
+--- a/xpa.py
++++ b/xpa.py
+@@ -28,7 +28,7 @@
+         return _fname
+     return None
+ 
+-_libpath = _find_shlib('xpa')
++_libpath = 'libxpa.so.1'
+ if _libpath:
+     libxpa = ctypes.cdll.LoadLibrary(_libpath)
+     _ulist = platform.uname()
diff --git a/dev-python/pyds9/pyds9-1.8.1.ebuild b/dev-python/pyds9/pyds9-1.8.1.ebuild
new file mode 100644
index 000000000000..e201c4ceed24
--- /dev/null
+++ b/dev-python/pyds9/pyds9-1.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to XPA to communicate with DS9"
+HOMEPAGE="https://github.com/ericmandel/pyds9"
+SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="x11-libs/xpa:0
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=(changelog README.md)
+
+PATCHES=( "${FILESDIR}/${P}-use-system-xpa.patch" )
diff --git a/dev-python/pyee/Manifest b/dev-python/pyee/Manifest
index cf3ef9511d2d..0b73c8d725d9 100644
--- a/dev-python/pyee/Manifest
+++ b/dev-python/pyee/Manifest
@@ -1 +1 @@
-DIST pyee-1.0.1.tar.gz 4056 SHA256 445c9cd811a53eeee3dd5649a02960eef142cbbf8f6fa10e5d31ebc4f8c78f68 SHA512 3072bd60f1ba596a1e65796cab652eab2f84f58e77741329f5c92bab926c3a01ca169eb1c8aea9fcff4d1a547643d709aec0ad13e182832ac52e9c22c91abdc6 WHIRLPOOL bfd350052e5a31099ca252354ba32f99f90403d2c86de79b590c1ba2ad94f1e5d6cfe0080b4648ef48e96745653d07c6872a8b30b19180b8acf18108c963f912
+DIST pyee-1.0.2.tar.gz 4263 SHA256 16944f91eb37c0acf7a370feef2c09678220963f24f38134703911f80b33d79c SHA512 73cbb3cc7b06be9d4c92f6bc901fa55e1ca51271177672e8a1636eedc6f82fc940d7dd844d0f4a959e52185c0ef934e9fbe4760b70d62f39b94f5d1c3660ce2c WHIRLPOOL e09230d7e94533aef1b5f00f746e839cfd362eba8ce3a4f4929a323ff15fed4e85c11dc2ff9347c4b9eae7ce211d18e29f9248354394a381a53e45bb06ac0a51
diff --git a/dev-python/pyee/pyee-1.0.1.ebuild b/dev-python/pyee/pyee-1.0.2.ebuild
index cd07ea57ff1c..cd07ea57ff1c 100644
--- a/dev-python/pyee/pyee-1.0.1.ebuild
+++ b/dev-python/pyee/pyee-1.0.2.ebuild
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index 0c755aa93fe6..243d20ff6ce3 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1,2 +1 @@
-DIST pyfeyn-0.3.4.tar.gz 27074 SHA256 6b1d86606b9b61cfc6285aec4a15202f60a819368b3e74fc13a586835f22da6e SHA512 b0ce1939d893df3af060cc64d11c2bb09f22c99b074aefe0e79d820ee4c6b5c64f4e8de8f4c31020b33735627b2dead9a70ea9d3504773417a058ac7a1915db8 WHIRLPOOL 6d303b0c941f7d698d4f8ca4d0286be74291392700eec6d63dbec9d9d0db22f77d790022d49176b0dbbb25bc6b44e4360dcf1a4821cb9806de0baf24dfcbebbf
-DIST pyfeyn-0.3.5.tar.gz 27341 SHA256 b6aada34fd31d57e755547bb19324fb7ed679b3e7e5f2ceaf9d41c5535445ca0 SHA512 8e1f119553ba01432a7859d077ca241da205ec82908826ab3bb6b7c86fdab9d1f3c93797daf0a9a5716445617ce8e867f584219437ae2cfd6b4a7681ea2a6c6c WHIRLPOOL fe987ff0f89abadc8124f2a599f1d7372331c5cf77cefddfd00e1371ee560c601c41aff5a1d884db25819f84601c0f87d7b68f40d2bb0f20a7b55892c25cb2e0
+DIST pyfeyn-1.0.0.tar.gz 27316 SHA256 134367ea91572bf6a73c188a86265989d7024cb2ab6647992037dc53ad0a5ce1 SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a WHIRLPOOL 72db3deb968d4e8dc63d61843b856225b212cc6907649596a4bdfdbe9245dd97c85913f2d9fcf3de863fa1d4bcd5d758693fcf74d305b80278013d81024c7a3a
diff --git a/dev-python/pyfeyn/files/pyfeyn-0.3.4.patch b/dev-python/pyfeyn/files/pyfeyn-0.3.4.patch
deleted file mode 100644
index 0017bdd81661..000000000000
--- a/dev-python/pyfeyn/files/pyfeyn-0.3.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r -U2 pyfeyn-0.3.4.orig/pyfeyn/lines.py pyfeyn-0.3.4/pyfeyn/lines.py
---- pyfeyn-0.3.4.orig/pyfeyn/lines.py	2014-03-06 23:12:24.000000000 +0700
-+++ pyfeyn-0.3.4/pyfeyn/lines.py	2014-05-14 21:45:49.356935407 +0700
-@@ -117,8 +117,12 @@
-         """Make this line a straight line between start and end."""
-         self.arcthrupoint = None
-+        return self
- 
- 
-     def bend(self, amount):
-         """Bend the line to the right by a given distance."""
-+        if amount==0:
-+            self.arcthrupoint = None
-+            return self
-         middle = self.p1.midpoint(self.p2)
-         nx = (middle.y() - self.p1.y()) / abs(self.p1.distance(middle))
diff --git a/dev-python/pyfeyn/files/pyfeyn-0.3.5.patch b/dev-python/pyfeyn/files/pyfeyn-0.3.5.patch
deleted file mode 100644
index 0da755aca800..000000000000
--- a/dev-python/pyfeyn/files/pyfeyn-0.3.5.patch
+++ /dev/null
@@ -1,598 +0,0 @@
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/__init__.py pyfeyn-0.3.5/pyfeyn/__init__.py
---- pyfeyn-0.3.5.orig/pyfeyn/__init__.py	2016-01-21 14:24:35.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/__init__.py	2016-01-24 19:21:55.813635215 +0600
-@@ -16,5 +16,5 @@
-     import pyx
- except:
--    print "You don't have PyX - that's a problem unless you're just running the setup script."
-+    print("You don't have PyX - that's a problem unless you're just running the setup script.")
-     import sys
-     sys.exit()
-@@ -23,6 +23,6 @@
- from distutils.version import StrictVersion as Version
- pyxversion = Version(pyx.version.version)
--if pyxversion < Version("0.9.0"):
--    print "Warning: PyFeyn may not work with PyX versions older than 0.9!"
-+if pyxversion < Version("0.14.0"):
-+    print("Warning: PyFeyn may not work with PyX versions older than 0.14!")
- 
- ## Units
-@@ -31,10 +31,10 @@
- 
- ## TeX stuff
--pyx.text.defaulttexrunner.set(mode="latex")
-+pyx.text.set(pyx.text.LatexRunner)
- import subprocess
- try:
-   subprocess.Popen(["kpsewhich","hepnicenames.sty"])
--  pyx.text.defaulttexrunner.preamble(r"\usepackage{hepnicenames}")
-+  pyx.text.default_runner.preamble(r"\usepackage{hepnicenames}")
- except:
--  print "Warning: hepnicenames package not found!"
-+  print("Warning: hepnicenames package not found!")
- 
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/blobs.py pyfeyn-0.3.5/pyfeyn/blobs.py
---- pyfeyn-0.3.5.orig/pyfeyn/blobs.py	2011-02-20 23:29:40.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/blobs.py	2016-01-24 11:50:44.290773693 +0600
-@@ -64,9 +64,9 @@
-         """Add a label."""
-         if config.getOptions().DEBUG:
--            print "Adding label: " + text
-+            print("Adding label: " + text)
-         self.labels.append(PointLabel(text=text, point=self,
-                                       displace=displace, angle=angle, size=size))
-         if config.getOptions().DEBUG:
--            print "Labels = " + str(self.labels)
-+            print("Labels = " + str(self.labels))
-         return self
- 
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/deco.py pyfeyn-0.3.5/pyfeyn/deco.py
---- pyfeyn-0.3.5.orig/pyfeyn/deco.py	2016-01-21 14:24:35.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/deco.py	2016-01-24 22:06:46.419219272 +0600
-@@ -4,20 +4,10 @@
- from pyfeyn.diagrams import FeynDiagram
- from pyfeyn.utils import Visible
--from pyfeyn import config,pyxversion
-+from pyfeyn import config
- 
--###########################################################################################
--## Added by George S. Williams to allow PyFeyn to work with PyX versions 0.12.x and 0.11.x
--## Also see changes in class Arrow and class ParallelArrow
--from distutils.version import StrictVersion as Version
--
--def getarrowpath(arrowtopath, selfpos, var1, selfsize, var2, selfconstriction,
--                 constrictionlen):
--        if pyxversion >= Version("0.12"):
--            arrowpath = pyx.deco._arrowhead(arrowtopath, selfpos,
--                                        var1, selfsize, var2, selfconstriction,
--                                        constrictionlen)
--        else:
--            arrowpath = pyx.deco._arrowhead(arrowtopath, selfpos,
--                                        var1, selfsize, var2, constrictionlen)
-+
-+def getarrowpath(arrowtopath, selfpos, var1, selfsize, var2, selfconstriction, constrictionlen):
-+        arrowpath = pyx.deco._arrowhead(arrowtopath, selfpos, var1, selfsize, var2,
-+                                        selfconstriction, constrictionlen)
-         return arrowpath
- 
-@@ -37,5 +27,5 @@
-         self.constriction = constriction
-         
--    def decorate(self, dp, texrunner=pyx.text.defaulttexrunner):
-+    def decorate(self, dp, texrunner=pyx.text.default_runner):
-         """Attach arrow to a path (usually a line)."""
-         dp.ensurenormpath()
-@@ -120,5 +110,5 @@
-             displacement -= intrinsicwidth
-         if config.getOptions().DEBUG:
--            print "Displacement = ", displacement
-+            print("Displacement = ", displacement)
- 
-         ## Position the arrow on the right hand side of lines
-@@ -208,5 +198,5 @@
-                                          pyx.text.vshift.mathaxis,
-                                          self.size] + self.textattrs)
--        t = pyx.text.defaulttexrunner.text(self.x, self.y, self.text, textattrs)
-+        t = pyx.text.default_runner.text(self.x, self.y, self.text, textattrs)
-         canvas.insert(t)
- 
-@@ -247,5 +237,5 @@
-                                          pyx.text.vshift.mathaxis,
-                                          self.size] + self.textattrs)
--        t = pyx.text.defaulttexrunner.text(x, y, self.text, textattrs)
-+        t = pyx.text.default_runner.text(x, y, self.text, textattrs)
-         canvas.insert(t)
- 
-@@ -294,5 +284,5 @@
-             displacement -= intrinsicwidth
-         if config.getOptions().DEBUG:
--            print "Displacement = ", displacement
-+            print("Displacement = ", displacement)
- 
-         ## Position the label on the right hand side of lines
-@@ -320,5 +310,5 @@
-                                          pyx.text.vshift.mathaxis,
-                                          self.size] + self.textattrs)
--        t = pyx.text.defaulttexrunner.text(x, y, self.text, textattrs)
-+        t = pyx.text.default_runner.text(x, y, self.text, textattrs)
-         #t.linealign(self.displace,
-         #            math.cos(self.angle * math.pi/180),
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/diagrams.py pyfeyn-0.3.5/pyfeyn/diagrams.py
---- pyfeyn-0.3.5.orig/pyfeyn/diagrams.py	2016-01-21 14:24:35.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/diagrams.py	2016-01-24 22:12:15.453205434 +0600
-@@ -2,7 +2,5 @@
- 
- import pyx
--from pyfeyn import config, pyxversion
--from distutils.version import StrictVersion as Version
--
-+from pyfeyn import config
- 
- ## Diagram class
-@@ -28,15 +26,15 @@
-         for obj in objs:
-             if config.getOptions().DEBUG:
--                print "#objs = %d" % len(self.__objs)
-+                print("#objs = %d" % len(self.__objs))
-             offset = 0
--            if obj.__dict__.has_key("layeroffset"):
--                #print "offset =", obj.layeroffset
-+            if "layeroffset" in obj.__dict__:
-+                #print("offset =", obj.layeroffset)
-                 offset = obj.layeroffset
-             self.highestautolayer += 1
-             obj.setDepth(self.highestautolayer + offset)
-             if config.getOptions().DEBUG:
--                print "Object %s layer = %d + %d = %d" % \
-+                print("Object %s layer = %d + %d = %d" % \
-                       (obj.__class__, self.highestautolayer, offset,
--                       self.highestautolayer + offset)
-+                       self.highestautolayer + offset))
-             self.__objs.append(obj)
- 
-@@ -45,7 +43,7 @@
-         """Draw the components of this diagram in a well-defined order."""
-         if config.getOptions().DEBUG:
--            print "Final #objs = %d" % len(self.__objs)
-+            print("Final #objs = %d" % len(self.__objs))
-         if config.getOptions().VDEBUG:
--            print "Running in visual debug mode"
-+            print("Running in visual debug mode")
- 
-         ## Sort drawing objects by layer
-@@ -59,5 +57,5 @@
-         for obj in drawingobjs:
-             if config.getOptions().DEBUG:
--                print "Depth = ", obj.getDepth()
-+                print("Depth = ", obj.getDepth())
-             obj.draw(self.currentCanvas)
- 
-@@ -70,7 +68,3 @@
-         c = self.drawToCanvas()
-         if c is not None and outfile is not None:
--            if pyxversion >= Version("0.12"):
--                c.writetofile(outfile, page_bbox=c.bbox().enlarged(enlargement))
--            else:
--                c.writetofile(outfile, bbox=c.bbox().enlarged(enlargement))
--
-+            c.writetofile(outfile, page_bbox=c.bbox().enlarged(enlargement))
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/feynml.py pyfeyn-0.3.5/pyfeyn/feynml.py
---- pyfeyn-0.3.5.orig/pyfeyn/feynml.py	2011-02-20 23:29:40.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/feynml.py	2016-01-24 12:08:07.881729805 +0600
-@@ -68,5 +68,5 @@
-                 root.append(self.labelToXML(obj))
-             else:
--                print "Can't convert object to XML!"
-+                print("Can't convert object to XML!")
-         # Combine single vertices/props into legs
-         self.legcount = 0
-@@ -76,14 +76,14 @@
-                 if tag.attrib["id"]==point:
-                    for tag2 in root.getchildren():
--                       if ((tag2.attrib.has_key("source") and
-+                       if (("source" in tag2.attrib and
-                             tag2.attrib["source"]==point) or
--                           (tag2.attrib.has_key("target") and
-+                           ("target" in tag2.attrib and
-                             tag2.attrib["target"]==point)):
-                           attribs = tag2.attrib
--                          if (tag2.attrib.has_key("source") and
-+                          if ("source" in tag2.attrib and
-                               tag2.attrib["source"]==point):
-                              del attribs["source"]
-                              attribs["sense"] = "incoming"
--                          if (tag2.attrib.has_key("target") and
-+                          if ("target" in tag2.attrib and
-                               tag2.attrib["target"]==point):
-                              attribs["sense"] = "outgoing"
-@@ -256,5 +256,5 @@
-         self.defaults = {}
-         if self.root.tag != "feynml":
--            raise "FeynML Error: <feynml> must be root element" % self.root.tag
-+            raise Exception("FeynML Error: <feynml> must be root element" % self.root.tag)
-         for element in self.root:
-             if element.tag == "head":
-@@ -265,5 +265,5 @@
-                 self.dicts.append({})
-             else:
--                raise "FeynML Error: invalid top-level tag <%s>" % element.tag
-+                raise Exception("FeynML Error: invalid top-level tag <%s>" % element.tag)
- 
- 
-@@ -321,5 +321,5 @@
-             p2 = thedict[element.attrib["target"]]
-         except:
--            raise "FeynML Error: invalid attributes for <propagator> element"
-+            raise Exception("FeynML Error: invalid attributes for <propagator> element")
-         l = NamedLine[thetype](p1, p2)
-         if "bend" in element.attrib:
-@@ -327,5 +327,5 @@
-                 l.bend(float(element.attrib["bend"]))
-             except:
--                raise "FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"]
-+                raise Exception("FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"])
-         if "style" in element.attrib:
-             l = self.apply_layout(element.attrib["style"], l)
-@@ -379,5 +379,5 @@
-                yradius = float(element.attrib["radius"][split:])
-         except:
--            raise "FeynML Error: invalid attribute for <blob> element"
-+            raise Exception("FeynML Error: invalid attribute for <blob> element")
-         if shape=="circle":
-             b = Circle(x=x, y=y, radius=radius)
-@@ -385,5 +385,5 @@
-             b = Ellipse(x=x, y=y, xradius=xradius, yradius=yradius)
-         else:
--            raise "FeynML Error: invalid shape attribute for <blob> element"
-+            raise Exception("FeynML Error: invalid shape attribute for <blob> element")
-         if "style" in element.attrib:
-             b = self.apply_layout(element.attrib["style"], b)
-@@ -393,5 +393,5 @@
-             thedict[element.attrib["id"]] = b
-         except:
--            raise "FeynML Error: missing id attribute in <blob> element"
-+            raise Exception("FeynML Error: missing id attribute in <blob> element")
-         return b
- 
-@@ -472,5 +472,5 @@
-             s = styling.split(":")
-             styledict[s[0].lstrip().rstrip()] = s[1]
--        if (styledict.has_key("fill-style")):
-+        if "fill-style" in styledict:
-            filltype = styledict["fill-style"].split()
-            if filltype[0]=="solid":
-@@ -483,5 +483,5 @@
-               D,A = float(filltype[1]), int(filltype[2])
-               obj.fillstyles = [pyx.pattern.crosshatched(D,A)]
--        if (styledict.has_key("mark-shape") or styledict.has_key("mark-size"))\
-+        if ("mark-shape" in styledict or "mark-size" in styledict)\
-             and isinstance(obj, DecoratedPoint):
-            try:
-@@ -494,7 +494,7 @@
-                 marksize = 0.075
-            obj.setMark(marktype(size=marksize))
--        if (styledict.has_key("arrow-size") or styledict.has_key("arrow-angle")
--            or styledict.has_key("arrow-constrict")
--            or styledict.has_key("arrow-pos")) and isinstance(obj, Line):
-+        if ("arrow-size" in styledict or "arrow-angle" in styledict
-+            or "arrow-constrict" in styledict
-+            or "arrow-pos" in styledict) and isinstance(obj, Line):
-            try:
-               arrsize = pyx.unit.length(float(styledict["arrow-size"]),unit="cm")
-@@ -514,11 +514,11 @@
-               arrpos = 0.5
-            obj.addArrow(arrow=Arrow(arrpos,arrsize,arrangle,arrconstrict))
--        if (styledict.has_key("parallel-arrow-size")
--            or styledict.has_key("parallel-arrow-angle")
--            or styledict.has_key("parallel-arrow-constrict")
--            or styledict.has_key("parallel-arrow-pos")
--            or styledict.has_key("parallel-arrow-length")
--            or styledict.has_key("parallel-arrow-displace")
--            or styledict.has_key("parallel-arrow-sense")) \
-+        if ("parallel-arrow-size" in styledict
-+            or "parallel-arrow-angle" in styledict
-+            or "parallel-arrow-constrict" in styledict
-+            or "parallel-arrow-pos" in styledict
-+            or "parallel-arrow-length" in styledict
-+            or "parallel-arrow-displace" in styledict
-+            or "parallel-arrow-sense" in styledict) \
-            and isinstance(obj, Line):
-            try:
-@@ -552,5 +552,5 @@
-            obj.addParallelArrow(arrpos, arrdisp, arrlen, arrsize, arrangle,
-                                 arrconstrict, arrsense)
--        if styledict.has_key("is3d") and isinstance(obj, Line):
-+        if "is3d" in styledict and isinstance(obj, Line):
-            fwords = ["0", "no", "false", "f", "off"]
-            twords = ["1", "yes", "true", "t", "on"]
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/hepnames.py pyfeyn-0.3.5/pyfeyn/hepnames.py
---- pyfeyn-0.3.5.orig/pyfeyn/hepnames.py	2011-02-20 23:29:40.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/hepnames.py	2016-01-24 12:12:08.927719668 +0600
-@@ -749,13 +749,13 @@
- def is_photon(name):
-     """Check if the given name refers to the photon."""
--    return Photon_dict.has_key(name)
-+    return name in Photon_dict
- 
- def is_gluon(name):
-     """Check if the given name refers to the gluon."""
--    return Gluon_dict.has_key(name)
-+    return name in Gluon_dict
- 
- def is_weakboson(name):
-     """Check if the given name refers to a weak vector boson."""
--    return VectorBosons_dict.has_key(name)
-+    return name in VectorBosons_dict
- 
- def is_gauge(name):
-@@ -767,5 +767,5 @@
- def is_higgs(name):
-     """Check if the given name refers to a Higgs boson."""
--    return Higgses_dict.has_key(name)
-+    return name in Higgses_dict
- 
- ## Fermion type testing
-@@ -773,9 +773,9 @@
- def is_quark(name):
-     """Check if the given name refers to a quark."""
--    return Quarks_dict.has_key(name)
-+    return name in Quarks_dict
- 
- def is_lepton(name):
-     """Check if the given name refers to a lepton."""
--    return Leptons_dict.has_key(name)
-+    return name in Leptons_dict
- 
- def is_quark_lepton(name):
-@@ -787,13 +787,13 @@
- def is_meson(name):
-     """Check if the given name refers to a meson."""
--    return mesons_dict.has_key(name)
-+    return name in mesons_dict
- 
- def is_baryon(name):
-     """Check if the given name refers to a baryon."""
--    return Baryons_dict.has_key(name)
-+    return name in Baryons_dict
- 
- def is_hadron(name):
-     """Check if the given name refers to a hadron."""
--    return Hadrons_dict.has_key(name)
-+    return name in Hadrons_dict
- 
- ## Other type tests
-@@ -801,5 +801,5 @@
- def is_ghost(name):
-     """Check if the given name refers to a ghost particle."""
--    return Ghost_dict.has_key(name)
-+    return name in Ghost_dict
- 
- ## Classify particle according to its coarse physical type
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/lines.py pyfeyn-0.3.5/pyfeyn/lines.py
---- pyfeyn-0.3.5.orig/pyfeyn/lines.py	2016-01-21 14:24:35.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/lines.py	2016-01-24 22:02:12.045230810 +0600
-@@ -33,5 +33,5 @@
-         a TeXLabel object."""
-         if config.getOptions().DEBUG:
--            print "Adding label: " + text
-+            print("Adding label: " + text)
-         #if text.__class__ == "Label":
-         #    self.labels.append(label)
-@@ -39,5 +39,5 @@
-         self.labels.append(LineLabel(text=text, line=self, pos=pos, displace=displace, angle=angle, size=size))
-         if config.getOptions().DEBUG:
--            print "Labels = " + str(self.labels)
-+            print("Labels = " + str(self.labels))
-         return self
- 
-@@ -140,5 +140,5 @@
-         self.arcThru(arcpoint)
-         if config.getOptions().DEBUG:
--            print self.getVisiblePath()
-+            print(self.getVisiblePath())
-         if config.getOptions().VDEBUG:
-             FeynDiagram.currenDiagram.currentCanvas.stroke(self.getVisiblePath(), [color.rgb.blue])
-@@ -212,5 +212,5 @@
-             except ZeroDivisionError:
-                 if config.getOptions().DEBUG:
--                    print "Grad 1 diverges"
-+                    print("Grad 1 diverges")
-                 n13 = 1e100
- 
-@@ -219,5 +219,5 @@
-             except ZeroDivisionError:
-                 if config.getOptions().DEBUG:
--                    print "Grad 2 diverges"
-+                    print("Grad 2 diverges")
-                 n23 = 1e100
- 
-@@ -258,5 +258,5 @@
- 
-             if config.getOptions().DEBUG and arcangle1 == arcangle2:
--                print "Arc angles are the same - not drawing anything"
-+                print("Arc angles are the same - not drawing anything")
- 
-             ## Calculate cross product to determine direction of arc
-@@ -286,9 +286,6 @@
-                 if len(subpaths) > 1:
-                     if config.getOptions().DEBUG:
--                        print "Num subpaths 1 = %d" % len(subpaths)
--                    subpaths.sort(
--                        lambda x, y :
--                        int(pyx.unit.tocm(x.arclen() - y.arclen()) /
--                            math.fabs(pyx.unit.tocm(x.arclen() - y.arclen()))) )
-+                        print("Num subpaths 1 = %d" % len(subpaths))
-+                    subpaths.sort(key=lambda x:pyx.unit.tocm(x.arclen()))
-                     vispath = subpaths[-1]
-                     if config.getOptions().VDEBUG:
-@@ -305,9 +302,6 @@
-                 if len(subpaths) > 1:
-                     if config.getOptions().DEBUG:
--                        print "Num subpaths 2 = %d" % len(subpaths)
--                    subpaths.sort(
--                        lambda x, y :
--                        int(pyx.unit.tocm(x.arclen() - y.arclen()) /
--                            math.fabs(pyx.unit.tocm(x.arclen() - y.arclen()))) )
-+                        print("Num subpaths 2 = %d" % len(subpaths))
-+                    subpaths.sort(key=lambda x:pyx.unit.tocm(x.arclen()))
-                     vispath = subpaths[-1]
-                     if config.getOptions().VDEBUG:
-@@ -329,6 +323,6 @@
-         styles = self.styles + self.arrows
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
--            print path
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-+            print(path)
-         canvas.stroke(path, styles)
-         for l in self.labels:
-@@ -382,6 +376,6 @@
-         ## TODO: call base class method?
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
--            print path
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-+            print(path)
-         canvas.stroke(path, styles)
-         for l in self.labels:
-@@ -407,6 +401,6 @@
-         ## TODO: call base class method?
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
--            print path
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-+            print(path)
-         canvas.stroke(path, styles)
-         for l in self.labels:
-@@ -520,5 +514,5 @@
-         styles = self.styles + self.arrows
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-         mypath = self.getDeformedPath()
-         if config.getOptions().DRAFT or not self.is3D:
-@@ -615,5 +609,5 @@
-         styles = self.styles + self.arrows
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-         canvas.stroke(self.getDeformedPath(), styles)
-         for l in self.labels:
-@@ -671,5 +665,5 @@
-                 curveradius = abs(curveradius/pyx.unit.m)
-                 #if config.getOptions().DEBUG:
--                #    print self.__class__, "- curve radius = ", curveradius
-+                #    print(self.__class__, "- curve radius = ", curveradius)
-                 if (mincurveradius is None or curveradius < mincurveradius):
-                     mincurveradius = curveradius
-@@ -680,5 +674,5 @@
-             numhloopcurves += int(0.1/mincurveradius)
-         if config.getOptions().DEBUG:
--            print self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
-+            print(self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
- 
-         defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
-@@ -691,5 +685,5 @@
-         styles = self.styles + self.arrows
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-         mypath1 = self.getDeformedPath(+1)
-         mypath2 = self.getDeformedPath(-1)
-@@ -789,5 +783,5 @@
-                 curveradius = abs(mincurveradius/pyx.unit.m)
-                 #if config.getOptions().DEBUG:
--                #    print self.__class__, "- curvature radius = ", curveradius
-+                #    print(self.__class__, "- curvature radius = ", curveradius)
-                 if (mincurveradius is None or curveradius < mincurveradius):
-                     mincurveradius = curveradius
-@@ -800,5 +794,5 @@
-             numhloopcurves += int(0.1/mincurveradius)
-         if config.getOptions().DEBUG:
--            print self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
-+            print(self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
- 
-         defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
-@@ -811,5 +805,5 @@
-         styles = self.styles + self.arrows
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-         mypath1 = self.getVisiblePath()
-         mypath2 = self.getDeformedPath()
-@@ -913,5 +907,5 @@
-                 curveradius = abs(curvature/pyx.unit.m)
-                 #if config.getOptions().DEBUG:
--                #    print self.__class__, "- curvature radius = ", curveradius
-+                #    print(self.__class__, "- curvature radius = ", curveradius)
-                 if (mincurveradius is None or curveradius < mincurveradius):
-                     mincurveradius = curveradius
-@@ -924,5 +918,5 @@
-             numhloopcurves += int(0.2/mincurveradius)
-         if config.getOptions().DEBUG:
--            print self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
-+            print(self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
- 
-         defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
-@@ -935,5 +929,5 @@
-         styles = self.styles + self.arrows
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-         mypath1 = self.getVisiblePath()
-         mypath2 = self.getDeformedPath()
-@@ -1034,5 +1028,5 @@
-                 curveradius = abs(curveradius/pyx.unit.m)
-                 #if config.getOptions().DEBUG:
--                #    print self.__class__, "- curve radius = ", curveradius
-+                #    print(self.__class__, "- curve radius = ", curveradius)
-                 if (mincurveradius is None or curveradius < mincurveradius):
-                     mincurveradius = curveradius
-@@ -1043,5 +1037,5 @@
-             numhloopcurves += int(0.1/mincurveradius)
-         if config.getOptions().DEBUG:
--            print self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
-+            print(self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
- 
-         defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
-@@ -1054,5 +1048,5 @@
-         styles = self.styles + self.arrows
-         if config.getOptions().DEBUG:
--            print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
-+            print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
-         mypath = [self.getVisiblePath(), self.getDeformedPath(+1), self.getDeformedPath(-1)]
-         if self.inverted:
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/points.py pyfeyn-0.3.5/pyfeyn/points.py
---- pyfeyn-0.3.5.orig/pyfeyn/points.py	2016-01-21 14:24:35.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/points.py	2016-01-24 11:57:49.863755795 +0600
-@@ -36,8 +36,8 @@
-         a PointLable object."""
-         if config.getOptions().DEBUG:
--            print "Adding label: " + text
-+            print("Adding label: " + text)
-         self.labels.append(PointLabel(text=text, point=self, displace=displace, angle=angle, size=size))
-         if config.getOptions().DEBUG:
--            print "Labels = " + str(self.labels)
-+            print("Labels = " + str(self.labels))
-         return self
- 
-diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/utils.py pyfeyn-0.3.5/pyfeyn/utils.py
---- pyfeyn-0.3.5.orig/pyfeyn/utils.py	2011-02-20 23:29:40.000000000 +0600
-+++ pyfeyn-0.3.5/pyfeyn/utils.py	2016-01-24 12:12:43.881718198 +0600
-@@ -41,5 +41,5 @@
-     def getDepth(self):
-         """Return the depth at which this instance lives."""
--        if self.__dict__.has_key("depth"):
-+        if "depth" in self.__dict__:
-             return self.depth
-         else:
-@@ -52,7 +52,7 @@
- 
-         if config.getOptions().DEBUG:
--            print "Comparing visible classes: ", \
-+            print("Comparing visible classes: ", \
-                   self.__class__, "->", self.getDepth(), "vs.", \
--                  other.__class__, "->", other.getDepth()
-+                  other.__class__, "->", other.getDepth())
-         else:
-             return cmp(self.getDepth(), other.getDepth())
diff --git a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch b/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
new file mode 100644
index 000000000000..0b4c29e74033
--- /dev/null
+++ b/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
@@ -0,0 +1,18 @@
+diff -r -U1 pyfeyn-1.0.0.orig/pyfeyn/feynml.py pyfeyn-1.0.0/pyfeyn/feynml.py
+--- pyfeyn-1.0.0.orig/pyfeyn/feynml.py	2016-02-09 22:48:29.000000000 +0100
++++ pyfeyn-1.0.0/pyfeyn/feynml.py	2016-02-14 13:11:16.034537778 +0100
+@@ -257,3 +257,3 @@
+         if self.root.tag != "feynml":
+-            raise "FeynML Error: <feynml> must be root element" % self.root.tag
++            raise Exception("FeynML Error: <feynml> must be root element" % self.root.tag)
+         for element in self.root:
+@@ -266,3 +266,3 @@
+             else:
+-                raise "FeynML Error: invalid top-level tag <%s>" % element.tag
++                raise Exception("FeynML Error: invalid top-level tag <%s>" % element.tag)
+ 
+@@ -328,3 +328,3 @@
+             except:
+-                raise "FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"]
++                raise Exception("FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"])
+         if "style" in element.attrib:
diff --git a/dev-python/pyfeyn/pyfeyn-0.3.4-r1.ebuild b/dev-python/pyfeyn/pyfeyn-0.3.4-r1.ebuild
deleted file mode 100644
index 7b4bbab094e9..000000000000
--- a/dev-python/pyfeyn/pyfeyn-0.3.4-r1.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-DEPEND=""
-RDEPEND="dev-python/pyx[${PYTHON_USEDEP}]
-	latex? ( dev-texlive/texlive-science )"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pyfeyn/pyfeyn-0.3.5.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild
index 0f438a75a2c4..0f438a75a2c4 100644
--- a/dev-python/pyfeyn/pyfeyn-0.3.5.ebuild
+++ b/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index 520e2b6797c1..38b6273ef58c 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -1 +1,2 @@
 DIST pyfits-3.3.tar.gz 1646403 SHA256 becb6dcc7e443138b9d239db7a0e8ad939e6e047c2c9ca86e84d0672da425fa1 SHA512 561fe61050e61745054e0e4712c4413e129293b062d2020219b61d648d7093ce6952e1f26da955a1bf570f76ba7eddeb1805c99f679300b072ef6bacc2e4c90a WHIRLPOOL 9b4b5dd236713359a9441e4179486e4b56ec11b7fc25c3abb59d30a6267fe87496601778731ba7ff92c55243621aa58ca493821b83224fde41a79f18c21e485b
+DIST pyfits-3.4.tar.gz 1692414 SHA256 ce0319cf6ef40846c5915202e4c8bd8d293ad85af4b14aa5a60fb285b7538c4b SHA512 b569f871f26dcd9cb2fbe9d823d55c525e8101b0fcf83fff4bc3f3ec4bc7f680953a29634518ea19383f533f5e23b3703fffdb4e0d577b1023b4323254ef3a7e WHIRLPOOL a121ca9b4d7b4457d24e905e8506402043679800eddc5c5813b68612bae1ee80940eb723f03504c9136fc5c2bac1a419aa52f87394689ae1099bb5002e77417e
diff --git a/dev-python/pyfits/pyfits-3.4.ebuild b/dev-python/pyfits/pyfits-3.4.ebuild
new file mode 100644
index 000000000000..dd6036d52f28
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Provides an interface to FITS formatted files under python"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/cfitsio:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
+	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
+		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
+		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
+		 )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
+
+python_prepare_all() {
+	sed -i \
+		-e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
+		"${S}"/setup.cfg || die
+
+	# https://github.com/spacetelescope/PyFITS/issues/95
+	sed -e "s/except UserWarning, w/except UserWarning as w/" \
+		-i pyfits/scripts/fitscheck.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	nosetests --verbose || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	local binary
+	for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
+		einfo "Renaming ${binary} to ${binary}-${PN}"
+		mv ${binary}{,-${PN}} || die "failed renaming"
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	DOCS=( FAQ.txt CHANGES.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index 5b98f26fc55b..f1fe27f0488d 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -2,3 +2,4 @@ DIST pygal-1.5.1.tar.gz 735659 SHA256 680e422f5c5dfd52520a1fa7cc89f9de50a04463a4
 DIST pygal-1.7.0.tar.gz 737013 SHA256 e0cf38aec260b0eceb4b7a30f8dcb988ed129915b9561856dd8cb131ae34bcf4 SHA512 b32ec050e0d62224b81bc19d7421a405fca0827ba5bf86f748c3166783527638c29f6c0d010170a682d4ee8f602fc2822738c818638ee39cc5a9a5c4708f61b9 WHIRLPOOL 3278d41dd3107dfad7c2065e5c115c89e005e3887fc3e4bc949796fdee4039912b14439e7af035a3a68151589cc1ac1b7f2e4ec66ef1611edf78e8b0c9c9423d
 DIST pygal-2.0.0.tar.gz 66678 SHA256 54846f1a74f24b54ad4554f1b0d4e05f0ea51e5f66e680bff486e4664572e5f4 SHA512 95beb43687d80043109567021d4b912b5385b934e7348321c9b0a1b048764df7f89a83d3c58653672ae2b8e69c0a2cacdd62a9c43c244443bb99e401ad019e1a WHIRLPOOL dd679983ed862d8dd71b84863d403f3aa01a5ba78f0c95d005e546c982291eb12f932705d70a1a3a0beeb34487bdf75df38354160239fba9e852aa744e3886e8
 DIST pygal-2.0.1.tar.gz 66763 SHA256 9af34cdecdb519a5d1d712677fc5123e956a2d0e57814592901da955e00527ae SHA512 a8d34f108cd9116594ed63cb64bf047510e546aac7e42f63e05dfac0c9e7768900f76f70f2555cf9c46bd0fbdcf6e27cc40ab1aaf8a62093d344a096929a5326 WHIRLPOOL a413d29a387acb96e6e642d11a37bda429d9da8ec5a43679b3561d5303a4f1d9a0ca9e6ee22e1da1d4fcd400c47d4b515a2ee503b545bc93d596bab3d7884fbf
+DIST pygal-2.1.1.tar.gz 69757 SHA256 515685964b880aafe27aa8664082ec9719e33e63027913c251cb9760e01be8ce SHA512 79851bd6278a3a71f067ea11f273fcd0755ac0ab2ba51266b161fff1f3b49d690bc2a1b3432255da4f3cd5b9cfcff570d713d0bbfaf6f2dfe5b6f922989c72bd WHIRLPOOL 166ce2f368626bab4c94cde221ae5bd8c7dcabd6830ea1d4f3c174e7a73c908b94c4626d79602e7eff4ae0a5ae0a23bd54fe35ea8d09fabfdda727d1b6806c6c
diff --git a/dev-python/pygal/pygal-2.1.1.ebuild b/dev-python/pygal/pygal-2.1.1.ebuild
new file mode 100644
index 000000000000..19b2a924f489
--- /dev/null
+++ b/dev-python/pygal/pygal-2.1.1.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=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="A python SVG charts generator"
+HOMEPAGE="http://pygal.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 867492ff122e..6b84d53195d2 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,2 +1,3 @@
 DIST Pygments-2.0.2.tar.gz 3462280 SHA256 7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51 SHA512 b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e WHIRLPOOL 4c98134f27dd29c89e4d6157284bdeecaa81c53d823e089292be21a6c418ba4ccfd458ced50326d5a356a7b6cb761a1990440096f5f3d820f776bb19fc0da09d
+DIST Pygments-2.1.1.tar.gz 2114190 SHA256 2df7d9a85b56e54c7c021dc98fc877bd216ead652c10da170779c004fb59c01b SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807 WHIRLPOOL 6b1ebed4b3c456ada335be87d184bfe197f489b445c362c8f1326229e137e859388e1812290bf1d7f6ed19b780dc8487fe9744863833889d961604fb9489b381
 DIST Pygments-2.1.tar.gz 2078224 SHA256 13a0ef5fafd7b16cf995bc28fe7aab0780dab1b2fda0fc89e033709af8b8a47b SHA512 4103a636a23d4a7f26c1eb98dc0d2386be17031715ceabb0f1dafb78f2635d8a7f2fe02ff7659c63fbc5c778dff9053c8ef2d916bbbab53841e2b0fafe64c213 WHIRLPOOL 81c5c5d110d2813acc12b7fb1800560189a37b51a2720dae2c9b612ec7c694fa381953491eab336a92ebf290fec505bea850fc0a8288f4b0964cfab0134dae8b
diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild
new file mode 100644
index 000000000000..ee306bf31467
--- /dev/null
+++ b/dev-python/pygments/pygments-2.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/ttf-fonts )"
+#		dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests other than
+# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	# With pypy3 there is 1 error out of 1556 tests when run as is and
+	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/pygobject-3.18.2.ebuild b/dev-python/pygobject/pygobject-3.18.2.ebuild
index cfd2ebb0b3df..1ed68961e5b3 100644
--- a/dev-python/pygobject/pygobject-3.18.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.18.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/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index 9646d87fb375..86b649ad63bd 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="app-crypt/gpgme"
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 621f42e5e9b5..37947de5af47 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1 +1,2 @@
 DIST PyGreSQL-4.1.1.tgz 100883 SHA256 bb14092f97c66ed13b8faf71471b8c156c6b46d915858447f3a63e9abe48eef7 SHA512 4b37c56f2112471aa5f3003a1d867382ce1b7510afa0963f0ceeb2f8175ca601bb5bade9ea2038d44a1041f12233e364f138a635bb7b353d0a82aeb7d9d49b7f WHIRLPOOL 323bfd1b72341be6b14d71fd4f05f5005a0f8a387f9b050ef3c786531ea19e057aa67fb5737b5aa0c4ca0912ad697a39d8957d70bb6bb4056e81f406ade5a6b9
+DIST PyGreSQL-4.2.zip 1377728 SHA256 c57adc6b76e8b513e819b8f36710cf906d21617ff6513a0c4dad4acecdfccf3c SHA512 84044480c3f25548137240ac999334546b87987ac6c601608bcae057cf93567f0eb24e343f6ee214ea87e09ac6bd5ce80cfeb5f75deb7896e87b001a2099c78f WHIRLPOOL cac5d4fed22e51316c3c8cc0de367dc5998642c1425a944b147ed059ee3f70387ac704f8465b6fdbde0802e92c21369f0171c2dc0ee2ebbc1e7f0c827b5b900d
diff --git a/dev-python/pygresql/pygresql-4.2.ebuild b/dev-python/pygresql/pygresql-4.2.ebuild
new file mode 100644
index 000000000000..91fb90dcd8ef
--- /dev/null
+++ b/dev-python/pygresql/pygresql-4.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="http://www.pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.zip"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="|| (
+	dev-db/postgresql:9.5
+	dev-db/postgresql:9.4
+	dev-db/postgresql:9.3
+	dev-db/postgresql:9.2
+	dev-db/postgresql:9.1
+	dev-db/postgresql:9.0
+)"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Verify that the currently selected PostgreSQL slot is set to one of
+# the slots defined in POSTGRES_COMPAT.
+postgres_check_slot() {
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
+	fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \
+	&& return 0
+
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+	if [[ "$res" -eq "0" ]] ; then
+			eerror "PostgreSQL slot must be set to one of: "
+			eerror "    ${POSTGRES_COMPAT[@]}"
+			return 1
+	fi
+
+	return 0
+}
+
+pkg_pretend() {
+	postgres_check_slot
+}
+
+pkg_setup() {
+	postgres_check_slot || die
+}
+
+python_install_all() {
+	local DOCS=( docs/*.rst )
+	distutils-r1_python_install_all
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/tutorial
+		doins tutorial/*
+		dohtml docs/*.{html,css}
+	fi
+}
diff --git a/dev-python/pygsl/Manifest b/dev-python/pygsl/Manifest
index d5d95ecb68de..4d3a32a4dee2 100644
--- a/dev-python/pygsl/Manifest
+++ b/dev-python/pygsl/Manifest
@@ -1 +1,2 @@
 DIST pygsl-0.9.5.tar.gz 1674504 SHA256 05d11160ff482e1f1f5f6a047aaef2776eedc1e8e1f98533a95299584fd4752d SHA512 7364e67ff2885be2cbe5410a573071209d3917f4807797b3b8525aacd03e6ab96e157e6d12d631c384e3b66602eab7e6cb89f9ab362f520397df900e77fcc875 WHIRLPOOL 404b5f06b1088d047e7afe56311ad9ce0bdcf465ab6961f3cc9d893f575d54c2a103e4c572a60d93e4cf27ee15d4000b7dfbcd6bd33bbc4cf6638749e87f7e24
+DIST pygsl-2.1.1.tar.gz 727636 SHA256 3d17e6deb5433b331a567a45ff467f41e9059def76e6ef0f21d8e891498f946a SHA512 141232032f0221b756596bc3426160849749642ddaa3667d36b19abf3b4a22b76b5e0b0e9452898494b7f6ce0f8d17a2e392bdaba535633bbfbf1a672bf8d62e WHIRLPOOL e2c6035104ca78cb0eec5ec9bdda8dfbc01182090f1edd176c6d4565f9a71364f107eb38229c5b7758dc455337622e70b5626acbe3552e2e48219ed2f0b1f33c
diff --git a/dev-python/pygsl/pygsl-0.9.5-r1.ebuild b/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
index 08a36b8a9f68..92102d21d45d 100644
--- a/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
+++ b/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -16,7 +17,8 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-DEPEND="sci-libs/gsl
+DEPEND="
+	<sci-libs/gsl-2
 	dev-python/numpy[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 # Testsuite written to be run post install
diff --git a/dev-python/pygsl/pygsl-2.1.1.ebuild b/dev-python/pygsl/pygsl-2.1.1.ebuild
new file mode 100644
index 000000000000..c093fef498dc
--- /dev/null
+++ b/dev-python/pygsl/pygsl-2.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for the GNU scientific library (gsl)"
+HOMEPAGE="http://pygsl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="
+	<sci-libs/gsl-2
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+# Testsuite written to be run post install
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyldap/Manifest b/dev-python/pyldap/Manifest
index 7849ceef4645..af0106aec1a7 100644
--- a/dev-python/pyldap/Manifest
+++ b/dev-python/pyldap/Manifest
@@ -1,2 +1,3 @@
 DIST pyldap-2.4.20.tar.gz 122175 SHA256 9f3c5679e6a2c26a852d0468c538239e458a39ee86ddbbd2f1ec5c6fc73a3755 SHA512 f29df58fa1617b8b61631ad4532fde7569dd9742d141e31c1724568c0b46ed63cbc83135089196a07e4dca22d76f05f3c5a74e9b1e8034e5673196912baa8642 WHIRLPOOL 27dcf5919b83e3236b2b18b02943080fe5f5e48e5e931f27dfae45612c075e58bd798bee1f52dde8674571f377dd99479ef0f4a4e917f8c55962cce51fc150a3
 DIST pyldap-2.4.21.tar.gz 124575 SHA256 7a2b1dc31679466db11320b91bd2058574ba25ef27224967040918046ff4c450 SHA512 14aa87421017cd8ba4dc9c9787995ab28c0a656bc665c82de0eaaf4dfe312c731e98bb30f8de5200f23518e9d18d0265eed8a77c1aa58a0551e2d06dbc91a292 WHIRLPOOL 466ed66c77be629b0184efabb2ca5129e0d7d7b9a600f122b875287157c6b7ceb4af9d325c1f17e9f49233739fe8071373d900b0b435a730480eabf365178565
+DIST pyldap-2.4.25.tar.gz 125234 SHA256 6a81ff791ee82fc246af724904d5d38f5fac97f5698a68e2907eaa5bb00bcc79 SHA512 23c34c0510d0e44f3d5d3af7c683ff41384c7fd06213ff50b14e43db27a1d1cdcc7c63477503f049ce7cbd1584ab1da0c0a88acb74b3ca7e05f3a841565e4713 WHIRLPOOL f537212124f2719507eee111801e985b6051d77e07a143fed5f4721ef0899ed4dd95d99eabfc3dd423401575f374448ed6b45f7546385eb983926be636d60efe
diff --git a/dev-python/pyldap/pyldap-2.4.25.ebuild b/dev-python/pyldap/pyldap-2.4.25.ebuild
new file mode 100644
index 000000000000..55a781d83313
--- /dev/null
+++ b/dev-python/pyldap/pyldap-2.4.25.ebuild
@@ -0,0 +1,75 @@
+# 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 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
+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"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND="
+	>net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/python-ldap"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C Doc html
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( Demo/. )
+	use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyltxml/Manifest b/dev-python/pyltxml/Manifest
deleted file mode 100644
index 5441a1881021..000000000000
--- a/dev-python/pyltxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyLTXML-1.3.tar.gz 27550 SHA256 4bd7a726667e48fc604bb471d775c0c42cb62a1aa77b01aa9a761012fab052f2 SHA512 0221557ec2a4311b346031a6059a7776ec30b9c34fe78e59a0e4f236931b3ab2268ed28de93429fe66f38fc855b6368eab990d5d977bca03bb4b0882136c0c1c WHIRLPOOL 6fc5ef5fba42e0b6e0ccea7424fe142c5784a488c4a171571fdc4434b28e74d9261b31a321ad7502d223c91e10f2a5d937e88d25bbd1a2d66812ddbe2a634231
diff --git a/dev-python/pyltxml/metadata.xml b/dev-python/pyltxml/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyltxml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pyltxml/pyltxml-1.3-r1.ebuild b/dev-python/pyltxml/pyltxml-1.3-r1.ebuild
deleted file mode 100644
index f3bd3bc19b70..000000000000
--- a/dev-python/pyltxml/pyltxml-1.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Bindings for LTXML libraries"
-HOMEPAGE="http://www.ltg.ed.ac.uk/software/xml/"
-SRC_URI="ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/PyLTXML-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND="=dev-libs/ltxml-1.2.5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/PyLTXML-${PV}"
-
-DOCS="00README"
-PYTHON_MODNAME="PyLTXML"
-
-src_prepare() {
-	distutils_src_prepare
-
-	sed \
-		-e s':projects/ltg/projects/lcontrib/include:usr/include:' \
-		-e s':projects/ltg/projects/lcontrib/lib:usr/lib/ltxml12:' \
-		-i setup.py || die "sed failed"
-}
diff --git a/dev-python/pymdstat/Manifest b/dev-python/pymdstat/Manifest
new file mode 100644
index 000000000000..7f4fbdd66d81
--- /dev/null
+++ b/dev-python/pymdstat/Manifest
@@ -0,0 +1 @@
+DIST pymdstat-0.4.2.tar.gz 5010 SHA256 fef53c6f1864fdfe8616d6e985498b7f05ef19d0952f7ec3e7f8379298b9ada9 SHA512 2e3c07d59151069962e1ba601b3751b331e233fdc6bbdeb0cada69ce36a731c12bcc6447218cc0c1ae4dd63d39d2be2bc3677aba739797cc534c5e38d1c72458 WHIRLPOOL 781fbc8b2217ed1e36a798fd05cc9d309085b75a2f4d56cf280bba63626c1d65a1bed1200d07d891261821e1e0f4a0733f66ba3f53e626b6d8be6a1600d3f801
diff --git a/dev-python/pymdstat/metadata.xml b/dev-python/pymdstat/metadata.xml
new file mode 100644
index 000000000000..312478ff35a0
--- /dev/null
+++ b/dev-python/pymdstat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pymdstat</remote-id>
+    <maintainer status="unknown">
+      <email>nicolas@nicolargo.com</email>
+      <name>Nicolas Hennion</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pymdstat/pymdstat-0.4.2.ebuild b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
new file mode 100644
index 000000000000..46989d05aabe
--- /dev/null
+++ b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to parse Linux /proc/mdstat"
+HOMEPAGE="https://github.com/nicolargo/pymdstat http://pypi.python.org/pypi/pymdstat"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Not included
+RESTRICT=test
+
+python_test() {
+	${PYTHON} unitest.py || die
+}
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
new file mode 100644
index 000000000000..f9904bbb75a1
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -0,0 +1 @@
+DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 SHA256 927f4670b893d46e2f6273ae938bf0a1db27ffae3336eba94813ccef6260c410 SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61 WHIRLPOOL c758b777bf004384806a038f54df8394a032d1120ac6f4992bab1f26a86a466103d3ee4a331c22b2670e39c246dd662a250a9f34fa7719a7dfd0c9d43186b766
diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl_accelerate/metadata.xml
new file mode 100644
index 000000000000..3c3d5ced6412
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
new file mode 100644
index 000000000000..bb120a073f97
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 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="Accelerate module for PyOpenGL"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL-accelerate"
+MY_PN="PyOpenGL-accelerate"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
index d5eb94af3563..c340da0a56f8 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~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 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index da7e32c72ea1..a250d561e5a0 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,2 +1,3 @@
 DIST Pyphen-0.8.tar.gz 962586 SHA256 378169ce89b8d3b6a0b95bbfdedc9da8c428d6b7c98ff6498ff41c390702a21a SHA512 230ae11fa3aabba52c923a562284cbc9051c42aa8bc6336bf7e66a47db8974adb3fe136f605bac4cb8c5dee20e68181e6fb3b0c5726a35ab85d11ac5e30c537a WHIRLPOOL 6a7ce38c2d0ca801d58464de8d2c184b28762ecb7b469494675ae87384bbf76cd333d4e3c7aeb32c75cc37c40d5169bb8dd833e3d979e421475ebd6ec5dc8092
 DIST Pyphen-0.9.1.tar.gz 1020062 SHA256 f518012a3296689b13f80a879ed75d1f876e6d9c09f982b114e78847407aa515 SHA512 b3fd71aab1a85d7a8a482907f5bffec1179a29ec3cbeef02a59d8ec975b57d3d667b47c7014b27ee08edeef5d652fcc2d091062e67e4ff2897cd37bcd93ad174 WHIRLPOOL e68bbf476880fd7c40d7b762e684835b51396a6c005d310faef51da6fe89df3c8fb1d98c5897de102248232ec0152c1a2687ff941c9f3391df646c2439195e1b
+DIST Pyphen-0.9.4.tar.gz 1092404 SHA256 abfa9a0ab055341f6e250c1a6bef395c3a06f0e4cba216eeef37f617b32c0bd7 SHA512 b48dcf02c5cdf5d7ee6d6968644958af9f31fba046612016d9ae1b8cfe44d438fe769592961f93f3342cc3f3af2dfc6cd40bbfe1be67e59de9a352c33f102917 WHIRLPOOL 23237754ef3b64aa47f3744660a025e3654498787303930563a2e2b6f6886323cc8b606d23c41067559cef237b1fcba0ee1cc3dad5699c1a4faabdaf66a7d205
diff --git a/dev-python/pyphen/pyphen-0.9.4.ebuild b/dev-python/pyphen/pyphen-0.9.4.ebuild
new file mode 100644
index 000000000000..acd50c027d6e
--- /dev/null
+++ b/dev-python/pyphen/pyphen-0.9.4.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,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
+MY_PN="Pyphen"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/Kozea/Pyphen"
+
+LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 739b3fdfae52..80191f2a53c0 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,3 +1,4 @@
+DIST pyquery-1.2.11.tar.gz 43556 SHA256 4a832ba73bfba03486f5445c75993a26bf62d38d26ff5fcfbde06a7bd0087fc6 SHA512 56ee20e0aefdd290069151d5085a876d6502a226ced72bd43e3e88572f31eecee7abecf4bdd38a1a17685021328963e9fe45eaaac121dc880bcb6ba74b8df12d WHIRLPOOL 70efeec9e2c3b28656c2af8221c4e74794b3799ddddffc8d1e3bb4dd43e70ca8c932966d9e332fcfcb8df7b3f342c70b8cb11b8b1cc8354e9d88294053174f1c
 DIST pyquery-1.2.4.tar.gz 23999 SHA256 1c39f786c42430279eadf787f1ef06873f15c9acba2698c23dfd925ac7b169d7 SHA512 77ec2efab157f693361e1dcbeabd7cac0709d3a8a25b6c47eb333be49c1485c7fa50b4fd9238bfff69657368130c2886cf6e0705415bdf1b48dc434365539c29 WHIRLPOOL 3fece4f710d69a0b57ab858f759196b269984a38af568003f7280215763c67b1e229feaf80f27b359a5da923248a11335026af4de85806ea6fc969c61c197685
 DIST pyquery-1.2.8.zip 42552 SHA256 59af39301bad397e085e5080987f94ef30672f1cf8e73d19d3307b3b63c3cb4b SHA512 9d344a5c4b0dd565e31c803ceecb217c71f9a70badbc65f9fcfb4a2cccb725a1bf938ed0b1697dcfdf0ec967321dccc1916a884ffdb0af9828a65005f63c47d7 WHIRLPOOL 5c98c3e7584d429a7c9bca564aac04e5dc6f579265aa9b8b768e167cdfcc57758b0d728b3102a56af75fa6ea838a6c1927e733a5171d3266574ba2b34ee85209
 DIST pyquery-1.2.9.zip 45289 SHA256 46c51eb878b787e814ee8f9737b0a62111034aeb4d1c06450ac5a8ea5a70e602 SHA512 f5152b471c896b39032add6a7f0e6ce63f426b4903bc7cf9eef12723c73453b40c310dd1497a7c4189fc6faaf804690fd91fb6d2f97fb6c4d6314682de4b8d05 WHIRLPOOL a57bb04402a3a8af98e7073d2b4e415a3e455bb67b4dc946831832f24339fe29fcd560123651abb3ae38c4ee9da3973638d27e064122702c0d1dd63d971fb67b
diff --git a/dev-python/pyquery/pyquery-1.2.11.ebuild b/dev-python/pyquery/pyquery-1.2.11.ebuild
new file mode 100644
index 000000000000..08cb9c610c32
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.2.11.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="https://github.com/gawel/pyquery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
+	test? ( ${RDEPEND}
+		dev-python/beautifulsoup:python-2[$(python_gen_usedep 'python2*')]
+		dev-python/beautifulsoup:python-3[$(python_gen_usedep 'python3*')]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
+
+python_test() {
+	# The suite, it appears, requires this hard setting of PYTHONPATH!
+	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+}
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index ada6ecb5fa04..70173b6a52c1 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1 +1,2 @@
 DIST pyscard-1.9.1.tar.gz 360952 SHA256 62ebeaaaea0b98e053f95ae9b357ab7ebb8901acb1100b77dbb421bfd84bea8e SHA512 97e56dde8e78c73bbda07ba8b418e1877a02ec54094b3b02bd6d6e8b4326b9ea61124ce89d6c2c5a6c9e4c92f3f1e576a02bf26bd8977cbed7a71c32ed96f151 WHIRLPOOL 6a232f62ab72b361892bd003d3764e38c3abd67f505ba8f0d49e867fc83ce39abc0ec7d6cfc258a533d5d8fa49c732d899a72d9d61072b5910417dc23cf2cbfd
+DIST pyscard-1.9.2.tar.gz 145287 SHA256 390b5f9393c04a2b3491a65c326fe045d2955a780ca675635ce2c74367d3fbba SHA512 8579dce6f31348581dbe5dfb6ebeceb35dd43ad6a903d02e00c55ab86353ae429501f0486a35b4916c26e6e380e07400dcd43d039ce18cbebe5061238c624e67 WHIRLPOOL 6d3dba315582e275cfccfa136c6475f1944a571f87405258f0bae86506b74b5b63134d6b3b4678a059692768035b31b0d83f8224d0efe8e31c6d1ba715735b42
diff --git a/dev-python/pyscard/pyscard-1.9.2.ebuild b/dev-python/pyscard/pyscard-1.9.2.ebuild
new file mode 100644
index 000000000000..70e504398914
--- /dev/null
+++ b/dev-python/pyscard/pyscard-1.9.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Smart cards support in python"
+HOMEPAGE="http://pyscard.sourceforge.net/ https://pypi.python.org/pypi/pyscard"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	dev-lang/swig"
+
+# Fails
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/pyro
+}
diff --git a/dev-python/pysnmp-apps/Manifest b/dev-python/pysnmp-apps/Manifest
index 324d60e4cf2b..aba4bdce5311 100644
--- a/dev-python/pysnmp-apps/Manifest
+++ b/dev-python/pysnmp-apps/Manifest
@@ -1,2 +1,3 @@
 DIST pysnmp-apps-0.3.4.tar.gz 24617 SHA256 c96c32d543c8f3866ee551962f0e1a0a8440e965bbcd8c1ed67c9a56cd17d18c SHA512 d384b7b77c5e5b684c00e77d0fc03498722dd1b9d61e876592489527d51f14140e360dc1f60a5a62d91d2fefef9bdae9c34ce9a205b4537c2278ac9d82a2c8d9 WHIRLPOOL edca9af1f891b2549edd3ee05c1441ff98f25c0aed00019c328adce0bc02a8fd844bdeab0f557936a0d555528eb379cda2a9f5f6dd1ec46cee3847522687dbb8
 DIST pysnmp-apps-0.4.0.tar.gz 25404 SHA256 c27934f37af2f32cc4817a7599af52f4c995f5f29a78334b8a8d29249a14f2c8 SHA512 990d25652c79da42f7b08c0c131957edc12eeb65c19d9e44955f7cfd70590a73d0d7148dcc76ddda6042b53a4b1375f11fbe9e488bd26161503f0863e6cb8fee WHIRLPOOL a250ee92162418d93a1e9f05b816bb23761aaea12cb3293c1648b352d58e1ec6ea5670565e69e71f0d0edca9a21e4470ef0e9254a08264c76a2d58d1ebbf9a83
+DIST pysnmp-apps-0.4.1.tar.gz 25525 SHA256 57accb8c2fcb255b4da85af07ef9cd6a266dc5143b2834419ec8a39a879edeb7 SHA512 9edf80b3fb2732448a6a9a750ff4e13f1985300e8b45308866faeddfedd234e3b9352407837c1f5d1e6c959164daa9fc135567610a2398e1e83b6e5bdfaa3cd9 WHIRLPOOL fc0bff4b9977e1c9ff4a46dd24f6a35c300633de7aef6e9563fa735b9860efc905d3c23ec4341f95cf7cb094a845eeabd09d9b2f933fe09482c0a8e16c69a8ca
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.4.1.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.4.1.ebuild
new file mode 100644
index 000000000000..fe714a0045d2
--- /dev/null
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="PySNMP applications"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-apps"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
+	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index ff8c02bae190..621ff2b7d35b 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,2 +1,3 @@
 DIST pysnmp-mibs-0.1.4.tar.gz 1982745 SHA256 a499ef45d942f42ab9e922c7da93efa084a7ec490ba6cad576b64a7d573ec043 SHA512 12e285d1adb3d2f6d1f300b3ad56a5f9dcb359b840e51c4599cb3ed406cd5b34b189ec6eba94fc72e57703a3c374995b60176940eba0478f6cc2f8eb96fffaca WHIRLPOOL 3d7079397aa1312abc30bc75aba9aab46d1286cd95dc7bf8d5c8470a8ea75857004ee597ceb33c0bac2e9fe21f61cdf65c3911491651ab9ec693a687907ca6a0
 DIST pysnmp-mibs-0.1.5.tar.gz 2086656 SHA256 85db3b66eb686be46ccf82f77b5ff01520d49bafe459a479aeb15224a71216c5 SHA512 90c380e410f4099049fdf94e438a659d807890577e615f28587f50d76d403351322695a63bb716ff8273bde7c29c5b123c1adf6db1475ed331ca27ecec0b13a5 WHIRLPOOL f45972b2936e2455f1d0ef4b7ba081007cd1e080b0e0de84dce6b35dfb4796a47bfb7ffe874b468ce0155437b5267b8257fdfc50bacbca41422ecff816d47197
+DIST pysnmp-mibs-0.1.6.tar.gz 2113334 SHA256 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2 WHIRLPOOL e0d2310049212bc87119ee55c42f13e5406aaad19f616cd5f18e0dfdc084ef0a0f36486157032be2ffe9d08f67ab0d0e2fef2b3af88657baaaa0cb5591a75a1f
diff --git a/dev-python/pysnmp-mibs/metadata.xml b/dev-python/pysnmp-mibs/metadata.xml
index 64e133baba2b..37a31ce229ad 100644
--- a/dev-python/pysnmp-mibs/metadata.xml
+++ b/dev-python/pysnmp-mibs/metadata.xml
@@ -5,6 +5,10 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
   <longdescription>
 This is a Python implementation of SNMP v.1/v.2c engine. Its general
 functionality is to assemble/disassemble SNMP messages from/into
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
new file mode 100644
index 000000000000..cde25fa30873
--- /dev/null
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="SNMP framework in Python - MIBs"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-mibs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-python/pysnmp-4.2.3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 7d267448affe..c37403883584 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,3 +1,4 @@
 DIST pysnmp-4.2.5.tar.gz 225014 SHA256 c46e65d99a604f690b3d5800e2f6e26e1ed9a3c7f7e17e7b4b4d897150f7077f SHA512 bf93d7dd7ca95ff8b272c90d0c7d4e528075c83d8d6d630ab50e392227188bd0abdd05ad98521d9c4c0a1891a0b448fb9e4411f8a1d6bc7a9c2f7bb132c0dca0 WHIRLPOOL 74724ca754a7f51d41d231e7c04a7dc027d167a293b2daf5e67b5a735ff92e0a57a44abee3355980e2d3b181aa31e8d10a205a151e44282878a1a3a4b31ac4d3
 DIST pysnmp-4.3.0.tar.gz 305695 SHA256 8baf97fb1c8bc4376e151d570b6b8358a0e93f002fae6d67ea78b0283bf64574 SHA512 6441c609d0720e517b51d5051318e89a9c5f82602ea23b003feaecf011c6e997873b45841edbe0fed869794ef473a264900c2e02135adfc70b165f80c97f885a WHIRLPOOL 93412136091643cf2f4ca1ec0de04231c6edd22aa7caf1124511773afbd8ccc9d3abc1c75475c16dc2a4a806274f50fc43eaff2c723ce19910e198d004e60a37
 DIST pysnmp-4.3.1.tar.gz 397941 SHA256 a24c1835a9c0fee7a8b29891650e5531ab0ceac25036129de1c03dc4b76e6129 SHA512 caf1999c0764bcabd0b0ca22a30e512a6c6c263c23fb2de1284634fa9fdbcf72745790235c984bc22d1e9d807ee2e850e464a6a5571082bd28bcf78657ccd8b9 WHIRLPOOL d17e8c0020c89b9c20e49f74acdd1779637a43f754d30a07dce378f002706bf6059f12ca4c506b1e3f41dcd4d4deca13923f7e117d74ccd0edae250f115628d0
+DIST pysnmp-4.3.2.tar.gz 398593 SHA256 7c2bd81df17aa7dca0057a68e7a32284a72231309a0237d66d5b803b5c118977 SHA512 55696d03f20b37edcfc605b68d308691387dd870a6e477b6907885789d6993e00c689e866ba8170604711669bc28c0da01039e4f15d0058a6ebb5f78c3f0e450 WHIRLPOOL 2dc77e7d509a8fb31ecd4f56c418641cd77c825c008b89455ec05d0cc34e43c9c25d76b88b522f60ce1c3109f92b192f8f0d24e1be5c172a5911ede10f8b199e
diff --git a/dev-python/pysnmp/pysnmp-4.3.2.ebuild b/dev-python/pysnmp/pysnmp-4.3.2.ebuild
new file mode 100644
index 000000000000..ae0b0e527efd
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	default
+
+	if use doc; then
+		touch docs/source/conf.py
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/* )
+	use examples && local EXAMPLES=( examples/. docs/mibs )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "You may also be interested in the following packages: "
+	elog "dev-python/pysnmp-apps - example programs using pysnmp"
+	elog "dev-python/pysnmp-mibs - IETF and other mibs"
+	elog "net-libs/libsmi - to dump MIBs in python format"
+}
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 306b0493b2eb..61d1bf45c114 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -2,3 +2,4 @@ DIST python-daemon-1.6.tar.gz 41564 SHA256 1665fb16bfeae72f16aa2de40bc75661458bd
 DIST python-daemon-2.0.4.tar.gz 71162 SHA256 07ca8c037d85bd365ef42ad7786d9d5866e636ede8e21da695a9ab4dc8c4dc19 SHA512 923680198616ffd17bc86f92c6639afe97a13d9a8d6658fb09011ddc57dabd0bcc4009abdd0be837ab092153f22ce535796705091d0785ce6845bf1919a419b3 WHIRLPOOL 2bdf2eeef58288f7df7f96fdb667b69d8b55f702bce376acc9a260a0e07f7541970834e9db3eb5effc9d37cb3df99a05979b4ac22bfb9ff72efa869fabfeb69e
 DIST python-daemon-2.0.5.tar.gz 71298 SHA256 afde4fa433d94d007206ee31a0941d55b5eb232a5422b670aad628547b46bf68 SHA512 6bac000e304e0828dd54cfa3c7972c07dedb07684f98e5f7e05815df2cf2f25c43ddf4f121e8d282519bdfcca0990fab585f18e43b2578123bc7fbe5f5f8b73e WHIRLPOOL db39b107f7c96cf5fd1c62262ed33bb6e53e8f79836be6d12dabd6b05ec59457df4fea70cd7fa2c38548fc0b60b22d01a62895251b6f26bfa0d9fe5577cdf55f
 DIST python-daemon-2.0.6.tar.gz 72668 SHA256 1730b8e80773379857bf4a792ccccea2cda05c151fbee986b909ceddafa27309 SHA512 0900c16cea90d8708fed22fdfb413e23a46d35a04a550535646b37063c6f5763de8653991ba600e5bf1ee29942cbc91ba8a9ec69413eea7dece407329fe4eb50 WHIRLPOOL f9684036f6aebb0b3f84bad2f48bc48f2a33e30f28af751a9f37dc95e0cae64cc7c19e4a17bd948e5401a23b920b7b6fa261bc028c87227ae6eb6090fbffb956
+DIST python-daemon-2.1.1.tar.gz 74276 SHA256 58a8c187ee37c3a28913bef00f83240c9ecd4a59dce09a24d92f5c941606689f SHA512 e2abb9fafea32fe5bc7d239387e3c22aa99f63df31cc4f57908ffdb5dc7f2768358df6ba5f3e827b4f83163628649f58a973b548066e8c79ab3c6c6ce09d8007 WHIRLPOOL 066509bccc63719553749446863996e592cbc28c23ffb6226044ff027c934396c6605938b4554048475dec3cd0fd6a965de5db50ac6c4e4952880abc13ee0c3a
diff --git a/dev-python/python-daemon/python-daemon-2.1.1.ebuild b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
new file mode 100644
index 000000000000..12dd258afd8f
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 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="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.python.org/pypi/python-daemon"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( ChangeLog )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index beada9109a8a..dde111bacb26 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1 +1,2 @@
 DIST python-efl-1.16.0.tar.xz 8737592 SHA256 3418ca7dc38f07bf610b9dcc7ce356bc8c45247a2100679bf840f640e2744e90 SHA512 6ee6f373b376af67af4124360482f7f0c2fb8b6e4c354ebba21c141a06be3f68ff17dcea45422c38d9e19595df035603df268aff74489007be6b9db13b861812 WHIRLPOOL 14cf92c31efae6a75de3d693075db8c3657519a60662db3373c8abef655d982f24e8ceddf10be605ec515b15d545ca4e2417767e3e48d68639e312f089bf2eff
+DIST python-efl-1.17.0.tar.xz 8835228 SHA256 9ea0fe0938bd4a970206b2b18f46f4d2a4fd1994e9b5f84af2d5f9fa98739179 SHA512 ff610dbacf72853b6c8fb1dcd41451f97156845efeb67a2d5d6c35d9b20c0f024c145a26a579f675bc2ad5844c23e58d8b21a09374aa195174f1a0c6316c0de4 WHIRLPOOL 0ee05c0cb175128c4719883a4c362ce4b3f98a93a7d960e47be2fa60a375748fc89599a111277d77a44caa9c96ad509d5b1c14c1ebafeb739461914560f2b4ed
diff --git a/dev-python/python-efl/python-efl-1.17.0.ebuild b/dev-python/python-efl/python-efl-1.17.0.ebuild
new file mode 100644
index 000000000000..a1ba58ee449f
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.17.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="bindings/python"
+	EGIT_URI_APPEND="${PN}"
+	EGIT_REPO_URI="git://git.enlightenment.org/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git"
+	inherit git-2
+else
+	SRC_URI="https://download.enlightenment.org/rel/bindings/python/${MY_P}.tar.xz"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Enlightenment Fundation Libraries"
+HOMEPAGE="http://www.enlightenment.org"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	>=media-libs/elementary-${PV}
+	>dev-python/dbus-python-0.83[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.17[${PYTHON_USEDEP}]
+	doc? (
+		media-gfx/graphviz[python]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc ; then
+		# Point sphinx to right location with builded sources
+		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py
+		esetup.py build_doc --build-dir "${S}"/build/doc/
+	fi
+}
+
+python_test() {
+	cd "${S}"/tests
+	rm -f ecore/test_09_file_download.py # violates sandbox
+	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
+	${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && DOCS=( "${S}"/build/doc/html )
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-geoclue/Manifest b/dev-python/python-geoclue/Manifest
deleted file mode 100644
index bad62811eb71..000000000000
--- a/dev-python/python-geoclue/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-geoclue-0.1.0.tar.gz 61062 SHA256 51748c22244f974854eacbf518a11a72cdf76045b7ab9cae44b7a592dfa4e259 SHA512 844c877038f9b8db096a33605be16f8aaea8e66fa84e3a42927f103afa9c8ab565b28cc69b9d02d30bfd02a20e6e20e7fdf28a7d06900db9d288775bb153c533 WHIRLPOOL b59fc942e9686e55f8a6d2aab2a335f51b0f8de4a13bd6d9f3945cabd5133fffd125b7373f3dc9c9b7941d66ef27e41aa832cf3e2f1ca332dfd6376b5dedaa08
diff --git a/dev-python/python-geoclue/metadata.xml b/dev-python/python-geoclue/metadata.xml
deleted file mode 100644
index e24dd86faa2a..000000000000
--- a/dev-python/python-geoclue/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild b/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
deleted file mode 100644
index 6fa0daae8e77..000000000000
--- a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Geoclue python module"
-HOMEPAGE="https://live.gnome.org/gtg/soc/python_geoclue/"
-SRC_URI="http://www.paulocabido.com/soc/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE="test"
-
-RDEPEND="
-	app-misc/geoclue:0
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="test? ( app-misc/geoclue:0 )"
-
-S="${WORKDIR}"/${PN}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}"
-	cd "${BUILD_DIR}" || die
-	virtualmake "${S}"/tests/test.py
-}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 318b53738f3b..811902e6cf21 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,4 +1,3 @@
 DIST python-keystoneclient-1.3.1.tar.gz 338187 SHA256 8a421dbdf01251119164bf6baa0ef78b261e5dd4d3508748e47b77d7652e7e92 SHA512 d11825b717d0aeec67d4dfb0382173ee834fe3dea2097b8ff9505b86bb08a5579d6fe87509d65022d4436a3a1b4d20f2a877ece3160b53979999495b77df0f08 WHIRLPOOL 9aa0af722f56eb4d98d7efb8a35b1db95207970fba0b32496a9ae4593a16471f976efe1e9bb3690106ec0f5a76b5a744e9177cc7c03d9ffe9ed54111e3bb138c
 DIST python-keystoneclient-1.3.2.tar.gz 342434 SHA256 1b2fd5ceeefd8d75ee749acd2c3dd8805c833c89828075b814392069cd5ae1eb SHA512 4cd986c42256fbc366b81c07ab637fe81358dde530a8e9a5b3f59f4deef5d56fb1799fc82d35a3f04d3e3b810c94bfc21235e93a77c925d235322aeaa20e420c WHIRLPOOL 65b776c928126f92108c1585658a10b89e6563ff8e71f8f249fdb86e11b29811de12b17ddddb39845d66ff9533ae44d93148bd811d1e31577092c3b598348c03
-DIST python-keystoneclient-1.7.2.tar.gz 356107 SHA256 d862183e0e53e7d0696a71ad9b6a9ff9f96b7f445564357de722604ca14fd6d2 SHA512 9a3f3205549f54dea73dc499d65613816f10fc2b5773734b6762db95965ef7192e3ca052748a3258925a5e120ccc6ed8d55b8860dfae94c6503d38b871039942 WHIRLPOOL cf0e0a9e1344cdbafea479be99aa25c40c0a32ccbfa05533aa957fe5003316d940c859caa74c4b9fa0495661d472913af48c666489ae392ad547e5ceb4cc5501
 DIST python-keystoneclient-1.7.3.tar.gz 355578 SHA256 805a317c92cd8700a4733ee80f383b2187de75aeb8e9895015799628df97c68f SHA512 36682247de6c6afee2e0cdf35115b4e6adc4bafef05311337e3299f97a8608a967ca537e8aeaea2e030344a7a8a103c627ff7d118c96c75ac1d169e1bc53d1af WHIRLPOOL 91f6744ea96f8343f1e6665e6db4159fa7d48e9cbc891a8c14aa5bd2165437f9d242f3ee9c960502fda0e26ab1669abec4b32f12be1c79626fe67f6bf25c2137
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild
deleted file mode 100644
index e741aa391a5f..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,95 +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
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-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 examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${TCDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.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}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${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/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${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/python-keystoneclient/python-keystoneclient-1.7.3.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
index 3440b8a41e82..29ea670c3076 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.7.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 # Note: blacklist version not in portage:
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index cde27c32a526..fb0487be9914 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1 +1,2 @@
 DIST python-mpd-0.5.4.tar.gz 45542 SHA256 04dbc3b8d90746298e42852c5b7fb5be5e7af2ca03e812059639b6c060d98c53 SHA512 6303d0eb1ef8120777b2c6a020e30bcc70bbe969b63790391c79ff0baf22c5050fce6a6e4cb80a86351cd76c93c92efb06b4fc2dd2087955d979210c511940ee WHIRLPOOL 4044cb6c368a8e7796775fcca6fb5f1b7df3faf8042b40e6d9baa2129dc6c2a2e500aa523a9ecfed28b561532090939cc87e82a0451085cd73b369c714c83f18
+DIST python-mpd-0.5.5.tar.gz 46334 SHA256 b9b9d3a477359f53b62b2ebc26fda29d96da66f86eac83c5e2277e85894d2ce2 SHA512 d5eec60045561a8a0e29eda2ec2fc341c9b81d61363260c884f0863e931077c31c32534e3c98a488ef31aa61cd3d21bdcfa625b7b062ef24bf3e8024dc1e7c5a WHIRLPOOL b09c2875d06b4d828c71a26c9a2ed6fe9f4373d4158f4cbf31956c5c590424993af4d43d1e24a3d94a81c946f800e73806362e1d077ced8444fe2da675a592b9
diff --git a/dev-python/python-mpd/python-mpd-0.5.5.ebuild b/dev-python/python-mpd/python-mpd-0.5.5.ebuild
new file mode 100644
index 000000000000..343c4ad31acc
--- /dev/null
+++ b/dev-python/python-mpd/python-mpd-0.5.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 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,3_5} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python MPD client library"
+HOMEPAGE="https://github.com/Mic92/python-mpd2"
+SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( doc/changes.rst doc/topics/{advanced,commands,getting-started,logging}.rst README.rst )
+
+python_test() {
+	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python_orocos_kdl/files/libdir.patch b/dev-python/python_orocos_kdl/files/libdir.patch
new file mode 100644
index 000000000000..8235649eaec9
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/libdir.patch
@@ -0,0 +1,13 @@
+Index: python_orocos_kdl/CMakeLists.txt
+===================================================================
+--- python_orocos_kdl.orig/CMakeLists.txt
++++ python_orocos_kdl/CMakeLists.txt
+@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI
+ 
+ find_package(PythonInterp REQUIRED)
+ find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED)
+-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
++execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=None))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ find_package(SIP REQUIRED)
+ include(SIPMacros)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
index 5b4808019348..5938f3f0811c 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" )
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/libdir.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 0d22bd204aeb..1ddb1dfa7873 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -32,6 +32,7 @@ RDEPEND="
 	dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/libdir.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index cc3f3c2f67bd..a8b53e68c20a 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1 +1,2 @@
 DIST qtconsole-4.1.1.tar.gz 406257 SHA256 741906acae9e02c0df9138ac88b621ef22e438565aa96d783a9ef88faec3de46 SHA512 2848eb8d3a8816a47ca422b24837372899864e750336509f3d8444333d0783bae46b9917258cab14d4e09d91d5068a7772fb849a267e1a7d6e282c7c75e9f4e9 WHIRLPOOL 1a3a638be2bdea3f9ab6d625edd110ef698a84cfdf3b1f4101375faf8ed60a0e8e9ab6e297575dab8e2e6389107ba62a6bb338c78934780e19dd4c498aee9eb9
+DIST qtconsole-4.2.0.tar.gz 408331 SHA256 937314f4f35bde9ee28e97b199289f8ac1b1ba14e2a4e22ab8aafa17a1bae5b7 SHA512 bf8ab82b316961ecf14e56dda27bb1253e7e56b10adc7388b1a6a8548526a756da45a16b34e891e966dfa72cdd73a571390b23b9ed1e5d4cb684f2ba14569368 WHIRLPOOL 4ccb073c2d29ee1908696867af41c28c1cc51a2c30a7d2e030de7dacc0e069788d2f08756c6a22044fc58cec9d1df84fe1de10692d8d0eea0ffe31c9a6d64b66
diff --git a/dev-python/qtconsole/qtconsole-4.2.0.ebuild b/dev-python/qtconsole/qtconsole-4.2.0.ebuild
new file mode 100644
index 000000000000..7ea50addbcec
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/ipython-4.0.0-r2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+	)
+	|| (
+		dev-python/pyside[${PYTHON_USEDEP},svg]
+		dev-python/PyQt4[${PYTHON_USEDEP},svg]
+		dev-python/PyQt5[${PYTHON_USEDEP},svg]
+	)
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
+	"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# jupyter qtconsole --generate-config ... jupyter-qtconsole: cannot connect to X server
+	# ERROR
+	sed \
+		-e 's:test_generate_config:_&:g' \
+		-i qtconsole/tests/test_app.py || die
+	virtx nosetests --verbosity=2 qtconsole
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 38adcd5e1589..518ed05c90ec 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,2 +1,3 @@
 DIST requests-mock-0.5.1.tar.gz 29729 SHA256 b1b1b864e633418c77f33d333b0fd88cb6123bfb816706b236f7b1db99795056 SHA512 79a270501cfee425af81b5d0ab7fcbebe08eca0ff8f9f57dab769bec7918f44ab7ca4a4b683ae195a5c8c6020d4730cf0c1482f6ff21cbbbea700491cc455903 WHIRLPOOL 87d2591e70dedd8a5bfae485dc0df411e5ed9ad1442f7e5f2d62d134c8e536e09b30f3b8c0f92def4b5c5f5df56fdd21eef9d4fde659ca5605bd17181f593021
 DIST requests-mock-0.6.0.tar.gz 31645 SHA256 a1f10ee53fef6aac6ca54cfb8fdb1b7ca6da59d68ea1a8c21ac513211842ad3e SHA512 5c23c1fdd3746f2b3b49508b7f05abb365e0608a32b6ead5d0ef18203bf75ab642626229e96b2e8826216d0f090f1bbd41bdfa78dd56f305a996a57f1e16179e WHIRLPOOL 65af690e429a09bc4358f1b0c387e3fff3faaf962cacd247c11c01ba84f79b3fe06b0dd801e9dab829550a5a340e562aa3ceb6a61e4307c14b5a16fdba8a1a7a
+DIST requests-mock-0.7.0.tar.gz 34722 SHA256 ee2816992d4505596ec3c98c7b4ab57475539ac037d08dd3a81370b1e3cdd568 SHA512 c2046d9291b3c852b986423dd3407c2486476417934aa2c21365fa94d821ebef7e01e90c61c6ab35d186654d3468e4a72505bb157cfb01f287b6d5c0041dc7f8 WHIRLPOOL ff4494eb30d5028aeaf7db1811130ddd3f89c5a0a57c55836fb35aa1ba598c5cb44f95879daa8be3b0aac8f57eb2649349243d5532cbd0ef31adb24c88321f27
diff --git a/dev-python/requests-mock/requests-mock-0.7.0.ebuild b/dev-python/requests-mock/requests-mock-0.7.0.ebuild
new file mode 100644
index 000000000000..7c3512b4736b
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
new file mode 100644
index 000000000000..925112e6801c
--- /dev/null
+++ b/dev-python/requests-toolbelt/Manifest
@@ -0,0 +1 @@
+DIST requests-toolbelt-0.5.1.tar.gz 187981 SHA256 4f4be5325cf4af12847252406eefca8e9d1cd3cfb23a377aaac5cea32d55d23e SHA512 fff70b7262efae616fe9fe8e25af9856d42ccecdaca71cfde0dd81c5d7c509aec30f7c99f4b886d844c168937197ed8287e873fffe6073e93e48412b5a902997 WHIRLPOOL 6c918a43ab70046545445d217cac0ea9fd18c1938aaa5bfe61645cb95a435630000d2fbe51317c8bc9fcb11c8f68c64c8c1af0ef265c72d2994f16b9365cff3f
diff --git a/dev-python/requests-toolbelt/metadata.xml b/dev-python/requests-toolbelt/metadata.xml
new file mode 100644
index 000000000000..9733c2c2dc5d
--- /dev/null
+++ b/dev-python/requests-toolbelt/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild
new file mode 100644
index 000000000000..3df2c62d1e5d
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 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 utility belt for advanced users of python-requests"
+HOMEPAGE="http://toolbelt.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="<=dev-python/requests-3.0.0"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index bb60f199db72..37e89e597f39 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,2 +1 @@
-DIST rosdistro-0.4.2.tar.gz 50857 SHA256 3d5bf062bd0ecbfef272456f1862a6bb7a4100d8f2ac9b4ce7792dbdcfed7a84 SHA512 24dd08a959918fa44faa465acd22bd8d157b792391a2701ee40997028ea90dd13848f72abf1098930cd4e7b8a162cea1ab28ceb0d82df74167c85c0ef014ad65 WHIRLPOOL 8207d60268282d9075655ec3676179b1e6a7d8b1ee571c5df90d4680f54c345175788d7abbf3c2b78504c491a7453193490574f8e68ca2bdba270b5db8983e2b
 DIST rosdistro-0.4.4.tar.gz 40001 SHA256 1c7c6886c2e61dd8143d3c08f5690f30e9d4e081d348c78bb0b2e8d32773c57b SHA512 4f6b79d88687f6e6147b95bef484a1555639d65044d01812af60eb072579345b5233bcda8fba251f0685a28b756addff7468c34978b0cc04c871ce4fe30fbe2c WHIRLPOOL 99a29b8c7ef475cd4599d2d9e8e28210af2a9d50b280dc9c315f16b3ae3be8b85e4da55a1c8cb6af55795b98207601307e7e846c0a8cdae6a5b4af356ff7b044
diff --git a/dev-python/rosdistro/rosdistro-0.4.2.ebuild b/dev-python/rosdistro/rosdistro-0.4.2.ebuild
deleted file mode 100644
index e6da9fa05ae1..000000000000
--- a/dev-python/rosdistro/rosdistro-0.4.2.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		http://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.4.4.ebuild b/dev-python/rosdistro/rosdistro-0.4.4.ebuild
index e6da9fa05ae1..7f7898e20477 100644
--- a/dev-python/rosdistro/rosdistro-0.4.4.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.4.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index e6da9fa05ae1..7f7898e20477 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 24e6a92c1d78..10243841fbeb 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,3 +1 @@
-DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3
-DIST rospkg-1.0.37.tar.gz 89332 SHA256 733e9e30d30a1f293f2d2b07060d231746ce88f7cfecb076d466d9aece5a0a8a SHA512 5e8e938831aac0c14b18d0f5063c8c8d50a2f13a4a15ce15955d854a840a8b46bab42d854b6d61d1e4e6bdef95f90e10008838d16b31e7d5b0d963b1c3c246d6 WHIRLPOOL 3d50c070197019b607e23a430affec8950539e0b32dd88f14e85027acea87435abebd8f58c4aeadd11cafee00d2faa26a3d9d88a0afb6efdc42dc0797642ef39
 DIST rospkg-1.0.38.tar.gz 89321 SHA256 1a1567d3e33c3910518dbfbb09760c499153b1c0ad6b8ddc5045488c11db43e4 SHA512 21cc9057a445b06db66b454e46c3ecdf8d83e54bbf4c204c63b13278dc93cdad60a80f4cab29eba7bc1811d43b406f91435499f7e58fa97814302dfb786f483e WHIRLPOOL 109e8d5ddc3f432c28959b7e6f15703aa2d67cd3ee524e4964e5388a7982b6aea144e5afcf0d22add230e33beb485ade0656025b77f2b56be75d313aa1e52870
diff --git a/dev-python/rospkg/files/py3.patch b/dev-python/rospkg/files/py3.patch
deleted file mode 100644
index 268ff895be4e..000000000000
--- a/dev-python/rospkg/files/py3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/ros-infrastructure/rospkg/pull/90
-
-commit 7be8d9e5ec3c6bffd970e93053078b707879c7b9
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Tue Oct 13 10:08:42 2015 +0200
-
-    src/rospkg/os_detect.py: Use "string in dict" instead of "dict.has_key(string)" for python3 compatibility.
-
-diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
-index 14b57c2..554b607 100644
---- a/src/rospkg/os_detect.py
-+++ b/src/rospkg/os_detect.py
-@@ -150,7 +150,7 @@ class FdoDetect(OsDetector):
-     """
-     def __init__(self, fdo_id):
-         release_info = read_os_release()
--        if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
-+        if release_info is not None and "ID" in release_info and release_info["ID"] == fdo_id:
-             self.release_info = release_info
-         else:
-             self.release_info = None
diff --git a/dev-python/rospkg/rospkg-1.0.35.ebuild b/dev-python/rospkg/rospkg-1.0.35.ebuild
deleted file mode 100644
index 06dd93b7b5c4..000000000000
--- a/dev-python/rospkg/rospkg-1.0.35.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
deleted file mode 100644
index 526c071695f8..000000000000
--- a/dev-python/rospkg/rospkg-1.0.37-r1.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-	"${FILESDIR}/py3.patch"
-)
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-1.0.38.ebuild b/dev-python/rospkg/rospkg-1.0.38.ebuild
index 06dd93b7b5c4..100d6bc0b260 100644
--- a/dev-python/rospkg/rospkg-1.0.38.ebuild
+++ b/dev-python/rospkg/rospkg-1.0.38.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 06dd93b7b5c4..100d6bc0b260 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
index f30cf00ed5b1..1ecee73060f2 100644
--- a/dev-python/rsa/rsa-3.2.3-r1.ebuild
+++ b/dev-python/rsa/rsa-3.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
index 5af9c4ed7aa4..d18698882b8a 100644
--- a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
+++ b/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE=""
 
 DEPEND=">=sys-libs/libselinux-2.0[python]
diff --git a/dev-python/sepolgen/sepolgen-9999.ebuild b/dev-python/sepolgen/sepolgen-9999.ebuild
index 549d87598e20..a6d6b6cea91c 100644
--- a/dev-python/sepolgen/sepolgen-9999.ebuild
+++ b/dev-python/sepolgen/sepolgen-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 4d5625d2214b..52e163594508 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1 +1,2 @@
 DIST service_identity-14.0.0.tar.gz 26033 SHA256 3105a319a7c558490666694f599be0c377ad54824eefb404cde4ce49e74a4f5a SHA512 d504ad388defb38a86ca82c8ff9582dbb664a929e4b4ee7f6732b2da5326c33b1764384a8d849972f83ae7800c775daf90c1f3fbc61b8d2c29294f44c7cd36d2 WHIRLPOOL bc6f3cba3e3bec83c527df60dc3cd4387d74baab5a88b5c2cb731661804139c78c86074902060b64e402364ac641b4b2617c98448d4a9e6b367dc0f9d6cd5dac
+DIST service_identity-16.0.0.tar.gz 30270 SHA256 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 SHA512 0ffa28b3dece2415a058ec159e4f85f3e86c0de520ed5d6933ec49edca91ccc79a57893ace40d5441455791433828ab55a939e90335dfdee8582627e33a896ae WHIRLPOOL 598c046bf0e7428d5d3c34e8315bc67a857377af105bddc7d07fde01eaaffb4be62026fdffab6c81eaaff897290ab735c5f3ad3f7f9c4a1bd9f932a39cef9aaf
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
new file mode 100644
index 000000000000..4486647524b0
--- /dev/null
+++ b/dev-python/service_identity/service_identity-16.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="https://github.com/pyca/service_identity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v -v -x || 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/simplebayes/Manifest b/dev-python/simplebayes/Manifest
new file mode 100644
index 000000000000..aef312711c29
--- /dev/null
+++ b/dev-python/simplebayes/Manifest
@@ -0,0 +1 @@
+DIST simplebayes-1.5.7.tar.gz 19260 SHA256 71cb029768bd25c172bdb3bd37174d42f872da92c33329ec736c3748ffa3b4a7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc WHIRLPOOL 826617d920c45411a138bc405f760229e79959b25f4cd7e3d6b4525cdd2e9fec43b88f0df011dd820a72484df5bf988e3a18b357fe2966e15a8349c686eba308
diff --git a/dev-python/simplebayes/metadata.xml b/dev-python/simplebayes/metadata.xml
new file mode 100644
index 000000000000..9d1e5c16ae1b
--- /dev/null
+++ b/dev-python/simplebayes/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription lang="en">
+A memory-based, optional-persistence naïve bayesian text classifier.
+
+This work is heavily inspired by the python "redisbayes" module found here:
+[https://github.com/jart/redisbayes] and [https://pypi.python.org/pypi/redisbayes]
+	</longdescription>
+	<upstream>
+		<remote-id type="github">hickeroar/simplebayes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
new file mode 100644
index 000000000000..affaca5d7788
--- /dev/null
+++ b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
+HOMEPAGE="https://github.com/hickeroar/simplebayes"
+SRC_URI="https://github.com/hickeroar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 1fbe8389a424..7e1a4424ffd0 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,3 +1,4 @@
 DIST simplejson-3.7.2.tar.gz 74877 SHA256 8358ecc05541be4068109acf26a4ae89ba14450d20e92e0973d0d67bea3d7431 SHA512 5e2874c4d627035b3e205b5208b46beb172ac934742b0cb68f43f70aa2f401ec568c2b69fccdb1d870bf5196df0f6e37b790332a6e4d7969a296c8c104bdfe0b WHIRLPOOL 26f5e23250031d9b20b121a7110a1b623f32128721281b2554f2727f815b03b39b0680d21b41bb8729288f2774d38e92301bcf72188d054aa03497818edefdca
 DIST simplejson-3.8.0.tar.gz 75875 SHA256 217e4797da3a9a4a9fbe6722e0db98070b8443a88212d7acdbd241a7668141d9 SHA512 c985a0f56170f78b6c6e8f0e4b4bf50f258c8f2639524f5b14d8e07b547e336acf96ac55cf562243fff06752ceba4a05f1e6dd43f6c918159a7b3640af0f0c1d WHIRLPOOL 368779f57bc1186d3b30ae80f74d0eca50709dfe6063d52c359d665eaacc9caa751fbbb9f4437e8bf8908f3569f85424632208d8f7c6146ebc8e8cc9c77b723d
 DIST simplejson-3.8.1.tar.gz 76033 SHA256 428ac8f3219c78fb04ce05895d5dff9bd813c05a9a7922c53dc879cd32a12493 SHA512 9c135347a015f5fbb4373da61282230430320c89bc1114f7487eb632bccbe29a4b2c396d724c6c72af5c7df78f1676869a037be9d137b4f29f18e82a9eb2b1f5 WHIRLPOOL 8441ccaff4e4115d58461f528179c4fc25139b5f7f86cc85826798e392e664154468f1fa2471f18fc7bd518adf06a75b493218765ca4df022d92e6ee24552e38
+DIST simplejson-3.8.2.tar.gz 76578 SHA256 d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495cdd47f SHA512 041445bcee97e37361ed6270937fb4e74b6fc05988678da213ddc4f57f83134bfc933b0fb22101c387898bffac1b29d6eb78f03ec0853cf1086b155cee6ca309 WHIRLPOOL c6d32565925653050beb1939db6215ad910891a19ef721d6bc53b3d2beb50667f6201e5afc71e28c1644d18cdbdb6f2d53bfb5ca75feb9e129d01ed7fca035c1
diff --git a/dev-python/simplejson/simplejson-3.8.2.ebuild b/dev-python/simplejson/simplejson-3.8.2.ebuild
new file mode 100644
index 000000000000..41e1c8ef5c04
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+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"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst CHANGES.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3-r1.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3-r1.ebuild
new file mode 100644
index 000000000000..c6fdce9e9b7c
--- /dev/null
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3-r1.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 python3_5 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to bring functools.singledispatch from Python 3.4 to Python 2.6-3.3"
+HOMEPAGE="http://docs.python.org/3/library/functools.html#functools.singledispatch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 3aad7ffffe69..e7bbcbb754f1 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,3 @@
 DIST spyder-2.3.4.zip 3707063 SHA256 da4b13d6faed3e8810c0418f8274b26fde4f265ea4f93bee154af128a755c184 SHA512 7a4ea65ea06e9944094fc94db78327f9e23a8fd6dda5d0e9aa0e82ba4cd7d9f50b1eb837395a3fa2fabe814df873ad8ddbcca223144c47af4007b0493575e41e WHIRLPOOL 53e8f42bdafe01072457f27e45a279f92a198f181344f8267be2b3940cbd6d3743685ffe3264b04344f83bcb73b3eb8c9ec0e6bf8ccef26e19901324bfacb682
 DIST spyder-2.3.5.2.zip 3039104 SHA256 40e589467b561af534aac6d8cc2ea0dc244d3ae4457afb41b3aec6db6f8b2336 SHA512 ac8e078991b2889c3359e700bd89d4c8487eeba412512bc9bd7685214f687001bcc411016283bcde4eb73f6186ffc5cadc9614d911acd8b788899ef5aafd66e1 WHIRLPOOL e2b2bca44bd2ec1461875a358868ab34c60f30ac5164ff6312302b495e859000b97afc78ce12c69dbc328fdcbead247a9defce9e29c08de367fc7d3a321ff007
+DIST spyder-2.3.8.zip 3043528 SHA256 99fdae2cea325c0f2842c77bd67dd22db19fef3d9c0dde1545b1a2650eae517e SHA512 7d40e081ce2ea579d8d98e58e31b53afc04360bebcd52a226adc5ed387ed94d1aa24d0372c2e3594689d0f44a81df9986d8c3fbe4ccbae7a493ad039aaba3acc WHIRLPOOL dfd1edb2006c89df1a5bbc9d42a5e4e0042691fbcef71f855af6c0111f2b38bb88aef61ac00cfe8fed574e631af295aacb6d784d184ddb107e46616ce3a65e01
diff --git a/dev-python/spyder/files/spyder-2.3.8-build.patch b/dev-python/spyder/files/spyder-2.3.8-build.patch
new file mode 100644
index 000000000000..2a4646ab0c08
--- /dev/null
+++ b/dev-python/spyder/files/spyder-2.3.8-build.patch
@@ -0,0 +1,154 @@
+--- a/setup.py
++++ b/setup.py
+@@ -21,8 +21,6 @@
+ import shutil
+ 
+ from distutils.core import setup
+-from distutils.command.build import build
+-from distutils.command.install_data import install_data
+ 
+ # Check for Python 3
+ PY3 = sys.version_info[0] == 3
+@@ -66,12 +64,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder3.png'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder.png'])]
++        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_light.ico'])]
+@@ -80,97 +73,6 @@
+     return data_files
+ 
+ 
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-# Sphinx build (documentation)
+-def get_html_help_exe():
+-    """Return HTML Help Workshop executable path (Windows only)"""
+-    if os.name == 'nt':
+-        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
+-        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
+-            if osp.isfile(hhc_exe):
+-                return hhc_exe
+-        else:
+-            return
+-
+-try:
+-    from sphinx import setup_command
+-
+-    class MyBuild(build):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + build.user_options
+-        def __init__(self, *args, **kwargs):
+-            build.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-        def with_doc(self):
+-            setup_dir = os.path.dirname(os.path.abspath(__file__))
+-            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
+-            install_obj = self.distribution.get_command_obj('install')
+-            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
+-        sub_commands = build.sub_commands + [('build_doc', with_doc)]
+-    CMDCLASS['build'] = MyBuild
+-
+-
+-    class MyInstall(install):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + install.user_options
+-        def __init__(self, *args, **kwargs):
+-            install.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-    CMDCLASS['install'] = MyInstall
+-
+-
+-    class MyBuildDoc(setup_command.BuildDoc):
+-        def run(self):
+-            build = self.get_finalized_command('build')
+-            sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+-            
+-            if not osp.exists(self.builder_target_dir):
+-                os.mkdir(self.builder_target_dir)
+-
+-            hhc_exe = get_html_help_exe()
+-            self.builder = "html" if hhc_exe is None else "htmlhelp"
+-
+-            try:
+-                setup_command.BuildDoc.run(self)
+-            except UnicodeDecodeError:
+-                print("ERROR: unable to build documentation because Sphinx "\
+-                      "do not handle source path with non-ASCII characters. "\
+-                      "Please try to move the source package to another "\
+-                      "location (path with *only* ASCII characters).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-            
+-            # Building chm doc, if HTML Help Workshop is installed
+-            if hhc_exe is not None:
+-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
+-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
+-                if osp.isfile(fname):
+-                    dest = osp.join(dirname, 'spyderlib')
+-                    try:
+-                        shutil.move(fname, dest)
+-                    except shutil.Error:
+-                        print("Unable to replace %s" % dest)
+-                    shutil.rmtree(self.builder_target_dir)
+-
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+-
+ NAME = 'spyder'
+ LIBNAME = 'spyderlib'
+ from spyderlib import __version__, __project_url__
+@@ -204,13 +106,7 @@
+     packages = get_subpackages(LIBNAME)+get_subpackages('spyderplugins')
+     return packages
+ 
+-# NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+-# platforms due to a bug in pip installation process (see Issue 1158)
+-SCRIPTS = ['%s_win_post_install.py' % NAME]
+-if PY3 and sys.platform.startswith('linux'):
+-    SCRIPTS.append('spyder3')
+-else:
+-    SCRIPTS.append('spyder')
++SCRIPTS = ['spyder']
+ EXTLIST = ['.mo', '.svg', '.png', '.css', '.html', '.js', '.chm', '.ini',
+            '.txt', '.rst']
+ if os.name == 'nt':
+@@ -246,7 +142,7 @@
+       package_data={LIBNAME: get_package_data(LIBNAME, EXTLIST),
+                     'spyderplugins':
+                     get_package_data('spyderplugins', EXTLIST)},
+-      requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"],
++      requires=["rope (>=0.9.2)", "PyQt4 (>=4.4)"],
+       scripts=[osp.join('scripts', fname) for fname in SCRIPTS],
+       data_files=get_data_files(),
+       options={"bdist_wininst":
+@@ -267,5 +163,4 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 57eeb9d98197..374a8a5dba61 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="pep8">Add support for <pkg>dev-python/pep8</pkg></flag>
     <flag name="pyflakes">Add support for <pkg>dev-python/pyflakes</pkg></flag>
     <flag name="pylint">Add support for <pkg>dev-python/pylint</pkg></flag>
+    <flag name="qtconsole">Add support for <pkg>dev-python/qtconsole</pkg></flag>
     <flag name="rope">Add support for <pkg>dev-python/rope</pkg></flag>
     <flag name="scipy">Add support for <pkg>sci-libs/scipy</pkg></flag>
     <flag name="sphinx">Add support for <pkg>dev-python/sphinx</pkg></flag>
diff --git a/dev-python/spyder/spyder-2.3.8.ebuild b/dev-python/spyder/spyder-2.3.8.ebuild
new file mode 100644
index 000000000000..2dd7841a1da6
--- /dev/null
+++ b/dev-python/spyder/spyder-2.3.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="https://github.com/spyder-ide/spyder"
+SRC_URI="https://bitbucket.org/${PN}-ide/${PN}lib/downloads/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint qtconsole +rope scipy sphinx"
+
+# rope requires no version bordering since all are >= miniumum version
+RDEPEND="
+	|| ( dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
+	dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
+	ipython? ( dev-python/ipython[qt4,${PYTHON_USEDEP}] )
+	qtconsole? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	pep8? ( dev-python/pep8[${PYTHON_USEDEP}] )
+	pyflakes? ( >=dev-python/pyflakes-0.5[${PYTHON_USEDEP}] )
+	pylint? ( dev-python/pylint[${PYTHON_USEDEP}] )
+	rope? ( $(python_gen_cond_dep 'dev-python/rope[${PYTHON_USEDEP}]' python2_7) )
+	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+	sphinx? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"
+
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc doc/html || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	doicon spyderlib/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index b5a84bfefa24..2b912df10bbb 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,5 +2,6 @@ DIST SQLAlchemy-0.7.10.tar.gz 3541639 SHA256 77aa39d65c9d043eba6ba329b359ff86742
 DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5 WHIRLPOOL 2cedf7713753a6cf8838741fcf06c5510387aa4e661ea3c0ecc2bb7bdb5b03fb90f072ccd1a5671f03943952340c6c3525836e1ebe9246506143b055a1ca1991
 DIST SQLAlchemy-1.0.10.tar.gz 4705865 SHA256 963415bf4ea4fa13698893464bc6917d291331e0e8202dddd0ebfed2864ef7e3 SHA512 c28663a28e460abc724998f1fa605c31d0060e77f654f7c392da75f36e337158e9955cb37ba1c6ee517ef182f42c25e682a279d6865c9ee438bfb13dffa475c5 WHIRLPOOL 7f15d92722e54bc38a991f5639d7dae645f8845d1229a54bf0eff854aef5de7ff4c2df4a51db0d9fe74c08129cd4b1fc09e5e99dd0af7ff52ea374f732efa355
 DIST SQLAlchemy-1.0.11.tar.gz 4708987 SHA256 0b24729787fa1455009770880ea32b1fa5554e75170763b1aef8b1eb470de8a3 SHA512 b7f4d97faffefad65bbfb0c16c1ac0e27addc28546637ad323273311cfe4ef17be6e77e6279331b575ffd6cfdc6e57634666e4898aa484b275142cf665ba4920 WHIRLPOOL 24f434d6baeffb478636517e9d5fbf49f8f5fd80dbd8ce7cdb065de61055cd873a79c5afbfb2be2fbb07a14bf65a91f33d93ca180b27f07c08cb5a4619adc9bf
+DIST SQLAlchemy-1.0.12.tar.gz 4748974 SHA256 6679e20eae780b67ba136a4a76f83bb264debaac2542beefe02069d0206518d1 SHA512 67878cd5dd43bebcf17ec40e6879084e661652d0cef3a848eaa3fbc89dcd499ba7bba595ae514a531889496c182a76cd78e2e7ea37ab366ce6b373cbe963c8af WHIRLPOOL fb9c9a8598338f58c837d7a3593244b9f7748495ee588162dae64b0fac2f053e36bfe436656f58aa0a8e671ccb04d01d52154a07bb149526d6a36f02de9e49ce
 DIST SQLAlchemy-1.0.8.tar.gz 4627601 SHA256 950c79c0abf9e9f99c43c627c51d40d14a946810a90c35e7cd827bfd0bffe46f SHA512 921f847a20548095cb1f41fe6147b393110e08f8f3ff0aee6081e7811e7c15b3c03583afd41ddf5aacdc1dde090c0512afb94c7cc33d9c27135a5525ed121e74 WHIRLPOOL 757f2a3832c8fefd5789cd981eb1b2028419362ed2714927198df6b91742236896d4ab0131969afa08e5508843e32e018a1361e28df3f22a15f811d78275f8cf
 DIST SQLAlchemy-1.0.9.tar.gz 4662673 SHA256 c3d37501e36ec5d74c2d7b4a3764719db86a9cdab4a24431bf58b386743ab10e SHA512 5032977e4fd3ff12d7ae10ca87f0ec9cd2d9eb5d200020b74faad1309eb1de5bacc9b4f5e53cb1b0b0b9c7f59b923a87a12ba050b37a631f9c77af2b896eb076 WHIRLPOOL 5e824f8581b98ac26f47d0bc8ae706783602ebe6bf921c6767f46db83b8322b022ea51603d1002017052144946256583c4fd9d2a92742c752333b530ed356121
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.12.ebuild
new file mode 100644
index 000000000000..243bc3f8fb09
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.12.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+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"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 155af41440a5..039976f8c44a 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND=""
 
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
new file mode 100644
index 000000000000..b1d26e01f0b3
--- /dev/null
+++ b/dev-python/statsd/Manifest
@@ -0,0 +1 @@
+DIST statsd-3.2.1.tar.gz 166047 SHA256 3fa92bf0192af926f7a0d9be031fe3fd0fbaa1992d42cf2f07e68f76ac18288e SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8 WHIRLPOOL 1ae98a9c16fdb7a1be8135c232c99d771e292dab7d87c12e6a989c18dad1c600c4ac2bb186a96dcdce49812fc26c30925ca30be3c2e85cb736797cb1c35c6571
diff --git a/dev-python/statsd/metadata.xml b/dev-python/statsd/metadata.xml
new file mode 100644
index 000000000000..5adf733e059e
--- /dev/null
+++ b/dev-python/statsd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">statsd</remote-id>
+    <maintainer status="unknown">
+      <email>james@mozilla.com</email>
+      <name>James Socol</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
new file mode 100644
index 000000000000..2f7ea238bcf3
--- /dev/null
+++ b/dev-python/statsd/statsd-3.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple statsd client"
+HOMEPAGE="https://github.com/jsocol/pystatsd http://pypi.python.org/pypi/statsd"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
index 31b0dff5e7a2..e3ee9fb6e7fe 100644
--- a/dev-python/tablib/Manifest
+++ b/dev-python/tablib/Manifest
@@ -1,3 +1,4 @@
 DIST tablib-0.10.0.tar.gz 724961 SHA256 41c2dad7f491f5557e22783a9af81bed62f7b6fb0d7afd4c2ee301f3eb428c93 SHA512 1582e574297386d20908aee00eeef415258fbcfe5387e6bbcb3a0e497662e7f107c35596624ca31b2b6ad49045a7a388ddb6f64171b9eb2a1b386324a7b29b47 WHIRLPOOL 39b3d792858a9ce08e6f0276a070575c2c3546e3377b15d98b130a288ecdc3c91ea671fa43790928aa4ee641616ee6fc1b3a7c008c0c40d243b2338e1892b0b8
 DIST tablib-0.11.1.tar.gz 758097 SHA256 f3727503553320dab268ccb604507c0a2ad1a5dae023362908984d0ec1fcca1a SHA512 77e3fead0f492f2f2fbc47e329333be00d08d807f8c1283f2897f446510f09325986e2dbd992fd8bd3bf898c0037f191ac7f976ce0d47cbb0a6cb0dfc64e52bc WHIRLPOOL bfde2977a998e07e0fdc2b366f0a0de97b93db041449b61c38eeffaa634b2ee5b52bccd5bbeab5d6fadf5b6ed112faf8a0f0ebb659ba70f23b278b60ae668967
+DIST tablib-0.11.2.tar.gz 758287 SHA256 553dd5b58e8e6e039aaa61587ec2fab38c05f0e25f58ac65b81a7851db62a497 SHA512 356bf308df7c3d7d20800814a945c83fc64e98fb859d180cf5d9455ec2634e0a20f0c6ed788a75117c7c3d7bd4cda319c2049ce760109d102b2cb9a0707fa4f2 WHIRLPOOL 1c213cc5d86bd8219c1b54422518569475dc40250f9ac0ca732c3b5886aad38db3b8fbc5f082ca1012b2a3c3612d847f0098370ac0e388b67ad7867e3afd9d46
 DIST tablib-0.9.11.tar.gz 571410 SHA256 05d7a1bcf5e723f1051b87bc4a699fce6f5a3fa158d91308c478ec7cd74290fd SHA512 bdc11b8d54c5d9edb7ac980859cdbb932162b1db5161c582a141b2a6a5b8f0742f3d55f248d3e4e5b4173727a5916af385b607ce807f7d2e4402b7ef62c5bad0 WHIRLPOOL 61a5bf5e26d9b2999857597dd4574f76b3fdc0762f86588e539bd6a70109ea464a7ff0f07145592e3ddcf1712df13fd6defbc9fb9a9c5a1ae558c870df0da82a
diff --git a/dev-python/tablib/tablib-0.11.2.ebuild b/dev-python/tablib/tablib-0.11.2.ebuild
new file mode 100644
index 000000000000..75a57fb1a1bc
--- /dev/null
+++ b/dev-python/tablib/tablib-0.11.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A format-agnostic tabular dataset library written in Python"
+HOMEPAGE="http://python-tablib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ujson[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v -v  || die
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 059e92ea4f58..12f5ebae3bc4 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -5,3 +5,4 @@ DIST testfixtures-4.3.3.tar.gz 86546 SHA256 ffe66d08ef2fdc0be5e6abe1e1d51384ae94
 DIST testfixtures-4.4.0.tar.gz 87356 SHA256 41096fe91c2939177f1729783bbfaef9e777ba44e7d8ff819ab1318d78beeba7 SHA512 0fdb87e1fd8311cbab274f4db71ec76767cc9e2f771eefb1a110bf42b07e30fc9edbe2db124742b3102b8f114af2666b0b8726f6330871fd72c7ea2f535d5fed WHIRLPOOL 8b5bb18b682f420ae4b66aa1da9ca0f312bff1974400b586cb2bcae635037e629352b37cfa2d1f8c7f91fd880e726c34d7f3aa532b2e04188f5f99ac7a69e2c1
 DIST testfixtures-4.6.0.tar.gz 87322 SHA256 f58ffea34cf0972a3fddcd1873d594d02289587f0ea1d3c1327749f9258cf013 SHA512 cd1e35c907d2f264976161f72c335cc136bec41dd56ee773920eae52a8553fbd7367c9218ba30acccd0a98c067a5aaf675655924f94da60cc190c608714b6bc2 WHIRLPOOL 64cb69d26217cf3748e87fc99029d586b20ee2ce13a8af98454cd33bd4121c021726cb7579b82dfead0b2a281e85fc3906a18ebd2c6a5b6c35c6b1eed49aaa1b
 DIST testfixtures-4.7.0.tar.gz 87453 SHA256 214f986a1f590eb67434dd110cc5046f2ec9d6fe0fc9b8a2e7e8203bfe745220 SHA512 7795ac4181018851f31360653e8f6766af2d96db1b453bd395fcdcb8d4ee02c3db644da7e6c83b170d0cca23f2c81f130b56dc086f3b2bb846ccb335cd18aa8e WHIRLPOOL d91def6902dbe297fd94dfc42d1d1b2dceedf851c67cbab771baeb5093bd95e0b03f41f22a68558a7dfde216f6e6d1afa347c7857327a15aa7d4722cae2add9d
+DIST testfixtures-4.9.1.tar.gz 90117 SHA256 e45eef63eb39e63f689ec9d25f03b9bcc201b15e6411f3b73cfe4d0611ad5e1d SHA512 20053d22297b7852382a4f2bf6d76bde6489f788a9073aaae407f68bb6b3d7bdc4a045868cf7c99fd294936768745ee7d652c86a4a96c33fb0e95fa0d96d2a59 WHIRLPOOL 2cabb01d1d11fcf54aac3ba05ed5432bbe0eeb416699b8b4db108a94ce87b1cebe5c5594c350f5e39b1cb4f036dd9577620235b2ddc757ea31c956d3b97f43d3
diff --git a/dev-python/testfixtures/testfixtures-4.9.1.ebuild b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
new file mode 100644
index 000000000000..45d8f0a3ac45
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.python.org/pypi/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7 pypy )
+	)
+	test? (
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/nose_fixes[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+python_prepare_all() {
+	# Makefile comes set pointing at a wrong location
+	sed \
+		-e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' \
+		-i docs/Makefile || die
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tinydb/Manifest b/dev-python/tinydb/Manifest
index 69c520b0baa0..57b553c12952 100644
--- a/dev-python/tinydb/Manifest
+++ b/dev-python/tinydb/Manifest
@@ -1 +1,2 @@
 DIST tinydb-3.1.2.zip 33703 SHA256 6d9df6c30fc37dad487c23bfadfa6161de422a7f2b16b55d779df88559fc9095 SHA512 5878c783ebcc413e08cf106e356258853b2a0d593e1ef6f5a35bdd1e85e7cb092289b745d9fab7aa2d95d66f131409193bdcd19b93506079610d55f1d288070d WHIRLPOOL 976804530eb5188a43f756f697e9d78f019d8b1ebe99e79c2172c4a5c9675f47e415c5feefa994e7134f3ddc3c3b59cafdf0dc548299dbe4095b852a1a0f270a
+DIST tinydb-3.1.3.zip 33969 SHA256 c46d46e5e4e632df47c75d8bf402f3d8e08a468e782b5475398dc6ac6448e16d SHA512 451f942f1fa38bf159cabc5b0738cb818921bf47a2159211a4048eee91a23dd734bcf3883e62d7b4ff85fa68def78edadf05d845a0ad0f3936d281e91de65ee6 WHIRLPOOL 0adf66a74359d5c99d263c9b6f2418539dc762eeed28993935e9c99a04058dbfdf5c85c73c8643d9b366982b438066fbb2c405723dc01673d103197a3e386817
diff --git a/dev-python/tinydb/tinydb-3.1.3.ebuild b/dev-python/tinydb/tinydb-3.1.3.ebuild
new file mode 100644
index 000000000000..0520012dcb41
--- /dev/null
+++ b/dev-python/tinydb/tinydb-3.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tiny, document oriented database optimized for your happiness :)"
+HOMEPAGE="https://github.com/msiemens/tinydb http://pypi.python.org/pypi/tinydb"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed \
+		-e "s:find_packages():find_packages(exclude=['tests']):g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
index 0fcecf64b9ef..a536272a8cd0 100644
--- a/dev-python/twitter/Manifest
+++ b/dev-python/twitter/Manifest
@@ -1,4 +1 @@
-DIST twitter-1.14.3.tar.gz 39538 SHA256 497fce2168cb57d5651932a39b70fc0c9304bebd53558107995102bca49210da SHA512 821af749b34d01319630388cb287af88f1e516d8d6117088e63d988cf2a397a70c2770df2e1f208bcfa9a18224aae98e7c2a6bb62b4fc8653e2bceed7f39a92c WHIRLPOOL 6ec6fa7a124aeceedc5a58a89f7ff5a6fed6d6f09993dbb3e581b7ef55810440390b8d8b22e4139aa7a770f203c065c2a75a149ff7d025491c7e11b3be97a00f
-DIST twitter-1.15.0.tar.gz 41074 SHA256 4c7079231c0826f3a4e8e28f9384ff928813ed2527a059c86074a695e309cbd4 SHA512 a0e97a9123afb19c3a57d2cfe0383aa87a8d1bd681a99895414bc304279bb3d638ddb14c9d01906f3ae78562a5447f027cad4e68175d1d3cdb6f408bcccef213 WHIRLPOOL 0a2aa6c7cd7cbc4e9e90eb5cb0edd5634df8dc5b4d721d8e3311b7113b6ae2347a2b7e3e7dadba003dfe42e03b7462d49f9e31909744cb3c206aa4169ffdb3c9
-DIST twitter-1.16.0.tar.gz 42597 SHA256 92a4c13570806cf3ae2aab10ff97000c1aa7fcc0ed5740ca1df01346642e3ec3 SHA512 090b8fc4a535d2b9be290e84a46b3d478e876fb4c9423266f385f33c5e325e1b9cbf8af039ac5066e7fca4f431abf2c64046af9ebd7a5884b5b2775292437246 WHIRLPOOL 4f2249a31f560e2e07d77a11366df68d1fa3f79cfa8e2fb2ec338a4278834ece111056089edaa4a58292678f243b4ef2fbb38acb59c2a83f5ce46776360f287f
 DIST twitter-1.17.0.tar.gz 42869 SHA256 85396c4c33b9b213f3d2d805caaf6b386b9e277af9117eb51e5a782f77257376 SHA512 26acaa2d608c09d749d95d27fb51f76df4bd4358d0f49ea5afe8ca0db0d06873d265d67c23858e26d8ce513041adaa0445221b09b0353c3508328e8715d1280c WHIRLPOOL 8196ad84473d24c3c55d342deae7c2dd7c0438be03749159a0488250d9fea2e99b54a1e13c3661cd8fc17c7484308b269611ec2b6dfe4262820173bb549c8408
diff --git a/dev-python/twitter/twitter-1.14.3.ebuild b/dev-python/twitter/twitter-1.14.3.ebuild
deleted file mode 100644
index 9f347f24db4b..000000000000
--- a/dev-python/twitter/twitter-1.14.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$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/twitter/twitter-1.15.0.ebuild b/dev-python/twitter/twitter-1.15.0.ebuild
deleted file mode 100644
index 4a0c8ba5ebdf..000000000000
--- a/dev-python/twitter/twitter-1.15.0.ebuild
+++ /dev/null
@@ -1,20 +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} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/twitter/twitter-1.16.0.ebuild b/dev-python/twitter/twitter-1.16.0.ebuild
deleted file mode 100644
index 9f347f24db4b..000000000000
--- a/dev-python/twitter/twitter-1.16.0.ebuild
+++ /dev/null
@@ -1,20 +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
-
-DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/twitter/twitter-1.17.0.ebuild b/dev-python/twitter/twitter-1.17.0.ebuild
index 9f347f24db4b..cb64f7852826 100644
--- a/dev-python/twitter/twitter-1.17.0.ebuild
+++ b/dev-python/twitter/twitter-1.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 51d033aa1bb4..bad9fdca4b21 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,2 +1 @@
-DIST vcstools-0.1.37.tar.gz 54213 SHA256 8d66379c5e5772a42b9680c9120a718bdc904745be22096d1f2bd5934cd625fc SHA512 c2992fd9977dd5cb0090319b828add26f60769bb7649d873e8edcac45c23a913667cde31f7ab658d5ce7de82930a5eb0ea9083994ea93b6ee9433966e70ee7b2 WHIRLPOOL aea89a863217ad09e2d183aa04f5c5173f6e7330ff2bfa1e713ab910f3ad0017e95fbf69c1cd94c10e20b7baa5974ad40fe9efda546860ef2a35f100808eb09e
 DIST vcstools-0.1.38.tar.gz 54671 SHA256 0e3d2b5681c2776453fb5b61ceab61fdb965d5342e46c08a5b62095eb0237117 SHA512 a3693d34777235e562a5db006af8f33590df99ffce96f5d3cfd2d816ebdc23ee5fb3536bf289b64a36588e60ce20ce8396a448394f300a12672fd8bf5800973e WHIRLPOOL 86fccbb181849f2b60d8159073bb3de659b7d96173952cb9b68a2869048827c48860fb67859db1341a0defeee0915d41c1d6e77e812f807ca11e91e92e0ed250
diff --git a/dev-python/vcstools/vcstools-0.1.37.ebuild b/dev-python/vcstools/vcstools-0.1.37.ebuild
deleted file mode 100644
index d7a8169479ef..000000000000
--- a/dev-python/vcstools/vcstools-0.1.37.ebuild
+++ /dev/null
@@ -1,59 +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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		http://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	#git config --global user.email "you@example.com"
-	#git config --global user.name "Your Name"
-
-	nosetests --with-coverage --cover-package vcstools || die
-}
diff --git a/dev-python/vcstools/vcstools-0.1.38.ebuild b/dev-python/vcstools/vcstools-0.1.38.ebuild
index d7a8169479ef..29cfdfaf9691 100644
--- a/dev-python/vcstools/vcstools-0.1.38.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.38.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/vcstools/vcstools-9999.ebuild b/dev-python/vcstools/vcstools-9999.ebuild
index d7a8169479ef..29cfdfaf9691 100644
--- a/dev-python/vcstools/vcstools-9999.ebuild
+++ b/dev-python/vcstools/vcstools-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
new file mode 100644
index 000000000000..711f00180d43
--- /dev/null
+++ b/dev-python/vdirsyncer/Manifest
@@ -0,0 +1 @@
+DIST vdirsyncer-0.7.5.tar.gz 86669 SHA256 3f51c1fabac7f231327deb098998185cbd77564dc1bfc29f4bc8d89226c96a37 SHA512 4df4469c8bd6f29e7250ee10407e34e2badd1b6c6260f4f71dbc090ca55837207d22edbbc83b6d7a5e332fc64dba49a9b94002bb607e39ba8cb7dbba8a5b0a28 WHIRLPOOL 9d95dd2e18c347ec02cc8019226e0fb6c3726b04845bf2da3aafbb738b72628c8359f51d5095312b8bfd990a6e208260eef90ac55decac2798eca0ddae6fb91f
diff --git a/dev-python/vdirsyncer/metadata.xml b/dev-python/vdirsyncer/metadata.xml
new file mode 100644
index 000000000000..9733c2c2dc5d
--- /dev/null
+++ b/dev-python/vdirsyncer/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.7.5.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.7.5.ebuild
new file mode 100644
index 000000000000..9a69fa9bc3ef
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.7.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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="Synchronize calendars and contacts"
+HOMEPAGE="https://github.com/untitaker/vdirsyncer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
+	dev-python/click-log[${PYTHON_USEDEP}]
+	dev-python/click-threading[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	=dev-python/lxml-3.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
diff --git a/dev-python/vertex/vertex-0.3.1-r1.ebuild b/dev-python/vertex/vertex-0.3.1-r1.ebuild
index c790604505c3..6fa2fd97364f 100644
--- a/dev-python/vertex/vertex-0.3.1-r1.ebuild
+++ b/dev-python/vertex/vertex-0.3.1-r1.ebuild
@@ -12,15 +12,16 @@ HOMEPAGE="http://divmod.org/trac/wiki/DivmodVertex https://pypi.python.org/pypi/
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
+IUSE="libressl test"
 
-DEPEND="
+RDEPEND="
 	!libressl? ( dev-libs/openssl:0 )
 	libressl? ( dev-libs/libressl )
 	>=dev-python/epsilon-0.6.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13-r1[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pretend )"
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/wcsaxes/Manifest b/dev-python/wcsaxes/Manifest
index df3441cbc88b..2ba5a5830302 100644
--- a/dev-python/wcsaxes/Manifest
+++ b/dev-python/wcsaxes/Manifest
@@ -1 +1,2 @@
 DIST wcsaxes-0.3.tar.gz 773984 SHA256 012861678afa3c05700c4dd94a73bbd0534dae7ef8d9dc215fb01d6e5a60477f SHA512 597494609e2add782dcf84a6163b7093d1a467ffb6321d6d25064f9f87dcb0f7e5e076818b0707b9f10d0894a26ce240cda9598f035364832efe57d6ec51d76a WHIRLPOOL 1d05ce40460a2477c43107f33a68de08cdeb66ee395d3311ee74c9e7d354b675584f3e5d79ea91303a1808ab767df6f54bb5c65993009edfa67b416057c459fe
+DIST wcsaxes-0.6.tar.gz 617882 SHA256 ab8101ff742ebba79da3ff7bf777f24fcf8275886dbb5482f0a2eb3ab6756ee4 SHA512 6254fabc31b7c2e44dd86b0330592e01a688e36957e9d96348f7b4d305242e02e27d2363fd7ada37ad6dba292c66bbace9ea675f475388ed5545ac24cad1226c WHIRLPOOL e2f1d7b230fb7ba3982915638535258377fd450d47f3f191ba0a12aa1698050213353e315de2329e3f8ad359a76bfccdc4291e49eb6b0a4947d0f41305977100
diff --git a/dev-python/wcsaxes/files/wcsaxes-0.6-disable_mpltest.patch b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_mpltest.patch
new file mode 100644
index 000000000000..b62e15a44569
--- /dev/null
+++ b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_mpltest.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Remove the tests that require pytest-mpl
+ Pytest_mpl is (still) not available in Debian.
+ https://github.com/astrofrog/pytest-mpl
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -11,7 +11,6 @@
+ minversion = 2.2
+ norecursedirs = build docs/_build
+ doctest_plus = enabled
+-addopts = --mpl --mpl-baseline-path=wcsaxes/tests/baseline_images
+ 
+ [ah_bootstrap]
+ auto_use = False
diff --git a/dev-python/wcsaxes/files/wcsaxes-0.6-disable_numpy_warnings_test.patch b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_numpy_warnings_test.patch
new file mode 100644
index 000000000000..ff6567c48f94
--- /dev/null
+++ b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_numpy_warnings_test.patch
@@ -0,0 +1,16 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Disable test_no_numpy_warnings
+ This test may fails when numpy decides that it wants to put some important
+ message as a warning; even if nothing goes wrong. This happens f.e. for
+ numpy-1.11.0~b2.
+--- a/wcsaxes/tests/test_misc.py
++++ b/wcsaxes/tests/test_misc.py
+@@ -51,6 +51,8 @@
+ COORDSYS= 'icrs    '
+ """, sep='\n')
+ 
++# see https://github.com/astrofrog/wcsaxes/issues/187
++@pytest.mark.xfail
+ def test_no_numpy_warnings():
+ 
+     # Make sure that no warnings are raised if some pixels are outside WCS
diff --git a/dev-python/wcsaxes/wcsaxes-0.6.ebuild b/dev-python/wcsaxes/wcsaxes-0.6.ebuild
new file mode 100644
index 000000000000..67bda681b879
--- /dev/null
+++ b/dev-python/wcsaxes/wcsaxes-0.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Framework for plotting astronomical and geospatial data"
+HOMEPAGE="http://wcsaxes.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6-disable_mpltest.patch"
+	"${FILESDIR}/${PN}-0.6-disable_numpy_warnings_test.patch"
+)
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -w
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 39136c71aff2..0494546455d2 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -4,4 +4,5 @@ DIST Werkzeug-0.10.tar.gz 1133931 SHA256 9a97a6fcf87390172748da9e5250710b352dff1
 DIST Werkzeug-0.11.1.tar.gz 1151713 SHA256 280b37866a1fa8604549cbc278f06d310143e20f1a6520ae5cf66e0df615e0a7 SHA512 d6cc65b8c3afe66f45acf3c9897679684c3525fcb27bbad54e7920fef15d88081d264f41f35f7a4d498e7f0664259f664a06ddfe794f8837585642a68d650c45 WHIRLPOOL 075923ea3f44356dc72b6272bc94d8a023c372123f19b59c9e3f2bf9852cdcf57d6ab54fc00b4d1eb87700852225e9f24877d550ab4c3813204cd07a9eef4590
 DIST Werkzeug-0.11.2.tar.gz 1152067 SHA256 eb4f98994b40a8e2edce289e811c9a38880ae53eb9ff6f031d0e243a69b0fcbf SHA512 aa83da47763a4c5b9b68c10e84ad195d8ae50b419faf25928d135cd0eebf7a57c4a7e178002a2f7a849005e0df8491398e12cd00098ccfb227ae2b75129e4966 WHIRLPOOL 612df2c211627712ed1853b89f17e943daf6156658fd7fd224133c8bc3d23808f77497a1bb5b711f9d7d446de8d2f6b8f0be1df0f9eb2e8f777d23a3bbed83dd
 DIST Werkzeug-0.11.3.tar.gz 1152396 SHA256 eb5f700a9bfc96420b055635af9002d3662e43d80c3ffd31f224c25bc0d5f462 SHA512 43fddfbf16e8771b21510749b95a55a03867009393e9b56802f894a74a1a8a51e0731e19c9b3c2c358cbb5e51e0c88ff6457bf672f934a62f8f114d3c7b6c357 WHIRLPOOL cc5a7b3985df5dc0f611ededce7b19667ab3ff4a20b08b6232cabe859633096c886ea654b9528d5660fa8c34001ac4148f96c53213a1e7a6a6d677a5361a0b57
+DIST Werkzeug-0.11.4.tar.gz 1152770 SHA256 e48fb7e3f2bb5a740dd9a666624699a4d83e2e028555f9c46bcc8ecfc2cd8c32 SHA512 c9851e38576251432c054b12e64097c3c81925d8bb413d209f33d44283779456974d3af43d9f7e15b227e2f7e18539496aef33eb9d533ebcf8398a9ac35aba2c WHIRLPOOL c763260397bac54429bfcb40fce27f7b2e5bcdd9a69866937aaeafb55b0eb488a8fde8cb962e66a5e449b8565ac7f77a091118493b5f3444576b846c611167d9
 DIST Werkzeug-0.9.6.tar.gz 1128428 SHA256 7f11e7e2e73eb22677cac1b11113eb6106f66cedef13d140e83cf6563c90b79c SHA512 0b36df25d5f69a0353f7a9321b9197ace2926b6d8e983a91ef372c270ff51462f7d86184447a5f74b4ad05ffdc6411098f77b45a4f1c906dd525d7edf220399c WHIRLPOOL db153036e9dc36c70239001a6b451adeaafa3819f4903bb8c297bb4313c9a064926a2aad6e4457810b53796b3e492228a9ee1ec165fe5dce0522ab0d2c7407f9
diff --git a/dev-python/werkzeug/werkzeug-0.11.4.ebuild b/dev-python/werkzeug/werkzeug-0.11.4.ebuild
new file mode 100644
index 000000000000..de3c1448c076
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.11.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index f842eddb744e..0c7752174988 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,2 +1,3 @@
 DIST Whoosh-2.6.0.zip 1193541 SHA256 7de7bc4d00a6d051dbb360b48eb7f3cd002373d87252fb0b284a3c9c453a7677 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37 WHIRLPOOL c42e9760833db7186f3df5946f6dd071288cfccf2eaefba95520a2415ca377c49cf74307b3fa2c9e655f134b086ae637e5db06330248b4a27e12175920f3c7b8
 DIST Whoosh-2.7.0.zip 1080985 SHA256 733df1ad4142fcd1e8f3259070de0521d272d7685e2febc0f4fdd1668cfe0d48 SHA512 5126a9ed5ef50af391905347c7aa1c1cc7d100213c29f5a5f67fcfabab9cdcfcd14a6b75735df8e343f61254d1fec8610f0e1260167a321ab303a0a55b02673f WHIRLPOOL 6a35448280e3c6382b8a4b50432d5def3a910d9af95d35afc11544030b69f0103aae910bbf91cb5942ec80f10a848bbd32dbd828c71482f5e2fc15a9cd29c249
+DIST Whoosh-2.7.2.zip 1096847 SHA256 0f72a49e02e2669a50f1ecaf0364fe0451619473c404efeca9914dd878de73f2 SHA512 3a5e41328e9bce102b9e68d648f6a0e61fa7e6be1585fd70a5885afb885717d0a4e73ef1b6d2086edec996228bbfbd6d7e01eaa64e831223ef1ea7b764d25d7f WHIRLPOOL eaaa85fd62e03bb63ac8cc48c9e29b2c9daf435e848aec7b7747e6fd390245bda044c5e9bafbf9e5f7df22b93e4cfacdc180cc821e3bd4739c229f6aaf9b58e0
diff --git a/dev-python/whoosh/whoosh-2.7.2.ebuild b/dev-python/whoosh/whoosh-2.7.2.ebuild
new file mode 100644
index 000000000000..5472430e5f5d
--- /dev/null
+++ b/dev-python/whoosh/whoosh-2.7.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=( python{2_7,3_3,3_4,3_5} pypy )
+
+MY_PN="Whoosh"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
+HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.python.org/pypi/Whoosh/"
+SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.zip"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# (backport from upstream)
+	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
+
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://bitbucket.org/mchaput/whoosh/issue/403/
+	use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/build/html
+}
+
+python_test() {
+	# https://bitbucket.org/mchaput/whoosh/issue/412/tarball-of-whoosh-270-pypi-missing-english
+	# tarball missing a file english-words.10.gz which when added sees all tests pass.
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( README.txt )
+	use doc && local HTML_DOCS=( docs/source/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 59023fca98aa..d8c0e0aacc36 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,13 +1,3 @@
-DIST XlsxWriter-0.7.3.tar.gz 231999 SHA256 2fa0f2d633bfbbc55a48abd4089820c744ed7a40e11c5c1580196a2c129eb8c6 SHA512 b85ef49fb6d5c6a6454292a7cdbc3fdff9674578f2e535aab7b08f671180f59934616fd78e89e007e8a662539dbbd9b0b9571b02df049a0e5f70f706d9acde35 WHIRLPOOL 7124119bd0151c76689b08fd4da74b5e5876f1047cbd63c960ff7728ed70bcc82ebcf1c44f4c08a4fe5ddcb9aca6441a5c428eab5f793028e3ef65ba3494ec85
-DIST XlsxWriter-0.7.4.tar.gz 232329 SHA256 e3192763b377a588fc06113836cf74a565926168929e55ba451baa684e857b62 SHA512 03da4b7f4b93250c7e22a100f78058f22f57b0746054d88a6cf3b2ef8026be8875344e08c15c3dac3fad19aac5c216199ae0910758856eded0957ea345727a1e WHIRLPOOL d6b1c36e7eabdc4f4554ce809c8295d2bb89bbccad85edb8b9c592c693dc5f68ba83be4d0a2ab79e15a02b5c298025fec36b342e350c24aa4332856582dbe433
-DIST XlsxWriter-0.7.6.tar.gz 232509 SHA256 8d32569e49c7a7e53ca26fc34e11897c80ebc94b86c4b9cc3f467d8d99cf5c64 SHA512 c40f11fc84cbbc2949d21f5d8c3eac0b826af76f6df39fbcfc5678269416fa90df8f16c8fa39de31e0ab82a0966903b72cf9ba255441cc13702963c7ac4a0bf6 WHIRLPOOL d751777eaf90737a2c1575b299c8ff186a6bced9dbc059428120c84c097ec91672b53aff6d5c313c07f9a7bd83ea48d4d67f4a1a1118f8c31f8138a3c5bf486e
-DIST XlsxWriter-0.7.7.tar.gz 232623 SHA256 33a6fac3b148ab6137a7e2c0869e33493aff5ccde66e434c1ccf49e8687b9606 SHA512 1779163469bb2ecb9ee75288f840f47dfca4d9f81f283411b8db00abceab855af2d06655b23d9aed378af5073a68fabef5df7e934f5166b2d7479b151a602a30 WHIRLPOOL 0b2f5cc118671b58c5743371107ab59107bcb13f49a1ab9de9397d0a4ecee91b7c7f9039d3a029588809d25e8607f779eee8a9a1734f030a7f02e6e77b195f2c
 DIST XlsxWriter-0.7.8.tar.gz 233091 SHA256 2200c2a69f63b350b3b1f5db8fae3e5b7135c01b7ac9c3b1d5926cf6583dd4cd SHA512 2343155c765533bbc146e928dfc82924f089c7abee2f3607be2e5f9b1da9166090164f134256cbd36f319a97c9aa651fb346cc7502a3f1721f9687a9cddb9364 WHIRLPOOL ba498cfe5929f8d302b2f81ca0291c465759ed070d030e650d4a973706562a397fda51632b31cdac8caba134d8199f3499c7505b9990a9fa02b908b5ac971bdc
-DIST XlsxWriter-0.7.9.tar.gz 234392 SHA256 c77c6300925ad6f79f6ff009db9ad1fbdd71241f2ae53444234a8693e8af3ada SHA512 ff9dde290f39272a678e9a1d00fdbc10ed72f6b5d012c9eb25505fd9f6ca7cacec24ad2144551b6765dd0f75e3a071c71c03facf70a500f2586aa183836c7325 WHIRLPOOL 095816937c43e0ab4f7a5f91bd9dc2da2ee17b34724b42a765912cdad54f45fda19f260d70e6475b85f1e0ff3a9b304b84f31d635fc9e11ee4a7da27dbb1a1ca
-DIST XlsxWriter-0.7.9.tar.xz 960772 SHA256 ebd97d1781f03aaea32adc308266a64cf1979f3374f2fc8047fcc5458763c01c SHA512 20e54546adc313d8177475d3fbde86a307883684e9a339e13bf1f5b866763974a6c11212337246e161739fc854e153c5619a2438a12d224f0b0d5fc120869525 WHIRLPOOL c9ac1ebfa7e6231c1333f28672158e4fe69388c6c939d5f4ee1b38bef09a876468031a0e68d8ab8182ac51459e5f31f56cf23bd989451055fc6403c99f130e0d
-DIST XlsxWriter-0.8.0.tar.gz 234488 SHA256 6ad16fcea6602404da4ced2d029431407735d08d20a16c9c5c7ff451d2a475db SHA512 fe4cdea26eb78bc9c1c767ea9140a399f99129368b6d936ea73efbf7f4c357283abfbce5424644c3fc0fec0687bef1615cc031722fce55c8bed75cc1eb8dffda WHIRLPOOL 3f08b9447986382d3384ff54324cf14953953ab426afbe6854892d91cc3cf547a3465bcf5c394543931506ee3ce94b66ba7186b0c7edb5b21ec34e9870b069dc
-DIST XlsxWriter-0.8.0.tar.xz 960724 SHA256 e16face6afa2e94bc6195d98dc2b82674f787f3855a70e79e2cc75a2a79b8c3c SHA512 dc7d24d1ec278b1480ae15f8802d4edf7423741682f32381006dc925cf82f48a64b7168366f191b2bd8dd47bf35b9b6f39dc1d85b07858435c24d3ff57486ea9 WHIRLPOOL e2cc9c384ae1db8c0cfdf0618d8e9e2f329d93fae8a38da55761e0b8cb8b603179f867a64fc9b110db8456f0063f2a7668126f786cc2d5a26b1972e090396893
-DIST XlsxWriter-0.8.2.tar.gz 234352 SHA256 7f736ca0e38cb5d0ebf5f84db28c8914c5fe017e035d162e4a3764dff1615800 SHA512 773235aaa335b8d2f1e07324fecef007360e2c430fd9b5091cd354d54f1541c16506bb132641c1092c433a9085f45077ce2f187f19e16a35c5e8606140502480 WHIRLPOOL bab917cea254ce0e4561026977b4ed804548ef6abfa3d017ef1a4a640b090f10fcde04e4e28c1ed8f59ea5064d555e7d3b06717ecf8253ad4375a1a776abaa37
 DIST XlsxWriter-0.8.4.tar.gz 234634 SHA256 9f0c421fba5849ebcf6a2d24e8eb54799fa48166fe53dbe6deb42669ed5c6643 SHA512 82b7a7e687431d09b31430e6eddb3c55f7d6bd1a631c2bc0741843d6a6d1fe59b219face9a9f7123d59aaf83643d5c00d13408eb45e5e5b810716d7440e33855 WHIRLPOOL 4ea00b8c016bd11294cc2898a171d0697cd306746fa58214ab6669f9e1f857102b14a26a65d58d89c4eed6a505b440c661f1971f3c0e74ff5d7201e93ebbb920
 DIST xlsxwriter-0.8.4-tests.zip 27275933 SHA256 a78ff7620e725412668489eea2987ac5e491fada4354ac6e0124fb296f0a1d5f SHA512 fe0c00e251b5a07e132c6bd2ddb19c95eb0782f00e35085895361500213695313370baacfa83317af814d5ab740ac8a6489fd96d5e9a3184bb2ea710683d2028 WHIRLPOOL 29f1e873fe72e29e99dd4b3ab3355baa3129fbf11bbe21a8e69202935c7c7e6ba5384e8d5c743127cc4d5585246c55c2341439ff722b5ee7b5a85ffc66c51d40
-DIST xlsxwriter-tests.zip 27278339 SHA256 caa70c0384e07577ec1ca16d58432dabe7fdab00d5da260faae52c0088b77bae SHA512 b6daf08aa10b50c77797556a17cc5a4b90ebc3372428cfba996b789841b40278ac87d45a2f60988833cbbb355d350d4b59614b5031f443f1aeea66069888c84f WHIRLPOOL dd4debd7127e4e69bee9bfbb60012fe2e2091aa1325c6d4e90ae64d4abbfb49717b87be558fd7a946ac16b3b1b25e355b6b5a73488b7877560d3cfe1f7d6f1fe
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.3.ebuild
deleted file mode 100644
index 214958d30cf8..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.3.ebuild
+++ /dev/null
@@ -1,33 +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} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.4.ebuild
deleted file mode 100644
index 7bd2f5bd545b..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.4.ebuild
+++ /dev/null
@@ -1,33 +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} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.6.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.6.ebuild
deleted file mode 100644
index 6966a9dbf8d1..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.6.ebuild
+++ /dev/null
@@ -1,33 +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,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.7.ebuild
deleted file mode 100644
index 6966a9dbf8d1..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.7.ebuild
+++ /dev/null
@@ -1,33 +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,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
index dae676dd49a6..7156da8b7c15 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.9.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.9.ebuild
deleted file mode 100644
index 553c0073c50d..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	test? ( https://dev.gentoo.org/~jlec/distfiles/${MY_P}.tar.xz )
-	"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.8.0.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.8.0.ebuild
deleted file mode 100644
index 553c0073c50d..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	test? ( https://dev.gentoo.org/~jlec/distfiles/${MY_P}.tar.xz )
-	"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.8.2.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.8.2.ebuild
deleted file mode 100644
index 26bd6ea7ac15..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.8.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-# PLEASE UPDATE
-# for up2date tests. Upstream says they are to large to be shipped to pypi
-# https://github.com/jmcnamara/XlsxWriter/issues/327
-# https://github.com/jmcnamara/XlsxWriter/issues/229
-RELEASE=e537eda35bd8855ea07f92b397b5301f6796a063
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	test? ( https://github.com/jmcnamara/XlsxWriter/archive/${RELEASE}.zip -> ${PN}-tests.zip )
-	"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	if use test; then
-		cp -r "${WORKDIR}"/${MY_PN}-${RELEASE}/${PN}/test ${PN}/ || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
new file mode 100644
index 000000000000..2bb395ac4259
--- /dev/null
+++ b/dev-python/zeroconf/Manifest
@@ -0,0 +1 @@
+DIST zeroconf-0.17.4.tar.gz 18158 SHA256 8d91c5589693b1abbf173561b308c5bc0abf3d06fd6e40de8cd5ee9205afbe83 SHA512 1a01282d20e83a213156febaf2aa7f4b009f347062cc8c2d8bf503c1e8a1606a1dbffc18d93d1a183be568b7911f18abedbe6ca2d958fbc5b550fc67b92d2ce4 WHIRLPOOL e913104a7bbf69b66999d5766725ab9b2904eedda46be0b12c2557f25bbd3e705391690ae9d5dc9c1d370bc0ed533d8d3bb8d3f041218aec1721edf1e975e6f4
diff --git a/dev-python/zeroconf/metadata.xml b/dev-python/zeroconf/metadata.xml
new file mode 100644
index 000000000000..0f2976fa11b6
--- /dev/null
+++ b/dev-python/zeroconf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">zeroconf</remote-id>
+    <maintainer status="unknown">
+      <email>UNKNOWN</email>
+      <name>Paul Scott-Murphy, William McBrine, Jakub Stasiak</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/zeroconf/zeroconf-0.17.4.ebuild b/dev-python/zeroconf/zeroconf-0.17.4.ebuild
new file mode 100644
index 000000000000..37d1fbbc427b
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.17.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="https://github.com/jstasiak/python-zeroconf http://pypi.python.org/pypi/zeroconf"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# Not included
+RESTRICT="test"
+
+python_prepare_all() {
+	# It's virtual/python-enum34
+	sed \
+		-e "s:'enum-compat',::g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index b987a6f9e72d..0e7e9d9fe412 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,2 +1,3 @@
 DIST zope.event-4.0.3.tar.gz 390984 SHA256 f5fdf6ca5716f714023358b212f7f435539dea11771603cd90eebf3ad34405f1 SHA512 bc328bb588beea0cdf55d5f36ff5b269d7b75f399b6d595e1df6565bf1d1fbe2d65b63072db26d096a3fc2dfc0fcec747ea7cf8eabe3c4535084347cb149f1e7 WHIRLPOOL 58ce4490fa86c79b30edc3c96d8d9e912b5d692bffe9664a29d2a7963efb90bb6d03acbe0774eb03ac912acfe44cca1c126cc1a840538bd2abcb1848ec972b53
 DIST zope.event-4.1.0.tar.gz 476047 SHA256 dc7a59a2fd91730d3793131a5d261b29e93ec4e2a97f1bc487ce8defee2fe786 SHA512 abb0a2de578546f678eb06160b50e6c301de97d4248baed80cd76cbf666b22962052f82d8a58a3006e72d288866e5d5baec86425ab27a79926b4706ef8d5915e WHIRLPOOL 9f07da6353636371df83e6fbb6d197d14959338ace4565ba1429d8759a26c3894a27e3fdaacecf2760c709a1baecc2128cd4c5430284ac7453dc8898e79d1f68
+DIST zope.event-4.2.0.tar.gz 488532 SHA256 ce11004217863a4827ea1a67a31730bddab9073832bdb3b9be85869259118758 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989 WHIRLPOOL adcf773453096493ef6740480dd6b9b2f62a48670767896b25dd168fe6406f9b160a1ffd71baa93a29a085805ffffb2baf3158e955850199b90821a782fe39e0
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
new file mode 100644
index 000000000000..6880a605950c
--- /dev/null
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1
+MY_PN=zope.event
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-qt/qtgui/files/qtgui-5.5.1-crash.patch b/dev-qt/qtgui/files/qtgui-5.5.1-crash.patch
new file mode 100644
index 000000000000..a2b8e62ac15b
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.5.1-crash.patch
@@ -0,0 +1,34 @@
+From 79447068579ea93d616d840bb8cbbf8adb1ed6ec Mon Sep 17 00:00:00 2001
+From: Nicolas Capens <capn@google.com>
+Date: Tue, 10 Nov 2015 00:03:34 -0500
+Subject: Fix potential division by zero.
+
+In a Chrome Remote Desktop session the htotal and/or vtotal timings
+can be zero and lead to a SIGFPE exception.
+
+Task-number: QTBUG-49322
+Change-Id: Id530335cc760d1938ed888ad095427fcf32c651d
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+Reviewed-by: Nicolas Capens <nicolas.capens@gmail.com>
+Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+---
+ src/plugins/platforms/xcb/qxcbscreen.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
+index 2a53b18..0e99d58 100644
+--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
++++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
+@@ -558,7 +558,8 @@ void QXcbScreen::updateRefreshRate(xcb_randr_mode_t mode)
+         for (; modesIter.rem; xcb_randr_mode_info_next(&modesIter)) {
+             xcb_randr_mode_info_t *modeInfo = modesIter.data;
+             if (modeInfo->id == mode) {
+-                m_refreshRate = modeInfo->dot_clock / (modeInfo->htotal * modeInfo->vtotal);
++                const uint32_t dotCount = modeInfo->htotal * modeInfo->vtotal;
++                m_refreshRate = (dotCount != 0) ? modeInfo->dot_clock / dotCount : 0;
+                 m_mode = mode;
+                 break;
+             }
+-- 
+cgit v0.11.0
+
diff --git a/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild
new file mode 100644
index 000000000000..2bf7dd15963a
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+# TODO: directfb, linuxfb, kms integration in eglfs
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
+	ibus jpeg libinput +png tslib tuio +udev +xcb"
+REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/harfbuzz-0.9.40:=
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	evdev? ( sys-libs/mtdev )
+	gtkstyle? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		!!x11-libs/cairo[qt4]
+	)
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		x11-libs/libxkbcommon
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.4
+		x11-libs/libXrender
+		>=x11-libs/libxcb-1.10:=[xkb]
+		>=x11-libs/libxkbcommon-0.4.1[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crash.patch" # bug 574636
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl
+	eglfs
+	evdev
+	evdev:mtdev:
+	:fontconfig
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	gtkstyle:gtkstyle:
+	gtkstyle:gtk2:STYLE_GTK
+	!:no-gui:
+	:system-harfbuzz:HARFBUZZ
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon-evdev:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xinput2:
+	xcb::XKB
+)
+
+src_prepare() {
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
+	# avoid automagic dep on qtdbus
+	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
+		src/platformsupport/platformsupport.pro || die
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	# avoid automagic dep on qtnetwork
+	use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+		src/plugins/generic/generic.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		$(qt_use gtkstyle)
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use libinput xkbcommon-evdev)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon-x11 system)
+		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.5.1.ebuild b/dev-qt/qtgui/qtgui-5.5.1.ebuild
deleted file mode 100644
index c40699381bc2..000000000000
--- a/dev-qt/qtgui/qtgui-5.5.1.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=5
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-# TODO: directfb, linuxfb, kms integration in eglfs
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
-	ibus jpeg libinput +png tslib tuio +udev +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	media-libs/fontconfig
-	>=media-libs/freetype-2.5.5:2
-	>=media-libs/harfbuzz-0.9.40:=
-	>=sys-libs/zlib-1.2.5
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	evdev? ( sys-libs/mtdev )
-	gtkstyle? (
-		x11-libs/gtk+:2
-		x11-libs/pango
-		!!x11-libs/cairo[qt4]
-	)
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXrender
-		>=x11-libs/libxcb-1.10:=[xkb]
-		>=x11-libs/libxkbcommon-0.4.1[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl
-	eglfs
-	evdev
-	evdev:mtdev:
-	:fontconfig
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	gtkstyle:gtkstyle:
-	gtkstyle:gtk2:STYLE_GTK
-	!:no-gui:
-	:system-harfbuzz:HARFBUZZ
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon-evdev:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xinput2:
-	xcb::XKB
-)
-
-src_prepare() {
-	# egl_x11 is activated when both egl and xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-	# avoid automagic dep on qtdbus
-	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
-		src/platformsupport/platformsupport.pro || die
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	# avoid automagic dep on qtnetwork
-	use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
-		src/plugins/generic/generic.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		$(qt_use gtkstyle)
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use libinput xkbcommon-evdev)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon-x11 system)
-		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild
index ad43060b7470..dd36f2976129 100644
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
index ad43060b7470..dd36f2976129 100644
--- a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 96e69cfbc981..6ae18ef87063 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,4 +1,5 @@
 DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
+DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
 DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_capture/audio_capture-0.2.11.ebuild b/dev-ros/audio_capture/audio_capture-0.2.11.ebuild
new file mode 100644
index 000000000000..dd65eace76e5
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.2.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-plugins/gst-plugins-lame:0.10
+	media-libs/gst-plugins-good:0.10
+	media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index 96e69cfbc981..6ae18ef87063 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,4 +1,5 @@
 DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
+DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
 DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.2.11.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.11.ebuild
new file mode 100644
index 000000000000..e872a7e500db
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index 96e69cfbc981..6ae18ef87063 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,4 +1,5 @@
 DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
+DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
 DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_play/audio_play-0.2.11.ebuild b/dev-ros/audio_play/audio_play-0.2.11.ebuild
new file mode 100644
index 000000000000..d8c67040ec3b
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.2.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-plugins/gst-plugins-alsa:0.10
+	media-libs/gst-plugins-good:0.10
+	media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/collada_parser/collada_parser-1.11.9.ebuild b/dev-ros/collada_parser/collada_parser-1.11.9.ebuild
new file mode 100644
index 000000000000..4661ff2a6689
--- /dev/null
+++ b/dev-ros/collada_parser/collada_parser-1.11.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Collada robot description format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/urdf_parser_plugin
+	dev-ros/roscpp
+	dev-ros/class_loader
+	dev-libs/urdfdom_headers
+	dev-libs/collada-dom
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/collada_urdf/collada_urdf-1.11.9.ebuild b/dev-ros/collada_urdf/collada_urdf-1.11.9.ebuild
new file mode 100644
index 000000000000..76180ad14709
--- /dev/null
+++ b/dev-ros/collada_urdf/collada_urdf-1.11.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	dev-ros/collada_parser
+	dev-ros/resource_retriever
+	dev-ros/urdf
+	dev-ros/geometric_shapes
+	dev-ros/tf
+	media-libs/assimp
+	dev-libs/tinyxml
+	dev-libs/collada-dom
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/gencpp-0.5.3.ebuild b/dev-ros/gencpp/gencpp-0.5.3.ebuild
index dcac00dc41c0..bd58a6c856e6 100644
--- a/dev-ros/gencpp/gencpp-0.5.3.ebuild
+++ b/dev-ros/gencpp/gencpp-0.5.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/gencpp"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/gencpp/gencpp-9999.ebuild b/dev-ros/gencpp/gencpp-9999.ebuild
index dcac00dc41c0..bd58a6c856e6 100644
--- a/dev-ros/gencpp/gencpp-9999.ebuild
+++ b/dev-ros/gencpp/gencpp-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/gencpp"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/geneus/Manifest b/dev-ros/geneus/Manifest
index 2ca191b346b0..aa2e42e38799 100644
--- a/dev-ros/geneus/Manifest
+++ b/dev-ros/geneus/Manifest
@@ -1,2 +1 @@
-DIST geneus-2.2.4.tar.gz 13718 SHA256 879d9e328693a217698a8448d146961568fb1f79cee59146dc60cbacd63582f6 SHA512 8ccb23e2a3a1e47b605853edee49cc6d44cdbbf33839c56770ff5b61ca903064983d1580226f1d8f80cb3b62a1c84c210c5d6e25971b24666cc7d5271db7fce4 WHIRLPOOL cb2544c9bb7534ec7f6f76ef02a220d7f1a9e645488a6ce5e3f43b5d66097bd21379e2ce57e12ce4e3d7097b12a6e973ec8b3c62caafb8ccbeb6b4ee5818f956
 DIST geneus-2.2.5.tar.gz 14230 SHA256 fc18dcca7185623b7059936e938bd4a93e3c8fd6a5b7f0eb80cf88625e0df49b SHA512 d3fb85e5ef05a8a2815a5eb65772994f1da8aa6455a72a4b68126c6ae0467cb0c79026e3a47983db873d696121a7e1996be2a3028cdc24e55f44baccce2e3f76 WHIRLPOOL 6730786ce548dca6dbc835ec1d611a357fbe027227f693d9dc0b3f705cb7c9464866da4d19ad0336f0432e9b1df0693fd2ab28725356ff73f17d44ce6b4a1a97
diff --git a/dev-ros/geneus/geneus-2.2.4.ebuild b/dev-ros/geneus/geneus-2.2.4.ebuild
deleted file mode 100644
index 078897734087..000000000000
--- a/dev-ros/geneus/geneus-2.2.4.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
-
-ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="EusLisp ROS message and service generators"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geneus/geneus-2.2.5.ebuild b/dev-ros/geneus/geneus-2.2.5.ebuild
index 078897734087..70cb625f3345 100644
--- a/dev-ros/geneus/geneus-2.2.5.ebuild
+++ b/dev-ros/geneus/geneus-2.2.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/geneus/geneus-9999.ebuild b/dev-ros/geneus/geneus-9999.ebuild
index 078897734087..70cb625f3345 100644
--- a/dev-ros/geneus/geneus-9999.ebuild
+++ b/dev-ros/geneus/geneus-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/genlisp/genlisp-0.4.15.ebuild b/dev-ros/genlisp/genlisp-0.4.15.ebuild
index 8d813053eac2..5d699ff5e376 100644
--- a/dev-ros/genlisp/genlisp-0.4.15.ebuild
+++ b/dev-ros/genlisp/genlisp-0.4.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/genlisp"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/genlisp/genlisp-9999.ebuild b/dev-ros/genlisp/genlisp-9999.ebuild
index 8d813053eac2..5d699ff5e376 100644
--- a/dev-ros/genlisp/genlisp-9999.ebuild
+++ b/dev-ros/genlisp/genlisp-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/genlisp"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/genmsg/genmsg-0.5.6.ebuild b/dev-ros/genmsg/genmsg-0.5.6.ebuild
index d70c53c0941d..c8f8b29bfa24 100644
--- a/dev-ros/genmsg/genmsg-0.5.6.ebuild
+++ b/dev-ros/genmsg/genmsg-0.5.6.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 ROS_REPO_URI="https://github.com/ros/genmsg"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/genmsg/genmsg-9999.ebuild b/dev-ros/genmsg/genmsg-9999.ebuild
index d70c53c0941d..c8f8b29bfa24 100644
--- a/dev-ros/genmsg/genmsg-9999.ebuild
+++ b/dev-ros/genmsg/genmsg-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 ROS_REPO_URI="https://github.com/ros/genmsg"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index 3ead43a6beb7..58cf4df99ef1 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,3 +1 @@
-DIST genpy-0.5.5.tar.gz 59514 SHA256 4727b5c176e94abd3fa4c2f3ce2b2b6d84ca7cb638a8899202a495a0f416df85 SHA512 f79e7ccf2ff6aba672ccbbf0a3ea9ac3c722d2eff5be5fcb71dcd345b45ad8dfde6db4b866bc2bc63707f377cef8757ebf6de61bf25599752360ae0c35dfada9 WHIRLPOOL 41fd1aa9a530fec161986994c12d240732d66e1014b8e8118b7296a33041e23042b0fd69a13fe580397147a37d7b3cf1e3c2371d2a1edf402f49c8d8403406ab
-DIST genpy-0.5.6.tar.gz 59571 SHA256 bf0c613206340483e054ff49570ba0b254ab285391fadbfecc1c392d642f6e77 SHA512 539bbbc2472ea0303c68318277e3e4301d10aac893266477815ccc3d08773c979b8d8f585115f11af5c364a75338909c144c28703337ddf9874c4afbfb0db12e WHIRLPOOL 701f8f1f20ce5f53ab37deff4365a44ce332239cdc39736d8a883db2af6b9da15812779bccb66a5aedf9154cdf05117d6bac4d9a4f60d4ced49b13034e6e0b14
 DIST genpy-0.5.7.tar.gz 59642 SHA256 e45d05206d71a32e8e3e9d4a87e966aec716e54035b298723b5cb51db66bcab9 SHA512 73b909245a3c54703ef04217da60f8e5cbc2849736bb6bfa457b24248abc0dfdd65b7db70e44a0a6069bf1fc006b9fbbf6c93e04664d4452695c8271d54c0758 WHIRLPOOL 0c77675b6fb46cfb463a396e86c63d4d53f586cc796de5d388e90d47c88427e3a7a272d3ddc3ae5ade2b912da922ade357ce970fe5b7132312360d5f886a55f8
diff --git a/dev-ros/genpy/genpy-0.5.5.ebuild b/dev-ros/genpy/genpy-0.5.5.ebuild
deleted file mode 100644
index 6f7df14e557d..000000000000
--- a/dev-ros/genpy/genpy-0.5.5.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=5
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="test"
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/genpy/genpy-0.5.6.ebuild b/dev-ros/genpy/genpy-0.5.6.ebuild
deleted file mode 100644
index 46b7961a883c..000000000000
--- a/dev-ros/genpy/genpy-0.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/genpy/genpy-0.5.7.ebuild b/dev-ros/genpy/genpy-0.5.7.ebuild
index 46b7961a883c..e18cd2aa843c 100644
--- a/dev-ros/genpy/genpy-0.5.7.ebuild
+++ b/dev-ros/genpy/genpy-0.5.7.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/genpy"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/genpy/genpy-9999.ebuild b/dev-ros/genpy/genpy-9999.ebuild
index 46b7961a883c..e18cd2aa843c 100644
--- a/dev-ros/genpy/genpy-9999.ebuild
+++ b/dev-ros/genpy/genpy-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/genpy"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild
index 848bcb317921..b7914738d8fb 100644
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild
+++ b/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
index 848bcb317921..b7914738d8fb 100644
--- a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
+++ b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/joint_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.11.9.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.11.9.ebuild
new file mode 100644
index 000000000000..c536693a99c1
--- /dev/null
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.11.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${PYTHON_USEDEP}]
+"
diff --git a/dev-ros/kdl_parser/Manifest b/dev-ros/kdl_parser/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/kdl_parser/Manifest
+++ b/dev-ros/kdl_parser/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/kdl_parser/kdl_parser-1.11.9.ebuild b/dev-ros/kdl_parser/kdl_parser-1.11.9.ebuild
new file mode 100644
index 000000000000..7a28042faf3c
--- /dev/null
+++ b/dev-ros/kdl_parser/kdl_parser-1.11.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/urdf
+	sci-libs/orocos_kdl
+	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser/kdl_parser-9999.ebuild b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
index f3a2d5c4440c..7a28042faf3c 100644
--- a/dev-ros/kdl_parser/kdl_parser-9999.ebuild
+++ b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/robot_model"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -23,4 +24,4 @@ RDEPEND="
 	dev-libs/tinyxml
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 315057b9ab13..9e8fbda709dd 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -1,4 +1,5 @@
 DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
 DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
 DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
 DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
new file mode 100644
index 000000000000..35693d7f2669
--- /dev/null
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 315057b9ab13..1a6ee4a67658 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,4 +1 @@
-DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
-DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
-DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
-DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
diff --git a/dev-ros/pr2_description/files/pr2_description.patch b/dev-ros/pr2_description/files/pr2_description.patch
deleted file mode 100644
index 5296a670a3ee..000000000000
--- a/dev-ros/pr2_description/files/pr2_description.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/pr2_description/CMakeLists.txt b/pr2_description/CMakeLists.txt
-index 1b75223..6c83182 100644
---- a/pr2_description/CMakeLists.txt
-+++ b/pr2_description/CMakeLists.txt
-@@ -91,8 +91,10 @@ add_custom_target(media_files ALL DEPENDS ${pr2urdf} ${pr2robot_expanded} ${prfr
- ## DEPENDS: system dependencies of this project that dependent projects also need
- catkin_package(CATKIN_DEPENDS xacro)
- 
--catkin_add_gtest(test_urdf test/test_urdf.cpp WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
--target_link_libraries(test_urdf urdfdom_model)
-+if(CATKIN_ENABLE_TESTING)
-+	catkin_add_gtest(test_urdf test/test_urdf.cpp WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-+	target_link_libraries(test_urdf urdfdom_model)
-+endif()
- 
- foreach(dir meshes gazebo materials robots documents urdf)
-    install(DIRECTORY ${dir}/ 
diff --git a/dev-ros/pr2_description/pr2_description-1.11.10.ebuild b/dev-ros/pr2_description/pr2_description-1.11.10.ebuild
deleted file mode 100644
index 3c99ffb7f2ea..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.11.10.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=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/pr2_description.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.11.11.ebuild b/dev-ros/pr2_description/pr2_description-1.11.11.ebuild
deleted file mode 100644
index daced8821d1f..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.11.11.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
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_description/pr2_description-1.11.13.ebuild b/dev-ros/pr2_description/pr2_description-1.11.13.ebuild
deleted file mode 100644
index daced8821d1f..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.11.13.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
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_description/pr2_description-1.11.14.ebuild b/dev-ros/pr2_description/pr2_description-1.11.14.ebuild
new file mode 100644
index 000000000000..c09b7f6640d7
--- /dev/null
+++ b/dev-ros/pr2_description/pr2_description-1.11.14.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ros/convex_decomposition
+	dev-ros/ivcon
+	test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_description/pr2_description-1.11.9.ebuild b/dev-ros/pr2_description/pr2_description-1.11.9.ebuild
deleted file mode 100644
index 3c99ffb7f2ea..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.11.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/pr2_description.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild
index daced8821d1f..c09b7f6640d7 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,7 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/xacro"
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-ros/convex_decomposition
 	dev-ros/ivcon
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index 315057b9ab13..9e8fbda709dd 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -1,4 +1,5 @@
 DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
 DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
 DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
 DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
new file mode 100644
index 000000000000..100efdd56436
--- /dev/null
+++ b/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 315057b9ab13..9e8fbda709dd 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,4 +1,5 @@
 DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
 DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
 DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
 DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.11.14.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.11.14.ebuild
new file mode 100644
index 000000000000..b296b46392f1
--- /dev/null
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.11.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_pose_publisher/Manifest b/dev-ros/robot_pose_publisher/Manifest
index 872de2f98e03..3d52f73f8554 100644
--- a/dev-ros/robot_pose_publisher/Manifest
+++ b/dev-ros/robot_pose_publisher/Manifest
@@ -1 +1 @@
-DIST robot_pose_publisher-0.2.3.tar.gz 4225 SHA256 b8e1f7e8957a89a929e66a3222261431e227639100f21a184e22dbd4226a467f SHA512 393c906754015161643a3047e8ab6690292d4446fc89fb1caa6e1a8fd25e6d880bcd23ea9780eea7c2fe7eb83331455894c93a90fdce01d0f483cae90b653314 WHIRLPOOL 4395b4a4395725eb1ff74768f92f0b39c42163b1c5a237d6776c01ec747e80e4fef3ce51ce632877f586e8219e6a9ea97ebfe3c591d1a807d4989239aa3675a6
+DIST robot_pose_publisher-0.2.4.tar.gz 4269 SHA256 5f6eaaabbe9e77d2830b6fb46e30001bc4f4d4bbd9f23eea69e125c1da318f40 SHA512 1309c0335dc0375802c3a4c7186d6248dca1307319d4ece6b390643d94bd2887cf5b016669d1b44025f04bd509424b7bee0d029c10f992a1207e2090366ae150 WHIRLPOOL 808d8209d19a4fe19f56a8c91ea7e892752684a231648323bfe0d72a4e5f9111911c5e0d0dbcc2d33c59c21885f573a474c444bea41984aae3058f54e492a3c3
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild
deleted file mode 100644
index ae81a9889c3c..000000000000
--- a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.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
-ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild
new file mode 100644
index 000000000000..ba8ba98a7fa2
--- /dev/null
+++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
index ae81a9889c3c..ba8ba98a7fa2 100644
--- a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
+++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher"
+ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
 KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
diff --git a/dev-ros/rosapi/Manifest b/dev-ros/rosapi/Manifest
index 901d1ece339e..a5ef02bce087 100644
--- a/dev-ros/rosapi/Manifest
+++ b/dev-ros/rosapi/Manifest
@@ -1 +1,2 @@
 DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
+DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
diff --git a/dev-ros/rosapi/rosapi-0.7.14.ebuild b/dev-ros/rosapi/rosapi-0.7.14.ebuild
new file mode 100644
index 000000000000..b84f396a3fc7
--- /dev/null
+++ b/dev-ros/rosapi/rosapi-0.7.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosnode[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_library/Manifest b/dev-ros/rosbridge_library/Manifest
index 901d1ece339e..a5ef02bce087 100644
--- a/dev-ros/rosbridge_library/Manifest
+++ b/dev-ros/rosbridge_library/Manifest
@@ -1 +1,2 @@
 DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
+DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.14.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.7.14.ebuild
new file mode 100644
index 000000000000..9299b50fc936
--- /dev/null
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.7.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosservice[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
index 901d1ece339e..a5ef02bce087 100644
--- a/dev-ros/rosbridge_server/Manifest
+++ b/dev-ros/rosbridge_server/Manifest
@@ -1 +1,2 @@
 DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
+DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.14.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.14.ebuild
new file mode 100644
index 000000000000..de815261bc71
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosauth[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/backports-ssl.patch"
+	"${FILESDIR}/tornado.patch"
+)
diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
index 96e69cfbc981..6ae18ef87063 100644
--- a/dev-ros/sound_play/Manifest
+++ b/dev-ros/sound_play/Manifest
@@ -1,4 +1,5 @@
 DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
+DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
 DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/sound_play/sound_play-0.2.11.ebuild b/dev-ros/sound_play/sound_play-0.2.11.ebuild
new file mode 100644
index 000000000000..c4b4cb101276
--- /dev/null
+++ b/dev-ros/sound_play/sound_play-0.2.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib
+	media-libs/gstreamer:0.10
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	dev-python/gst-python[${PYTHON_USEDEP}]
+	app-accessibility/festival
+	media-libs/gst-plugins-good:0.10
+	media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild b/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
index 00cb85f0f2fe..e0e7b0adfba8 100644
--- a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
+++ b/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ros/tf
 	x11-libs/fltk
 	sci-electronics/Stage
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest )
diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild
index 00cb85f0f2fe..e0e7b0adfba8 100644
--- a/dev-ros/stage_ros/stage_ros-9999.ebuild
+++ b/dev-ros/stage_ros/stage_ros-9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ros/tf
 	x11-libs/fltk
 	sci-electronics/Stage
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest )
diff --git a/dev-ros/std_msgs/std_msgs-0.5.9.ebuild b/dev-ros/std_msgs/std_msgs-0.5.9.ebuild
index def89fe81778..9707b2b18bdf 100644
--- a/dev-ros/std_msgs/std_msgs-0.5.9.ebuild
+++ b/dev-ros/std_msgs/std_msgs-0.5.9.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/std_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ${SCM} ros-catkin
 
diff --git a/dev-ros/std_msgs/std_msgs-9999.ebuild b/dev-ros/std_msgs/std_msgs-9999.ebuild
index def89fe81778..9707b2b18bdf 100644
--- a/dev-ros/std_msgs/std_msgs-9999.ebuild
+++ b/dev-ros/std_msgs/std_msgs-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/std_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ${SCM} ros-catkin
 
diff --git a/dev-ros/std_srvs/std_srvs-1.11.1.ebuild b/dev-ros/std_srvs/std_srvs-1.11.1.ebuild
index 27eafe76b022..c46beb25b4ac 100644
--- a/dev-ros/std_srvs/std_srvs-1.11.1.ebuild
+++ b/dev-ros/std_srvs/std_srvs-1.11.1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -17,5 +17,5 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/std_msgs[${PYTHON_USEDEP}]"
+RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_srvs/std_srvs-9999.ebuild b/dev-ros/std_srvs/std_srvs-9999.ebuild
index 27eafe76b022..c46beb25b4ac 100644
--- a/dev-ros/std_srvs/std_srvs-9999.ebuild
+++ b/dev-ros/std_srvs/std_srvs-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -17,5 +17,5 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/std_msgs[${PYTHON_USEDEP}]"
+RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild
index b27e93ac6517..2d7b8e6b98c9 100644
--- a/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry_experimental"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
index b27e93ac6517..2d7b8e6b98c9 100644
--- a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
+++ b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry_experimental"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/urdf/urdf-1.11.9.ebuild b/dev-ros/urdf/urdf-1.11.9.ebuild
new file mode 100644
index 000000000000..e406d8de61e2
--- /dev/null
+++ b/dev-ros/urdf/urdf-1.11.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-libs/urdfdom
+	dev-libs/urdfdom_headers
+	dev-ros/urdf_parser_plugin
+	dev-ros/pluginlib
+	dev-ros/rosconsole_bridge
+	dev-ros/roscpp
+	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-9999.ebuild b/dev-ros/urdf/urdf-9999.ebuild
index e0ec2afa5395..e406d8de61e2 100644
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ b/dev-ros/urdf/urdf-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/robot_model"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -26,4 +27,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )"
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf_parser_plugin/Manifest b/dev-ros/urdf_parser_plugin/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/urdf_parser_plugin/Manifest
+++ b/dev-ros/urdf_parser_plugin/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.11.9.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.11.9.ebuild
new file mode 100644
index 000000000000..3bfb77facbf7
--- /dev/null
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.11.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ base class for URDF parsers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/urdfdom_headers"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.5.1.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.5.1.ebuild
index 82798c520835..ea17641a8cce 100644
--- a/dev-ruby/actionmailer/actionmailer-4.2.5.1.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-4.2.5.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/actionpack-4.2.5.1.ebuild b/dev-ruby/actionpack/actionpack-4.2.5.1.ebuild
index 6ac5189180ad..ba3bfe952fc8 100644
--- a/dev-ruby/actionpack/actionpack-4.2.5.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-4.2.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-4.2.5.1.ebuild b/dev-ruby/actionview/actionview-4.2.5.1.ebuild
index 5a093fd106e0..65eaceb6cbf6 100644
--- a/dev-ruby/actionview/actionview-4.2.5.1.ebuild
+++ b/dev-ruby/actionview/actionview-4.2.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/activejob-4.2.5.1.ebuild b/dev-ruby/activejob/activejob-4.2.5.1.ebuild
index 7ec460628d84..c42f4f3a2a78 100644
--- a/dev-ruby/activejob/activejob-4.2.5.1.ebuild
+++ b/dev-ruby/activejob/activejob-4.2.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-4.2.5.1.ebuild b/dev-ruby/activemodel/activemodel-4.2.5.1.ebuild
index 2a3deb3c1fb0..f5059c377dfd 100644
--- a/dev-ruby/activemodel/activemodel-4.2.5.1.ebuild
+++ b/dev-ruby/activemodel/activemodel-4.2.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/activerecord-4.2.5.1.ebuild b/dev-ruby/activerecord/activerecord-4.2.5.1.ebuild
index a347afbd897d..de9e737bdc2f 100644
--- a/dev-ruby/activerecord/activerecord-4.2.5.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-4.2.5.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/ast/Manifest b/dev-ruby/ast/Manifest
index ae8b9a92c5c3..65581939d7ea 100644
--- a/dev-ruby/ast/Manifest
+++ b/dev-ruby/ast/Manifest
@@ -1,3 +1 @@
-DIST ast-2.0.0.gem 14336 SHA256 e8912628cabb49357e69f741b707b5b92c1be8be596e236589c4c44e6d453cd2 SHA512 dee0296c4d1bcad6454930778cadf0395b25a87b4c24d15a74d190739344c66bce3f08451868278fc9cea1a420e8548698342264edeccda76b793afabc5ebf6b WHIRLPOOL 3a8ea7c502324261628711ebeb2391045938aa7e95e1d18e235365f58ab89f407162787a7299df3e0a2c112c6943d40e407b38509f993bd627a8d7216e041b6b
-DIST ast-2.1.0.gem 14848 SHA256 f3066fd52ad2aa5731d5321ea609190deade4f2be251a3891d1cecdc1df74b80 SHA512 b60fb87ba204456dbb09ed6d747322555e415f5849d67dfb75624c4de2158b65038db7e4762ac6faf6c2b6854b0af8069b13e0b9c33b50eeaf69d5963588403a WHIRLPOOL eea8653a94d54bd1eef6f081b3197f728593f6f05e8e6632d0f4a672b35e123dd7276d250142ec5a6e222800ca8926ac60bf112f35e44c97464fa0fb3250bfb0
 DIST ast-2.2.0.gem 14848 SHA256 8be669575d41b7b961a3e6ed370e550bed6083b3f8337ab6c8b506871c02ad92 SHA512 556b9d68787a05f33f6f7e518971dfc965d326fd1a2e0dd1d16d1360526c598fccb0117a09348da88f6243bb3295dbb6d91fa6bd2a27c19cd7b519105b826aea WHIRLPOOL da7ca57261786f8bdb6e87733649535bbacd6f0f82614a865019f518177f0e3877df72a9fdc7ffac07af35254b73553340e708d1a8d913039cfd0cbca847cddb
diff --git a/dev-ruby/ast/ast-2.0.0.ebuild b/dev-ruby/ast/ast-2.0.0.ebuild
deleted file mode 100644
index 4972ae247f7f..000000000000
--- a/dev-ruby/ast/ast-2.0.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for working with abstract syntax trees"
-HOMEPAGE="https://github.com/whitequark/ast"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bacon )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/git ls/d" ${PN}.gemspec || die
-	sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bacon -Itest -a || die
-}
diff --git a/dev-ruby/ast/ast-2.1.0.ebuild b/dev-ruby/ast/ast-2.1.0.ebuild
deleted file mode 100644
index 4972ae247f7f..000000000000
--- a/dev-ruby/ast/ast-2.1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for working with abstract syntax trees"
-HOMEPAGE="https://github.com/whitequark/ast"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bacon )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/git ls/d" ${PN}.gemspec || die
-	sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bacon -Itest -a || die
-}
diff --git a/dev-ruby/aws-sdk-core/Manifest b/dev-ruby/aws-sdk-core/Manifest
index d42fcdfdac6d..89bb6cc8e3af 100644
--- a/dev-ruby/aws-sdk-core/Manifest
+++ b/dev-ruby/aws-sdk-core/Manifest
@@ -1 +1,2 @@
+DIST aws-sdk-ruby-2.2.18.tar.gz 1745330 SHA256 f3e83cd1d502561ebd5ec833b952bb8a29436d1f8ef010a8adb7dff4953cac92 SHA512 dfe5d6ff90724592fc2d6364a0dcee1b6cc1e6836d4c79193362246c54d1f59a0dff0c7a57bf7996f59ef7e0988ea013f86bf27a36bf8cbab9055edc0ea54528 WHIRLPOOL e539ef5a678efb7fbfc57989611216caf40d2510d0e4c6204724b3315f2df2ec0a4d4b7a225da575cb7a6cc37dd4f82d98fe6c5c698eb0def43165b0e2d4fa23
 DIST aws-sdk-ruby-2.2.5.tar.gz 1671525 SHA256 5fba8661d99d939162a349fddf0a89003267856f4faaa8baa5875c916241e4d1 SHA512 93e848922b9410297ccd82d8e71477f8246c4088f6145e53e7300ff7b4d8a3683274aba794a11df9fbe3a600b0b4cf6d4487f5a45f11fe8b4aad967ae4ee6e33 WHIRLPOOL fac9dc67dc047bc652b4645612f534c08f6b29f9ce456e80d1c7d497bdc748961e15b579162b0a9d42f3f416801eb2a9a365c817698e18638ec0f4a38ff1b6b7
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.2.18.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.2.18.ebuild
new file mode 100644
index 000000000000..0428f8584550
--- /dev/null
+++ b/dev-ruby/aws-sdk-core/aws-sdk-core-2.2.18.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="aws-sdk-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="http://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/jmespath:1"
+
+all_ruby_prepare() {
+	# Avoid spec that gets confused by our directory names
+	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
+		spec/seahorse/client/plugin_list_spec.rb || die
+}
diff --git a/dev-ruby/aws-sdk-resources/Manifest b/dev-ruby/aws-sdk-resources/Manifest
index d42fcdfdac6d..89bb6cc8e3af 100644
--- a/dev-ruby/aws-sdk-resources/Manifest
+++ b/dev-ruby/aws-sdk-resources/Manifest
@@ -1 +1,2 @@
+DIST aws-sdk-ruby-2.2.18.tar.gz 1745330 SHA256 f3e83cd1d502561ebd5ec833b952bb8a29436d1f8ef010a8adb7dff4953cac92 SHA512 dfe5d6ff90724592fc2d6364a0dcee1b6cc1e6836d4c79193362246c54d1f59a0dff0c7a57bf7996f59ef7e0988ea013f86bf27a36bf8cbab9055edc0ea54528 WHIRLPOOL e539ef5a678efb7fbfc57989611216caf40d2510d0e4c6204724b3315f2df2ec0a4d4b7a225da575cb7a6cc37dd4f82d98fe6c5c698eb0def43165b0e2d4fa23
 DIST aws-sdk-ruby-2.2.5.tar.gz 1671525 SHA256 5fba8661d99d939162a349fddf0a89003267856f4faaa8baa5875c916241e4d1 SHA512 93e848922b9410297ccd82d8e71477f8246c4088f6145e53e7300ff7b4d8a3683274aba794a11df9fbe3a600b0b4cf6d4487f5a45f11fe8b4aad967ae4ee6e33 WHIRLPOOL fac9dc67dc047bc652b4645612f534c08f6b29f9ce456e80d1c7d497bdc748961e15b579162b0a9d42f3f416801eb2a9a365c817698e18638ec0f4a38ff1b6b7
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.2.18.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.2.18.ebuild
new file mode 100644
index 000000000000..e9a1a4ccad56
--- /dev/null
+++ b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.2.18.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="aws-sdk-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="http://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
index 7864e757251f..81c9099505d5 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST aws-sdk-ruby-1.66.0.tar.gz 1774530 SHA256 265e20a99c17d3f476ce6f6e981fd37e8e529dac2a38eba1ef7a25205f8f49b6 SHA512 53b13bab1db26f9eb6ba411a7143377fbdc56548fe881742953f388af60508be30cc2c82a3dce89675be2c799774d30313d19b47875a52d4c9134ce5f4b1914c WHIRLPOOL 265d01034a3e31f8e12dc8962d67fa727e7123de0e5c56c633a84d4b7e91168f6c8ea9f4e4291ef54ef570f4675f2f087610bf11b11ec9efdb1c345c42dcb1ec
+DIST aws-sdk-ruby-2.2.18.tar.gz 1745330 SHA256 f3e83cd1d502561ebd5ec833b952bb8a29436d1f8ef010a8adb7dff4953cac92 SHA512 dfe5d6ff90724592fc2d6364a0dcee1b6cc1e6836d4c79193362246c54d1f59a0dff0c7a57bf7996f59ef7e0988ea013f86bf27a36bf8cbab9055edc0ea54528 WHIRLPOOL e539ef5a678efb7fbfc57989611216caf40d2510d0e4c6204724b3315f2df2ec0a4d4b7a225da575cb7a6cc37dd4f82d98fe6c5c698eb0def43165b0e2d4fa23
 DIST aws-sdk-ruby-2.2.5.tar.gz 1671525 SHA256 5fba8661d99d939162a349fddf0a89003267856f4faaa8baa5875c916241e4d1 SHA512 93e848922b9410297ccd82d8e71477f8246c4088f6145e53e7300ff7b4d8a3683274aba794a11df9fbe3a600b0b4cf6d4487f5a45f11fe8b4aad967ae4ee6e33 WHIRLPOOL fac9dc67dc047bc652b4645612f534c08f6b29f9ce456e80d1c7d497bdc748961e15b579162b0a9d42f3f416801eb2a9a365c817698e18638ec0f4a38ff1b6b7
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.2.18.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.2.18.ebuild
new file mode 100644
index 000000000000..b2a9596b0f3c
--- /dev/null
+++ b/dev-ruby/aws-sdk/aws-sdk-2.2.18.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="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="${PN}-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="http://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl
+	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/certificate_authority/certificate_authority-0.1.6.ebuild b/dev-ruby/certificate_authority/certificate_authority-0.1.6.ebuild
index a89103223d53..2f3c16f2cea3 100644
--- a/dev-ruby/certificate_authority/certificate_authority-0.1.6.ebuild
+++ b/dev-ruby/certificate_authority/certificate_authority-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/classifier-reborn/Manifest b/dev-ruby/classifier-reborn/Manifest
index 9e13d5d0eeb6..c0c467b4a94e 100644
--- a/dev-ruby/classifier-reborn/Manifest
+++ b/dev-ruby/classifier-reborn/Manifest
@@ -1 +1,2 @@
 DIST classifier-reborn-2.0.3.tar.gz 22888 SHA256 3cee84bd7bee0b6d64d94d370736eda7283a933afcc8e5b0a93af88e83937213 SHA512 37e6c078de65ac7851acc9e5ea3ffbad2dfde1923bf765b6cd936457cdf52d3738e35b84d1ef94e1b5af396e1821f09749090d29fdfaf121f0a0ac50ec9b1418 WHIRLPOOL d5ae8072aaf977404bc389473ce9ce8071c70cc10f886232fd292afa39a879030e6e1ee310fa60d61e36048074da9a8729eeba179cd92798bef1924604071d74
+DIST classifier-reborn-2.0.4.tar.gz 40653 SHA256 cd6d283a9f3e7aaffe7fe55d30d8f45ea6ba91027931b6c0c63bad007c9de53c SHA512 f89a075b61c1f36894cc57cba3943174c4414512e6f89dd2fa854126e38132239312f2b3464ffbd9b531d8f2987658fafa9cd8fe29d5f7ad8146984436deddd5 WHIRLPOOL 4f1a6c95fa08f4b3eb38078f441801657fdfa91d22e312fc36a46741f30365388b585fc85fca1693752be567ae3e213d82a522718af649d3af6efe8eecbf6c6f
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.0.4.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.0.4.ebuild
new file mode 100644
index 000000000000..a02a984b4e4e
--- /dev/null
+++ b/dev-ruby/classifier-reborn/classifier-reborn-2.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Module to allow Bayesian and other types of classifications"
+HOMEPAGE="https://github.com/jekyll/classifier-reborn"
+SRC_URI="https://github.com/jekyll/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gsl test"
+
+ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
+	!!dev-ruby/classifier
+	gsl? ( dev-ruby/rb-gsl )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	if use !gsl; then
+		sed -e 's/$GSL = true/$GSL = false/'\
+			-e 's/vector_serialize/vector/'\
+			-i lib/${PN}/lsi.rb || die
+	fi
+	# Comment out broken test
+	sed -i -e "/assert 'Normal',/s/^/#/" test/bayes/bayesian_test.rb || die
+}
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 0d7ce75eaf24..6e952d4aac70 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,2 +1,3 @@
 DIST coderay-1.1.0.tar.gz 242639 SHA256 a33f6490aacd1d035fa82e2c1fe88b0e2c9553c1f7d24b813ca2b4d73804342f SHA512 9443a629bf60b7f888198ebfc72f012cceda5c9cb3e14204b3d025807dc4cb0ca0896869ae1cc89f1aa87a7c0e84830cb03aee2c4da4fd80326606a0e22b2031 WHIRLPOOL 50c5b6d07e803bfd7e14c10b0f583657f2b95dc548a748a8d677b80c49480110e9e763bdd6fe376bf58b1992a61a93e88ba2b5476ce9437e41a8d1fc5addc745
 DIST coderay-1.1.0.tgz 242639 SHA256 2e9fc7ac7ef9b14fc87f8467994bf436d3bc1e7fb6f768cc2c1049ea5c6cd96f SHA512 8bf57162f59a35a2c0df9e4925ce2313c77a8613849df6e18052c3d15c5a1a39f73ff0a090675711e274e269f271dc6f7c5a9ade25cdaa34080ee3e245e9d19a WHIRLPOOL 31bd461ce9fec3d402bed43103b43136dca4388cd27f226c16fb33b957117b14701dac147c0b0c61204fe806e4c7b2175f4c3908e673791a1f1f412f7879fd26
+DIST coderay-1.1.1.tar.gz 220111 SHA256 75736cb542a8fb355943f8f256c690b5b79171c2a5569d9abca305c6ac803e60 SHA512 850cd1db29b90455f329fd2eec7ddf8f0556469162d9abb8579c8e3a7d19f4aee15185d4846b0d5f74016e1dd66eef78d06155684c64040706e4cf121d05c5c9 WHIRLPOOL 15a517cfa52fa3b9cb7a9f2491de4635517f2c96d9903ce0265d54d5214f7c70e429b4a583bea27c58a1193594ff645c71242f0841bd7551c8cfe373753804d3
diff --git a/dev-ruby/coderay/coderay-1.1.1.ebuild b/dev-ruby/coderay/coderay-1.1.1.ebuild
new file mode 100644
index 000000000000..31e76e91a8f6
--- /dev/null
+++ b/dev-ruby/coderay/coderay-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# The test target also contains test:exe but that requires
+# shoulda-context which we do not have packaged yet.
+RUBY_FAKEGEM_TASK_TEST="test:functional test:units"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="Changes-pre-1.0.textile Changes.textile FOLDERS README_INDEX.rdoc README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library for syntax highlighting"
+HOMEPAGE="http://coderay.rubychan.de/"
+SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Redcloth is optional but automagically tested, so we add this
+# dependency to ensure that we get at least a version that works: bug
+# 330621.
+ruby_add_bdepend "test? ( >=dev-ruby/redcloth-4.2.2 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/git ls-files/ s:^:#:' coderay.gemspec || die
+}
diff --git a/dev-ruby/coffee-rails/coffee-rails-4.1.1-r1.ebuild b/dev-ruby/coffee-rails/coffee-rails-4.1.1-r1.ebuild
index d5f7425b85d7..26b1feeb57cc 100644
--- a/dev-ruby/coffee-rails/coffee-rails-4.1.1-r1.ebuild
+++ b/dev-ruby/coffee-rails/coffee-rails-4.1.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${PV}.ta
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE=""
 
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index cb1c597587f9..97265dacb781 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,2 +1,3 @@
 DIST commander-4.3.7.gem 35328 SHA256 c5caa7882a27a793b720e8c071218cc26d112d85a73d4dda1f93be08bfa09f3a SHA512 adfb4483fe3b74bb40d2e6e3101b990eee82aea1c6593ea2ce76213740ab4e3e39eb25cd1d22ec23d406d20c5d6f8bb930c1058a808abd01b7fdb20463209cb8 WHIRLPOOL 27e65562d7cd90d268683321a829ffcf364dd326a008872640b6f8107c2107940fec50ce1cec3a13732fa922b60443114da74e5e85f3ff8841cc85a1cc9c76da
 DIST commander-4.3.8.gem 35328 SHA256 e88fbd8f8b1b630f2e8b7812975bbaa84364a79669176cada333b396413117af SHA512 0630adc6c775c880312b55b78a3d835e4312a6166f407215693386b8436f91f1e7588c834e0aa8bec32872329a09598602ce16f400db3417c95e814a159ae279 WHIRLPOOL e40a3f8048d270da1ca8f814716fe0159a8399a453db5405c700991acec7978e87fab7210d969b8b257391fe6a5e284df994a39531a54259b248850ee35087ad
+DIST commander-4.4.0.gem 35840 SHA256 358ae12110faed47683633bdf0e71d6782a0f3eccdbaea4e76b375d260490a56 SHA512 e417c68c83041a088ec8d7e5202ac733b2a80699d1e15ca1612a904327833dce9ad788a9523ebe2c83f4e509001e93283745378ab5ca5aee15072690ca51d530 WHIRLPOOL 95f05cae077bbbd6091658ede341894d53e9a4c8dca52b0039daad443507ff999727e042000e349b7098c9012daa4f1d715ea6cb6f359b54b67c655ff8779a8d
diff --git a/dev-ruby/commander/commander-4.4.0.ebuild b/dev-ruby/commander/commander-4.4.0.ebuild
new file mode 100644
index 000000000000..02c51aec44a7
--- /dev/null
+++ b/dev-ruby/commander/commander-4.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The complete solution for Ruby command-line executables"
+HOMEPAGE="https://visionmedia.github.com/commander/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/highline-1.7.2"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.0.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.0.ebuild
index 974ea9e09f5a..e620b0709d2a 100644
--- a/dev-ruby/connection_pool/connection_pool-2.2.0.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index b56a92573e68..0bac0bea1d77 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,3 +1,3 @@
-DIST dalli-2.6.4.gem 40448 SHA256 04fde96890b41a4b4c71bdcdddbf8522d7685bd3b57d4632ef2f4a04c481cbc1 SHA512 ce734e1d122a9b20c567497ff88dbbf5ddb03912e88ae70199746808695c139062a25797c34b82a203139568f44791dd09a91eff9b4816d26ce50f6e74cef860 WHIRLPOOL 3a30d3ddcdfc976a42a9d0feb1b8beaa39c5b45179127a01e1493899dc68c18cb79f06e57ad32c8b03dccec6c82652b218b4691567530954af0e77fab2ffa5ea
 DIST dalli-2.7.4.gem 47616 SHA256 acdf155946cda8eb55edb9af7c44888dc8b726930f157729ffa67f5bc2fc8a7b SHA512 2bd1efeb245177f15feb02fdf40ef1d2bf0cb820a2a881ef810b3d30aa837ad53dc755c5ce8b95de689c27ec83d93e85501d9b5b1e57c8bf0c6eeff8bd42a78f WHIRLPOOL 7866f0500ad2c28d8cae0a8802376474ccc31696d4e5871b1802fdcd6b4f49fdf822bf789458962e7b17a2d05ff3a114d6a8de15919efc6f218ff55a56f0a002
 DIST dalli-2.7.5.tar.gz 46899 SHA256 405eca6938d9c59b1bc1b58fa2c0867f726184f7095d41ce8a4e7d9f4c3d84eb SHA512 5477a2a34efa932d675dbfe31cc48b45c3a9eff5cf64cc7210b996d811bd8d6f1ffff1e5a6eb4e50cb680ac62f39c06a09612341a6a8a855246cca7596cc5146 WHIRLPOOL 16351abc5c2cb43dfa8c107e492a18243aeb37ad58bc4d4130394f62844cddf57b542d42cae4262f40513b2304d64ae280efe4f2dea8e75adfc5ae00bdc504de
+DIST dalli-2.7.6.tar.gz 48481 SHA256 cb6aada5e4d4e058cfe84ba2d4adcb9bdf5717927f25da07351fced690f8a927 SHA512 ee2270e719f6ff108654d20dfc560cdc6067808c211ae75304f5ca3f7772561b25a699fddb051e42db744bb202228bdbb904171faf5e1804f1f2bed4341bc258 WHIRLPOOL a3587ce71b8831a6d8a5b75ce959221244e3cd486d316a9d69dd18a6acf033d4b4c0f1e955606b4313f9452ed9c6244c74ebce9c1636b7be8d3be4645d40ecad
diff --git a/dev-ruby/dalli/dalli-2.6.4.ebuild b/dev-ruby/dalli/dalli-2.6.4.ebuild
deleted file mode 100644
index 0189840f6468..000000000000
--- a/dev-ruby/dalli/dalli-2.6.4.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/mperham/dalli"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:0
-		>=dev-ruby/mocha-0.13
-		>=dev-ruby/activesupport-3 )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/appraisal/ s:^:#:' Rakefile || die
-
-	sed -i -e '1igem "minitest", "~> 4.0"' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-2.7.4-r1.ebuild b/dev-ruby/dalli/dalli-2.7.4-r1.ebuild
deleted file mode 100644
index be9cf9c3a7f9..000000000000
--- a/dev-ruby/dalli/dalli-2.7.4-r1.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/mperham/dalli"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		>=dev-ruby/activesupport-4.1
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '1igem "minitest", "~> 5.0"' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-2.7.6.ebuild b/dev-ruby/dalli/dalli-2.7.6.ebuild
new file mode 100644
index 000000000000..2ce7c5fff20f
--- /dev/null
+++ b/dev-ruby/dalli/dalli-2.7.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest:5
+		>=dev-ruby/mocha-0.13
+		dev-ruby/rack
+		>=dev-ruby/activesupport-4.1
+		dev-ruby/connection_pool )"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '1igem "minitest", "~> 5.0"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	# Drop rails dependency which is only used to display the version
+	# number, so we only need to depend on activesupport and avoid
+	# complicated circular dependencies.
+	sed -i -e '/rails/I s:^:#:' \
+		-e '14irequire "active_support"' test/helper.rb || die
+}
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index ec98818f53cb..7053b9d25cbe 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -2,3 +2,4 @@ DIST dbf-2.0.13.gem 125952 SHA256 d970c42f6f677df3b31788814845ac3135979987641447
 DIST dbf-2.0.8.gem 115712 SHA256 d953117337e3d12720815304b5e584ccdd7d081b65d0a01dd2d825087e1b4f79 SHA512 b2098359f88b5df50113af979d0d95591b1b15db22e8554bced14f4a5190ac3f490971e7f857bb832d4957f82e6f82d5cbcea0332401a54cf41b897bfb1f3b74 WHIRLPOOL 7afdf410cfc43009e407a14ffe5944d1639ec4318d9517314b9d41734341777ce5833033462accf3ea699d26b4fd4a3fb410875ee4b9eda197199cefd3db7836
 DIST dbf-3.0.3.gem 125952 SHA256 5db79720ae7079c9539be3abc4a2801ee9ea4d0a4fc5ca3ded44f9ef67015b24 SHA512 6f04ec0903ac3daa24bf388a103248cbd7fd9353616cd738c5e0b72f8c27a0cd19d9113655b1e5dd9d6193b6549496526febf7ba49ed729a1a2f1f77cc202a97 WHIRLPOOL 786ed9d7954536b795c1225a067064c673ba7a630df213e3d13526b1388739c3a9a4eb3f90eec3e8fcbb9e630930d694f595475176aa880e66f9a028578c20a0
 DIST dbf-3.0.4.gem 126464 SHA256 5025ad14396b3fe9f033d69c464df543f311e2feacf282777b8a40793cda6184 SHA512 5e2e62010316801a67d2a463a48f3405ef0bf9e02394f184e055296d0eb14a0e539af3938faa7907d079a24707e660dc18223eff5618989363bf6e54ebf0db4a WHIRLPOOL eeff288cbe3afbfb105d41d69ea09bc101050bb6aef3e497b87fbc9b496dcd9e5f1e43ba05a8db3b65dfbb5db5dbf85b62c6dffe125f02407b2929cba429b8d5
+DIST dbf-3.0.5.gem 126976 SHA256 4c054c124aac204d3c8698f828ba6f199ecd7a649c237a817f90c44083f76432 SHA512 6defd871499af1012c39d6927bbff981eaed92cee56ccfd47c8bbc587f0bcb0b1a73238f281f7b7093a38849e101d77f1704abe4d136372c95858a3c6b0a9f5f WHIRLPOOL 4c505038ac3acfefece72250c3e8e167181ec3f168ae9c64c993e8fd718d49de5786483faa8d2140dcdec7330aa879d44869d8c417aaeb1a60a2485f1c841726
diff --git a/dev-ruby/dbf/dbf-3.0.5.ebuild b/dev-ruby/dbf/dbf-3.0.5.ebuild
new file mode 100644
index 000000000000..ed97bf740ae5
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/fuubar/fuubar-2.0.0.ebuild b/dev-ruby/fuubar/fuubar-2.0.0.ebuild
index 8357dbacfa8e..035b9732d98a 100644
--- a/dev-ruby/fuubar/fuubar-2.0.0.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jeffkreeftmeijer/fuubar"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rspec:3 >=dev-ruby/ruby-progressbar-1.4"
diff --git a/dev-ruby/globalid/globalid-0.3.6.ebuild b/dev-ruby/globalid/globalid-0.3.6.ebuild
index 3dd38bae95ba..aaf063b885c5 100644
--- a/dev-ruby/globalid/globalid-0.3.6.ebuild
+++ b/dev-ruby/globalid/globalid-0.3.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.1.0 >=dev-ruby/railties-4.1.0 )"
diff --git a/dev-ruby/http/http-0.9.8.ebuild b/dev-ruby/http/http-0.9.8.ebuild
index d4751d420f15..53cfb50f6a24 100644
--- a/dev-ruby/http/http-0.9.8.ebuild
+++ b/dev-ruby/http/http-0.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/http/http-1.0.2.ebuild b/dev-ruby/http/http-1.0.2.ebuild
index e29d6a7a9d66..bfc40582611c 100644
--- a/dev-ruby/http/http-1.0.2.ebuild
+++ b/dev-ruby/http/http-1.0.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.1.0.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.1.0.ebuild
index fe2ad735ce58..70fd7a46cda4 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.1.0.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.1.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE=""
 
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index ca39b0097a41..ba20d96ebdce 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,2 +1,3 @@
 DIST kramdown-1.4.2.gem 226816 SHA256 ae9b9456c69fa06f9c3058841e09b85e07cda875eb36c3202ea46baf8e123ea8 SHA512 31e7a30bcc453968ec6db0c1f0e5f8cea222dde8b8f6a26da72e0cf1b049c9f4c4e8384685a5e241e41fda526cd0f5fba4ac7debd0fb0d3eb6539dd9afc1dd27 WHIRLPOOL aa0166861584c2e3115923db1de9203581c02f4cab42866a88947a3e52fb32eee4ab2cdcc2fd623669a4c8a2e1972a340d9100a04fbc595bb40bde46e553223f
 DIST kramdown-1.8.0.gem 238080 SHA256 54287608f4399006ae5549f009053d2029ad75bf462dc70203c116580ac0d867 SHA512 8dace5b6ad764654c4375a4c2fad171e88448281936ced8d4efc5956e291e7c31b0ef295845241cb3e36976dc4a1e78886d2dff9fc172845622ab74a3b062230 WHIRLPOOL a58df1a8b19b274baea9feb7658b17d524c3abf983c9f56c80c69a7c180e1c48f22b106c2685acb950504531cf10dd388eaf0fc3699eeb3d8aac82cb3521adb7
+DIST kramdown-1.9.0.gem 238592 SHA256 e00ef90f083f845118577dd6a040b4a4aa475bd7a2a645b2ad6944da0555598b SHA512 0ac14adec59c4032d27ac0e3c66a0737688295562782c86f80c953fdca56b5611b7f32dfb570649421fdc1b47deea72715a21c907124c99663bc1a23c1f489ec WHIRLPOOL ba34d5e746e6e3515c40dd3716d4e277ba5c15978095dc91f4a74e2c981dbf4e04717185870f7cfba5e76edc7f3bd209aa6d51f901673ec9dcc6d1ba7c635775
diff --git a/dev-ruby/kramdown/kramdown-1.9.0.ebuild b/dev-ruby/kramdown/kramdown-1.9.0.ebuild
new file mode 100644
index 000000000000..fbace93b06dc
--- /dev/null
+++ b/dev-ruby/kramdown/kramdown-1.9.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
+HOMEPAGE="http://kramdown.gettalong.org/"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="latex"
+
+LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
+RDEPEND+=" ${LATEX_DEPS}"
+DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
+
+ruby_add_rdepend "dev-ruby/prawn:2
+	dev-ruby/prawn-table
+	>=dev-ruby/rouge-1.8
+	>=dev-ruby/itextomml-1.5
+	>=dev-ruby/coderay-1.0.0
+	>=dev-ruby/ritex-1.0
+	>=dev-ruby/stringex-1.5.1"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( >=dev-ruby/minitest-5.0 )"
+
+all_ruby_prepare() {
+	if ! use latex; then
+		# Remove latex tests. They will fail gracefully when latex isn't
+		# present at all, but not when components are missing (most
+		# notable ucs.sty).
+		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
+	fi
+
+	# Avoid tests requiring node to be installed with mathjaxnode.
+	rm -f test/testcases/span/math/mathjaxnode* \
+	   test/testcases/block/15_math/mathjaxnode* || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/kramdown.1
+}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index e9b8e2e45c9d..80a9b6039767 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,3 +1 @@
-DIST loofah-2.0.1.gem 59392 SHA256 e47f811395f87885374e780e64034a7263b52d5308352e32851ccd0c1bd7c66c SHA512 6bed99fced69538aa64c6ef67878420ef88d427c7cf6e74599f33ff9cfc9fcd6e9450de30a922d54bdead4851a39ec0b4bd58e58ab5ed1ef89610151c7f9270f WHIRLPOOL d100ba311a54303a11227cc50d82c4469f2d66462b8614e3a1ff9d512340981219431968282dd84c4cad0970c4b462a0f6ce0bfa792f34bc3f83ab4cc2789807
-DIST loofah-2.0.2.gem 59392 SHA256 1ab5fb9a1dca7b955e75d582f57d236de46430ab5c5b5a33987c04d3ec93ccc7 SHA512 f61b853847bd0dfecada1d8eb4f0ab1b179c804f0ac7c74f927a8275f6d1e9fb35456abdaa0ca3f81d8281f31c77088757fe2f994332ce0a742bb89fb1d2986c WHIRLPOOL a6ba55875d168e9a8c5bd3ad99e50f124f598ce21159025516ae7b4a7cf80e4a587f7c5f34c01ef568e4796a4a006ec4135b2da3938d40bbab7ce852a5ee54c4
 DIST loofah-2.0.3.gem 60416 SHA256 48c76e74f25229e0f492c2aaf770253fe44b162a0d18c2de1c59831b44d13781 SHA512 1f08bcfa09bf075b4d84707099cce6bdaa986cd6c79f63fc60c8bee4812c5a31cee1021cd314fc2033842d7b01ffe63f5f6acbf271a0db2ee631cd326520d700 WHIRLPOOL 6dc1ec2c70d8cd89e58fd59e4c656d2d780b3b9d0ac41434d3511dca1b38cd89e1156b3804a4121b1fc578a784331bffe5c47033b36b7a96579c8d3374ecafbf
diff --git a/dev-ruby/loofah/loofah-2.0.1.ebuild b/dev-ruby/loofah/loofah-2.0.1.ebuild
deleted file mode 100644
index abc8449c72a6..000000000000
--- a/dev-ruby/loofah/loofah-2.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$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A general library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 >=dev-ruby/hoe-2.3.0 )"
-
-all_ruby_prepare() {
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
diff --git a/dev-ruby/loofah/loofah-2.0.2.ebuild b/dev-ruby/loofah/loofah-2.0.2.ebuild
deleted file mode 100644
index abc8449c72a6..000000000000
--- a/dev-ruby/loofah/loofah-2.0.2.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_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A general library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 >=dev-ruby/hoe-2.3.0 )"
-
-all_ruby_prepare() {
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
diff --git a/dev-ruby/loofah/loofah-2.0.3.ebuild b/dev-ruby/loofah/loofah-2.0.3.ebuild
index abc8449c72a6..43305aba8983 100644
--- a/dev-ruby/loofah/loofah-2.0.3.ebuild
+++ b/dev-ruby/loofah/loofah-2.0.3.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
 
 inherit ruby-fakegem
 
-DESCRIPTION="A general library for manipulating and transforming HTML/XML documents and fragments."
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
 HOMEPAGE="https://github.com/flavorjones/loofah"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/map/Manifest b/dev-ruby/map/Manifest
index 910e79d3fda1..809126693a84 100644
--- a/dev-ruby/map/Manifest
+++ b/dev-ruby/map/Manifest
@@ -1 +1,2 @@
 DIST map-6.5.5.gem 24064 SHA256 71d248690fecab630d4efc8bcfbff5ce7a225c107c544cba79f19ead1221731c SHA512 55014cc5d7e04879f62adf73ce4feb9afee826fac2b6b8493fc81422e418584666fd5d6335dc87cf70e8f980eaa4e0b5b032a3e48442b90c375d5a9907798535 WHIRLPOOL 02b445e02932b6ba939f332b51a506912cdd782d88d34db29aed9783acefb856b17a2e767d1cb91ef2a20d2c83b5c4fdc5592d54747aa04619daff5c5efccfdb
+DIST map-6.6.0.gem 23040 SHA256 153a6f384515b14085805f5839d318f9d3c9dab676f341340fa4300150373cbc SHA512 26854ee6aec63fde2da94b2c15e6916136ba20f7c47a321d47018b62fa3977168c04da9f2ffae07aabfed415c8d478146db7cef28413a0078b90a095fc6cd9fb WHIRLPOOL 89d0bd22cad6d3981251906ce2e80499c7dc79c83b7b2d0026ab2feaecc5a0286e25e5a5704a7e47233d43c3d575e58fcb343451674c8eeab921e5d7422794b1
diff --git a/dev-ruby/map/map-6.6.0.ebuild b/dev-ruby/map/map-6.6.0.ebuild
new file mode 100644
index 000000000000..44da6df08fca
--- /dev/null
+++ b/dev-ruby/map/map-6.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_GEMSPEC="map.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A string/symbol indifferent ordered hash that works in all rubies"
+HOMEPAGE="https://github.com/ahoward/map"
+
+LICENSE="|| ( Ruby BSD-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/Config/RbConfig/' Rakefile || die
+}
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 763ee4b6e69e..ae44c017706c 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,4 +1,3 @@
-DIST mysql2-0.3.19.gem 52224 SHA256 d34c6804e1916361ff352da0f0f57e615909cad0edcbf18d9aba78e1ddc2918a SHA512 1486e6016854776307a42b8edd1b51f222c9ec4a3aa769aba03579c132e778673ed5cd788d129fecb73085a01989adf9813d36d20ff292573b6db041354270f5 WHIRLPOOL 12db1a0c0b8260bae189590094978038903e871e1e91cf9d502117a05807344a60d9b40be0c8a45e5be74f027eefbf7e2c2ab5d5ba2d8e9bcdabaf6b41c8024b
 DIST mysql2-0.3.20.gem 52224 SHA256 37166b21ca4b92a7af9bea566d78884b05391cfc14f786c18e7f264b422f0758 SHA512 65088e57b3693cb2b28cd37fc595de43edb85dba14421c1c43cd0c4e41efc0a8a39bd541213170af95e712998b44411a4212d9b96750207ed9d7292aa1e66c91 WHIRLPOOL 23e9852f3f9ee76e4463c4397b1e96288e2f8575030f33540c7c8cc8ca8fc106be2aec1c117dd008e4026872850731b4396babbbbeb971e8dacf523fe33387c9
-DIST mysql2-0.4.1.gem 71680 SHA256 1ba5e782424a7a8d9ed75456c0df22d4196d6ca84a3a8a1ba3d009c5783d0fe2 SHA512 6abd2e63c5a24fa935d706afecba1a14b6fbb408a1a5e88b78b19a034426d7dbaaa82646b471d5d3965547d8377b196031f1a00e86a0da54665e485aa051ce7c WHIRLPOOL 21e6aa216a564335dd9e980e93ee29bd29a5958392c759d6e86c8a88f35d843eb8b9292c904ec3102c079e023757d0555a7faf8c9bb028151815bb68ad0024a2
 DIST mysql2-0.4.2.gem 72704 SHA256 0a12414109d6f1c328ed29a2157daff265eab81f1b3bce7794fcb4804fdaeb66 SHA512 d6883149dbd505c5d7f73c657a5fd2eebaeff9f78d411ac2fcb9bf78dc7f45866290067f20af2dd40a1851a26b09f1af404bc7aba3c60dd979475b7db81e2dae WHIRLPOOL 999b87d21acb6f8dfeb33770c27dc0b00d4576edc5e14311e543bca09be79bf56fe8d9aa93b881dca99ed5a21634c2bb1328cb0f0877ee7f0573013bb0688284
+DIST mysql2-0.4.3.gem 73728 SHA256 d81dca548bb36dde18ca187be7c7e497186f7881d24e9a58c53468976602989b SHA512 bd55bec7ae6eaa6e3f1aaffa990d9f6d19a98595a08b3eedcca3b1b38ef48181f241f651a5b20b1a8b4b55df6076d7addce9b8119e73ecc2bf384174b5f5a3e7 WHIRLPOOL d6533da63b6037638b7b54794791f6a1f3e1e6ecff6017b08acf8841348d75bee0c88a2f4ac9270d6746973a3fad2aa6465e8e76b3c6905aba2b2094ad3ca38d
diff --git a/dev-ruby/mysql2/mysql2-0.3.19.ebuild b/dev-ruby/mysql2/mysql2-0.3.19.ebuild
deleted file mode 100644
index ef3a37f29621..000000000000
--- a/dev-ruby/mysql2/mysql2-0.3.19.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
-
-each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2 || die
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.4.1.ebuild b/dev-ruby/mysql2/mysql2-0.4.1.ebuild
deleted file mode 100644
index 3b15943db4bc..000000000000
--- a/dev-ruby/mysql2/mysql2-0.4.1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
-
-each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.4.3.ebuild b/dev-ruby/mysql2/mysql2-0.4.3.ebuild
new file mode 100644
index 000000000000..d4090a5550bb
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.4.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND} virtual/libmysqlclient"
+RDEPEND="${RDEPEND} virtual/libmysqlclient:="
+
+each_ruby_configure() {
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mysql2
+	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
new file mode 100644
index 000000000000..54f5ea572c92
--- /dev/null
+++ b/dev-ruby/octokit/Manifest
@@ -0,0 +1 @@
+DIST octokit-4.2.0.tar.gz 2740295 SHA256 af4853f022677fd1c344e20d396912a3783f6bd43fffc9b608d9c4218eebcef8 SHA512 5b596da5c2b6bff4cbef3c3faa57a341e7e46dffa8b16d81072b567a5827138ce173a13c1054719853aaf821ad8f5ef8c7e1f666769f3a1e538ef886e64dc1c4 WHIRLPOOL 781bf01f770ee42568ce8278787542dc8840c7dc489042a1d52cb3c59e5ccf13cd3d8269ddc5f9443447060b10c0fd56c89218c1dfdd02c4989e3d20c0c6ebf8
diff --git a/dev-ruby/octokit/metadata.xml b/dev-ruby/octokit/metadata.xml
new file mode 100644
index 000000000000..fd61014adc35
--- /dev/null
+++ b/dev-ruby/octokit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">octokit/octokit.rb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/octokit/octokit-4.2.0.ebuild b/dev-ruby/octokit/octokit-4.2.0.ebuild
new file mode 100644
index 000000000000..a16dcf84ca99
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com//octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend ">=dev-ruby/sawyer-0.5.3"
+ruby_add_bdepend "test? ( >=dev-ruby/netrc-0.7.7
+	dev-ruby/vcr:2
+	>=dev-ruby/webmock-1.9 )"
+
+all_ruby_prepare() {
+	sed -i -e "1,10d" -e "/require 'vcr'/i\gem 'vcr', '~> 2.9.2'" spec/helper.rb || die
+}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index b002166dae81..7d8369d66eb8 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,3 +1,2 @@
-DIST parser-2.2.3.0.gem 456704 SHA256 4cb1cf8b34f8d331c9f4a02e4b2f8068cde73b1c957c9c6f24401251d503ab91 SHA512 8f3c20417fd2c788573f0a0068f03c8bca80f3f3e49b0a2516b5f976e896453707fee50e248968a1f65294cb86f771749decd71d9a56588c1ef5cff9dd048cea WHIRLPOOL 8427e10f57128457a7490b807272fc6d09c6b36d91e8d28a493a429ada2d4a5526b3fa7dcfc3c06013b07e4fcddefdbdacdb8a0a578fefbc701ec8294d727582
-DIST parser-2.3.0.2.gem 503808 SHA256 4941df938d747bea9922468ce76c7364851439084b09bb066e12314aec2ef03d SHA512 0b4413d4402e70e7f49ccbeedde8ae59b7815eae488e09d9f36319a2eae82a72a93f2643051b97561edb1f712f2455745649050e5a942a7f33808dd823661de9 WHIRLPOOL 27c5861222867ff150bbe69b123506d75567750f46343602baf1620fa998835fc9aceb17c4fcfbf92c62eb590d61b097ee580255fb5b70c58bf6ddeb0ff7e0ba
 DIST parser-2.3.0.4.gem 508928 SHA256 1c480682d9fc2b19f67520fb250f6f9713ac419e1dd0d71b235122a4991828c6 SHA512 e9f273a78c40e1ea5861308653d3e284ddb564527eb0d2cc6ca1a495e2ab6453eefabfc0c24784ddd383cd156e47b9824e902b2834955d9d4e3dd9361281a7d0 WHIRLPOOL e48aa6ee3d5467012ada0bed8ab260d77248a0aacf09ea449ec450ec97e7942460e3499131653b1488161e115d5219cde12b39905edee4755ecd63c898e6940d
+DIST parser-2.3.0.6.gem 509440 SHA256 7fc1c0b72d237c8842ff15d8709acda05cacd38492ce5065dfb1304d659924e4 SHA512 4c03d201c05ec8a655d8062a90ed4b28b37e1251b9e6797964482c197bdb44b275b40778e787ffbf1360394dac47f7beb5b45877b0145c22e66d61502a199674 WHIRLPOOL ca62cb861cfd6a94e6388696b6e45865bc6b5fdcf21ac3fbab1e450b162c295be5f4c14e2a34c4df1342d08bb559afb27c2e52f708b2a8b6d71b180baf453289
diff --git a/dev-ruby/parser/parser-2.2.3.0.ebuild b/dev-ruby/parser/parser-2.2.3.0.ebuild
deleted file mode 100644
index 0bc7d5b0a421..000000000000
--- a/dev-ruby/parser/parser-2.2.3.0.ebuild
+++ /dev/null
@@ -1,33 +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="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/racc
-	dev-ruby/cliver )"
-ruby_add_rdepend "dev-ruby/ast"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/simplecov/,+35d" test/helper.rb || die
-}
diff --git a/dev-ruby/parser/parser-2.3.0.2.ebuild b/dev-ruby/parser/parser-2.3.0.6.ebuild
index 5ac9378e1ae1..5ac9378e1ae1 100644
--- a/dev-ruby/parser/parser-2.3.0.2.ebuild
+++ b/dev-ruby/parser/parser-2.3.0.6.ebuild
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index 12b9615a94be..1facd255a226 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1,3 +1,2 @@
-DIST pdf-core-0.5.0.gem 43008 SHA256 582c08d26965ab59d2129c34ddb5437300c9a5ecf1138a7cd75f905d590f8686 SHA512 67f4055de49dace03e7272668e79e00def9f2c6ebcd3edfff2a12830e3fd2449037c79202c0d575696cbef8e67da5bc430c17b0d842115e0291ff95f135716e8 WHIRLPOOL d4a060fcd42c018b9a2a11a195e05198c60998be9c3c7d5127293fc8cdd3c13736a54895e96cf9a6c09c56bfbd53d7fc5b7ae6cbd1f904c31e73584d0dd2118d
-DIST pdf-core-0.5.1.gem 43008 SHA256 d2b0761c0c5b6b0c196f22bce184060230db689c1436c996892d26b97d2d083d SHA512 b88025556d04af27117092ad7bf6bf08d3424ade3515815b8d26be1aa63940e956cbd0194f10953439bd51f4f743432b59262c48151132f17e20b5efb2649635 WHIRLPOOL cd9f91568d01634f185cadb1e34384b09dbb9cedae036e75f640a9b6a40ca79b71685c7714d1d868c8383f012808cab065dbc5dc58cae64abc20936024a75c34
 DIST pdf-core-0.6.0.gem 43008 SHA256 5ece7892eb5e28ec08625c895a23cfc790e8f3d5031f25dceb1b018dfd2a49cf SHA512 a6090a17aa570d12b18e501cc6b9f2cfbec30cd497ba7bbf63cc2d13136635c67db906fe1c04caa3a52b5d31008708e9c433872d95bed5742c517028670252c2 WHIRLPOOL 6943b8d2a87e0e20ec812b1d5d69e9c440a2586dd9c6276c0c4aebe8b2a3617a248b8b78d1e89eae73c139e5421fd01f788130ef8e1a10f9fb3a0f109980b8d0
+DIST pdf-core-0.6.1.gem 43008 SHA256 debd79635c3d1e40d4f35bb3b7524b8077fc6d8a568679dc7d3bced6e60410e8 SHA512 dc9074658cb4037fc1ab4f51a19bd67396c31ef18ac5c89e94563711eced8a7a6ec642e907564c92453cac08cd7a09f6da6f6da87536475cce8238cef087467a WHIRLPOOL 4264d49d6a87c379b41ee4997938491ab7488c61517abdbcce1bd9e348edd642316a8ca8d6578a3125d4098337ddc94e25a87850c1a060f3b7b1846027d5ee32
diff --git a/dev-ruby/pdf-core/pdf-core-0.5.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.5.0.ebuild
deleted file mode 100644
index 837a95a75a7e..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.5.0.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1.1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-core/pdf-core-0.5.1.ebuild b/dev-ruby/pdf-core/pdf-core-0.5.1.ebuild
deleted file mode 100644
index ed53c9c4987a..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.5.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$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1.1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild b/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
new file mode 100644
index 000000000000..740bc42f7913
--- /dev/null
+++ b/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements low level PDF features for Prawn"
+HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
+
+LICENSE="|| ( Ruby GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1.1*
+	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 1db5336429da..4facb50eb9e0 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1 +1,2 @@
+DIST pdf-reader-1.4.0.tar.gz 10237090 SHA256 c23d5eec976c5d824d16f348ef49b87b0918cc2a2327aa7936605b92b8c181e9 SHA512 e9b123058c5bf31c7ac264adf17da25cb643408cd0ac4f8da0b7949576e11b1ac4141df649c7ce45f3accf2ddfb6ab3edd35ce336e4588bb090bfbbfe1f42965 WHIRLPOOL 8d50fde908037c228cc40028cb10e040b4571446ebba07140e6f0b1515d6ff0d282c37c08071a86a256e8a3722a86c069d2e1db6bd35fb2c577c68fbfc2d41a9
 DIST pdf-reader-git-1.3.3.tgz 9987686 SHA256 1e5e468fe99911ec4472031e66ebe6a4bb1fc05a2156b646ce9dff43c0253815 SHA512 5394767df24de30133e3b33a00421588f85fecd4006d2bbe622e905ef0d92947a2d11f6ea7bb8f61b43aebba9204b2c2512f97dc120d19fc87cd0a42011a3750 WHIRLPOOL bd6f15fe6548728d884890cddfddb4abf0e35504528036703f582e3c405e7c4efcb71a7b4e846b67e7767bcaf34a9219ee9d1a7f45f84bf2cabd860eebf2934e
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.0.ebuild
new file mode 100644
index 000000000000..e595ecad894d
--- /dev/null
+++ b/dev-ruby/pdf-reader/pdf-reader-1.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GITHUB_USER=yob
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
+
+inherit ruby-fakegem
+
+DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
+HOMEPAGE="https://github.com/yob/pdf-reader/"
+
+# We cannot use the gem distributions because they don't contain the
+# tests' data, we have to rely on the git tags.
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/afm-0.2.1
+	=dev-ruby/ascii85-1*
+	=dev-ruby/hashery-2*
+	dev-ruby/ttfunk:*
+	dev-ruby/ruby-rc4"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/* || die
+}
diff --git a/dev-ruby/polyglot/polyglot-0.3.5.ebuild b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
index 7c041689077f..3bcb65af6f13 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 60ac4b08f3eb..1e9c4f77fcb2 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,2 +1,3 @@
 DIST puppetdb-termini_3.0.1-1puppetlabs1_all.deb 21662 SHA256 a1930ded1549187b9c6d1bbd267b0ffe353f498cd053364349a99ed34214c614 SHA512 7ddbf0ae264fcf6063ba180e6ba19e1c491ece7f11b761f6fa66ba39c89de6e7b1a14efa04a113e553892bf987f79f3175dd950f55ce05b985ef7ea19e470ab0 WHIRLPOOL 204d8f8889e4725cf515ce23b5f8b3c5c987899751e2c1a43acae3ef92d7c8297921cc60c739d3fa6f77259b1e539a40b70e9cf081ab15509f21ef5a0b892a2e
 DIST puppetdb-termini_3.1.0-1puppetlabs1_all.deb 21074 SHA256 58b7f2cd7f374c7d3be69be5d53b8def650b8cddf8848619981451532cfcc4eb SHA512 ac265806f33bbde23825a09f19710ee99e0f12195d921033aa156641e7c092e3ceefa40a855ce39a216ca486bf0d898d27ca3801be01af6f2e47b7582004c0bc WHIRLPOOL add162e4d66474cee3e6291c4305917128c3840fd8abda3ce4ff78337e1ac8c23a616fd5074f098f1036a9be75f21c27aa906c632cc49e5e2031a13b02d423bd
+DIST puppetdb-termini_3.2.3-1puppetlabs1_all.deb 22028 SHA256 b5461dac4bff77530b071dcffe270e896846eefdb83aa65d70cfdfab6eafda1f SHA512 d7f789f73a8e82e7cc291631577574aa75357a8a404f6949127749f26209c6f3017472afedcc1ce73b2d118b946423db059c7e840ad00828b491b1631321879b WHIRLPOOL 78be90206062adf49ace4518aa65d7a88ca18cd34a4b20857c03f7434103e0145f38018f7312b4c3514940c346e643e662bcbaf6974bd6ffe1af102afce5b493
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild
new file mode 100644
index 000000000000..98635dbc191a
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.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
+
+USE_RUBY="ruby20 ruby21"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/puppetdb/${PN}_${PV}-1puppetlabs1_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 9f6a916e71aa..c912b7f807ea 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,2 +1,3 @@
 DIST rack-attack-4.3.1.gem 16384 SHA256 9a2ea5df8c9b4a715ecd6497e7553c7e50fdb1452abe724bd8ae359115621146 SHA512 6f89b7f8afb8adab09b0df984df2ad4dbd043ad73dbb7adad11a87f9f4041194bb4f63399fd5c5d15bec1ee47a682247a9f01217ada8eeda1fb09235dd00ffaa WHIRLPOOL e9f45190635229975bb02abe2f6996d6de82f7486339c3bc26ac65dfa6a6f1da5e58a1f6f92b835388ddc218ff2971dec3a223e6c6be4e06c7eb034d06e1e1d2
 DIST rack-attack-4.4.0.gem 16896 SHA256 8e20760712a51a51f9919ffd24f8c638d2e1bbe13340b61fbc0c984a4cb40d6e SHA512 2c9d0a90c99481990d2cc777dfa4875b23fab16f542645a610619f870cccca8373ffe205ff0785732045216f3b97bfbc983dedd76941a12c0e36baf0050477a3 WHIRLPOOL 6e9d131ad525f83d2d2eb699d148dfd276199fa491f86c9bca9fa399c1f6cd53390558c24f137298651d29c71483d56567f24c9d3f529e0b60d37ca0bd18fa1b
+DIST rack-attack-4.4.1.gem 16896 SHA256 81367dad64d7e7ce560b9427b0334eae674accd2cdb6d982f02875702e32fdb3 SHA512 1373cd47fdc06a1d4bfc751f3c8ca7c7394117090d190f5b58c4d7b91ac91babfc7bfed7690961ad6534ccb0ce8918f721d3e1b33902d12e686978c1c459e572 WHIRLPOOL 3ac1f89ead19272f6078cefd1df50f8a144b6c3b7a7dd9848709dae6a39e4563d367975bf26c46b7cfe5066542c17efde622653d60db0a75dc14ab7e9fbba0a7
diff --git a/dev-ruby/rack-attack/rack-attack-4.4.1.ebuild b/dev-ruby/rack-attack/rack-attack-4.4.1.ebuild
new file mode 100644
index 000000000000..232152e9171a
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-4.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? ( dev-ruby/activesupport
+	dev-ruby/rack-test
+	dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3.ebuild b/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3.ebuild
index a3394d71bce1..6f9936833f52 100644
--- a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3.ebuild
+++ b/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rails/rails-deprecated_sanitizer"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.2"
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.7.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.7.ebuild
index 29f5eef84322..993c87377d50 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.7.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3.ebuild
index f7cc8327f220..8311e044460c 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/loofah:0"
diff --git a/dev-ruby/rails/rails-4.2.5.1.ebuild b/dev-ruby/rails/rails-4.2.5.1.ebuild
index afa0052fb706..6fcfbf23b12a 100644
--- a/dev-ruby/rails/rails-4.2.5.1.ebuild
+++ b/dev-ruby/rails/rails-4.2.5.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="+asset-pipeline"
 
diff --git a/dev-ruby/railties/railties-4.2.5.1.ebuild b/dev-ruby/railties/railties-4.2.5.1.ebuild
index 8a14333e8185..6e83eef40b24 100644
--- a/dev-ruby/railties/railties-4.2.5.1.ebuild
+++ b/dev-ruby/railties/railties-4.2.5.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/rb-gsl/Manifest b/dev-ruby/rb-gsl/Manifest
index b168378c6d7c..fbeac69a16d5 100644
--- a/dev-ruby/rb-gsl/Manifest
+++ b/dev-ruby/rb-gsl/Manifest
@@ -1,4 +1 @@
 DIST gsl-1.16.0.6.gem 594944 SHA256 3fa354277d68a729e239a8c9eb3408f2978a444b7da3708cff120a9cb69cdcff SHA512 99610ef7e9b57c29f1972c4cb2853642157660b885a0a9761876c649badeb02dace7f0191453ce63d1a7f59bc3ee89fb61a73ae71522b5430f7916a60c4d1490 WHIRLPOOL e2b0c71e5262242586e02ffba632978057a0a467171974a0acab9e43e0f268741815b93a43a573dbffa56fe8448b95d909622207dba2f52ecb231d92abc648b2
-DIST rb-gsl-1.16.0.3.gem 587776 SHA256 fb88cab2be18c422fa9cdabc3e43952d3ae9af72fc4be5109b76c1b6ae2c7f45 SHA512 e1640d616069c90d9e3929dd2d8649a463bb720d318ff6d5aaf263d3be216387f1eb5137aca58a40b5cfd7a5c5796e3c68d94f298ef10a309dfe923507dfe8c3 WHIRLPOOL 3bae2beaaf91ac09e2b0f8e5e1d14accc5ef393ab85f3885c889e99c99ffe035f24515f1ba45a68de2974415c0d5c46dc3f930988dc8323215f94cd60c29a58e
-DIST rb-gsl-1.16.0.4.gem 588288 SHA256 bc6573cc36410d2ec88672d4b12e2c908684796b276a8743c19345bbb44bef94 SHA512 93d9064b3a268b81c4cd2bdc9c6a22871ec31daa327a254cbc3c7b715eb9fa20da3b3ebc370413675045cf9fbf9ae843e7aa4b6c53469b4f46ecbab27c560deb WHIRLPOOL 44cea9a3571005aeef993b81d56350f76006c05b8887ec3cb6e49b33b101e6a566c39d637ba36d4084af0bb32a406dcce782a6091aebe24098dfa9564718d367
-DIST rb-gsl-1.16.0.5.gem 594944 SHA256 00e35dd3b23a3b37e7e2e52887bcbd130ef3949289284fc05e40397da18b8e37 SHA512 39ebdd04efa7995fe3a601af62246a4baaf92aceddf975a93693db199277e9c84e36c4dbc8d08c5cd66ca4e9cb2300c6d0fb1ee8f226c32a78e7ae1c453211d6 WHIRLPOOL 2e496d46965f57c2e0b9bd4dfe7a7bd6f792778c3c0af6688ff8eff2ead48b5853cc2eaa4f5690a120ed8647c2948c247a57629899cf5fd22c8ea2b4a4f13cf1
diff --git a/dev-ruby/rb-gsl/metadata.xml b/dev-ruby/rb-gsl/metadata.xml
index bd1c8c52f967..32e472e5de41 100644
--- a/dev-ruby/rb-gsl/metadata.xml
+++ b/dev-ruby/rb-gsl/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">david-macmahon/rb-gsl</remote-id>
+    <remote-id type="github">SciRuby/rb-gsl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rb-gsl/rb-gsl-1.16.0.3.ebuild b/dev-ruby/rb-gsl/rb-gsl-1.16.0.3.ebuild
deleted file mode 100644
index 690566c78e98..000000000000
--- a/dev-ruby/rb-gsl/rb-gsl-1.16.0.3.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-inherit ruby-fakegem multilib
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README"
-
-RUBY_FAKEGEM_TASK_TEST="test:libs"
-DESCRIPTION="Ruby interface to GNU Scientific Library"
-HOMEPAGE="https://github.com/david-macmahon/rb-gsl"
-#SRC_URI="https://github.com/david-macmahon/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND+=" sci-libs/gsl"
-RDEPEND+=" sci-libs/gsl"
-
-RUBY_S="${PN}-${P}"
-
-ruby_add_rdepend "dev-ruby/narray"
-
-each_ruby_prepare() {
-	sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/gsl extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/gsl V=1
-	cp ext/gsl/*$(get_modname) lib/gsl || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb -Ilib -Itest test/*.rb test/*/*.rb || die
-}
diff --git a/dev-ruby/rb-gsl/rb-gsl-1.16.0.4.ebuild b/dev-ruby/rb-gsl/rb-gsl-1.16.0.4.ebuild
deleted file mode 100644
index 6e02280f0dc9..000000000000
--- a/dev-ruby/rb-gsl/rb-gsl-1.16.0.4.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit ruby-fakegem multilib
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README"
-
-RUBY_FAKEGEM_TASK_TEST="test:libs"
-DESCRIPTION="Ruby interface to GNU Scientific Library"
-HOMEPAGE="https://github.com/david-macmahon/rb-gsl"
-#SRC_URI="https://github.com/david-macmahon/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND+=" sci-libs/gsl"
-RDEPEND+=" sci-libs/gsl"
-
-RUBY_S="${PN}-${P}"
-
-ruby_add_rdepend "dev-ruby/narray"
-
-each_ruby_prepare() {
-	sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/gsl extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/gsl V=1
-	cp ext/gsl/*$(get_modname) lib/gsl || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb -Ilib -Itest test/*.rb test/*/*.rb || die
-}
diff --git a/dev-ruby/rb-gsl/rb-gsl-1.16.0.5.ebuild b/dev-ruby/rb-gsl/rb-gsl-1.16.0.5.ebuild
deleted file mode 100644
index 10c07b56f798..000000000000
--- a/dev-ruby/rb-gsl/rb-gsl-1.16.0.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit ruby-fakegem multilib
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:libs"
-DESCRIPTION="Ruby interface to GNU Scientific Library"
-HOMEPAGE="https://github.com/david-macmahon/rb-gsl"
-#SRC_URI="https://github.com/david-macmahon/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND+=" >=sci-libs/gsl-1.15"
-RDEPEND+=" >=sci-libs/gsl-1.15"
-
-RUBY_S="${PN}-${P}"
-
-ruby_add_bdepend "dev-ruby/narray"
-ruby_add_rdepend "dev-ruby/narray"
-
-each_ruby_prepare() {
-	sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl_native/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/gsl_native extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/gsl_native V=1
-	cp ext/gsl_native/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rb-gsl/rb-gsl-1.16.0.6.ebuild b/dev-ruby/rb-gsl/rb-gsl-1.16.0.6.ebuild
index 1ea156820886..57d572c2be28 100644
--- a/dev-ruby/rb-gsl/rb-gsl-1.16.0.6.ebuild
+++ b/dev-ruby/rb-gsl/rb-gsl-1.16.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_NAME="gsl"
 inherit ruby-fakegem multilib
@@ -20,16 +20,16 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
-DEPEND+=" >=sci-libs/gsl-1.15"
-RDEPEND+=" >=sci-libs/gsl-1.15"
+DEPEND+=" >=sci-libs/gsl-1.15 <sci-libs/gsl-2.1"
+RDEPEND+=" >=sci-libs/gsl-1.15 <sci-libs/gsl-2.1"
 
 RUBY_S="${PN}-${P}"
 
 ruby_add_bdepend "dev-ruby/narray"
 ruby_add_rdepend "dev-ruby/narray"
 
-each_ruby_prepare() {
-	sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl_native/extconf.rb || die
+all_ruby_prepare() {
+	sed -i -e '/LOCAL_LIBS/ s: -l: -L#{path.gsub("src", "lib")} -l:' ext/gsl_native/extconf.rb || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index a28c88cf2128..88be43f1b6f7 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,3 +1,2 @@
-DIST rqrcode-0.6.0.gem 25088 SHA256 8a57b341e4fc148ef105b16a9ad1eea883a40a55dac9949804cd6431119d30f5 SHA512 613f91855696ec8b95b3879f0639cb5057066e21d5d80714b1cb63cd3dfefbb69fe0baa890d269b326c033febbad2e3705b024bd6baaa550e703b6dac09d10c0 WHIRLPOOL 27a5ce83237a2327409da75d73825a3301d8a154aeea9d581648953a9dec4911c306be6ff77d1b22a543b11420c4dbf1f3861cc4747fa7bca2375c4038549593
-DIST rqrcode-0.7.0.gem 25088 SHA256 8b3a5cba9cc199ba2d781a7c767cb55679f29a3621aa0506a799cec3760d16a1 SHA512 ea336b24d43113821100f96680740d265456ebfda46f064b17e0a51295ca945203d03f0be27d3c6b86398393ba9d102f339db4708ec36d09f90cb240d16a6d3c WHIRLPOOL d74324bbc835368583e526c23bd5f4f57d7e2abd83940da9f05833518788815eca8c6d9b61bdf090640ae0a6efd0cc7e0aad3d4de179e373905a78c879578931
+DIST rqrcode-0.10.1.gem 27136 SHA256 0a4ca43374b65e980287104a85805df00d9ecea1e3eda9f41503e8d7bcb53740 SHA512 5b2d6e63bc069a1cf436d2df159bef673ef621a73d72c52bbdec1c2d820f4553172d5c3499b9347e0939d422bffa8f39ecaae123ce0be360d25ab6c08a6eb583 WHIRLPOOL 0a5a66eac0029215a9ee6d9419d265c20006b083d26f3a443fa8fcf293df014689dde5111acf498d62f477768d34c4ecb4f5017234b75f5ad231a15341798fc2
 DIST rqrcode-0.9.0.gem 27136 SHA256 31b84b2203fb3892f5d9d86ae5ccb67420031d7cb06c3739214e88afc6968130 SHA512 80ce9fcfac53bc23818fe6bf49dec088df298e1c8232245cea1f423e0a78b4e19342aab39a80165ca3ff41076eba2ab80b2ddd5564283d748950305f6d545b2f WHIRLPOOL 65d076daab72dff9714581790190a2dd3ea963f33f1eb2d31933c73341b89d93062220f9488338c22c76ad96922cc534b95155574e34eb65ac8db06007af8d5f
diff --git a/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild b/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild
new file mode 100644
index 000000000000..bc4bc4edd95c
--- /dev/null
+++ b/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for encoding QR Codes"
+HOMEPAGE="https://whomwah.github.com/rqrcode/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/chunky_png:0"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest"' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['test/test_r*.rb'].each{|f| require f}"
+}
diff --git a/dev-ruby/rqrcode/rqrcode-0.6.0.ebuild b/dev-ruby/rqrcode/rqrcode-0.6.0.ebuild
deleted file mode 100644
index f0db90edaf0e..000000000000
--- a/dev-ruby/rqrcode/rqrcode-0.6.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
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.com/rqrcode/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/chunky_png"
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/rqrcode/rqrcode-0.7.0.ebuild b/dev-ruby/rqrcode/rqrcode-0.7.0.ebuild
deleted file mode 100644
index f0db90edaf0e..000000000000
--- a/dev-ruby/rqrcode/rqrcode-0.7.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
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.com/rqrcode/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/chunky_png"
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
index 409806d088d4..21121d05e6a7 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
@@ -20,7 +20,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="graph test"
 REQUIRED_USE="test? ( graph )"
 
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 97de9d3c60bb..34d06363b483 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,8 +1,6 @@
 DIST rspec-core-2.14.8-git.tgz 195949 SHA256 757febdcc4465b62fb41572e1fb7e0deb86f903127cb2941ea65d2c1d4ac29db SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095 WHIRLPOOL 5b2422d7f1d087caf654ea04d81f269ae90be63eb73135d34691839c27e6dfa152aac425f64a860b3af50ef0bf513ac7f4a68c979c254083f187e57a96c20fe3
 DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2813dea2f5f927929b40e9ee170c43 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44 WHIRLPOOL 5584be2da2310688155c4fe600a4a36f68434440ebc00b063e9fcdcb3188138831a210f482ac86a469984fcf9838d795511ea02433020ecc6bc1d6aacc8c72bd
 DIST rspec-core-3.2.3-git.tgz 276647 SHA256 7122fe372cdf0d4ff60aef42768fc9cc0350bd1943f5c1fa6189153829519ab2 SHA512 a5eb294c4770275662205b4edde2426c7d7ab7f9fb3cea6fc1171071b941a94b6d6386348fd83ba9e76a35512ea56be0b657ba2d8e210fe73c8564e76ebea7ae WHIRLPOOL 895d5fab418ddc5adc9a33078499f59b2865b636516110f0042bd08b4d9ecdb304f135655c0b05102f47725b94da831c986889b8a76eed3e8aa2c693f2d29d63
-DIST rspec-core-3.3.1-git.tgz 332355 SHA256 9dc839186e72fe5d4b4f15500bc2a976d08dc4af859be2b69778b1c4f84d321b SHA512 cddbfc1dae98de2db31a5f9c5a60cf1cdd4995f35bcd1bea525f18fc8b3649d7c8a2e23169873874be22b4f75b14b89d086e2372ed1dd93a157ae03c5989a760 WHIRLPOOL a3e5fa2264b40313c1fcf1890087f218a5a9f442f82528f4422a315858a036ff36cdc671dbb7e1f4d937385e6568cb7950c43ab7249c78b834ba07e5dae671d6
 DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
-DIST rspec-core-3.4.0-git.tgz 354166 SHA256 852bf29d13c30e921126b57233b80a56495465fe80f3a5fb036721f20a74a668 SHA512 9961b99a2209268528a3cee741f682f37300d0bd88c8364ee400073a3274e7465d767f01207db12789debb73a4bcb5dc6eb06039b0364cdf9fd72803fa917bc5 WHIRLPOOL 9d6176434c72a2eacb8d4ca5ae794f0bd0351507bf51a1b102f4eb12dce02a84cbf2f813c801ac5fc591c533ef4ffe995b9e8df374de4ecffe3cb8367e1c1b59
-DIST rspec-core-3.4.1-git.tgz 354375 SHA256 ed75c25573e155b5fd9f57102785294b2f9b4d3796b96279ba977acbb5bf9eb2 SHA512 e472969b7d1571be39438190029690acdcd760b61f7067e8bf66b29324f2eeb7f870f382dacc79738f0aeea1c66bc971b7a8b93ae6a2c3bc61ac539ce4b452a3 WHIRLPOOL 53243e1374d9cc50f950d17e7de30d9dc3f0c3ac0dea16f41c3b36f3160e95d1ab6ed720e83dc508b4925c3340ed4876918fbcfafe937f9b7753cc8888a266a2
 DIST rspec-core-3.4.2-git.tgz 354859 SHA256 bcb93520f5cb2bc0f2f66c09579970c524e7404575cefc5aefcd3da594d775b6 SHA512 33fc3336a01b86f9c22e5e9fe9f78f2b4f66a309fd0bff90d565484912d2ae6525dc80b0e6e2c6d2b5d698c2848e0b025cc4f065b533b9936ba6e7dfb03bae88 WHIRLPOOL 451f5b70bdd9db53fc7fabc84dacff6cd3cbda3422ca475a1090e5bcd2ec42249e91953c0d648c5a4d2ab12af85e778b392a1e75717526d89577ecffe88f0cfa
+DIST rspec-core-3.4.3-git.tgz 355961 SHA256 9dea290b7a1e30e483d61451e968554591a0ce385b66bc75d27d0f9eed7455e3 SHA512 26973fb7de7e2055cfafece0b3d68c2dab3498f6e3705bc2a4d41633b18783d142c7c9bee82fbec0d577b7d97d85c747c8cbdeb0cf8d2b5c017009fa087f2ec2 WHIRLPOOL f52dfaa2dc83efb49f66693e7b9eff20d5237d0593985ed88283247d50e2fa24d6f3739d9c01c0a4fa298b9da1072a01b055b0d4618eadeb8de9e7403cccb7be
diff --git a/dev-ruby/rspec-core/rspec-core-3.2.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.3.ebuild
deleted file mode 100644
index e86374352d1c..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.2.3.ebuild
+++ /dev/null
@@ -1,95 +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_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-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="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.0.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	case ${RUBY} in
-		*ruby22)
-			# The rubygems version bundled with ruby 2.2 causes warnings.
-			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild
deleted file mode 100644
index 4a99fdcd2f3c..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild
+++ /dev/null
@@ -1,99 +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_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-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="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-# Skip yard for ruby22 for now since we don't support ruby22 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.0.ebuild
deleted file mode 100644
index 182c56c76d06..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.4.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
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid specs for older coderay version which is no longer packaged
-	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
-		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
-		spec/rspec/core/source/syntax_highlighter_spec.rb
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild
deleted file mode 100644
index 182c56c76d06..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.4.1.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
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid specs for older coderay version which is no longer packaged
-	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
-		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
-		spec/rspec/core/source/syntax_highlighter_spec.rb
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild
new file mode 100644
index 000000000000..25460b389ddc
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.0.9
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/zentest-4.6.2
+		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid specs for older coderay version which is no longer packaged
+	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
+		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
+		spec/rspec/core/source/syntax_highlighter_spec.rb
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+	# case ${RUBY} in
+	# 	*ruby22)
+	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
+	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+	# 		;;
+	# esac
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		yardoc || die
+	fi
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.0.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.0.ebuild
index cba9d65a7d47..6ed61af45a36 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.0.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/thekompanee/rspectacular"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
diff --git a/dev-ruby/ruby-mp3info/Manifest b/dev-ruby/ruby-mp3info/Manifest
index bda7b9fa6ad4..189a7da92b99 100644
--- a/dev-ruby/ruby-mp3info/Manifest
+++ b/dev-ruby/ruby-mp3info/Manifest
@@ -1,3 +1,2 @@
-DIST ruby-mp3info-0.8.6-git.tgz 88463 SHA256 1b52aff957da105641fcb1713a4afdb031aa6dcc064b1f81f36b744e00754f1f SHA512 3b536850d18a6ab0da9a9d096c79b78e6ec2b8fec78a551dc1b44a94b97a77a37fbb8db7d3fc6fa41c1b0732d949de624b89bf28119752c0486f703a1d0873ea WHIRLPOOL 8edbd44d271f77fa2eee2cb4cbba1b30af626e4a496dc55b91b3ac5470e237b651c715fa56ace937ab985ea1640823f11ccd0e30afc8de7fd0c5a8e344658e9e
-DIST ruby-mp3info-0.8.7-git.tgz 89119 SHA256 f7e5df39b44748f7ceb2d246ecbafbc66b35144d0e7b789db3e04993d5bfea8b SHA512 4b1cfdd4c94d98a78fddeb67639265c5d1aa333fae847ac42663bb93d2e8380d46b6e87482c117001cc14ad9b1f6f2cc2dbb865c5fd12c4ec22e6ca26565685a WHIRLPOOL 8345b8d5e6ad5254a5313dfbf310953c8904e38586cea4d029c73ad4c09700fe25064d807528ae83d45da32511b8c3a254d721b3350f340984958ba9ec391cd5
 DIST ruby-mp3info-0.8.8-git.tgz 89283 SHA256 0a114f8223865531f6423f7f8c4c351d7db3dc0e91b3eaa8b3dbf4098a313357 SHA512 8cfd98cdd04e214b2905ebb7563f2af16833985efdbf53339233902d1a3c323936edac4e618c96b6903ff6282d9e2e6f399f80dae3b98deb32971e00b4efce6c WHIRLPOOL f64bf52ffc17ddedf527f494c76bfa8791de6a3a79e309ee13ff217202edee2f6655a1009771643cf9ea1d7c23a6f9dbb87474e9ac3e65ac19eb8444ae7f57b8
+DIST ruby-mp3info-0.8.9-git.tgz 89364 SHA256 5882525a3b336026bf48147a1343d7b2e5b49d72133d5567aa247578842e5c18 SHA512 ff1911c9468271126e5bc4bb5bcb03ffae9c25bfae7b73d49bc7ea35f42561d9e335cc08476d229b683ebed5fe4aa65647de3586efab6c81644d5ee7983995a2 WHIRLPOOL 4606131f10aa8ff99c207f3931439f1f4c0a3427acd34e85fbc544ac985f9e94f1b266bf497fd7f870ac08b6b09eb8d17ad754b548eab7203ed97aaa4496ec87
diff --git a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.6.ebuild b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.6.ebuild
deleted file mode 100644
index eb2623a01f63..000000000000
--- a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.6.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby library for access to mp3 files (internal infos and tags)"
-HOMEPAGE="http://rubyforge.org/projects/ruby-mp3info/"
-SRC_URI="https://github.com/moumar/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND+=" test? ( media-sound/id3v2 )"
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe )"
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Use a newer test-unit than is shipped with ruby19
-	sed -i -e '6igem "test-unit"' test/test_ruby-mp3info.rb || die
-}
diff --git a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.7.ebuild b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.7.ebuild
deleted file mode 100644
index eb2623a01f63..000000000000
--- a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.7.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby library for access to mp3 files (internal infos and tags)"
-HOMEPAGE="http://rubyforge.org/projects/ruby-mp3info/"
-SRC_URI="https://github.com/moumar/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND+=" test? ( media-sound/id3v2 )"
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe )"
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Use a newer test-unit than is shipped with ruby19
-	sed -i -e '6igem "test-unit"' test/test_ruby-mp3info.rb || die
-}
diff --git a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.9.ebuild b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.9.ebuild
new file mode 100644
index 000000000000..9e3b5eff7d41
--- /dev/null
+++ b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby library for access to mp3 files (internal infos and tags)"
+HOMEPAGE="http://rubyforge.org/projects/ruby-mp3info/"
+SRC_URI="https://github.com/moumar/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND+=" test? ( media-sound/id3v2 )"
+
+ruby_add_bdepend "doc? ( dev-ruby/hoe )"
+ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index c0063ba49400..849713911194 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1 +1,2 @@
 DIST ruby-prof-0.15.8.tgz 81627 SHA256 9e210052402003e41f041605291decdc5e794ae61894ab52651ffb70aeb17504 SHA512 d53fdd936dd4d7e8071a3d85877e3a82a307c62e20488ca8604e9041e4bf830568d8d1e6bde7ad463f15b07748a29669515e1a0b199e2df2562bd10a07bb935a WHIRLPOOL ce42ea37ad8b3f96c2d2a4afca8bec6cec603654a651e30cf728d24ea34c953f9a4999ee5707601c0f728231654fad9f9c5febf32dfa579bd58b5828c6957b94
+DIST ruby-prof-0.15.9.tgz 83664 SHA256 000a42145bc0db20295d6feeb096788c3c6f226c9b9ee96a4d03cbb81a279cdd SHA512 6567cf29dd08be5d16a4ffb39c7475fb7daee472dba13894bdfca4a21c153bcc2f96b7b4dfb3f346e49528d593f5c29aabf9735b3f97ba7b09a97ee4514df43b WHIRLPOOL 7c052faf6e3c0ad2c0bf5dc3441166602e55f38a3694978c16af043812a8de30c3b326f5917d8bb95591c41738ccc066ebd78bc661080f20df687547ed78c9f7
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.15.9.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.15.9.ebuild
new file mode 100644
index 000000000000..082769965dba
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-0.15.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
+SRC_URI="https://github.com/ruby-prof/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Avoid bundler
+	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
+
+	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
+
+	# Fix a timing-dependant spec since its thresholds for success are
+	# too tight.
+	sed -i -e '/test_class_methods/,/^  end/ s:^:#:' test/measure_cpu_time_test.rb || die
+
+	# We install the shared object in lib, not ext.
+	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
+
+	# Avoid unneeded dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
+
+	# Create directory required for the test suite to pass
+	mkdir tmp || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ruby_prof || die "build failed"
+
+	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for dir in examples ; do
+		docinto "$dir"
+		dodoc -r "$dir"/*
+	done
+}
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 35545e278714..0d645390a219 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1 +1,2 @@
 DIST ruby-progressbar-1.4.2.gem 24064 SHA256 1285524b097446471bc60c4b756f9f8c4b527dd870eaf318e7d83380cde99fa7 SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd WHIRLPOOL 50bcbefce6fe3e1b05ad20476f67f9e610e5e91e5d9bc92a8ecc0ef5ab79233c16237c04f3782878855fae8115e556d53a0c6624d151fcd49bd58792aeb370f7
+DIST ruby-progressbar-1.7.5.gem 21504 SHA256 71c754e2e3f26b87f307e360dee8f2267800b88327a7def0098d7e6cb752d643 SHA512 1a5cb4b8ca9a9669bdaa60fcf3f01bec347b4ac1aefe737a7c6014bf40166c72d74ab0f489638c12ffd5245cc2b0a19186f7ab440bd7629579bf00d5155a8741 WHIRLPOOL 13e05a761c10c6fbb87cfb11f83f18acae93daeec1e11306b432ee751427e0d95a56d63cd7528590242b3e5241d4de6eaef2ea1b9190a1c1196430f4828f5580
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild
new file mode 100644
index 000000000000..48eaf0f033cf
--- /dev/null
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Text Progress Bar Library for Ruby"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rspectacular )"
+
+all_ruby_prepare() {
+	sed -i -e '/warning_filter/ s:^:#:' \
+		spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby20)
+			# Skip specs since rspectacular doesn't work with ruby 2.0:
+			# https://github.com/thekompanee/rspectacular/issues/4
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 1ad6d48f2784..255393cbd438 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,2 +1,3 @@
 DIST ruby2ruby-2.1.4.gem 24576 SHA256 355e7d8e3c0e2a846c74aace24dfdb8fe3de01311ade2453735f69b6a3e40bc0 SHA512 e436902cdae8628ce49c676350594c220e86a1c356fc6924d845c7774c0de488349050fcbd9df98cb73ed9c66f770b0bed173486d4fab58dab665991fdbe74c9 WHIRLPOOL aaf261aede3c59c1bfec955c5ad7355991136a3ce984160e8cb5d251003d0817735dc8e08312515301699b95ec36c06fbf6d458ff2921f4ebfd710bd7a4856c9
 DIST ruby2ruby-2.2.0.gem 25088 SHA256 f59a681a26f2f2219eca8340064a913ffd6fa2e6a1f4ebbdb4b8263d4001acce SHA512 d5ca1cab8e83f5fef31c5d471e0285fc17ccd1477ce16717d20581868e99fecb3002ff3d9d000782fa7e00b99f9c647c5cae6a5162dafc9613652e86d756fef3 WHIRLPOOL 2d16f5b4e737d1c860159af39798788a7b9ad603b243ff70191f1fbda544513b0ec4f4340106099a6890f866a4aed41865f56fd5cb4d07561504ffbf27c63311
+DIST ruby2ruby-2.3.0.gem 25088 SHA256 19d9648bebce9eb08f279192ba18a03b9776a29fa527f2654191b4a12daad487 SHA512 82630abf24ddf53b5bbd8f9d399f49b043e6f1c418ec83f1ff5011044d3a7b52864a3c7c5f628a9afb5afcf59f7c5126a413e7743ceb1e03bf623d919af1fbda WHIRLPOOL d1b6cca7d61ba149e91c9c407631adf4bc9985e977ca1141c13fdbf169011e5371bf78e8599a63d6111204f7e39786b751f1aa1592b0893c0a647e7914e26027
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.3.0.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.3.0.ebuild
new file mode 100644
index 000000000000..0eba572ff956
--- /dev/null
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates readable ruby from ParseTree"
+HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
+
+LICENSE="GPL-2"
+SLOT="2"
+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="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/sexp_processor-4.6.0:4
+	>=dev-ruby/ruby_parser-3.1:3
+	!<dev-ruby/ruby2ruby-1.3.1-r1"
+ruby_add_bdepend "doc?  ( dev-ruby/hoe dev-ruby/hoe-seattlerb )
+	test? ( >=dev-ruby/minitest-5.3:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 1b5bad92987c..0bf332744cdf 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,3 +1,3 @@
 DIST rubygems-2.2.5.tgz 416772 SHA256 0f015d63ee3f48be2cc440332d992a33f6df113ced25b7a0007372d304bfeaa4 SHA512 eac6d7c4801d7bf65ac8e244ff88677929e491db8c5054a31d936eaf1e1fabfc8c4b560040c01c7d9707758cfbad9a8063144bb37b494dd1b6f66a0222871e03 WHIRLPOOL 6e02359ce84352f39b13c3f59d9fd82788a5a2ae88d069df05642d5349cb33c06c3477de56c937a44742fb6aa6cfdb7b32dbadac131fb12e6387f983564879c6
-DIST rubygems-2.4.8.tgz 447712 SHA256 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e SHA512 1cc2e9e19d665268f475ce90547377d41a4ea5ce9a9afab4979de0247a0dd82b04529c087c899d9ced5564fa9051e1d2fe23ddb764ba411915bab2ce344ac419 WHIRLPOOL e9fa65b3ff24a05082fd6ded221706c45e8d7c6677ccc31e6971991320800d47fef99651fb338c797e20ab4ab7775c7192e09f4575fc815640c4f2a8d5ea273b
 DIST rubygems-2.5.1.tgz 469494 SHA256 02d4bb76687983d973ea8700912e798ca23be32bcce7956171254c93a2365273 SHA512 fd333398f9ce3a0c734fc66bf936a8287a64f8dfafe01987cf85497be57f021fc64c1015de9b4f0a36d24ffda152c2b02055a425c05cbd43266f55c0b1d5f052 WHIRLPOOL 8f4a7ee94cb9825ea35606347734e53c95dabfdf458cc6914ca4eb875451314a520a4849c607aff61afb25f29e6e44e7ed0667b0757ea15fe53f9d4a71710e3d
+DIST rubygems-2.5.2.tgz 475434 SHA256 5171ce6fa04c74606991f9c318a924f095241d7ce18c21a00455c8ebe4aeecca SHA512 43544619799ac6f0b22285954a3b46a2d8aea425ef16a26de4ebb5ea1b3a4f2d3a2031ac53bb890554fe935ca1d03101a5d4d9eae4619aaab72a079650fd8921 WHIRLPOOL 59806bd34ab0bfa66bd770c02054c16bd5c5bb836d0213018151339fda422780e5ace4bfecfad408075ae25d6c74e40d0925dccdc7a46aff545b93cc21faa4b2
diff --git a/dev-ruby/rubygems/rubygems-2.4.8.ebuild b/dev-ruby/rubygems/rubygems-2.4.8.ebuild
deleted file mode 100644
index 5b40d83ceca0..000000000000
--- a/dev-ruby/rubygems/rubygems-2.4.8.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/rubygems/rubygems-2.5.2.ebuild b/dev-ruby/rubygems/rubygems-2.5.2.ebuild
new file mode 100644
index 000000000000..84e580465ff6
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.5.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://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_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.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_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
+		test/rubygems/test_{gem_installer,require}.rb || die
+	sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^  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
+	rm -f test/rubygems/test_gem_indexer.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
index 0eed5121e910..53aeb86e05c7 100644
--- a/dev-ruby/rubyntlm/Manifest
+++ b/dev-ruby/rubyntlm/Manifest
@@ -1,3 +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
 DIST rubyntlm-0.5.3.gem 27648 SHA256 67b102621103d59f80553c5f9924c7def90ae3c98b404495dd3411d557d1bb48 SHA512 d7a86bc3e66aed77285e0a065c13e1a4211a7148d90e4f14da308c49dc080bab000cd77d1ae89149f5ccccb671f111ac65ead1363e08944b6aff54e35b096f0a WHIRLPOOL d396cc6307b0118dda9034b4801275f7bb348daa56f309c6e4f2636564f1903d9a11375b338a3f9299295404a2f70f25063bdc023137611e7a5795c3e2f05a09
+DIST rubyntlm-0.6.0.gem 31232 SHA256 f7e9b5054106fdbe9117719282f99177c95bea57d9ff76b1799e551028656102 SHA512 522142632d9f979b26b29017dcbc39dcc6caa75b235bcc89bf83e04db68e550a38f3c967c36acf61e910b4a2748089d0ccdd184754a8fe6f33e8494ef6b4f3bd WHIRLPOOL 95341aaafc27c93ef51b36da28cf540ce474b7bd9f4f9a66ec59c8faf82ee3f6edd62e1bfddab6c24156bc0233dcb38697d8b59e7b25b0c851ff70556891542e
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.4.0.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.4.0.ebuild
deleted file mode 100644
index b4b39a440665..000000000000
--- a/dev-ruby/rubyntlm/rubyntlm-0.4.0.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
-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
deleted file mode 100644
index 73d06f2a7ab7..000000000000
--- a/dev-ruby/rubyntlm/rubyntlm-0.5.2.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
-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/rubyntlm/rubyntlm-0.6.0.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.6.0.ebuild
new file mode 100644
index 000000000000..97f93d80c92d
--- /dev/null
+++ b/dev-ruby/rubyntlm/rubyntlm-0.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="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/sass-rails/sass-rails-5.0.4-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.4-r1.ebuild
index a5698eb7b768..0e7e1a7b5a67 100644
--- a/dev-ruby/sass-rails/sass-rails-5.0.4-r1.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-5.0.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE=""
 
diff --git a/dev-ruby/sawyer/Manifest b/dev-ruby/sawyer/Manifest
new file mode 100644
index 000000000000..c02880bfa588
--- /dev/null
+++ b/dev-ruby/sawyer/Manifest
@@ -0,0 +1 @@
+DIST sawyer-0.7.0.gem 15872 SHA256 72e855027c812f2cad7f4fa4746cab07727dde91d75516d353c155002846c4b2 SHA512 8f63adfc9c544f88280a18e7bab25c193d6e0aab5973f07774b838c40ce7f7da6f148d6122ccd9e3824eb292389d994c84e2460460f7b6f9f340b27f331d59bd WHIRLPOOL 4e6822ed65c38051c765d6bafe416bb033fd35e2555baff2844be0cc317aea1dd0b50870e6a6c2c5ade8f6a5ab1fb6c16c2330b8e509f82a345d140bb68e4bd3
diff --git a/dev-ruby/sawyer/metadata.xml b/dev-ruby/sawyer/metadata.xml
new file mode 100644
index 000000000000..26176ca29e7f
--- /dev/null
+++ b/dev-ruby/sawyer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lostisland/sawyer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/sawyer/sawyer-0.7.0.ebuild b/dev-ruby/sawyer/sawyer-0.7.0.ebuild
new file mode 100644
index 000000000000..da866baeccbe
--- /dev/null
+++ b/dev-ruby/sawyer/sawyer-0.7.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Secret User Agent of HTTP"
+HOMEPAGE="https://github.com/lostisland/sawyer"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/faraday-0.10
+	<dev-ruby/addressable-2.5"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 73bb7620a0cb..5e52de26e65f 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,3 +1,4 @@
 DIST selenium-webdriver-2.47.1.gem 2872832 SHA256 0140306e064fc40eb2dc632a88fd47dabe786ec2b29f7c59ee425d58113f7b86 SHA512 2973983dfca3ae1c97f55edc9db9480a7595676439c57ae58ec8af18ae6c5e210e2a2efcab630036079c4fed0513ce2e961b36dec3501b41e787a92ebf8cca98 WHIRLPOOL 137327e3066f9cdd52fc41ef1a36ee7a1ebb669b0a5dcbb9aafe7f49d180d2b41850b60089592b2ae9db8c9127764db2108543a173853b1ba4edf16131e8858c
 DIST selenium-webdriver-2.50.0.gem 890368 SHA256 6dde9797faebd84bdf252fff9cf0135c70c6027545a54efaf98b626425755115 SHA512 a1b1b51aaec744008fab7db063c8cb53e7065ac766d4e56b98e0055aee576b718ae56bf60244c0ebcd7c98932b7ff9c2c8b8a78bc6d8dfae1fe6fbb813869098 WHIRLPOOL 0d5fe0cdea8f36b45c3fdb1ea2b2ae786029c8dd6a8ee7cd26d336499d3a77b36c6e0bd87dc73595c6b7e2de9482b46a29be3022087722505f28423efd61af43
 DIST selenium-webdriver-2.51.0.gem 890880 SHA256 d3db5ed851e5de386d6a5a8ff86190ab9dd886e27ede400a02ede4ece648de84 SHA512 ed9d62c12f717872e0d15dba8fb3e92642191f049ebb08be32439421782a543849f7e7fa7712f7c5bfc15f00fe1f18df9252ff0e3bba0db9d7af7ad404ab203f WHIRLPOOL c4cdc14f69274eaf46137af170c0d972ebdf1277288448d7dc73bc057a54761f1f938c6c78beb491e2f0be64f992a02e655395c8fd6751eb81e0c27581506082
+DIST selenium-webdriver-2.52.0.gem 890880 SHA256 1faa96cbf02cc4f0f57e0f40db26e4f4a26d1a2f6a7eecd852f2e9df11ea0820 SHA512 0cf7029ac0d0bfc7b0e26dda494d2fa5e6ba49b591206b7fc3b8ffe42dbe836126d9d2958d690a0b4e79c6e0918dd2de87e07b21645d101caeeb645779f07b84 WHIRLPOOL 8fad185e712eccf1de073fdd9fed8e804892684507d9d065fa846e7c8adbc9a439548c44000c172204fad0d847be55cad9fd36c07d02585d74524837f70dc909
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.52.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.52.0.ebuild
new file mode 100644
index 000000000000..dffb511bdbba
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.52.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/multi_json-1.0.4
+	dev-ruby/rubyzip:1"
+
+all_ruby_prepare() {
+	# Make websocket a development dependency since it is only needed
+	# for the safari driver which we don't support on Gentoo.
+	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
+}
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index fe93bfad73cc..21b26734350d 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,3 +1,4 @@
 DIST sexp_processor-4.4.4.gem 38912 SHA256 43cab5a67ca409d62411f869ddb7a0a4de0988b489d3f1d610d9b6e521964fd5 SHA512 b17c2a6a5675a5244a935f4d3024bcb6eadb667a189a406b4f890b29361042a5523df55cdb5ee82e60180eacc5999a163f2e88a0b70113aa42aa50cffbdfe1e2 WHIRLPOOL 01d7193d6e3c74d517f108b8aa778fcbd701987d20ee503ae9947ce60a0b3824d1dfae2ca6a0bd4f7b314cfa8c22fb347db0b6fef218833a022f2aec351d37fb
 DIST sexp_processor-4.6.0.gem 39424 SHA256 e2498f90c75bd4c19d1739afadde8c03af26a881c8bd775f71d2f180de65b43f SHA512 48c96a826472029f22e46138831ee9952250e747b9b5e2637d348ae4cba08d4097c88148457d4215e264c556595da44cb7aad8612642a3e49d68888b6d2e0363 WHIRLPOOL 5fd40d5813d957dd304eb3b697b780db23aab24be096fb25fd4448f6b069424f045e3de20d9e5f315901b1bef039371c797377fb5ac837c21204431ca1c77a18
 DIST sexp_processor-4.6.1.gem 39424 SHA256 e2e96c2ee3ea81e1dc7b4b4abee23b6e552e669cfe456ee69126a29a03373cd7 SHA512 25513e71e30c0ded46201d81e454ab628054c2380c4b9715d6b05cf08703ce3cc31e7d127514f2abc12d875d0d53791740b728922f91b85ba579931799de09d7 WHIRLPOOL 6cd94d615eec3858e2fcb920526438a9d6a6c4509da48369812fb5235e62814be6a7fbe63b9c392287938127f00900ec89638173a5b64b85a1f8bc6ac9e80d8a
+DIST sexp_processor-4.7.0.gem 39424 SHA256 963a1f5b21c95595fb3cf1e8531784bf3d8fe30302cf6f271b08aefdc63e453f SHA512 6c48853f2eaca37bcddb097f6677d37835171618e4209d07baa1f361d4cdf4ce95a11f892b6b258cd91e51555aa046c404d8970560618b4e8a86fd0d6dca71c7 WHIRLPOOL cad0c31e6aace9066be2d400d392206c7b9f71b2fbdbe072d0a1d98e241acc15f79c0992d45cffc261284f751d1b5046380254b0f050f62fbdad0132437e3b8a
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.7.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.7.0.ebuild
new file mode 100644
index 000000000000..11ef73a19f36
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/hoe-3.13
+		dev-ruby/hoe-seattlerb
+		>=dev-ruby/minitest-5.5
+	)"
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
index ae31b1e8c27b..1a8ae8c24c52 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index aa8d2a0792c2..04fb4d71ef1d 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,3 +1,4 @@
 DIST spring-1.6.0.tar.gz 39122 SHA256 9f0917d410a24e970fc7a6082f12548be617393162bbe9c646464b2912bd445f SHA512 ce5792cd2626a9e60ee73e24bd8a221aa93d3af2e6741e7e4df81b3a18fe79da46e2004f7d29f9a3db1a788663151a7869b4a738c239f6a13b5f2374c4ba9af7 WHIRLPOOL a213e56eefc724e9c45418c7073b7410bf11c2deb5746a2740e4a168bebfb39a22aa1ddb5b216eee92c9fabf02cffe7b1e51bfcf71abc9864ce9fc226b4a37bc
 DIST spring-1.6.1.tar.gz 39109 SHA256 1f7206613c5fab57e77e2f551cb8a9bd3f3f0e445b095537048431ec92216c1f SHA512 129f99217b64ef1bc3c700b8dacb53df76a9dc6c0c76e523f9477bbbe2244f8c99881f9c9e092dc2a664ed938f438a5f30155f9cb1e1782e003ca494c7cca8bc WHIRLPOOL 40919d82d76f72e5d4f0fce5fd55c480e5070dfc165a3e4f90cdf70db961390cd279ff9f7d1a1268d5a3be9877e67887c51ee7bc26b6435ee96d54a280ad4eb8
 DIST spring-1.6.2.tar.gz 39206 SHA256 2e4a579b8847de39fd4ff72d9644c354115d1174809d7f6c9cf67fba774671fe SHA512 bb46cb6fcbb70b976230a32075072f1fa5a7a1d9f4819a8d9783c3793713407e7481e091400fcf9f5cce0e1b40982b76c378f7384425d2ac71c12baec2fd9adf WHIRLPOOL 85bc50cbf156ed7356b603b31e880fbeb35c4062ddd16ed92d83af96444d370d9318bd770f6714daaf8690592c267929ac8ab12f2d3981156da78661c7b148e6
+DIST spring-1.6.3.tar.gz 39349 SHA256 6396158ef4479e5bedaa4383db197ead1e04c4c9781eed3300e954ec66a6ce34 SHA512 88d605cd5c9751a8dd3d9e7903beda0304f0d7b31934735c841b63ee450d5250b73b73f7c95f8a25dcffbbeb73e05028873bf54827481d19a691d345744d576d WHIRLPOOL ff8220c6ba1201765268120434903796c7a2ce3401ca88a71d3b82aaca1694471fe1fe929832559a8faf666aee8b9b517f462aee12a81940d5047893b1dbf719
diff --git a/dev-ruby/spring/spring-1.6.3.ebuild b/dev-ruby/spring/spring-1.6.3.ebuild
new file mode 100644
index 000000000000..034b7e72e60a
--- /dev/null
+++ b/dev-ruby/spring/spring-1.6.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-2.3.3-r1.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-2.3.3-r1.ebuild
index 4186903d579a..4b79246b90d8 100644
--- a/dev-ruby/sprockets-rails/sprockets-rails-2.3.3-r1.ebuild
+++ b/dev-ruby/sprockets-rails/sprockets-rails-2.3.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="test"
 
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index 80ea04191a3d..925f97d72976 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1 +1,2 @@
 DIST stringex-2.5.2.gem 128000 SHA256 27a8ee92a808a83284438e51ed391f3539ae6b39731b95cb4ad940974f6d0a94 SHA512 06905b5d59b40f59c0901bbaacbf303cd906be110cd69a4b8cc29cecd69b6aa73d80cee0c9c0e2014f662b9fca1611c0fe334fcba3c4fa686224dac94f4e0d41 WHIRLPOOL 21a66f7babd2424035e4874d9f5168736c81f6da8388764633d9618064998bfeb076076cfd0d9125583903be25070fa329c4e8fccd81ebb8f801c4447e6be7b4
+DIST stringex-2.6.0.gem 129536 SHA256 15611e3765430e6e4cb794d289be6bb7b8a8c873d3ff6fd7dbf8c222c68f7ff6 SHA512 a54bf6ab9fcb0a11f6e27a125e6b1d8a49fa0ef4ca703d512c99a20ad59316184017a30e8fede5e7df3449cac53a395f530dde2033d6b15ca540b2c51aab92eb WHIRLPOOL f9102672888332145cc7548f971d5cde6550391e155c4a27ec5796cfd6aa2cc92dcedd51d431705362fd5b7fe362a713aa718d5741eb35a56348a885f41426f6
diff --git a/dev-ruby/stringex/stringex-2.6.0.ebuild b/dev-ruby/stringex/stringex-2.6.0.ebuild
new file mode 100644
index 000000000000..c38d1978ebcf
--- /dev/null
+++ b/dev-ruby/stringex/stringex-2.6.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_DOC_DIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+# we could rely on activerecord[sqlite3], but since we do not remove the
+# sqlite3 adapter from activerecord when building -sqlite3, it's easier
+# to just add another dependency, so the user doesn't have to change the
+# USE flags at all.
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/i18n-0.6.9:0.6
+		dev-ruby/redcloth
+		dev-ruby/test-unit:2
+	)"
+
+USE_RUBY=${USE_RUBY/ruby22/} ruby_add_bdepend "test? ( >=dev-ruby/activerecord-3 dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '1agem "i18n", "~>0.6.9"' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+		case ${RUBY} in
+				*ruby22)
+						# Avoid tests depending on Rails until we have a version
+						# keyworded.
+						rm -rf test/unit/{acts_as_url,localization}* || die
+						;;
+		esac
+}
+
+each_ruby_test() {
+	# rake seems to break this
+	ruby-ng_testrb-2 -Ilib -Itest test/unit/*/*_test.rb test/performance/*_test.rb || die "tests failed"
+}
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
new file mode 100644
index 000000000000..5ae5850c13c5
--- /dev/null
+++ b/dev-ruby/travis/Manifest
@@ -0,0 +1 @@
+DIST travis-1.8.2.gem 192000 SHA256 1ae0415a342838f9faeedbb8a8536ed3c40d9e6872ae37c39d1216fe211f085e SHA512 e047b72d76804d6987698fc47e7acf62125b04862e6671d4887c3d982ecc3b16c4ff1aee8afed5b29ab7c39d622afdbee21d4365f81abb7d505f9092cb4a6a52 WHIRLPOOL 21f8aa6894d3cd2cdeae09da4594dc53aed8be26bf1ce872ecceab66ebf4979e390003a6c6c33cb712ff094091f6679f44b2ad729bd63fd22bb9cbe9b0d0dd3c
diff --git a/dev-ruby/travis/metadata.xml b/dev-ruby/travis/metadata.xml
new file mode 100644
index 000000000000..3394e7a0c743
--- /dev/null
+++ b/dev-ruby/travis/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+        <name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">travis-ci/travis.rb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/travis/travis-1.8.2.ebuild b/dev-ruby/travis/travis-1.8.2.ebuild
new file mode 100644
index 000000000000..c786ee423a11
--- /dev/null
+++ b/dev-ruby/travis/travis-1.8.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Travis CI Client (CLI and Ruby library) "
+HOMEPAGE="https://github.com/travis-ci/travis.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+ruby_add_bdepend "
+	test? ( >dev-ruby/rack-test-0.6 )
+	>dev-ruby/sinatra-1.3
+"
+
+ruby_add_rdepend "
+	dev-ruby/backports
+	>dev-ruby/faraday-0.9
+	>=dev-ruby/faraday_middleware-0.9.1
+	>dev-ruby/gh-0.13
+	>dev-ruby/highline-1.6
+	>dev-ruby/launchy-2.1
+	>dev-ruby/pusher-client-0.4
+	>=dev-ruby/typhoeus-0.6.8
+"
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index 6a5b64548e6d..b7fca69fea28 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1,3 +1,2 @@
-DIST treetop-1.4.15.gem 78336 SHA256 ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff SHA512 350e3b4fc5236f5523e7ba7486699192a689d680e60687519ffdb8707241fce493a86713d1a0a1e243654c609e221b194e151c29bee9aa7cff71ab397223791b WHIRLPOOL a474c3bb9fe43ce73c32cd795214fce168b9d8116746075ef982728b4ded802f5f5995efacf20501c42ddb90fe7e766880dd3e05dd7e8dc815cd804180007b74
-DIST treetop-1.5.3.gem 78336 SHA256 ab3c49c3a39e7c9bea88a90524545e39bed032758a130295f8d6a433c62ff472 SHA512 517ca72fe9c6d27c1ef6722a33b2639fdeb0867ad68b02a7d8795ec1b2bc3b9c9d56aaf400a4159c06c4714065c6a17e44bc985573cb11523d52b53b3a9ec9bf WHIRLPOOL b8b3300a99f65e837dabfd5beaa19d4d83c21b237736f8d675edf4a39ca8061e980b8ea4ccdab1f3c2cba0de0d25ec88db75bbd738258f1e1af2e5b4c632f345
 DIST treetop-1.6.3.gem 81920 SHA256 8b0bb528a57b9af6324ed7c9856b1d1ee2f1b53e71de79628bc47704234862bb SHA512 a4018f551ae74e84d126c4aa7e3bbcd2b2765175d1999bfac328b0b653cb6e5a5e599e51925575024af55092700bd40fd19c20c16d6cb2374d2f8d4b5f7a6229 WHIRLPOOL 20d8d302c309979fb0572c3d8388b3a39afcea31e29555a5173c78f2528a2943540587a059b087a3a380163fbac6f138ffb10e7df5dd48b0cfc42f00fe581461
+DIST treetop-1.6.4.gem 81408 SHA256 bdce555085a1aaabf503abd036b81e1bd0f724f17bea1331b39ed866c2106241 SHA512 2e685dae085d4fb851d565806338a8c04ac55d22d804ce1a6e4e7fa69f77c45793d7ec05f8cf54db6f0f4ab92b947f429e196726cc99048f2b06134d276185ed WHIRLPOOL e5fcc119bcba99a5019a784557159dd5ed319e56c87d56d9a9c8e6c21c7d6f32f57bf272d9c19481007a6526ec72b59bb83459bd0e27b4b2d38a207820d5b390
diff --git a/dev-ruby/treetop/treetop-1.4.15-r1.ebuild b/dev-ruby/treetop/treetop-1.4.15-r1.ebuild
deleted file mode 100644
index a1cf6850b48a..000000000000
--- a/dev-ruby/treetop/treetop-1.4.15-r1.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
-
-# jruby fails tests, not investigated yet.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Treetop is a language for describing languages"
-HOMEPAGE="http://treetop.rubyforge.org/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-0.10.2 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
-
-all_ruby_prepare() {
-	# Use a ruby18 compatible regexp, already fixed upstream.
-	sed -i -e 's/\[:\^space:\]/\^[:space:]/' spec/compiler/character_class_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}
diff --git a/dev-ruby/treetop/treetop-1.5.3.ebuild b/dev-ruby/treetop/treetop-1.5.3.ebuild
deleted file mode 100644
index 3861c298e453..000000000000
--- a/dev-ruby/treetop/treetop-1.5.3.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
-
-# jruby fails tests, not investigated yet.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Treetop is a language for describing languages"
-HOMEPAGE="https://github.com/cjheath/treetop"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
-
-all_ruby_prepare() {
-	# Use a ruby18 compatible regexp, already fixed upstream.
-	sed -i -e 's/\[:\^space:\]/\^[:space:]/' spec/compiler/character_class_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}
diff --git a/dev-ruby/treetop/treetop-1.6.4.ebuild b/dev-ruby/treetop/treetop-1.6.4.ebuild
new file mode 100644
index 000000000000..d69403ae14cb
--- /dev/null
+++ b/dev-ruby/treetop/treetop-1.6.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Treetop is a language for describing languages"
+HOMEPAGE="https://github.com/cjheath/treetop"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
+ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1:0"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r examples/*
+}
diff --git a/dev-ruby/webmock/webmock-1.22.6.ebuild b/dev-ruby/webmock/webmock-1.22.6.ebuild
index cf816c2004f7..318e71a4f850 100644
--- a/dev-ruby/webmock/webmock-1.22.6.ebuild
+++ b/dev-ruby/webmock/webmock-1.22.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
 
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index c3eaa9d9328c..a2c5af871d4b 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1 +1,2 @@
 DIST websocket-1.1.1.gem 24064 SHA256 a8629d64b1255098ebb4a69fc892a53d70a1d55e49ab2f3fe54c201bf8505bbd SHA512 8b814070e1d9b18c5ca860555ee11a32fa427ca1058e7c33f43f57b186a820a06ba61d3117ccf5868cf1274dd0978729d69c39bff707c489efe812cb2769f461 WHIRLPOOL 4832ca7df72d5efb20ee62945b1994c0a6a10fb39057fbfacdc06dc0d99e256eac81c20d3d7db2826db65a770fa0323e1bc322f8803e150c6d082ba859156ff3
+DIST websocket-1.2.2.gem 26112 SHA256 e42a150316fa957b49da39308338b33c3f8ea9bb8a7720d26a042547e4d32cbb SHA512 a79e87a317a60c021f988edcf51a1fe2e0eaba44a152db1d74d81ac0208ffaa9483959bb162d56cd5c7b916da224bae9598b42510fa24fdcc64ad34e46c406c8 WHIRLPOOL 795bbb92423a382d5707cdf9288b86d7964972fc2d265971cc46875a5901fafb29bc99bcb03fc88a80616f09e3b45c626f3b5681311e2b16dca4226491f74227
diff --git a/dev-ruby/websocket/websocket-1.2.2.ebuild b/dev-ruby/websocket/websocket-1.2.2.ebuild
new file mode 100644
index 000000000000..2d59a56d8d1c
--- /dev/null
+++ b/dev-ruby/websocket/websocket-1.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
+HOMEPAGE="https://github.com/imanel/websocket-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-scheme/bigloo/Manifest b/dev-scheme/bigloo/Manifest
deleted file mode 100644
index cafb2124f9bb..000000000000
--- a/dev-scheme/bigloo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bigloo-3.4a-patchset-1.tbz2 3282 SHA256 44f3f62e39b344bdc4c6eb54f7e2003fedcadb23b6bf2a1a8b647f9799884b2a SHA512 2a3769792ab45ed234c4f00792f660ad92acbe649a5bc6d1529e1b7809d9e6315beef37471f8fdd68f91fac511d3eb2c26dd6bcc984587bf4e0494f501bc49c8 WHIRLPOOL 2fca460b5628d2661fc2e45862a8a08ffe9273bc06757e7149f75d5d3ad23c992ba6b3a63ee57e93ade2c429acc2d086f24cdc0c099fab5d9e5a8b31c51ca8b3
-DIST bigloo3.0c-4.tar.gz 11776933 SHA256 047bb6b36c8ca51a2b261fdfba6b0637808d0d9923360633f695bcc3dd6b6c2b SHA512 3833fac604744524eb4d0fbb307692423555d8c98d91233f4269f9078dd19eba156e709aa0bc0af43638e8bf4bc49cad60a0fba2dad48abd5f9922996e8ee666 WHIRLPOOL 6b55c801180c5f1fbdac20c3ff074ad85b8b0c0bde98384860fef165c727b7a584bca65d916a29b7fc9266f414c2659c4adfaa1bd6e0347ee8116e804ee2d33f
-DIST bigloo3.4a-3.tar.gz 13631619 SHA256 c6bf16a60a16447444dc1e3eadf061d37f2796ebb75f3190415fb14aa06bc4bd SHA512 4d8ce613d309c51da788855fbb92961fd00664c6a4422586937e40c04241d8387bf2f0ae47219bf54f6410e725466b35c043f8735f277c10c2f23c7b60107159 WHIRLPOOL 52bb2bae5d50ebd2ebd4e363eb7ddb85fba85c7b72b10838e7b6dddcf99e0c5f993038fbe2b57d5785999518cad6112887851d957e111314e420c08e9b616509
-DIST bigloo3.6a.tar.gz 14264922 SHA256 3c026d97d79b8d97d6104c1e63b8ef1b77380462262c5172d8ca66f932d45a54 SHA512 3e89061aed35b6697f767b9e7658aa028d229152ddfb750daa48c138cbe1d43426558543df2f2dc8f0069679ca1f987bfd06dad9758bef01ec8ecec30b56baa7 WHIRLPOOL ef7f111e2616a118fdfaeb04d8bafff32e5e6c8677a40d6441ad44d2aa56c0e9ab7f9c8628a3b579c62562894ebde143d2e0798166c2454a1500ff8410c633c9
diff --git a/dev-scheme/bigloo/bigloo-3.0c_p4.ebuild b/dev-scheme/bigloo/bigloo-3.0c_p4.ebuild
deleted file mode 100644
index f99563acf1f9..000000000000
--- a/dev-scheme/bigloo/bigloo-3.0c_p4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit elisp-common multilib java-pkg-opt-2
-
-MY_P=${PN}${PV/_p/-}
-MY_P=${MY_P/_alpha/-alpha}
-MY_P=${MY_P/_beta/-beta}
-
-DESCRIPTION="Bigloo is a Scheme implementation"
-HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Bigloo/bigloo.html"
-SRC_URI="ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="emacs? ( virtual/emacs )
-		java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-
-S=${WORKDIR}/${MY_P%-*}
-
-SITEFILE="50bigloo-gentoo.el"
-
-IUSE="emacs java"
-# fullbee"
-
-src_prepare() {
-	sed -i -e 's/^cstrip="-s"/cstrip="no"/' \
-		-e 's/STRIP=$strip/STRIP=true/' \
-		configure || die
-}
-
-src_configure() {
-	# Bigloo doesn't use autoconf and consequently a lot of options used by econf give errors
-	# Manuel Serrano says: "Please, dont talk to me about autoconf. I simply dont want to hear about it..."
-	./configure \
-		$(use java && echo "--jvm=yes --java=$(java-config --java) --javac=$(java-config --javac)") \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--benchmark=yes \
-		--sharedbde=no \
-		--sharedcompiler=no \
-		--coflags="" || die "configure failed"
-
-#		--bee=$(if use fullbee; then echo full; else echo partial; fi) \
-
-}
-
-src_compile() {
-	if use emacs; then
-		elisp-compile etc/*.el || die "elisp-compile failed"
-	fi
-
-	# parallel build is broken
-	emake -j1 || die "emake failed"
-}
-
-src_install () {
-#	dodir /etc/env.d
-#	echo "LDPATH=/usr/$(get_libdir)/bigloo/${PV}/" > ${D}/etc/env.d/25bigloo
-
-	# make the links created not point to DESTDIR, since that is only a temporary home
-	sed 's/ln -s $(DESTDIR)/ln -s /' -i Makefile.misc
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-
-	if use emacs; then
-		elisp-install ${PN} etc/*.{el,elc} || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-#	einfo "Compiling bee..."
-#	emake compile-bee || die "compiling bee failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/bigloo/bigloo-3.4a_p3.ebuild b/dev-scheme/bigloo/bigloo-3.4a_p3.ebuild
deleted file mode 100644
index 61318fae09a1..000000000000
--- a/dev-scheme/bigloo/bigloo-3.4a_p3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit elisp-common multilib eutils flag-o-matic java-pkg-opt-2
-
-MY_P=${PN}${PV/_p/-}
-MY_P=${MY_P/_alpha*/-alpha}
-MY_P=${MY_P/_beta*/-beta}
-
-BGL_RELEASE=${PV/_*/}
-PATCHSET="1"
-
-DESCRIPTION="Bigloo is a Scheme implementation"
-HOMEPAGE="http://www-sop.inria.fr/indes/fp/Bigloo/bigloo.html"
-SRC_URI="ftp://ftp-sop.inria.fr/members/Cyprien.Nicolas/mirror/bigloo-${BGL_RELEASE}-patchset-${PATCHSET}.tbz2
-	ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bglpkg calendar crypto debug doc emacs gmp gstreamer java mail multimedia packrat sqlite srfi1 srfi27 ssl text threads web"
-
-# bug 254916 for >=dev-libs/boehm-gc-7.1
-DEPEND=">=dev-libs/boehm-gc-7.1[threads?]
-	emacs? ( virtual/emacs )
-	gmp? ( dev-libs/gmp )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	java? ( >=virtual/jdk-1.5 app-arch/zip )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/-[ab]*/}
-
-SITEFILE="50bigloo-gentoo.el"
-
-pkg_setup() {
-	if use gstreamer; then
-		if ! use threads; then
-			die "USE Dependency: 'gstreamer' needs 'threads'. You may enable 'threads', or disable 'gstreamer'."
-		fi
-
-		if ! use multimedia; then
-			die "USE Dependency: 'gstreamer' needs 'multimedia'."
-		fi
-	fi
-
-	if use packrat && ! use srfi1; then
-		die "USE Dependency: 'packrat' needs 'srfi1'."
-	fi
-
-	if use srfi27; then
-		# 'dev-scheme/bigloo srfi27' should be added in arch/amd64/package.use.mask
-		if use amd64; then
-			ewarn "srfi27 is known to only work on 32-bit architectures." \
-				"The USE is ignored on amd64."
-		elif ! use gmp; then
-			die "USE Dependency: 'srfi27' needs 'gmp'."
-		fi
-	fi
-
-	if use bglpkg && ! (use sqlite && use web); then
-		die "USE Dependency: 'bglpkg' needs both 'sqlite' and 'web'."
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-
-	# bglmem is not built according to the EFLAGS
-	#  (which forces LDFLAGS, see emake below)
-	ebegin "Adding EFLAGS to BMEMFLAGS"
-	sed -i 's/BMEMFLAGS[^=]\+= /&$(EFLAGS) /' bde/bmem/Makefile
-	eend $?
-
-	# Removing bundled boehm-gc
-	rm -rf gc || die
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf=""
-
-	# Filter Zile emacs replacement. Bug #336717
-	if use emacs; then
-		myconf="--bee=full --emacs=${EMACS} --lispdir=${SITELISP}/${PN}"
-	else
-		myconf="--emacs=false"
-	fi
-
-	# dev-java/ibm-jdk-bin fails during configure, bug #331279
-	# api/crypto java tests show failures, I'm looking into it
-	if use java; then
-		sed -e "s/^\(jcflags=\)\(.*\)/\\1\"\\2 $(java-pkg_javac-args)\"/" \
-			-e 's/jcflags=$jcflags/jcflags="$jcflags"/'\
-			-i configure
-		myconf="${myconf}
-		--jvm=yes"
-	fi
-
-	# No pkglib/pkgcomp in IUSE, I don't see any need besides bglpkg
-	# One or the other could be added upon user request
-	if use bglpkg; then
-		myconf="${myconf}
-		--enable-bglpkg --enable-pkgcomp --enable-pkglib"
-	else
-		myconf="${myconf}
-		--disable-bglpkg --disable-pkgcomp --disable-pkglib"
-	fi
-
-	# srfi27 management
-	if use amd64; then
-		myconf="${myconf}
-		--disable-srfi27"
-	else
-		myconf="${myconf}
-		$(use_enable srfi27)"
-	fi
-
-	# Put every non quoted configure opt into myconf, for the einfo below
-	myconf="
-		--prefix=/usr
-		--libdir=/usr/$(get_libdir)
-		--benchmark=yes
-		--coflags=
-		--customgc=no
-		--sharedbde=no
-		--sharedcompiler=no
-		--strip=no
-		$(use debug && echo --debug)
-		${myconf}
-		$(use_enable calendar)
-		$(use_enable crypto)
-		$(use_enable gmp)
-		$(use_enable gstreamer)
-		$(use_enable mail)
-		$(use_enable multimedia)
-		$(use_enable packrat)
-		$(use_enable sqlite)
-		$(use_enable srfi1)
-		$(use_enable ssl)
-		$(use_enable text)
-		$(use_enable threads)
-		$(use_enable web)
-"
-
-	einfo "Configuring bigloo with:" \
-		"--ldflags=\"${LDFLAGS}\" $(echo ${myconf} | sed 's/\n\t\t/ /g')"
-
-	# Bigloo doesn't use autoconf and consequently a lot of options used by econf give errors
-	# Manuel Serrano says: "Please, dont talk to me about autoconf. I simply dont want to hear about it..."
-	./configure --ldflags="${LDFLAGS}" ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake EFLAGS='-ldopt "$(LDFLAGS)"' || die "emake failed"
-
-	if use emacs; then
-		einfo "Compiling bee..."
-		emake -j1 compile-bee EFLAGS='-ldopt "$(LDFLAGS)"' || die "compiling bee failed"
-	fi
-}
-
-# default thinks that target doesn't exist
-src_test() {
-	emake -j1 test || die "emake test failed"
-}
-
-src_install() {
-	# Makefile:671:install: install-progs install-docs
-	emake DESTDIR="${D}" install-progs || die "install failed"
-
-	if use emacs; then
-		einfo "Installing bee..."
-		emake DESTDIR="${D}" install-bee || die "install-bee failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	else
-		# Fix EMACS*=false in Makefile.config
-		sed -i 's:^\(EMACS=\).*$:\1:' "${D}"/usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
-			|| die "dosed EMACS failed"
-		sed -i 's:^\(EMACSBRAND=\).*$:\1:' "${D}"/usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
-			|| die "dosed EMACSBRAND failed"
-	fi
-
-	dodoc ChangeLog README || die "dodoc failed"
-	newdoc LICENSE COPYING || die "newdoc failed"
-
-	cd "${S}/manuals"
-	if use doc; then
-		dohtml -r  . || die "dohtml failed"
-		doinfo *.info* || die "doinfo failed"
-	fi
-
-	for man in *.man; do
-		newman ${man} ${man/.man/.1} || die "newman ${man} ${man/.man/.1} failed"
-	done
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "In order to use the bee-mode, add"
-		elog "  (require 'bmacs)"
-		elog "to your ~/.emacs file"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/bigloo/bigloo-3.6a.ebuild b/dev-scheme/bigloo/bigloo-3.6a.ebuild
deleted file mode 100644
index 73ecc24f6e3f..000000000000
--- a/dev-scheme/bigloo/bigloo-3.6a.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit elisp-common multilib eutils flag-o-matic java-pkg-opt-2
-
-MY_P=${PN}${PV/_p/-}
-MY_P=${MY_P/_alpha*/-alpha}
-MY_P=${MY_P/_beta*/-beta}
-
-BGL_RELEASE=${PV/_*/}
-
-DESCRIPTION="Bigloo is a Scheme implementation"
-HOMEPAGE="http://www-sop.inria.fr/indes/fp/Bigloo/bigloo.html"
-SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="bglpkg calendar crypto debug doc emacs gmp java mail multimedia openpgp packrat sqlite srfi1 srfi27 ssl text threads web"
-REQUIRED_USE="
-	bglpkg? ( web )
-	openpgp? ( crypto )
-	packrat? ( srfi1 )
-	srfi27? ( x86? ( gmp ) )
-"
-
-# bug 254916 for >=dev-libs/boehm-gc-7.1
-DEPEND=">=dev-libs/boehm-gc-7.1[threads?]
-	emacs? ( virtual/emacs )
-	gmp? ( dev-libs/gmp )
-	java? ( >=virtual/jdk-1.5 app-arch/zip )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/-[ab]*/}
-
-SITEFILE="50bigloo-gentoo.el"
-
-pkg_pretend() {
-	if use srfi27 && use amd64; then
-		#TODO: 'dev-scheme/bigloo srfi27' in arch/amd64/package.use.mask?
-		ewarn "srfi27 is known to only work on 32-bit architectures." \
-			"This IUSE is ignored on amd64."
-	fi
-}
-
-src_prepare() {
-	# Removing bundled boehm-gc
-	rm -rf gc || die
-
-	# Fix some printf format warnings
-	epatch "${FILESDIR}/${PN}-${BGL_RELEASE}-fix_printf_format_warnings.patch"
-
-	# bug 354751: Fix '[a-z]' sed range for non ascii LC_COLLATE order
-	sed 's/a-z/[:alpha:]/' -i configure autoconf/* || die 'sed s/a-z/[:alpha:]/ failed'
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf=""
-
-	# Filter Zile emacs replacement. Bug #336717
-	if use emacs; then
-		myconf="--bee=full --emacs=${EMACS} --lispdir=${SITELISP}/${PN}"
-	else
-		myconf="--emacs=false"
-	fi
-
-	# Add JCFLAGS to the configure script
-	# (api/{crypto,openpgp} jvm tests show failures)
-	if use java; then
-		sed -e "s/^\(jcflags=\)\(.*\)/\\1\"\\2 $(java-pkg_javac-args)\"/" \
-			-e 's/jcflags=$jcflags/jcflags="$jcflags"/'\
-			-i configure
-		myconf="${myconf}
-		--jvm=yes"
-	fi
-
-	# No pkglib/pkgcomp in IUSE, I don't see any need besides bglpkg
-	# One or the other could be added upon user request
-	if use bglpkg; then
-		myconf="${myconf}
-		--enable-bglpkg --enable-pkgcomp --enable-pkglib"
-	else
-		myconf="${myconf}
-		--disable-bglpkg --disable-pkgcomp --disable-pkglib"
-	fi
-
-	# srfi27 management
-	if use amd64; then
-		myconf="${myconf}
-		--disable-srfi27"
-	else
-		myconf="${myconf}
-		$(use_enable srfi27)"
-	fi
-
-	# Put every non quoted configure opt into myconf, for the einfo below
-	myconf="
-		--prefix=/usr
-		--libdir=/usr/$(get_libdir)
-		--benchmark=yes
-		--coflags=
-		--customgc=no
-		--sharedbde=no
-		--sharedcompiler=no
-		--strip=no
-		$(use debug && echo --debug)
-		${myconf}
-		$(use_enable calendar)
-		$(use_enable crypto)
-		$(use_enable gmp)
-		--disable-gstreamer
-		$(use_enable mail)
-		$(use_enable multimedia)
-		$(use_enable openpgp)
-		$(use_enable packrat)
-		--disable-phone
-		$(use_enable sqlite)
-		$(use_enable srfi1)
-		$(use_enable ssl)
-		$(use_enable text)
-		$(use_enable threads)
-		$(use_enable web)
-"
-
-	einfo "Configuring bigloo with:" \
-		"--ldflags=\"${LDFLAGS}\" $(echo ${myconf} | sed 's/\n\t\t/ /g')"
-
-	# Bigloo doesn't use autoconf and consequently a lot of options used by econf give errors
-	# Manuel Serrano says: "Please, dont talk to me about autoconf. I simply dont want to hear about it..."
-	./configure --ldflags="${LDFLAGS}" ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake EFLAGS='-ldopt "$(LDFLAGS)"' || die "emake failed"
-
-	if use emacs; then
-		einfo "Compiling bee..."
-		emake compile-bee EFLAGS='-ldopt "$(LDFLAGS)"' || die "compiling bee failed"
-	fi
-}
-
-# default thinks that target doesn't exist
-src_test() {
-	emake -j1 test || die "emake test failed"
-}
-
-src_install() {
-	# Makefile:671:install: install-progs install-docs
-	emake DESTDIR="${D}" install-progs || die "install failed"
-
-	if use emacs; then
-		einfo "Installing bee..."
-		emake DESTDIR="${D}" install-bee || die "install-bee failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	else
-		# Fix EMACS*=false in Makefile.config
-		sed -i \
-			-e 's:^\(EMACS=\).*$:\1:' \
-			-e 's:^\(EMACSBRAND=\).*$:\1:' \
-			"${D}"/usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
-			|| die "sed !emacs in Makefile.config failed"
-	fi
-
-	dodoc ChangeLog README || die "dodoc failed"
-
-	pushd "${S}/manuals" &>/dev/null
-	if use doc; then
-		dohtml -r  . || die "dohtml failed"
-		doinfo *.info* || die "doinfo failed"
-	fi
-
-	for man in *.man; do
-		newman ${man} ${man/.man/.1} || die "newman ${man} ${man/.man/.1} failed"
-	done
-	popd &>/dev/null
-
-	# Remove created directories which remains empty
-	pushd "${D}/usr" &>/dev/null
-	rmdir -p doc/bigloo-${BGL_RELEASE} info man/man1 || die "rm empty dirs failed"
-	popd &>/dev/null
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "In order to use the bee-mode, add"
-		elog "  (require 'bmacs)"
-		elog "to your ~/.emacs file"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/bigloo/files/50bigloo-gentoo.el b/dev-scheme/bigloo/files/50bigloo-gentoo.el
deleted file mode 100644
index 576bdde482e3..000000000000
--- a/dev-scheme/bigloo/files/50bigloo-gentoo.el
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; dev-scheme/bigloo
-
-(add-to-list 'load-path "@SITELISP@")
diff --git a/dev-scheme/bigloo/files/bigloo-3.3a_p5-no_strip.patch b/dev-scheme/bigloo/files/bigloo-3.3a_p5-no_strip.patch
deleted file mode 100644
index 7a3b1190551f..000000000000
--- a/dev-scheme/bigloo/files/bigloo-3.3a_p5-no_strip.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur bigloo3.3a.orig/configure bigloo3.3a/configure
---- bigloo3.3a.orig/configure	2009-12-01 11:13:15.000000000 -0300
-+++ bigloo3.3a/configure	2009-12-11 02:08:57.000000000 -0300
-@@ -62,7 +62,7 @@
- featureflags=
- coflags=-O3
- 
--cstrip="-s"
-+cstrip=""
- cpicflags="demanded" # Possible values for cpicflags are:
-              #  - "no" not to use position independent code (recommended)
-              #  - "demanded" auto configuration but with a preference to "no"
-@@ -78,7 +78,7 @@
- ld=
- ldlibs=-lc
- ldcomplibs=-lc
--strip=       # left blank for autoconfiguration
-+strip=""       # left blank for autoconfiguration
- longlong=    # The C type to represent long long integers
- havelonglong=
- stringsplit="0"
-@@ -684,6 +684,10 @@
-       extralibs="";
-       cstrip="no";;
- 
-+    --strip=no)
-+      cstrip="no";
-+      strip="no";;
-+
-     --pnet)
-       dotnetclrstyle=pnet;
-       dotnetcsccstyle=pnet;
diff --git a/dev-scheme/bigloo/files/bigloo-3.6a-fix_printf_format_warnings.patch b/dev-scheme/bigloo/files/bigloo-3.6a-fix_printf_format_warnings.patch
deleted file mode 100644
index d21541afc1e7..000000000000
--- a/dev-scheme/bigloo/files/bigloo-3.6a-fix_printf_format_warnings.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-Author: Jerry James <loganjerry <at> gmail.com>
-Title: Patch for removing printf "warning: format" in bigloo source code
-URL: http://article.gmane.org/gmane.lisp.scheme.bigloo/5112
---- api/gstreamer/src/Clib/bglgst.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ api/gstreamer/src/Clib/bglgst.c	2011-02-14 15:24:29.464185149 -0700
-@@ -93,12 +93,12 @@ bglgst_use_threadsp() {
- /*    bgl_gobject_boehm_alloc_init ...                                 */
- /*---------------------------------------------------------------------*/
- static gpointer bgl_gst_alloc( gsize n ) {
--   fprintf( stderr, "GC_MALLOC n=%d\n", n );
-+   fprintf( stderr, "GC_MALLOC n=%" G_GSIZE_FORMAT "\n", n );
-    return GC_MALLOC( n );
- }
- 
- static gpointer bgl_gst_realloc( gpointer ptr, gsize n ) {
--   fprintf( stderr, "GC_REALLOC ptr=%p n=%d\n", ptr, n );
-+   fprintf( stderr, "GC_REALLOC ptr=%p n=%" G_GSIZE_FORMAT "\n", ptr, n );
-    return GC_REALLOC( ptr, n );
- }
- 
-@@ -297,7 +297,7 @@ bgl_g_value_to_obj( const GValue *gval, 
-       case G_TYPE_ENUM: {
- 	 long obj = g_value_get_enum( gval );
- 
--	 fprintf( stderr, "G_TYPE_ENUM not implemented yet %d (%s:%d)\n",
-+	 fprintf( stderr, "G_TYPE_ENUM not implemented yet %ld (%s:%d)\n",
- 		  obj, __FILE__, __LINE__ );
- 
- 	 return BUNSPEC;
---- runtime/Clib/capply.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ runtime/Clib/capply.c	2011-02-14 15:04:59.255817644 -0700
-@@ -627,7 +627,7 @@ obj_t apply( obj_t function, obj_t args_
- 	 default: {
- 	    char msg[ 128 ];
- 	    sprintf( msg,
--		     "too many arguments provided (%d) in apply (max 50)",
-+		     "too many arguments provided (%ld) in apply (max 50)",
- 		     -arity );
- 	    
- 	    C_SYSTEM_FAILURE( BGL_ERROR, "apply", msg, function );
-@@ -1229,7 +1229,7 @@ obj_t apply( obj_t function, obj_t args_
-          default: {
- 	    char msg[ 128 ];
- 	    sprintf( msg,
--		     "too many arguments provided (%d) in apply (max 50)",
-+		     "too many arguments provided (%ld) in apply (max 50)",
- 		     arity );
- 	    
- 	    C_SYSTEM_FAILURE( BGL_ERROR, "apply", msg, function );
---- runtime/Clib/cstring.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ runtime/Clib/cstring.c	2011-02-14 15:04:18.391856999 -0700
-@@ -293,23 +293,23 @@ integer_to_string_padding( long x, long 
- 
-       case 8 :
- 	 if( x < 0 ) {
--	    sprintf( fmt, "-%%0%dlo", padding - 1 );
-+	    sprintf( fmt, "-%%0%ldlo", padding - 1 );
- 	 } else {
--	    sprintf( fmt, "%%0%dlo", padding );
-+	    sprintf( fmt, "%%0%ldlo", padding );
- 	 }
- 	 break;
-       case 16 :
- 	 if( x < 0 ) {
--	    sprintf( fmt, "-%%0%dlx", padding - 1);
-+	    sprintf( fmt, "-%%0%ldlx", padding - 1);
- 	 } else {
--	    sprintf( fmt, "%%0%dlx", padding );
-+	    sprintf( fmt, "%%0%ldlx", padding );
- 	 }
- 	 break;
-       default :
- 	 if( x < 0 ) {
--	    sprintf( fmt, "-%%0%dld", padding - 1 );
-+	    sprintf( fmt, "-%%0%ldld", padding - 1 );
- 	 } else {
--	    sprintf( fmt, "%%0%dld", padding );
-+	    sprintf( fmt, "%%0%ldld", padding );
- 	 }
- 	 break;
-    }
---- runtime/Clib/cerror.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ runtime/Clib/cerror.c	2011-02-14 15:03:19.097168636 -0700
-@@ -69,7 +69,7 @@ bgl_debug_typeof( obj_t obj ) {
- obj_t
- bgl_debug_header( obj_t obj ) {
-    fprintf( stderr, "obj=%p\n", obj );
--   fprintf( stderr, "  TAG_MASK=%d ", (((long)obj) & TAG_MASK) );
-+   fprintf( stderr, "  TAG_MASK=%ld ", (((long)obj) & TAG_MASK) );
-    switch( (((long)obj) & TAG_MASK) ) {
-       case TAG_STRUCT: fprintf( stderr, "(TAG_STRUCT)\n" ); break;
-       case TAG_INT: fprintf( stderr, "(TAG_INT)\n" ); break;
-@@ -96,7 +96,7 @@ bgl_debug_header( obj_t obj ) {
-    }
- 
-    if( POINTERP( obj ) ) {
--      fprintf( stderr, "  TYPE=%d ", TYPE( obj ) );
-+      fprintf( stderr, "  TYPE=%ld ", TYPE( obj ) );
-       switch( TYPE( obj ) ) {
- 	 case 0: fprintf( stderr, "(PAIR_TYPE) " ); break;
- 	 case 1: fprintf( stderr, "(STRING_TYPE) " ); break;
-@@ -132,7 +132,7 @@ bgl_debug_header( obj_t obj ) {
- 	    else
- 	       fprintf( stderr, "(unknown type) " );
-       }
--      fprintf( stderr, "HEADER_SIZE=%d\n", HEADER_SIZE( CREF( obj )->header ) );
-+      fprintf( stderr, "HEADER_SIZE=%ld\n", HEADER_SIZE( CREF( obj )->header ) );
-    }
- 
-    return obj;
---- runtime/Clib/ccontrol.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ runtime/Clib/ccontrol.c	2011-02-14 15:07:40.999882828 -0700
-@@ -200,9 +200,9 @@ bgl_procedure_entry_to_string( obj_t pro
-    obj_t res = make_string_sans_fill( 17 );
-    
-    if( VA_PROCEDUREP( proc ) ) {
--      sprintf( BSTRING_TO_STRING( res ), "%016x", PROCEDURE_VA_ENTRY( proc ) );
-+      sprintf( BSTRING_TO_STRING( res ), "%016lx", (long)PROCEDURE_VA_ENTRY( proc ) );
-    } else {
--      sprintf( BSTRING_TO_STRING( res ), "%016x", PROCEDURE_ENTRY( proc ) );
-+      sprintf( BSTRING_TO_STRING( res ), "%016lx", (long)PROCEDURE_ENTRY( proc ) );
-    }
- 
-    return res;
---- bde/bmem/lib/thread.c.orig	2011-01-24 06:30:51.000000000 -0700
-+++ bde/bmem/lib/thread.c	2011-02-14 15:18:41.127937649 -0700
-@@ -50,9 +50,9 @@ bglthread_switch( void *this, void *next
- void
- thread_dump_statistics( FILE *f ) {
-    if( context_switches || scheduler_awake ) {
--      fprintf( f, "  (thread (context-switches %d) (scheduler-awake %d))\n",
-+      fprintf( f, "  (thread (context-switches %ld) (scheduler-awake %ld))\n",
- 	       context_switches, scheduler_awake );
--      fprintf( stderr, "thread...(context switches=%d, scheduler awake=%d)\n",
-+      fprintf( stderr, "thread...(context switches=%ld, scheduler awake=%ld)\n",
- 	       context_switches,
- 	       scheduler_awake );
-    }
---- bde/bmem/lib/alloc.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ bde/bmem/lib/alloc.c	2011-02-14 15:10:55.176083686 -0700
-@@ -109,7 +109,7 @@ alloc_dump_type( pa_pair_t *i, FILE *f )
- /*---------------------------------------------------------------------*/
- void
- alloc_dump( fun_alloc_info_t *i, FILE *f ) {
--   fprintf( f, "      (%d %d %d\n", i->gc_num,
-+   fprintf( f, "      (%lu %lu %lu\n", i->gc_num,
- 	    BMEMSIZE( i->dsize ), BMEMSIZE( i->isize ) );
-    fprintf( f, "        (dtype" );
-    for_each( (void (*)(void *, void *))alloc_dump_type, i->dtypes, f );
-@@ -486,7 +486,7 @@ GC_malloc( size_t lb ) {
- 
- #if BMEMDEBUG
-    if( bmem_debug ) {
--      fprintf( stderr, "GC_malloc(%d): %s %d\n",
-+      fprintf( stderr, "GC_malloc(%zu): %s %d\n",
- 	       lb, bgl_debug_trace_top_name(), get_alloc_type() );
-    }
- #endif
-@@ -513,7 +513,7 @@ GC_realloc( obj_t old, size_t lb ) {
- 
- #if BMEMDEBUG
-    if( bmem_debug ) {
--      fprintf( stderr, "GC_realloc(%d): top=%s type=%d\n",
-+      fprintf( stderr, "GC_realloc(%zu): top=%s type=%d\n",
- 	       lb, bgl_debug_trace_top_name(), get_alloc_type() );
-    }
- #endif
-@@ -541,7 +541,7 @@ GC_malloc_atomic( size_t lb ) {
- 
- #if BMEMDEBUG
-    if( bmem_debug ) {
--      fprintf( stderr, "GC_malloc_atomic(%d): top=%s type=%d\n",
-+      fprintf( stderr, "GC_malloc_atomic(%zu): top=%s type=%d\n",
- 	       lb, bgl_debug_trace_top_name(), get_alloc_type() );
-    }
- #endif
-@@ -623,7 +623,7 @@ BGl_registerzd2classz12zc0zz__objectz00(
- 			       hash, def,
- 			       constructor, virt );
- 
--   fprintf( stderr, "ok\n", cname );
-+   fprintf( stderr, "ok\n" );
- 
-    return class;
- }
---- bde/bmem/lib/symbol.c.orig	2011-01-24 06:30:51.000000000 -0700
-+++ bde/bmem/lib/symbol.c	2011-02-14 15:13:47.727927175 -0700
-@@ -33,7 +33,7 @@ make_symbol( obj_t name ) {
- 
- #if BMEMDEBUG
-    if( bmem_debug > 1 ) {
--      fprintf( stderr, "make_symbol: %s %p\n", name, symbol );
-+      fprintf( stderr, "make_symbol: %s %p\n", BSTRING_TO_STRING( name ), symbol );
-    }
- #endif
-    symbol->symbol_t.header = MAKE_HEADER( SYMBOL_TYPE, SYMBOL_SIZE );
---- bde/bmem/lib/trace.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ bde/bmem/lib/trace.c	2011-02-14 15:17:49.472275324 -0700
-@@ -79,9 +79,9 @@ bgl_debug_trace_top() {
- 		  fprintf( stderr, "                  top->name=KEYWORD %p\n", top->name );
- 	       } else {
- 		  if( !POINTERP( top->name ) ) {
--		     fprintf( stderr, "                  top->name=pas pointer %d\n", top->name );
-+		     fprintf( stderr, "                  top->name=pas pointer %p\n", top->name );
- 		  } else {
--		     fprintf( stderr, "                  top->name=pointer %p\n", TYPE( top->name  ) );
-+		     fprintf( stderr, "                  top->name=pointer %ld\n", TYPE( top->name  ) );
- 		  }
- 	       }
- 	    }
---- bde/bmem/lib/gchook.c.orig	2011-01-24 06:30:52.000000000 -0700
-+++ bde/bmem/lib/gchook.c	2011-02-14 15:12:29.119566199 -0700
-@@ -45,13 +45,13 @@ GC_collect_hook( int heapsz, long livesz
-    gc_number++;
- 
-    if( heapsz > (1024 * 1024) ) {
--      fprintf( stderr, "gc %3d: alloc size=%.2fMB, heap size=%.2fMB, live size=%.2fMB\n",
-+      fprintf( stderr, "gc %3lu: alloc size=%.2fMB, heap size=%.2fMB, live size=%.2fMB\n",
- 	       gc_number,
- 	       ((double)gc_alloc_size / (1024. * 1024.)),
- 	       ((double)heapsz / (1024. * 1024.)),
- 	       ((double)livesz / (1024. * 1024.)) );
-    } else {
--      fprintf( stderr, "gc %3d: alloc size=%dKB, heap size=%dKB, live size=%ldKB\n",
-+      fprintf( stderr, "gc %3lu: alloc size=%luKB, heap size=%dKB, live size=%ldKB\n",
- 	       gc_number,
- 	       gc_alloc_size / 1024,
- 	       heapsz / 1024,
-@@ -81,7 +81,7 @@ gc_alloc_size_add( int size ) {
- /*---------------------------------------------------------------------*/
- static void
- GC_dump_gc( gc_info_t *i, FILE *f ) {
--   fprintf( f, "    (%d %d %d %d)\n",
-+   fprintf( f, "    (%lu %lu %lu %lu)\n",
- 	    i->number,
- 	    BMEMSIZE( i->alloc_size ),
- 	    BMEMSIZE( i->heap_size ),
diff --git a/dev-scheme/bigloo/metadata.xml b/dev-scheme/bigloo/metadata.xml
deleted file mode 100644
index 88cbe66d9d23..000000000000
--- a/dev-scheme/bigloo/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>scheme@gentoo.org</email>
-    <name>Gentoo Scheme Project</name>
-  </maintainer>
-  <longdescription>
-    Bigloo is a Scheme implementation devoted to one goal: enabling Scheme
-    based programming style where C(++) is usually required. Bigloo attempts
-    to make Scheme practical by offering features usually presented by
-    traditional programming languages but not offered by Scheme and functional
-    programming. Bigloo compiles Scheme modules. It delivers small and fast
-    stand alone binary executables. Bigloo enables full connections between
-    Scheme and C programs, between Scheme and Java programs, and between
-    Scheme and C# programs.
-  </longdescription>
-  <use>
-    <flag name="bglpkg">Build bglpkg binary, which can be use to access scmpkg servers (requires web)</flag>
-    <flag name="calendar">Build the embedded library for calendar programming</flag>
-    <flag name="crypto">Build the embedded cryptographic library</flag>
-    <flag name="debug">Enable extra debug codepaths</flag>
-    <flag name="doc">Install Bigloo Manual (HTML docs of Bigloo and r5rs)</flag>
-    <flag name="emacs">Build and install the Bigloo Developement Environment for Emacs (aka bee-mode)</flag>
-    <flag name="gmp">Adds support for <pkg>dev-libs/gmp</pkg> (GNU MP library)</flag>
-    <flag name="java">Enable the JVM backend for the Bigloo compiler</flag>
-    <flag name="mail">Mail library for email management (e.g. maildir and imap support)</flag>
-    <flag name="multimedia">Build multimedia library (e.g. for managing images). Needed for <pkg>dev-scheme/hop</pkg></flag>
-    <flag name="openpgp">Build OpenPGP support (requires crypto)</flag>
-    <flag name="packrat">Bigloo port of Tony Garnock-Jones' packrat parser (requires srfi1)</flag>
-    <flag name="sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg></flag>
-    <flag name="srfi1">Build the srfi1 library: List library</flag>
-    <flag name="srfi27">Build the srfi27 library: Source of Random Bits (32bit-arch only, requires gmp)</flag>
-    <flag name="ssl">Adds support for SSL connections through <pkg>dev-libs/openssl</pkg></flag>
-    <flag name="threads">Enable thread support, it depends on <pkg>dev-libs/boehm-gc</pkg> built with threads use flag</flag>
-    <flag name="text">Library for dealing with text (e.g. BibTeX parser)</flag>
-    <flag name="web">Library for web programming (e.g. XML, CGI parsers). Needed for <pkg>dev-scheme/hop</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-scheme/hop/Manifest b/dev-scheme/hop/Manifest
deleted file mode 100644
index 2d7a170e6c16..000000000000
--- a/dev-scheme/hop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hop-2.0.1.tar.gz 2407554 SHA256 4f631be4d79a52b81ea7358d22c49cc188665d8e349c13f16b041693bd5a97b3 SHA512 1e208397cbaed4482f4a2e47abcbc083644d9ccf80fa5081b78d41071bf2f7827cbd0f17aa08db6bfdc9f4a9a25a40fb5b76258d4aed32f530d445ec767d10f8 WHIRLPOOL 04cff1938cf04efe8c3e5cdd201639bbf0c25df0f4fc984bb430dbd2053d1d08000f018368597e832341566b4f2e5f55e2710bf6eab00df2221378de2e0d74c2
diff --git a/dev-scheme/hop/files/hop.confd b/dev-scheme/hop/files/hop.confd
deleted file mode 100644
index 1688f64813d5..000000000000
--- a/dev-scheme/hop/files/hop.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/hop: config file for /etc/init.d/hop
-
-# see `hop --help` # for valid cmdline options
-#HOP_OPTS=""
diff --git a/dev-scheme/hop/files/hop.initd b/dev-scheme/hop/files/hop.initd
deleted file mode 100644
index 9d111fe181a1..000000000000
--- a/dev-scheme/hop/files/hop.initd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-HOPEXEC=/usr/bin/hop
-HOPUSER=hop
-HOPHOME=/var/www
-PIDFILE=/var/run/hop.pid
-LOGFILE=/var/log/hop
-
-# For user extensions through /etc/conf.d/hop
-HOP_OPTS="--log-file ${LOGFILE} ${HOP_OPTS}"
-
-depend() {
-    need localmount net
-}
-
-logfile() {
-    if [ ! -f ${LOGFILE} ]
-    then
-	touch ${LOGFILE}
-    fi
-    chown ${HOPUSER} ${LOGFILE} || eerror "Cannot create logfile"
-    return 0
-}
-
-start() {
-    logfile || return 1
-
-    ebegin "Starting Hop Web Broker"
-    start-stop-daemon --start --oknodo \
-	--background --chuid ${HOPUSER} \
-	--make-pidfile --pidfile ${PIDFILE} \
-        --exec ${HOPEXEC} --env HOME=${HOPHOME} \
-	-- ${HOP_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping Hop Web Broker"
-    start-stop-daemon --stop \
-	--exec ${HOPEXEC} --pidfile ${PIDFILE}
-    eend $?
-}
diff --git a/dev-scheme/hop/hop-2.0.1.ebuild b/dev-scheme/hop/hop-2.0.1.ebuild
deleted file mode 100644
index 1a32ce140f39..000000000000
--- a/dev-scheme/hop/hop-2.0.1.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 eutils multilib user
-
-DESCRIPTION="Hop is a higher-order language for programming interactive web applications"
-HOMEPAGE="http://hop.inria.fr/"
-SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Hop/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=dev-scheme/bigloo-3.3a[ssl?,threads?]"
-
-RDEPEND="${DEPEND}"
-
-IUSE="ssl threads debug"
-
-pkg_setup() {
-	enewgroup hop
-	enewuser hop -1 -1 /var/lib/hop hop
-}
-
-src_configure() {
-	# Hop doesn't use autoconf and consequently a lot of options used by econf give errors
-	# Manuel Serrano says: "Please, dont talk to me about autoconf. I simply dont want to hear about it..."
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--etcdir=/etc/hop \
-		$(use_enable ssl) \
-		$(use_enable threads) \
-		$(use debug && echo "--debug") \
-		|| die "configure failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	newinitd "${FILESDIR}/hop.initd" hop || die
-	newconfd "${FILESDIR}/hop.confd" hop || die
-}
diff --git a/dev-scheme/hop/metadata.xml b/dev-scheme/hop/metadata.xml
deleted file mode 100644
index 3580e68154f5..000000000000
--- a/dev-scheme/hop/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
-HOP is a new programming language designed for the Web 2.0. It is a higher-order language for programming interactive web applications such as web agendas, web galleries, music players, etc. HOP can be viewed as a replacement for traditional graphical toolkits. HOP is implemented as a Web broker, i.e., a Web server that may act indifferently as a regular Web server or Web proxy.
-	</longdescription>
-	<use>
-		<flag name="ssl">Enable SSL support for hop</flag>
-		<flag name="threads">Enable thread support for hop, it depends on <pkg>dev-scheme/bigloo</pkg> built with threads use flag.</flag>
-		<flag name="debug">Enables building with debug symbols</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-scheme/schemik/Manifest b/dev-scheme/schemik/Manifest
deleted file mode 100644
index a9bb54e68c0b..000000000000
--- a/dev-scheme/schemik/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST schemik-1.2.40.0.tar.gz 132603 SHA256 cadee740b9b651dd52c384ef8356cefa9b326d15bf69a3f0344e9303c6975ab1 SHA512 b37bd31810e7cbad31d8bb65ebe8a7eb254eb26143079f8b9bd16f41900905da900e9c4beb32e9af4a1fd6bda1c2de5b3b5c1eb5144c26b45947a80063198649 WHIRLPOOL 01415ff5a4d63142d7b059e9702762a6d7994d3f649efd521fc38b554ed0babee4a011d3e11cc44b9b1f3e5dd94aef90db0e91f6bba66439384b94b616c525f4
diff --git a/dev-scheme/schemik/files/schemik-1.2.40.0-asneeded.patch b/dev-scheme/schemik/files/schemik-1.2.40.0-asneeded.patch
deleted file mode 100644
index 07083e6e96e8..000000000000
--- a/dev-scheme/schemik/files/schemik-1.2.40.0-asneeded.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing build with as-needed, respect LDFLAGS
-
-http://bugs.gentoo.org/show_bug.cgi?id=330623
-
---- Makefile
-+++ Makefile
-@@ -4,7 +4,7 @@
- STATIC_NAME="schemik-i686-linux-static"
- 
- all: stack_eval.o types.o functions.o env.o initial_env.o schemik.c rt.o int_funcs.o readline_wrapper.o config.h thread_pool.o parser.o lexer.o errors.o
--	$(CC) ${COMP_ARGS} `pkg-config --libs --cflags glib-2.0` -o schemik stack_eval.o types.o int_funcs.o functions.o env.o initial_env.o rt.o readline_wrapper.o thread_pool.o parser.o lexer.o errors.o schemik.c -lgc -lpthread -lreadline -lncurses -lm
-+	$(CC) $(LDFLAGS) ${COMP_ARGS} -o schemik stack_eval.o types.o int_funcs.o functions.o env.o initial_env.o rt.o readline_wrapper.o thread_pool.o parser.o lexer.o errors.o schemik.c -lgc -lpthread -lreadline -lncurses -lm `pkg-config --libs --cflags glib-2.0`
- 
- stack_eval.o: stack_eval.c eval.h vm.h vm.c stack.c stack.h int_funcs.h functions.h rt.h mutex.h types.h config.h dump_vm.c tm_log.c tm_log.h constants.def
- 	$(CC) ${COMP_ARGS} `pkg-config --cflags glib-2.0` -c stack_eval.c
diff --git a/dev-scheme/schemik/metadata.xml b/dev-scheme/schemik/metadata.xml
deleted file mode 100644
index 2017a8741185..000000000000
--- a/dev-scheme/schemik/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>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
-	Schemik is a high-level lexically-scoped implicitly-parallel dialect of
-	Scheme and Common LISP, this means the parallel execution of programs is
-	done independently of the programmer and each program written in Schemik
-	always produces the same results no matter which parts of the program are
-	executed simultaneously.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">schemik</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-scheme/schemik/schemik-1.2.40.0.ebuild b/dev-scheme/schemik/schemik-1.2.40.0.ebuild
deleted file mode 100644
index 693896be8315..000000000000
--- a/dev-scheme/schemik/schemik-1.2.40.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit toolchain-funcs versionator eutils
-
-DESCRIPTION="High-level lexically-scoped implicitly-parallel dialect of Scheme and Common LISP"
-HOMEPAGE="http://schemik.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/boehm-gc
-		>=dev-libs/glib-2.0
-		sys-libs/readline"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	sed -i -e 's/\(COMP_ARGS=\)-g \(-Wall -Winline\) -O2/\1$(CFLAGS) \2/' \
-	Makefile || die "patching Makefile failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)|| die "emake failed"
-}
-
-src_install() {
-	dobin schemik || die "dobin failed"
-	insinto "/usr/share/${PN}/$(get_version_component_range 1-2)"
-	doins "scm/base.scm" || die "Standard library installation failed"
-	dodoc ChangeLog README || die "dodoc failed"
-	doman doc/man/schemik.1.gz || die "doman failed"
-}
diff --git a/dev-tcltk/tcl-sql/Manifest b/dev-tcltk/tcl-sql/Manifest
deleted file mode 100644
index 7eab16f7e3c8..000000000000
--- a/dev-tcltk/tcl-sql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tcl-sql-20000114.tgz 159365 SHA256 203acb2dac5589bd730482995887f328efc40d8881ea1365d96d4340fdcdb53b SHA512 ba16bd0e4a3483b7d2786783ed299732691efd27b43c87143d9037ea4da91ab49d3b66b0967e95baebedb9f778de620313fdf6f2ecdd69ebd6de054b4fbe806f WHIRLPOOL e50173b2b19a66eb31bb1b8b2578fa1a344e5b83ebea016dc9b172f0f48ab8f025e2e7024ddc29fa0134a446638e9bea6a803b7fbd73c19fc584e51b4c856b04
diff --git a/dev-tcltk/tcl-sql/files/fix-const.patch b/dev-tcltk/tcl-sql/files/fix-const.patch
deleted file mode 100644
index 64289472265a..000000000000
--- a/dev-tcltk/tcl-sql/files/fix-const.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -urN tcl-sql.old/sql-mysql.cc tcl-sql/sql-mysql.cc
---- tcl-sql.old/sql-mysql.cc	2000-01-12 20:50:03.000000000 -0500
-+++ tcl-sql/sql-mysql.cc	2004-08-08 13:15:15.820828056 -0400
-@@ -1,3 +1,4 @@
-+#define USE_OLD_FUNCTIONS
- #include "tcl.h"
- #include "sql-mysql.h"
- 
-@@ -20,7 +21,7 @@
- // -------------------------------------------------------------
- char *
- Sql_mysql::getErrorMsg() {
--	char *msg = mysql_error(&mysql);
-+	char *msg = (char *)mysql_error(&mysql);
- 	if (*msg == '\0') {
- 		return errormsg;
- 	} else {
-@@ -71,7 +72,7 @@
- 
- // -------------------------------------------------------------
- int
--Sql_mysql::numRows(int resHandle=0) {
-+Sql_mysql::numRows(int resHandle) {
- 	if (!results[resHandle]) { return -1; }
- 	return(mysql_num_rows(results[resHandle]));
- }
-@@ -109,7 +110,7 @@
- 
- // -------------------------------------------------------------
- void
--Sql_mysql::endquery(int resHandle=0) {
-+Sql_mysql::endquery(int resHandle) {
- 	if (!results[resHandle]) return;
- 	mysql_free_result(results[resHandle]);
- 	results[resHandle] = NULL;
-@@ -120,7 +121,7 @@
- // Note: A new Sql_row is allocated. Has to be freed by calling
- // party.
- Sql_row *
--Sql_mysql::fetchrow(int resHandle=0) {
-+Sql_mysql::fetchrow(int resHandle) {
- 
- 	if (!results[resHandle]) {
- 		sprintf(errormsg, "Result handle [%d] not in use.\n", resHandle);
-diff -urN tcl-sql.old/sql.cc tcl-sql/sql.cc
---- tcl-sql.old/sql.cc	2000-01-12 20:53:23.000000000 -0500
-+++ tcl-sql/sql.cc	2004-08-08 13:12:57.058923072 -0400
-@@ -122,7 +122,7 @@
- 
- // -------------------------------------------------------------
- //
--int SqlCmd(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) 
-+int SqlCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) 
- {
- 	if (argc == 1) {
- 		Tcl_SetResult(interp, "Usage: sql command ?handle?", TCL_STATIC);
-@@ -137,7 +137,7 @@
- 
- 	// -----------------------------------
- 	if (strcmp(argv[1], "connect")==0) {
--		c = mgr->connect(argc-2, argv+2);
-+		c = mgr->connect(argc-2, (char **)(argv+2));
- 		if (c < 0) {
- 			char *basemsg = "Unable to Connect: ";
- 			char *errmsg = mgr->getErrorMsg();
-@@ -160,7 +160,7 @@
- 		if (argc <= 2) {
- 			Tcl_SetResult(interp, "Usage:\nsql command handle", TCL_STATIC);
- 			return TCL_ERROR;
--		} else if ((connid = stripPrefix(argv[2], HANDLE_PREFIX)) < 0) {
-+		} else if ((connid = stripPrefix((char *)argv[2], HANDLE_PREFIX)) < 0) {
- 			Tcl_AppendResult(interp, "sql: Invalid handle: ", argv[2], NULL);
- 			return TCL_ERROR;
- 		} else if (!mgr->inUse(connid)) {
-@@ -172,19 +172,19 @@
- 
- 		// take care of the command:
- 		if (strcmp(argv[1], "exec") == 0) {
--			res = execCmd(interp, conn, argv[3]);
-+			res = execCmd(interp, conn, (char *)argv[3]);
- 		} else if (strcmp(argv[1], "query") == 0) {
--			res = queryCmd(interp, conn, argv[3]);
-+			res = queryCmd(interp, conn, (char *)argv[3]);
- 		} else if (strcmp(argv[1], "endquery") == 0) {
--			res = endqueryCmd(interp, conn, argv[3]);
-+			res = endqueryCmd(interp, conn, (char *)argv[3]);
- 		} else if (strcmp(argv[1], "fetchrow") == 0) {
--			res = fetchrowCmd(interp, conn, argv[3]);
-+			res = fetchrowCmd(interp, conn, (char *)argv[3]);
- 		} else if (strcmp(argv[1], "numrows") == 0) {
--			res = numrowsCmd(interp, conn, argv[3]);
-+			res = numrowsCmd(interp, conn, (char *)argv[3]);
- 		} else if (strcmp(argv[1], "disconnect") == 0) {
- 			res = disconnectCmd(interp, mgr, connid);
- 		} else if (strcmp(argv[1], "selectdb")==0) {
--			res = selectdbCmd(interp, conn, argv[3]);
-+			res = selectdbCmd(interp, conn, (char *)argv[3]);
- 		} else {
- 			Tcl_AppendResult(interp, "sql: unknown sql command: ", argv[1], NULL);
- 			return TCL_ERROR;
-
diff --git a/dev-tcltk/tcl-sql/files/ldflags.patch b/dev-tcltk/tcl-sql/files/ldflags.patch
deleted file mode 100644
index 2099ed115f95..000000000000
--- a/dev-tcltk/tcl-sql/files/ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 81a80ea..7738920 100644
---- a/Makefile
-+++ b/Makefile
-@@ -22,8 +22,8 @@ OBJS	   = $(SRC:%.cc=$(OBJ_DIR)/%.o)
- 
- # -- Configurable parameters: ----------------------------
- # Section II:
--CC	= g++
--LD	= g++
-+CXX ?= g++
-+LD	?= g++
- FLAGS	= -Wall
- # include the path to your libmysqlclient as one of the -L's
- LD_FLAGS = -L/usr/lib/mysql -L/usr/local/mysql/lib \
-@@ -69,10 +69,10 @@ CURDATE = `date +%y%m%d`
- all:	sql.so
- 
- $(OBJ_DIR)/%.o: %.cc
--	$(CC) -c $(INCLUDE) $(EXTRA_FLAGS) $(FLAGS) -o $@ $<
-+	$(CXX) $(CXXFLAGS) -c $(INCLUDE) $(EXTRA_FLAGS) $(FLAGS) -o $@ $<
- 
- sql.so:	$(OBJS)
--	$(LD) $(OBJS) $(EXTRA_LINKS) $(LD_FLAGS) $(EXTRA_LD_FLAGS) -o sql.so
-+	$(CXX) $(LDFLAGS) $(EXTRA_LINKS) $(OBJS) -o sql.so $(LD_FLAGS) $(EXTRA_LD_FLAGS) -ltcl
- 
- clean:
- 	@ rm -f *~ $(OBJ_DIR)/*.o sql.so
diff --git a/dev-tcltk/tcl-sql/metadata.xml b/dev-tcltk/tcl-sql/metadata.xml
deleted file mode 100644
index 958870d1d6a3..000000000000
--- a/dev-tcltk/tcl-sql/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 type="project">
-		<email>tcltk@gentoo.org</email>
-		<description>TCL / TK herd</description>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">tcl-sql</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild b/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild
deleted file mode 100644
index f1b7b96641fe..000000000000
--- a/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.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
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A generic Tcl interface to SQL databases"
-HOMEPAGE="http://www.parand.com/tcl-sql/"
-SRC_URI="mirror://sourceforge/tcl-sql/${PN}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/tcl:0=
-	virtual/mysql"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	find . -type f -exec chmod 644 '{}' \; || die
-	epatch \
-		"${FILESDIR}"/fix-const.patch \
-		"${FILESDIR}"/ldflags.patch
-	tc-export CXX
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/${P}
-	doexe sql.so
-	dodoc CHANGES.txt CODE_DESCRIPTION.txt docs/sample.full.txt docs/sample.simple.txt
-	dohtml README.html docs/api.html
-}
diff --git a/dev-tex/flabels/flabels-1.0.ebuild b/dev-tex/flabels/flabels-1.0.ebuild
index 8ff7f797246d..b5c92393d2b6 100644
--- a/dev-tex/flabels/flabels-1.0.ebuild
+++ b/dev-tex/flabels/flabels-1.0.ebuild
@@ -18,12 +18,3 @@ IUSE=""
 
 S=${WORKDIR}/${PN}
 DOCS="README"
-
-src_prepare() {
-	chmod +x makedoc
-}
-
-src_compile() {
-	latex-package_src_compile
-	./makedoc
-}
diff --git a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
index fc73489866e5..ead3610dee4e 100644
--- a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mirror.ctan.org/support/${PN}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE=""
 
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
index af9e7858c481..ec4c86b14297 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 CDEPEND="virtual/latex-base
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
deleted file mode 100644
index cd33e8d8d139..000000000000
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit latex-package java-utils-2 java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Extract annotations from pdf files"
-HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/pax/"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE=""
-
-CDEPEND="virtual/latex-base
-	dev-java/pdfbox
-	dev-java/fontbox"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	virtual/perl-Getopt-Long
-	dev-perl/File-Which
-	>=virtual/jre-1.5
-	!<=dev-texlive/texlive-latexextra-2010"
-
-TEXMF=/usr/share/texmf-site
-S=${WORKDIR}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="pdfbox fontbox"
-
-src_prepare() {
-	epatch "${FILESDIR}/javajars.patch"
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	cd "${S}/source/latex/pax"
-	eant || die
-}
-
-src_install() {
-	newbin scripts/pax/pdfannotextractor.pl pdfannotextractor || die
-	java-pkg_dojar "${S}/source/latex/pax/pax.jar" || die
-	insinto ${TEXMF}
-	doins -r tex || die
-	dodoc doc/latex/pax/README || die
-}
diff --git a/dev-util/anjuta/anjuta-3.18.2.ebuild b/dev-util/anjuta/anjuta-3.18.2.ebuild
index f0f3bdefb2e2..1671bb66883e 100644
--- a/dev-util/anjuta/anjuta-3.18.2.ebuild
+++ b/dev-util/anjuta/anjuta-3.18.2.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/catkin/catkin-0.6.16-r2.ebuild b/dev-util/catkin/catkin-0.6.16-r2.ebuild
index 1e114945e04a..f9a32a87c9f0 100644
--- a/dev-util/catkin/catkin-0.6.16-r2.ebuild
+++ b/dev-util/catkin/catkin-0.6.16-r2.ebuild
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="http://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ${SCM} cmake-utils python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 1e114945e04a..f9a32a87c9f0 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="http://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit ${SCM} cmake-utils python-r1 python-utils-r1
 
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index a6353a13d41d..32f47e4c93df 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,3 +1,2 @@
-DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce
 DIST cdiff-0.9.7.tar.gz 32061 SHA256 63b7f1037cbcf5ce76b56cd4e5643751e25e0c2a124bcd382af827651d81ca90 SHA512 2f2bf77ecc6e369325753c5d1c6fd23279138e8ae6a4d11cd102b5674d5c7e089e7f2613bbd39d68a00b0db16c589df64af14746228e38065556d0eb11b1e0cd WHIRLPOOL c26cb5df0b02b3567fa334ab2fe131ee99742b782d1bc8e83a4f06476c03d8242bbdc8489cec07ffb49ada0f5404c192c69765e3d9835fdf5feb944f8bb0e703
 DIST cdiff-0.9.8.tar.gz 34861 SHA256 61229ba5b294faa8b4c257a220cfda34ac4a7ecf35aa88e8121c36234fea3760 SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3 WHIRLPOOL a49f492746fba7af7869408bdfcb4ae2accfb78f9b999d49763f35fbfddb58ac96ae9a734e22441a0b9d060d89de56704f09762c1af10c059851e280a348156b
diff --git a/dev-util/cdiff/cdiff-0.9.6.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild
deleted file mode 100644
index e16cd6efad2f..000000000000
--- a/dev-util/cdiff/cdiff-0.9.6.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"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Term based view of colored, incremental diff in a Git/Mercurial/Svn workspace"
-HOMEPAGE="https://github.com/ymattw/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
-
-DOCS=( CHANGES.rst README.rst )
-
-python_test() {
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/cdiff/cdiff-0.9.7.ebuild b/dev-util/cdiff/cdiff-0.9.7.ebuild
index cfde74d83980..d37dc8420433 100644
--- a/dev-util/cdiff/cdiff-0.9.7.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.7.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} )
 inherit distutils-r1
 
 if [[ "${PV}" != *"9999"* ]] ; then
-	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 else
 	KEYWORDS=""
diff --git a/dev-util/cocom/Manifest b/dev-util/cocom/Manifest
deleted file mode 100644
index 6d8d18a67b7b..000000000000
--- a/dev-util/cocom/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cocom-0.996.tar.gz 4632140 SHA256 e143ab556d79a35ef31ec1e240897c9b8a8d0b6693e50a2b6e47d7fd4b200519 SHA512 57a7338677c443d293f02d64f38268bd76feb075e3c9780fcd37e53a294d5e8fa374bb98d40b505d2d8f9fd9b7d8327f8f461cf4650868bf4adfd5b244cf1d4e WHIRLPOOL 599b48e444acb13bc14e170d8f34602462e45de8c4efea2f611ac7e023f876249c68e83712d9734639e456fc5961704999df6dc0baa139ae4fd965ecca7cd26f
diff --git a/dev-util/cocom/cocom-0.996-r1.ebuild b/dev-util/cocom/cocom-0.996-r1.ebuild
deleted file mode 100644
index 8e817965be44..000000000000
--- a/dev-util/cocom/cocom-0.996-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="Toolset to help create compilers, cross-compilers, interpreters, and other language processors"
-HOMEPAGE="http://cocom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-RDEPEND="!!media-gfx/hugin"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-configure.patch"
-	cd "${S}"/REGEX
-	eautoconf
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc CHANGES README
-}
diff --git a/dev-util/cocom/files/cocom-0.996-configure.patch b/dev-util/cocom/files/cocom-0.996-configure.patch
deleted file mode 100644
index ad584a82a219..000000000000
--- a/dev-util/cocom/files/cocom-0.996-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cocom-0.996/configure.orig	2007-02-08 19:25:24.000000000 +0100
-+++ cocom-0.996/configure	2009-09-01 20:21:04.000000000 +0200
-@@ -5474,7 +5474,7 @@
- 	Linux*)
- 	  GCC_FPIC=-fPIC
- 	  LIB_SUFFIX=so
--	  MAKELIB="gcc -shared -Wl,-soname,\\\$\$0 -o \\\$\$0"
-+	  MAKELIB="$CC $LDFLAGS -shared -Wl,-soname,\\\$\$0 -o \\\$\$0"
- 	  AFTER_MAKELIB="echo \\\$\$0"
- # The following option is needed if we use no shared dino library but
- # shared external library
diff --git a/dev-util/cocom/metadata.xml b/dev-util/cocom/metadata.xml
deleted file mode 100644
index 0101a3ef8b46..000000000000
--- a/dev-util/cocom/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-		COCOM tool set is oriented towards the creation of compilers,
-		cross-compilers, interpreters, and other language processors.
-		Now COCOM tool set consists of the following components:
-		* Ammunition (reusable packages)
-		* Sprut (internal representation description translator)
-		* Nona (code selector description translator)
-		* Msta (syntax description translator)
-		* Oka (pipeline hazards description translator)
-		* Shilka (keywords description translator)
-
-		All of these components are written in ANSI C and have common style
-		input languages (a la YACC). All code generated by the components is in
-		also strict ANSI C and in standard C++. All documentation exists in
-		ASCII, TeX dvi, Postsrcipt, HTML, and GNU info formats. 
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">cocom</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/creduce/creduce-2.4.0.ebuild b/dev-util/creduce/creduce-2.4.0.ebuild
index 76098b7b1d2e..ab9551703093 100644
--- a/dev-util/creduce/creduce-2.4.0.ebuild
+++ b/dev-util/creduce/creduce-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ DEPEND="
 	dev-perl/Sys-CPU
 	dev-util/astyle
 	dev-util/indent
-	sys-devel/clang:0/3.7
-	sys-devel/llvm:0/3.7.0[clang]"
+	=sys-devel/clang-3.7*:0=
+	=sys-devel/llvm-3.7*:0=[clang]"
 
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cscope/cscope-15.8a.ebuild b/dev-util/cscope/cscope-15.8a.ebuild
index 8db9728cdede..208407b7d1e8 100644
--- a/dev-util/cscope/cscope-15.8a.ebuild
+++ b/dev-util/cscope/cscope-15.8a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm 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="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 8f913571e48a..e9bc0821601b 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,3 +1,4 @@
 DIST debootstrap_1.0.75.tar.gz 61897 SHA256 4fdc5daf7bce3816a7faa916e7cbd6d45357f241f0d845bec0015c06fd7c7cd6 SHA512 bbf4a9e33ee0b398064aa12ba77c7e2ad8fba0e050a8d821341c9c065f8554476aaa6c67f93e3255f85828b98643080f331aee9de6a901a9d5fb5cbcb8ed6beb WHIRLPOOL dca8e385102ef03ea970320fc1fea8a8f44fc09b78384591911df046afb0f14157e90fafb3cf8c021ea7568e22eea9f26674eb07cfb25b21ed72810cf0957c7a
 DIST debootstrap_1.0.78.tar.gz 63725 SHA256 b08b32152f240b42ee7fc30f365d95527edf9012e25a16a5f03ba70297389abb SHA512 a65435fde2e7d2bb2dd51c8ac1fad51616d3ff11a2966c74eb1b2869685d62c7e0f7e2ecb539f92a700e2a6d570d0715ba15476ac0439feb9fda80310db2392b WHIRLPOOL 4f86fda0b95de15520586bab92506b75f44c48aaf1ea3bb3025b309c9f4063549e9faf526c3b9a7423335b0e64072f0a23e6f3dafeb7137d9f2c778e60ad77e9
+DIST debootstrap_1.0.79.tar.gz 64390 SHA256 11ee0dca0c0e0b5ccb0f80c885f62467c67b90abcbdd7f48dd8ca66af4ec5fc0 SHA512 dcaff6930b8b6679f5306be64405ee8e6670c2361a1d448701a3039453f0f42763e54e3841d1fd5bf201ca005f240a81e077db27593aa4066c21236cdf637535 WHIRLPOOL 42d0505e51774aabd15505d2036feb5cb97bb7b8b290b43fd914870de8135fd5602334115b0faa12a6bb28f11b0460d3fdbfa4385ddc4055f5aef37c9c0635ab
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
diff --git a/dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild b/dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild
new file mode 100644
index 000000000000..1ea5e165e7ea
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/debootstrap/debootstrap-1.0.78.ebuild b/dev-util/debootstrap/debootstrap-1.0.78.ebuild
deleted file mode 100644
index 8c30ccb533b4..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.78.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
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring"
-		elog " (--keyring=K), please install app-crypt/gnupg."
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.79.ebuild b/dev-util/debootstrap/debootstrap-1.0.79.ebuild
new file mode 100644
index 000000000000..78ad534d1170
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.79.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/devhelp/devhelp-3.18.1.ebuild b/dev-util/devhelp/devhelp-3.18.1.ebuild
index d2c6c131d1de..9022eb7a58ba 100644
--- a/dev-util/devhelp/devhelp-3.18.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.18.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/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
deleted file mode 100644
index 31e6d404b0d9..000000000000
--- a/dev-util/eclipse-sdk/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST eclipse-R3_5_1-fetched-src.tar.bz2 79061683 SHA256 3c93115e3031686dd26c94833cd21ce26244340408a435a3b9dcd29404309c60 SHA512 2ad3669a5d39abeebed4121ccc67a42590b9ae80bde5ae69b4fc079e39640cabfcb3a7388c6cc6329fff74c0858f20b97c855fd4828a3b1a90bd6aa2c486dd63 WHIRLPOOL 36ccc7323ea0958b595e29bf12eb2b7a3891800119030353bdb4ed7f47f20f567435508415e909580958d2af1c0b40850dbb8f7d03ba1f649931b1d067fb59d9
-DIST eclipse-build-R0_4_0.tar.gz 164001 SHA256 87f159e0861b378b1ea13d3173d6066fbc141a350283b0f0278831a5097cbe1b SHA512 c8ff9fcf3dc6512e051d8d3d89391b49b6260583980851409263fdb03ea1af9f8bde55fc18db4e418c109cc78aa1bd33f90e0b5a8ffa65f4c826ecfc245ba6ca WHIRLPOOL 243be2d46de3454ca514e5955219742cddc2c9762ee9040087ccdac227699f054476f57e6b66daaf2a188e746c1196d6605b6e64b415c6f017600c256763d2d8
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
deleted file mode 100644
index 58ced432c30d..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-WANT_ANT_TASKS="ant-nodeps"
-
-# eclipse-build is too complicated for automatic fixing
-# if there are any fixes we should create patches
-# and push them upstream
-JAVA_PKG_BSFIX="off"
-
-inherit eutils java-pkg-2 java-ant-2 check-reqs
-
-BUILD_ID="R3_5_1"
-ECLIPSE_BUILD_VER="R0_4_0"
-S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}"
-
-DESCRIPTION="Eclipse SDK"
-HOMEPAGE="http://www.eclipse.org/eclipse/"
-SRC_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-${BUILD_ID}-fetched-src.tar.bz2
-	http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="3.5"
-KEYWORDS="amd64 x86"
-IUSE="doc gnome source"
-
-CDEPEND=">=dev-java/swt-${PV}:${SLOT}
-	>=dev-java/ant-1.7.1
-	>=dev-java/ant-core-1.7.1
-	>=dev-java/asm-3.1:3
-	>=dev-java/commons-codec-1.3
-	>=dev-java/commons-el-1.0
-	>=dev-java/commons-httpclient-3.1:3
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/hamcrest-core-1.1
-	>=dev-java/icu4j-4.0.1:4
-	>=dev-java/jsch-0.1.41
-	>=dev-java/junit-3.8.2:0
-	>=dev-java/junit-4.5:4
-	>=dev-java/lucene-1.9.1:1.9
-	>=dev-java/lucene-analyzers-1.9.1:1.9
-	>=dev-java/sat4j-core-2.1:2
-	>=dev-java/sat4j-pseudo-2.1:2
-	dev-java/tomcat-servlet-api:2.5
-	x86? ( gnome? ( gnome-base/gconf ) )
-	dev-java/ant-nodeps"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=virtual/jdk-1.6"
-
-ALL_OS='aix hpux linux macosx qnx solaris win32'
-ALL_WS='carbon cocoa gtk motif photon win32 wpf'
-ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'
-
-buildDir="${S}/build/eclipse-${BUILD_ID}-fetched-src"
-
-pkg_setup() {
-	ws='gtk'
-	if use x86 ; then os='linux' ; arch='x86'
-	elif use amd64 ; then os='linux' ; arch='x86_64'
-	fi
-
-	java-pkg-2_pkg_setup
-
-	if use doc ; then
-		ewarn "Having the 'doc' USE flag enabled greatly increases the build time."
-		ewarn "You might want to disable it for ${PN} if you don't need it."
-	fi
-}
-
-src_unpack() {
-	CHECKREQS_MEMORY="1536M"
-	if use doc || use source ; then
-		CHECKREQS_DISK_BUILD="3072M"
-	else
-		CHECKREQS_DISK_BUILD="1536M"
-	fi
-	check_reqs
-
-	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz"
-	mv "${WORKDIR}/eclipse-build-0_4_RC6" "${S}" || die
-	ln -s "${DISTDIR}/eclipse-${BUILD_ID}-fetched-src.tar.bz2" "${S}"/ || die
-
-	cd "${S}"
-	# building with ecj fails for some reason (polluted classpath probably)
-	java-pkg_force-compiler javac
-	eant unpack
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/3.5/jvmarg.patch" || die
-
-	# apply patches before we start cleaning junk out
-	eant applyPatches
-
-	# fix up hardcoded runtime class paths
-	sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \
-			-i {,pde}build.properties || die
-
-	# fix up arch specifications if we're x86_64
-	if use amd64 ; then
-		sed -e 's/x86/\0_64/' -i "${buildDir}"/buildConfigs/eclipse-build-config/build.properties || die
-	fi
-
-	# disable building of libgnomeproxy on x86 if USE=-gnome
-	if ! use gnome ; then
-		sed_xml_element 'condition' -e '/property="build\.libgnomeproxy"/d' -i build.xml || die
-	fi
-
-	# skip compilation of SWT native libraries (we use the system-installed copies)
-	sed_xml_element 'ant' -e '/swt/d' -i build.xml || die
-
-	ebegin 'Removing plugins of irrelevant platforms'
-	local remove_os=" ${ALL_OS} " ; remove_os=${remove_os/ ${os} / }
-	remove_os=${remove_os# } ; remove_os=${remove_os% } ; remove_os=${remove_os// /'\|'}
-	local remove_ws=" ${ALL_WS} " ; remove_ws=${remove_ws/ ${ws} / }
-	remove_ws=${remove_ws# } ; remove_ws=${remove_ws% } ; remove_ws=${remove_ws// /'\|'}
-	local remove_arch=" ${ALL_ARCH} " ; remove_arch=${remove_arch/ ${arch} / }
-	remove_arch=${remove_arch# } ; remove_arch=${remove_arch% } ; remove_arch=${remove_arch// /'\|'}
-	sed_xml_element 'includes\|plugin' \
-			-e '/id="org\.eclipse\.\(core\.net\.linux\.x86\|update\.core\.linux\)"/b' \
-			-e '/os="'"${remove_os}"'"/d' -e '/ws="'"${remove_ws}"'"/d' -e '/arch="'"${remove_arch}"'"/d' \
-			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
-		|| die 'remove irrelevant platforms failed'
-	eend
-
-	if ! use doc ; then
-		ebegin 'Removing documentation plugins'
-		rm -rf "${buildDir}"/plugins/*.doc{,.*}
-		eclipse_delete-plugins '.*\.doc\(\..*\|\)'
-		eend
-	fi
-
-	if ! use source ; then
-		ebegin 'Removing source plugins'
-		rm -rf "${buildDir}"/plugins/*.source{,_*}
-		eclipse_delete-plugins '.*\.source'
-		eend
-	fi
-
-	unbundle "${buildDir}"/plugins
-	cd ${buildDir} || die
-	epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch"
-	epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch"
-}
-
-src_compile() {
-	ANT_OPTS='-Xmx512M' eant -DbuildArch=${arch}
-}
-
-src_install() {
-	local destDir="/usr/$(get_libdir)/eclipse-${SLOT}"
-
-	insinto "${destDir}"
-	shopt -s dotglob
-	doins -r "${buildDir}"/installation/* || die
-	shopt -u dotglob
-	chmod +x "${D}${destDir}"/eclipse
-	rm -f "${D}${destDir}"/libcairo-swt.so  # use the system-installed SWT libraries
-
-	ebegin 'Unbundling dependencies'
-	unbundle "${D}${destDir}"
-	eend
-
-	# Install Gentoo wrapper and config
-	dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die
-	insinto /etc
-	doins "${FILESDIR}/${SLOT}/eclipserc-${SLOT}" || die
-
-	# Create desktop entry
-	make_desktop_entry "eclipse-${SLOT}" "Eclipse ${PV}" "${destDir}/icon.xpm" || die
-}
-
-unbundle() {
-	pushd "${1}" > /dev/null || die
-	eclipse_unbundle-dir plugins/org.apache.ant_* ant-core,ant-nodeps lib
-	eclipse_unbundle-dir plugins/org.junit_* junit
-	eclipse_unbundle-dir plugins/org.junit4_* junit-4
-	eclipse_unbundle-jar plugins/com.ibm.icu_*.jar icu4j-4
-	eclipse_unbundle-jar plugins/com.jcraft.jsch_*.jar jsch
-	eclipse_unbundle-jar plugins/javax.servlet_*.jar tomcat-servlet-api-2.5 servlet-api
-	eclipse_unbundle-jar plugins/javax.servlet.jsp_*.jar tomcat-servlet-api-2.5 jsp-api
-	eclipse_unbundle-jar plugins/org.apache.commons.codec_*.jar commons-codec
-	eclipse_unbundle-jar plugins/org.apache.commons.el_*.jar commons-el
-	eclipse_unbundle-jar plugins/org.apache.commons.httpclient_*.jar commons-httpclient-3
-	eclipse_unbundle-jar plugins/org.apache.commons.logging_*.jar commons-logging
-	#eclipse_unbundle-jar plugins/org.apache.jasper_*.jar tomcat-jasper
-	eclipse_unbundle-jar plugins/org.apache.lucene_*.jar lucene-1.9
-	eclipse_unbundle-jar plugins/org.apache.lucene.analysis_*.jar lucene-analyzers-1.9
-	eclipse_unbundle-jar plugins/org.eclipse.swt."${ws}.${os}.${arch}"_*.jar swt-${SLOT}
-	eclipse_unbundle-jar plugins/org.hamcrest.core_*.jar hamcrest-core
-	#eclipse_unbundle-jar plugins/org.mortbay.jetty_*.jar jetty
-	eclipse_unbundle-jar plugins/org.objectweb.asm_*.jar asm-3
-	eclipse_unbundle-jar plugins/org.sat4j.core_*.jar sat4j-core-2
-	eclipse_unbundle-jar plugins/org.sat4j.pb_*.jar sat4j-pseudo-2
-	popd > /dev/null
-}
-
-# Replaces the bundled jars in plugin dir ${1} with links to the jars from
-# java-config package ${2}. If ${3} is given, the jars are linked in ${1}/${3}.
-eclipse_unbundle-dir() {
-	local bundle=${1} package=${2} into=${3}
-	local basename=$(basename "${bundle}")
-	local barename=${basename%_*}
-
-	if [[ -d "${bundle}" ]] ; then
-		einfo "  ${barename} => ${package}"
-
-		pushd "${bundle}" > /dev/null || die
-		local classpath=$(manifest_get META-INF/MANIFEST.MF 'Bundle-ClassPath')
-		manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
-		rm -f ${classpath//,/ } META-INF/ECLIPSEF.{RSA,SF}
-		java-pkg_jar-from ${into:+--into "${into}"} "${package}"
-		popd > /dev/null
-	fi
-}
-
-# Converts plugin jar ${1} into a plugin dir, creates symbolic links to the
-# jars of java-config package ${2} in that dir, and updates artifacts.xml and
-# bundles.info to reflect the fact that the plugin is now a dir.
-eclipse_unbundle-jar() {
-	local bundle=${1} package=${2} jar=${3}
-	local basename=$(basename "${bundle}" .jar)
-	local barename=${basename%_*}
-
-	if [[ -f "${bundle}" ]] ; then
-		einfo "  ${barename} => ${package}"
-
-		mkdir "${bundle%.jar}"
-		pushd "${bundle%.jar}" > /dev/null || die
-		"$(java-config --jar)" -xf "../${basename}.jar" plugin.properties META-INF/MANIFEST.MF || die
-		java-pkg_jar-from "${package}" ${jar:+"${jar}.jar"}
-		local classpath=$(find . -type l -name '*.jar' -print0 | tr '\0' ',')
-		classpath=${classpath%,} ; classpath=${classpath//.\/}
-		manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
-		manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "${classpath}"
-		popd > /dev/null || die
-		rm "${bundle}"
-
-		sed_xml_element 'artifact' \
-				-e '/id='\'"${barename//./\.}"\''/s|</artifact>|  <repositoryProperties size='\'1\''>\n        <property name='\'artifact.folder\'' value='\'true\''/>\n      </repositoryProperties>\n    \0|' \
-				-i artifacts.xml || die
-		sed -e 's|'"${bundle//./\.}"'|'"${bundle%.jar}"'/|' \
-			-i configuration/org.eclipse.equinox.simpleconfigurator/bundles.info || die
-	fi
-}
-
-# Removes feature.xml references to plugins matching ${1}.
-eclipse_delete-plugins() {
-	sed_xml_element 'includes\|plugin' -e '/id="'"${1}"'"/d' \
-			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
-		|| die 'eclipse_delete-plugins failed'
-}
-
-# Prints the first value from manifest file ${1} whose key matches regex ${2},
-# unfolding as necessary.
-manifest_get() {
-	sed -n -e '/^\('"${2}"'\): /{h;:A;$bB;n;/^ /!bB;H;bA};d;:B;g;s/^[^:]*: //;s/\n //g;p;q' "${1}" \
-		|| die 'manifest_get failed'
-}
-
-# Deletes values from manifest file ${1} whose keys match regex ${2}, taking
-# into account folding.
-manifest_delete() {
-	sed -n -e ':A;/^\('"${2}"'\): /{:B;n;/^ /!{bA};bB};p' -i "${1}" \
-		|| die 'manifest_delete failed'
-}
-
-# Replaces the value for key ${2} in the first section of manifest file ${1}
-# with ${3}, or adds the key-value pair to that section if the key was absent.
-manifest_replace() {
-	LC_ALL='C' awk -v key="${2}" -v val="${3}" '
-function fold(s,  o, l, r) {
-	o = 2 ; l = length(s) - 1 ; r = substr(s, 1, 1)
-	while (l > 69) { r = r substr(s, o, 69) "\n " ; o += 69 ; l -= 69 }
-	return r substr(s, o)
-}
-BEGIN { FS = ": " }
-f { print ; next }
-i { if ($0 !~ "^ ") { f = 1 ; print } ; next }
-$1 == key { print fold(key FS val) ; i = 1 ; next }
-/^\r?$/ { print fold(key FS val) ; print ; f = 1 ; next }
-{ print }
-END { if (!f) { print fold(key FS val) } }
-' "${1}" > "${1}-" && mv "${1}"{-,} || die 'manifest_replace failed'
-}
-
-# Executes sed over each XML element with a name matching ${1}, rather than
-# over each line. The entire element (and its children) may be removed with the
-# 'd' command, or they may be edited using all the usual sed foo. Basically,
-# the script argument will be executed only for elements matching ${1}, and the
-# sed pattern space will consist of the entire element, including any nested
-# elements. Note that this is not perfect and requires no more than one XML
-# element per line to be reliable.
-sed_xml_element() {
-	local elem="${1}" ; shift
-	sed -e '/<\('"${elem}"'\)\([> \t]\|$\)/{:_1;/>/!{N;b_1};/\/>/b_3' \
-			-e ':_2;/<\/\('"${elem}"'\)>/!{N;b_2};b_3};b;:_3' "${@}"
-}
diff --git a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5
deleted file mode 100644
index f50a51ad629d..000000000000
--- a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-#
-# Tiny startup wrapper for Eclipse
-#
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org>
-# Copyright (c) 2004-2008, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, version 2
-#
-
-SLOT="3.5"
-
-[ -f "/etc/eclipserc-${SLOT}" ] && . "/etc/eclipserc-${SLOT}"
-[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
-
-ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"}
-ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
-
-if [ ! -x "${ECLIPSE_BIN}" ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit 1
-fi
-
-if [ $(id -u) -eq 0 ] ; then
-	echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr
-	exit 1
-fi
-
-case "$(java-config -f)" in
-	*gcj*)
-		export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb"
-		;;
-esac
-
-eval $(gjl --package "swt-${SLOT}" --get-args)
-
-[ -n "${ECLIPSE_XMS}" ] && VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"
-[ -n "${ECLIPSE_XMX}" ] && VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"
-[ -n "${ECLIPSE_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"
-[ -n "${ECLIPSE_MAX_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"
-
-# Fix for JRE 1.5.
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
-
-# Fix for >=x11-libs/gtk+-2.18.1 (not needed for Eclipse 3.6+)
-# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=291257
-export GDK_NATIVE_WINDOWS=true
-
-exec "${ECLIPSE_BIN}" -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" -vmargs ${VM_ARGS} 
diff --git a/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5
deleted file mode 100644
index 703b6491c463..000000000000
--- a/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file specifies some initial Eclipse settings, like memory allowed
-# These settings only affect Eclipse startup and overall configuration
-# Main Eclipse configuration should be done within Eclipse (with the GUI)
-
-# Following variables controls the minimal and maximum amounts of memory
-# allocated to Eclipse (respectively).
-# Increase those numbers if you get OutOfMemory errors.
-
-ECLIPSE_XMS=128m
-ECLIPSE_XMX=256m
-
-# Following variables controls the minimal and maximum amounts of memory
-# allocated to the permanent generation space.
-# This space contains data related to all classes.
-# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment
-# these variables and even increase it, if you have enough RAM.
-# Else you will get crashes related to OutOfMemory in PermGen exceptions. 
-
-#ECLIPSE_PERMSIZE=64m
-#ECLIPSE_MAX_PERMSIZE=128m
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
deleted file mode 100644
index a9ab46e50588..000000000000
--- a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak.bak	2010-03-06 06:32:49.000000000 +1300
-+++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak	2010-03-06 06:33:31.000000000 +1300
-@@ -27,14 +27,14 @@
-   PROGRAM_OUTPUT=eclipse
- endif
- 
--PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so
-+PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION)
-+PROGRAM_LIBRARY=$(PROGRAM_SONAME).so
- 
- ifeq ($(DEFAULT_JAVA),)
-   DEFAULT_JAVA=DEFAULT_JAVA_JNI
- endif
- 
- # Define the object modules to be compiled and flags.
--CC=gcc
- MAIN_OBJS = eclipseMain.o
- COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o
- DLL_OBJS	= eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o
-@@ -44,8 +44,8 @@
- #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
- LIBS = -lpthread -ldl
- GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\""
--LFLAGS = -shared -fpic -Wl,--export-dynamic 
--CFLAGS = -g -s -Wall\
-+LFLAGS = -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic 
-+CFLAGS += -Wall\
- 	-fpic \
- 	-DLINUX \
- 	-DMOZILLA_FIX \
-@@ -95,10 +95,10 @@
- 	$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
- 
- $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
--	$(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
- 	
- $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
--	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
- 
- install: all
- 	cp $(EXEC) $(OUTPUT_DIR)
diff --git a/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch
deleted file mode 100644
index f76f540b9b5e..000000000000
--- a/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java.old	2010-03-04 07:29:04.000000000 +1300
-+++ ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java	2010-03-04 07:29:28.000000000 +1300
-@@ -139,7 +139,7 @@
- 			"org.junit4", new VersionRange("[4.5.0,5.0.0)"), "junit.jar", "org.junit4.source", "junitsrc.zip", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- 	
- 	private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription(
--			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-+			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), "hamcrest-core.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- 
- 	/**
- 	 * @return the JUnit3 classpath container
diff --git a/dev-util/eclipse-sdk/files/3.5/jvmarg.patch b/dev-util/eclipse-sdk/files/3.5/jvmarg.patch
deleted file mode 100644
index 95ac7049038a..000000000000
--- a/dev-util/eclipse-sdk/files/3.5/jvmarg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/eclipse-build-0_4_RC6/build.xml	2009-11-05 11:15:17.000000000 +0000
-+++ b/build/eclipse-build-0_4_RC6/build.xml	2010-01-07 22:29:17.000000000 +0000
-@@ -283,6 +283,7 @@
- 			<arg line="-Dbuilder=${buildConfig} " />
- 			<arg line="-DbuildDirectory=${buildDirectory} " />
- 			<arg line="-consolelog " />
-+			<jvmarg value="-Xmx512m"/>
- 		</java>
- 		<!--
- 		<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml
deleted file mode 100644
index b5a96e3145bb..000000000000
--- a/dev-util/eclipse-sdk/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-The Eclipse Project is an open source project of eclipse.org, overseen by
-a Project Management Committee (PMC) and project leaders. The work is done
-in subprojects working against a CVS repository. The Eclipse Project
-Charter describes the organization of the project, roles and
-responsibilities of the participants, and top level development process
-for the project. The JDT and PDE are plug-in tools for the Eclipse
-Platform. Together, these three pieces form the Eclipse SDK download, a
-complete development environment for Eclipse-based tools, and for
-developing Eclipse itself.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/exmap/Manifest b/dev-util/exmap/Manifest
deleted file mode 100644
index a34a5b5dbe01..000000000000
--- a/dev-util/exmap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST exmap-0.10.tgz 124620 SHA256 f6d5feffa53afa3e1321df91b127cdf403f7239076539eeef9aab665286c007c SHA512 ce9cd231ab8d726ea29f9ad1cccd505b00661290acfa6dadfe0bee756d706011cc7003ade011b106778eaa11d00b8b7b2eb094fb3666062faa063761f4622503 WHIRLPOOL 3cc45d74be4eee8d61993799d1f89ad7529b33c0dd979520b0f1160da75cd8477519fd3f4c904f6295f08d5d908a5ae61b6638f38a7624ab7e26496837fba34d
diff --git a/dev-util/exmap/exmap-0.10-r1.ebuild b/dev-util/exmap/exmap-0.10-r1.ebuild
deleted file mode 100644
index 4c25abe48413..000000000000
--- a/dev-util/exmap/exmap-0.10-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils linux-mod
-
-DESCRIPTION="A memory analysis kernel module with userland tool"
-HOMEPAGE="http://www.berthels.co.uk/exmap/"
-SRC_URI="http://www.berthels.co.uk/${PN}/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="dev-libs/libpcre
-	gtk? ( dev-cpp/gtkmm:2.4
-		x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-
-MODULE_NAMES="exmap(misc:${S}/kernel)"
-BUILD_TARGETS="clean kernel_modules"
-
-src_prepare() {
-	# patch find_task_by_pid to pid_task and &proc_root to NULL
-	epatch "${FILESDIR}/${P}-kernel.patch"
-
-	# use $(MAKE), remove -g on CXXFLAGS, clean up CXX/LD invocations
-	# remove -Werror, bug 468246
-	epatch "${FILESDIR}/${PF}-makefiles.patch"
-
-	# somthing strange between linux-mod supplied ARCH and old kernels
-	# which leads to arch/x86/Makefile: file/dir x86 not found
-	if kernel_is lt 2 6 25 ; then
-		sed -i -e 's:\$(MAKE):unset ARCH ; \$(MAKE):' kernel/Makefile || die
-	fi
-
-	# new gcc include behavior
-	epatch "${FILESDIR}/${P}-gcc.patch"
-
-	# gcc4.5 fails on return false as std::string
-	epatch "${FILESDIR}/${P}-gcc45.patch"
-
-	# fix for 64bit from http://www.kdedevelopers.org/node/4166
-	epatch "${FILESDIR}/${P}-fix64bit.patch"
-
-	# fix underlinking with -Wl,--as-needed
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# no longer call make clean in kernel source dir
-	epatch "${FILESDIR}/${P}-kernel-3.5.patch"
-
-	rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die
-}
-
-src_compile() {
-	export KERNEL_DIR
-	linux-mod_src_compile
-
-	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C jutil || die
-	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C src $(use gtk || echo exmtool) || die
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin src/exmtool || die
-	use gtk && { dobin src/gexmap || die ; }
-	dodoc TODO README || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog "Please load the exmap kernel module before running exmtool or gexmap."
-}
diff --git a/dev-util/exmap/exmap-0.10.ebuild b/dev-util/exmap/exmap-0.10.ebuild
deleted file mode 100644
index 1ee0349cf09e..000000000000
--- a/dev-util/exmap/exmap-0.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils linux-mod
-
-DESCRIPTION="A memory analysis kernel module with userland tool"
-HOMEPAGE="http://www.berthels.co.uk/exmap/"
-SRC_URI="http://www.berthels.co.uk/${PN}/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="dev-libs/libpcre
-	gtk? ( dev-cpp/gtkmm:2.4
-		x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-
-MODULE_NAMES="exmap(misc:${S}/kernel)"
-BUILD_TARGETS="clean kernel_modules"
-
-src_prepare() {
-	# patch find_task_by_pid to pid_task and &proc_root to NULL
-	epatch "${FILESDIR}/${P}-kernel.patch"
-
-	# use $(MAKE), remove -g on CXXFLAGS, clean up CXX/LD invocations
-	epatch "${FILESDIR}/${P}-makefiles.patch"
-
-	# somthing strange between linux-mod supplied ARCH and old kernels
-	# which leads to arch/x86/Makefile: file/dir x86 not found
-	if kernel_is lt 2 6 25 ; then
-		sed -i -e 's:\$(MAKE):unset ARCH ; \$(MAKE):' kernel/Makefile || die
-	fi
-
-	# new gcc include behavior
-	epatch "${FILESDIR}/${P}-gcc.patch"
-
-	# gcc4.5 fails on return false as std::string
-	epatch "${FILESDIR}/${P}-gcc45.patch"
-
-	# fix for 64bit from http://www.kdedevelopers.org/node/4166
-	epatch "${FILESDIR}/${P}-fix64bit.patch"
-
-	# fix underlinking with -Wl,--as-needed
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# no longer call make clean in kernel source dir
-	epatch "${FILESDIR}/${P}-kernel-3.5.patch"
-
-	rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die
-}
-
-src_compile() {
-	export KERNEL_DIR
-	linux-mod_src_compile
-
-	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C jutil || die
-	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C src $(use gtk || echo exmtool) || die
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin src/exmtool || die
-	use gtk && { dobin src/gexmap || die ; }
-	dodoc TODO README || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog "Please load the exmap kernel module before running exmtool or gexmap."
-}
diff --git a/dev-util/exmap/files/exmap-0.10-as-needed.patch b/dev-util/exmap/files/exmap-0.10-as-needed.patch
deleted file mode 100644
index 72671b31fc70..000000000000
--- a/dev-util/exmap/files/exmap-0.10-as-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile	2010-08-09 01:17:29.000000000 +0200
-+++ src/Makefile	2010-08-09 01:21:13.000000000 +0200
-@@ -42,15 +42,15 @@
- OBJS += $(TR_OBJ)
- TESTS +=  t_range
- 
--TE_OBJ = t_elf.o Elf.o Range.o
-+TE_OBJ = t_elf.o Elf.o Range.o ../jutil/Pcre.o
- OBJS += $(TE_OBJ)
- TESTS +=  t_elf
- 
--TP_OBJ = t_pcre.o
-+TP_OBJ = t_pcre.o ../jutil/Pcre.o
- OBJS += $(TP_OBJ)
- TESTS +=  t_pcre
- 
--TX_OBJ = t_exmap.o $(EXMAP_OBJ)
-+TX_OBJ = t_exmap.o ../jutil/Pcre.o $(EXMAP_OBJ)
- OBJS += $(TX_OBJ)
- TESTS +=  t_exmap
- 
diff --git a/dev-util/exmap/files/exmap-0.10-fix64bit.patch b/dev-util/exmap/files/exmap-0.10-fix64bit.patch
deleted file mode 100644
index 8f886f1fe9a7..000000000000
--- a/dev-util/exmap/files/exmap-0.10-fix64bit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-I quite frankly don't entirely understand this code, but exmap's debug
-output on i586 and x86_64 pointed out these differences and this makes
-it work.
-
---- exmap-0.10/src/Exmap.cpp.sav	2006-09-28 18:52:25.000000000 +0200
-+++ exmap-0.10/src/Exmap.cpp	2010-01-02 17:45:49.787955568 +0100
-@@ -450,7 +450,7 @@ void Vma::add_pages(const list<Page> &pa
- 
- bool Vma::is_vdso()
- {
--    return fname() == "[vdso]";
-+    return fname() == "[vdso]" || fname() == "[vsyscall]";
- }
- 
- bool Vma::is_file_backed()
-@@ -1495,7 +1495,7 @@ bool MapCalculator::calc_map_for_seg(con
- 
-     filevmas.pop_front();
-     dbg << pref.str() << "consuming vma\n";
--    if (!filevmas.empty() && !filevmas.front()->is_file_backed()) {
-+    while (!filevmas.empty() && !filevmas.front()->is_file_backed()) {
- 	filevmas.pop_front();
- 	dbg << pref.str() << "consuming anon vma\n";
-     }
diff --git a/dev-util/exmap/files/exmap-0.10-gcc.patch b/dev-util/exmap/files/exmap-0.10-gcc.patch
deleted file mode 100644
index fd73371529bc..000000000000
--- a/dev-util/exmap/files/exmap-0.10-gcc.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ru exmap-0.10/work/exmap-0.10/jutil/jutil.cpp exm/work/exmap-0.10/jutil/jutil.cpp
---- jutil/jutil.cpp	2006-09-28 18:52:25.000000000 +0200
-+++ jutil/jutil.cpp	2010-02-15 15:35:43.000000000 +0100
-@@ -3,6 +3,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <cstring>
- #include <limits.h>
- #include <dirent.h>
- 
-diff -ru exmap-0.10/work/exmap-0.10/jutil/jutil.hpp exm/work/exmap-0.10/jutil/jutil.hpp
---- jutil/jutil.hpp	2006-09-28 18:52:25.000000000 +0200
-+++ jutil/jutil.hpp	2010-02-15 15:40:02.000000000 +0100
-@@ -3,6 +3,7 @@
- 
- #include <iostream>
- #include <string>
-+#include <cstdlib>
- #include <list>
- #include <map>
- 
-diff -ru exmap-0.10/work/exmap-0.10/src/exmtool.cpp exm/work/exmap-0.10/src/exmtool.cpp
---- src/exmtool.cpp	2006-09-28 18:52:25.000000000 +0200
-+++ src/exmtool.cpp	2010-02-15 15:34:04.000000000 +0100
-@@ -5,6 +5,7 @@
- 
- #include <sstream>
- #include <iostream>
-+#include <cstring>
- #include <vector>
- 
- using namespace std;
-@@ -19,9 +18,9 @@
- 
- struct command
- {
--    char *command;
-+    const char *command;
-     Handler handler;
--    char *usage;
-+    const char *usage;
- } cmd_handles[] = {
-     { "procs",
-       do_procs,
-
-diff -ru exmap-0.10/work/exmap-0.10/src/Elf.cpp norg/work/exmap-0.10/src/Elf.cpp
---- src/Elf.cpp	2006-09-28 18:52:25.000000000 +0200
-+++ src/Elf.cpp	2010-02-15 16:55:37.000000000 +0100
-@@ -4,6 +4,7 @@
- #include "Elf.hpp"
- 
- #include <sstream>
-+#include <cstring>
- #include <unistd.h> // getpagesize()
- 
- using namespace std;
-
-diff -ru exmap-0.10/jutil/TestRunner.cpp.orig exmap-0.10/jutil/TestRunner.cpp
---- jutil/TestRunner.cpp.orig	2010-02-15 22:00:03.000000000 +0100
-+++ jutil/TestRunner.cpp	2010-02-15 22:00:19.000000000 +0100
-@@ -1,5 +1,6 @@
- #include "TestRunner.hpp"
- #include "Pcre.hpp"
-+#include <cstdio>
- 
- using namespace std;
- 
diff --git a/dev-util/exmap/files/exmap-0.10-gcc45.patch b/dev-util/exmap/files/exmap-0.10-gcc45.patch
deleted file mode 100644
index a9ed3419e774..000000000000
--- a/dev-util/exmap/files/exmap-0.10-gcc45.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Elf.cpp	2010-05-14 01:40:27.000000000 +0200
-+++ src/Elf.cpp	2010-05-14 01:46:06.000000000 +0200
-@@ -579,7 +579,7 @@
- std::string Section::find_string(istream &is, int index)
- {
-     if (!is_string_table() || index < 0) {
--	return false;
-+	return NULL;
-     }
- 
-     int offset = _sectstruct->offset() + index;
diff --git a/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch b/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch
deleted file mode 100644
index 314f0fc3301f..000000000000
--- a/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- exmap-0.10/kernel/Makefile
-+++ exmap-0.10/kernel/Makefile
-@@ -10,4 +10,4 @@
- 	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules
- 
- clean:
--	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
-+	#$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
diff --git a/dev-util/exmap/files/exmap-0.10-kernel.patch b/dev-util/exmap/files/exmap-0.10-kernel.patch
deleted file mode 100644
index 8bc58737b6d5..000000000000
--- a/dev-util/exmap/files/exmap-0.10-kernel.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Tested with linux-2.6.16-gentoo-r13, linux-2.6.25-gentoo-r9, linux-2.6.26-gentoo-r4, linux-2.6.27-gentoo-r10, 
-linux-2.6.28-gentoo-r6, linux-2.6.29-gentoo-r6, linux-2.6.30-gentoo-r9, linux-2.6.32-gentoo-r4, linux-2.6.32-gentoo-r5
-
-diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/exmap.c exmap-0.10/work/exmap-0.10/kernel/exmap.c
---- kernel/exmap.c	2006-09-28 18:52:25.000000000 +0200
-+++ kernel/exmap.c	2010-02-17 16:15:04.000000000 +0100
-@@ -392,7 +392,11 @@
- 	struct task_struct *tsk;
- 	int errcode = -EINVAL;
- 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	tsk = pid_task(find_pid_ns(pid, &init_pid_ns), PIDTYPE_PID);
-+	#else
- 	tsk = find_task_by_pid(pid);
-+	#endif
- 	if (tsk == NULL) {
- 		printk (KERN_ALERT
- 			"/proc/%s: can't find task for pid %d\n",
-@@ -507,7 +511,11 @@
- 							NULL);
- 
- 	if (exmap_proc_file == NULL) {
-+		#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+		remove_proc_entry (PROCFS_NAME, NULL);
-+		#else
- 		remove_proc_entry (PROCFS_NAME, &proc_root);
-+		#endif
- 		printk (KERN_ALERT "/proc/%s: could not initialize\n",
- 			PROCFS_NAME);
- 		return -ENOMEM;
-@@ -523,7 +523,9 @@
- 	
- 	exmap_proc_file->read_proc = procfile_read;
- 	exmap_proc_file->write_proc = procfile_write;
-+	#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,29)
- 	exmap_proc_file->owner = THIS_MODULE;
-+	#endif
- 	
- 	/*     exmap_proc_file->mode         = S_IFREG | S_IRUGO; */
- 	/* TODO - this is quite probably a security problem */
-@@ -532,5 +540,9 @@
- void cleanup_module ()
- {
- 	printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+	remove_proc_entry (PROCFS_NAME, NULL);
-+	#else
- 	remove_proc_entry (PROCFS_NAME, &proc_root);
-+	#endif
- }
diff --git a/dev-util/exmap/files/exmap-0.10-makefiles.patch b/dev-util/exmap/files/exmap-0.10-makefiles.patch
deleted file mode 100644
index e3841c60566d..000000000000
--- a/dev-util/exmap/files/exmap-0.10-makefiles.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ru exmap-0.10.orig/work/exmap-0.10/jutil/Makefile exmap-0.10/work/exmap-0.10/jutil/Makefile
---- jutil/Makefile	2006-09-28 18:52:25.000000000 +0200
-+++ jutil/Makefile	2010-02-17 17:31:56.000000000 +0100
-@@ -12,21 +12,20 @@
- OBJ += $(ETOBJ)
- EXES += egtest
- 
--CXX=g++
--CXXFLAGS=-Wall -Werror -g -I.
--LD=g++
--LDFLAGS=-lpcre
-+CXX = g++
-+CXXFLAGS += -Wall -Werror -I.
-+LD = ld
- 
- build: $(LIBS) $(EXES)
- 
- trun: $(TROBJ) $(JLIB)
--	$(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L.
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(TROBJ) -o trun -ljutil -lpcre -L.
- 
- $(JLIB): $(JOBJ)
- 	ar rs $(JLIB) $(JOBJ)
- 
- egtest: $(ETOBJ)
--	$(LD) $(ETOBJ) -o egtest $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(ETOBJ) -o egtest $(LDFLAGS)
- 
- clean:
- 	rm -f $(OBJ) $(EXES) $(JLIB) *~
-diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/Makefile exmap-0.10/work/exmap-0.10/kernel/Makefile
---- kernel/Makefile	2006-09-28 18:52:25.000000000 +0200
-+++ kernel/Makefile	2010-02-17 17:30:06.000000000 +0100
-@@ -7,7 +7,7 @@
- build: kernel_modules
- 
- kernel_modules:
--	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) modules
-+	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules
- 
- clean:
--	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean
-+	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
-Only in exmap-0.10/work/exmap-0.10/kernel/.tmp_versions: exmap.mod
-diff -ru exmap-0.10.orig/work/exmap-0.10/src/Makefile exmap-0.10/work/exmap-0.10/src/Makefile
---- src/Makefile	2006-09-28 18:52:25.000000000 +0200
-+++ src/Makefile	2010-02-17 17:33:38.000000000 +0100
-@@ -1,5 +1,5 @@
- CXX=g++
--LD=g++
-+LD=ld
- JUTILDIR=../jutil
- 
- #CXXFLAGS += -pg
-@@ -11,11 +11,12 @@
- 
- EXMAP_OBJ=Exmap.o Range.o Elf.o
- 
--CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR)
--LDFLAGS += -lpcre -ljutil -L$(JUTILDIR)
-+CXXFLAGS += -Wall -Werror -I$(JUTILDIR)
-+LDFLAGS += -L$(JUTILDIR)
-+LIBS += -lpcre -ljutil
- 
- GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4`
--GTKLDFLAGS = `pkg-config --libs gtkmm-2.4`
-+GTKLIBS = `pkg-config --libs gtkmm-2.4`
- 
- # ------------------------------------------------------------
- 
-@@ -76,34 +77,34 @@
- 	$(JUTILDIR)/trun $(TESTS)
- 
- gexmap: $(GEM_OBJ)
--	$(LD) -o gexmap $(GEM_OBJ) $(LDFLAGS) $(GTKLDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o gexmap $(GEM_OBJ) $(LIBS) $(GTKLIBS)
- 
- gexmap.o: gexmap.cpp
--	$(CC) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
-+	$(CXX) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
- 
- exmtool: $(CL_OBJ)
--	$(LD) -o exmtool $(CL_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o exmtool $(CL_OBJ) $(LIBS)
- 
- elftool: $(ET_OBJ)
--	$(LD) -o elftool $(ET_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o elftool $(ET_OBJ) $(LIBS)
- 
- showproc: $(SP_OBJ)
--	$(LD) -o showproc $(SP_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o showproc $(SP_OBJ) $(LIBS)
- 
- t_range: $(TR_OBJ)
--	$(LD) -o t_range $(TR_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_range $(TR_OBJ) $(LIBS)
- 
- t_elf: $(TE_OBJ)
--	$(LD) -o t_elf $(TE_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_elf $(TE_OBJ) $(LIBS)
- 
- t_pcre: $(TP_OBJ)
--	$(LD) -o t_pcre $(TP_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_pcre $(TP_OBJ) $(LIBS)
- 
- t_exmap: $(TX_OBJ)
--	$(LD) -o t_exmap $(TX_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_exmap $(TX_OBJ) $(LIBS)
- 
- t_artsd: $(TA_OBJ)
--	$(LD) -o t_artsd $(TA_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_artsd $(TA_OBJ) $(LIBS) 
- 
- clean: cleantags cleandoc
- 	rm -f $(OBJS) $(EXES) $(SHLIBS) $(EXTRA_DEL_FILES)
diff --git a/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch b/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch
deleted file mode 100644
index 4c971454bc74..000000000000
--- a/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ru exmap-0.10.orig/work/exmap-0.10/jutil/Makefile exmap-0.10/work/exmap-0.10/jutil/Makefile
---- jutil/Makefile	2006-09-28 18:52:25.000000000 +0200
-+++ jutil/Makefile	2010-02-17 17:31:56.000000000 +0100
-@@ -12,21 +12,20 @@
- OBJ += $(ETOBJ)
- EXES += egtest
- 
--CXX=g++
--CXXFLAGS=-Wall -Werror -g -I.
--LD=g++
--LDFLAGS=-lpcre
-+CXX = g++
-+CXXFLAGS += -Wall -I.
-+LD = ld
- 
- build: $(LIBS) $(EXES)
- 
- trun: $(TROBJ) $(JLIB)
--	$(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L.
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(TROBJ) -o trun -ljutil -lpcre -L.
- 
- $(JLIB): $(JOBJ)
- 	ar rs $(JLIB) $(JOBJ)
- 
- egtest: $(ETOBJ)
--	$(LD) $(ETOBJ) -o egtest $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(ETOBJ) -o egtest $(LDFLAGS)
- 
- clean:
- 	rm -f $(OBJ) $(EXES) $(JLIB) *~
-diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/Makefile exmap-0.10/work/exmap-0.10/kernel/Makefile
---- kernel/Makefile	2006-09-28 18:52:25.000000000 +0200
-+++ kernel/Makefile	2010-02-17 17:30:06.000000000 +0100
-@@ -7,7 +7,7 @@
- build: kernel_modules
- 
- kernel_modules:
--	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) modules
-+	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules
- 
- clean:
--	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean
-+	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
-Only in exmap-0.10/work/exmap-0.10/kernel/.tmp_versions: exmap.mod
-diff -ru exmap-0.10.orig/work/exmap-0.10/src/Makefile exmap-0.10/work/exmap-0.10/src/Makefile
---- src/Makefile	2006-09-28 18:52:25.000000000 +0200
-+++ src/Makefile	2010-02-17 17:33:38.000000000 +0100
-@@ -1,5 +1,5 @@
- CXX=g++
--LD=g++
-+LD=ld
- JUTILDIR=../jutil
- 
- #CXXFLAGS += -pg
-@@ -11,11 +11,12 @@
- 
- EXMAP_OBJ=Exmap.o Range.o Elf.o
- 
--CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR)
--LDFLAGS += -lpcre -ljutil -L$(JUTILDIR)
-+CXXFLAGS += -Wall -I$(JUTILDIR)
-+LDFLAGS += -L$(JUTILDIR)
-+LIBS += -lpcre -ljutil
- 
- GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4`
--GTKLDFLAGS = `pkg-config --libs gtkmm-2.4`
-+GTKLIBS = `pkg-config --libs gtkmm-2.4`
- 
- # ------------------------------------------------------------
- 
-@@ -76,34 +77,34 @@
- 	$(JUTILDIR)/trun $(TESTS)
- 
- gexmap: $(GEM_OBJ)
--	$(LD) -o gexmap $(GEM_OBJ) $(LDFLAGS) $(GTKLDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o gexmap $(GEM_OBJ) $(LIBS) $(GTKLIBS)
- 
- gexmap.o: gexmap.cpp
--	$(CC) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
-+	$(CXX) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
- 
- exmtool: $(CL_OBJ)
--	$(LD) -o exmtool $(CL_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o exmtool $(CL_OBJ) $(LIBS)
- 
- elftool: $(ET_OBJ)
--	$(LD) -o elftool $(ET_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o elftool $(ET_OBJ) $(LIBS)
- 
- showproc: $(SP_OBJ)
--	$(LD) -o showproc $(SP_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o showproc $(SP_OBJ) $(LIBS)
- 
- t_range: $(TR_OBJ)
--	$(LD) -o t_range $(TR_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_range $(TR_OBJ) $(LIBS)
- 
- t_elf: $(TE_OBJ)
--	$(LD) -o t_elf $(TE_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_elf $(TE_OBJ) $(LIBS)
- 
- t_pcre: $(TP_OBJ)
--	$(LD) -o t_pcre $(TP_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_pcre $(TP_OBJ) $(LIBS)
- 
- t_exmap: $(TX_OBJ)
--	$(LD) -o t_exmap $(TX_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_exmap $(TX_OBJ) $(LIBS)
- 
- t_artsd: $(TA_OBJ)
--	$(LD) -o t_artsd $(TA_OBJ) $(LDFLAGS) 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_artsd $(TA_OBJ) $(LIBS) 
- 
- clean: cleantags cleandoc
- 	rm -f $(OBJS) $(EXES) $(SHLIBS) $(EXTRA_DEL_FILES)
diff --git a/dev-util/exmap/metadata.xml b/dev-util/exmap/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-util/exmap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
index 1e93e9ac4eba..67f9bc2bab72 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.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.18.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
index f144b2ff7123..1671e1d3121d 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.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/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
index dc8003219c83..e61fe6c77e24 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
index cd3f82a3e6dc..60ba2221de59 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
@@ -15,7 +15,7 @@ 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"
+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.45.8:2
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index d51d433743d2..d3a66eeef35c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,4 +1,4 @@
 DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6
 DIST jenkins-bin-1.642.1.war 63664516 SHA256 ce036e227fe1fed15e3da9be8d29e859bdcda7118895fd269d1c9ac35925de66 SHA512 1fa79b6029078d8a8c0996b63dc7c411f9a56037257dbb3080e07559cb949af819f6245846b5c586ba7c9a61d5a25137d3c2d9c91a7a63fe2b4f3358d7c439c2 WHIRLPOOL 2b54f22895f7de1ced34bd99a03d37b4f06211e6dd5bdd56ac49eff2b010797f82f4d67f2a2b051feb2eba08f5eb87ca7223c46a75c690588361eb11aa007d62
-DIST jenkins-bin-1.646.war 63352963 SHA256 2b892d363e1ce88e4d3a37e7d5c17c0be5bce902b3b98e6e0ebfe0d2d509f2d4 SHA512 b67f0dc90b8f58fed51490e850a4cf281e20501fefe42c4293d7721f8b658c210463f62d1acd72d8d5bc172616e6435f1633c52ccda35f8f16886581abea70c3 WHIRLPOOL 2be58f37ebd1e2928d403524b27adac788918a58c5261ef564051c2efc57372e2e89366321aa6f6e39906ebe70eb29b49910a65c318efaa90d1b4ca94d666d6d
 DIST jenkins-bin-1.647.war 63359416 SHA256 52778609d34cb532c934509bb2a63c77986ae8e9b7e85186bad0235f58e4200f SHA512 cf8130453b52a19d6fa1f54a6676496f7d3ffe2a0793fe2b95ecb9296ab0bae831aebb5d3af81d8e7ee5c51e0942f315ba3c720be09e31e6c0d7e1a972bb6c29 WHIRLPOOL 4c4e388fc6909608f340d9e3eb6c379d228193b9f00d2875d096b0d938bbe14af2c3cab0285510b45ee3d1ed048dbf1a07b6f39279077fc91f5516d356b8080c
+DIST jenkins-bin-1.649.war 64590491 SHA256 ca270b2a7e3d8927e7765e516c7cff9b90a85c7a3010d632f8f3b96a5acb9b82 SHA512 5480692cdb2efd94ea6c6f5f56909f69b2b0be7d794dd7e8860a2e31a650992aa63ffbdc67686dfd7cb484d07766227151dc40b8729340d5a07daa461216b57c WHIRLPOOL 5828194b863d64cd2d80c30306622479347846f56b517d2df3ccc26ba1b37861ecf2e98b10196d2e62f1f6764015376802cbb04bd8a70dd0aa8cff29d40e6fa8
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.646.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild
index 96dfaf75f07d..96dfaf75f07d 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.646.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
new file mode 100644
index 000000000000..caafff4b2637
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
@@ -0,0 +1,71 @@
+https://bugs.gentoo.org/421649
+
+For some reason testsuite does not handle warnings well:
+  /tmp/lt-cZI2cFo0z7.c:2:24: warning: inplicit function declaration «puts» [-Wimplicit-function-declaration]
+       void func2(void) { puts("func2"); }
+                          ^
+and abandons problematic tests:
+  Testcase compile failed, so all tests in this file will automatically fail.
+diff --git a/testsuite/ltrace.main/filters.exp b/testsuite/ltrace.main/filters.exp
+index 988346f..f7f4140 100644
+--- a/testsuite/ltrace.main/filters.exp
++++ b/testsuite/ltrace.main/filters.exp
+@@ -24,2 +24,3 @@ set libfilt1 [ltraceCompile libfilt1.so [ltraceSource c {
+ set libfilt2 [ltraceCompile libfilt2.so [ltraceSource c {
++    #include <stdio.h>
+     void func2(void) { puts("func2"); }
+diff --git a/testsuite/ltrace.main/parameters.c b/testsuite/ltrace.main/parameters.c
+index ff24a38..9569dbe 100644
+--- a/testsuite/ltrace.main/parameters.c
++++ b/testsuite/ltrace.main/parameters.c
+@@ -19,2 +19,3 @@ void func_strfixed(char*);
+ void func_ppp(int***);
++void func_string(char*);
+ void func_stringp(char**);
+diff --git a/testsuite/ltrace.main/signals.c b/testsuite/ltrace.main/signals.c
+index a02e795..fda4ab9 100644
+--- a/testsuite/ltrace.main/signals.c
++++ b/testsuite/ltrace.main/signals.c
+@@ -7,2 +7,3 @@
+ #include <sys/types.h>
++#include <unistd.h>
+ 
+diff --git a/testsuite/ltrace.minor/time-record.c b/testsuite/ltrace.minor/time-record.c
+index a66b838..7d5e5e3 100644
+--- a/testsuite/ltrace.minor/time-record.c
++++ b/testsuite/ltrace.minor/time-record.c
+@@ -7,2 +7,3 @@
+ #include <time.h>
++#include <unistd.h>
+ 
+diff --git a/testsuite/ltrace.minor/trace-clone.c b/testsuite/ltrace.minor/trace-clone.c
+index db1936d..c68b128 100644
+--- a/testsuite/ltrace.minor/trace-clone.c
++++ b/testsuite/ltrace.minor/trace-clone.c
+@@ -10,2 +10,3 @@
+ #include <sched.h>
++#include <unistd.h>
+ 
+diff --git a/testsuite/ltrace.minor/trace-fork.c b/testsuite/ltrace.minor/trace-fork.c
+index c5f0c71..e1ab17f 100644
+--- a/testsuite/ltrace.minor/trace-fork.c
++++ b/testsuite/ltrace.minor/trace-fork.c
+@@ -8,2 +8,4 @@
+ #include <sys/types.h>
++#include <sys/wait.h>
++#include <unistd.h>
+ 
+@@ -29,3 +31,4 @@ main ()
+       printf("My child pid is %d\n",pid);
+-      wait(); 
++      int status;
++      wait(&status);
+     }
+diff --git a/testsuite/ltrace.torture/signals.c b/testsuite/ltrace.torture/signals.c
+index b786c81..86e2dba 100644
+--- a/testsuite/ltrace.torture/signals.c
++++ b/testsuite/ltrace.torture/signals.c
+@@ -7,2 +7,3 @@
+ #include <sys/types.h>
++#include <unistd.h>
+ 
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index 8611887d3264..cb60e0efbea2 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -30,6 +30,7 @@ S=${WORKDIR}/${PN}-${LTRACE_V}
 
 src_prepare() {
 	epatch "${WORKDIR}"/debian/patches/[0-9]*
+	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 58df523a2559..8db44162ad03 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,3 +1,2 @@
-DIST lttng-modules-2.5.0.tar.bz2 275319 SHA256 3dfa268024834a4598bbd356d2ae7ea1e2ad828c625943ea5f5ead484e8ad82b SHA512 c266d51af66958f25137db352e2df4497126afc4d448a226b1a03e422702e2aba8fed10ace68c50408ccdc99380f8cf4e85b44f08f9f1dd17efdb6f7d051ac0d WHIRLPOOL 87a21dd546342d8448ab1f7f4870c970d35133c1c1876b6d6147f50dd4ab8a86bd500fc6df208425a08348058d4e5f9da65f39ae481f54cdd268dcb7525f866c
-DIST lttng-modules-2.5.1.tar.bz2 277110 SHA256 962238175f0959ac71b97fdde144a3f76a84f63aea6b3645f94da88512bcccdb SHA512 f144710483660edd59e328fae89a72510a8e295aa29c3c7d6ff2da5900fe6d7f746970068e7a43c18ec6f987635563629c918471cdd7e2b2f6a2bc8fffdeefb4 WHIRLPOOL 29bd62f0b87c19f14278cc82c61c8c11c78a9c3fbd1548b7c2a6c9fae0c612849d00ff8acbb454389e8fa298cfad4bcbfefb5d001514be1b17bfa1f23ed754e3
-DIST lttng-modules-2.6.0-rc1.tar.bz2 295707 SHA256 5faf1a460b34235574c71acfb97ba93bce2e8b4b79c17735939d4cd849a4e439 SHA512 995544f9e966cfc7ba2a2e1d510d70eba4101117ea877e11597654768e2a2ec7f09c5ff2280a3d51a99b3b32918d5a3ff7e16d2e0de70cb5abe412a13a8f8a79 WHIRLPOOL 253ffb2f23db074a286a570bc2e9f66aa7e7198d0911565b472b122ed4d8b460c88ebfa62d35cfdf1b7aa19cdd8f8d5114004a4c0487cee42c7bc3d0836a0aec
+DIST lttng-modules-2.6.4.tar.bz2 295609 SHA256 2e476958563839140a1d5f4316a51ea73fd54283464e050494977a62846099e0 SHA512 ec93456829b04964d0c9befd1071e220bc047e3bf57978bf9e6a666d0be418c5825873746604e0758cd8fcd47f70f4471e0b190ad87f53b79d7efa94febeef03 WHIRLPOOL 4a1bb3f04e91eba8e668efe156dc3e553090071777aef9773d17c8235fffc7746635e34eaa979cd736a43b51047f5251f44a74d85c70d0f602a0704d6152aa10
+DIST lttng-modules-2.7.1.tar.bz2 297555 SHA256 3ce48a0d0fef39d2cc4687ec866de8f2fe49289faad02425b689559d7ddd077f SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744 WHIRLPOOL 671f9eb773742ea8409806cf1ed26911654910c8c75a719654c6c0e154b80b07c4319cbf94b4a1114ffbca4d935e4631d7128701764d84622117c5f1d1b033bb
diff --git a/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild
deleted file mode 100644
index 14fd7addac85..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild
deleted file mode 100644
index 14fd7addac85..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild b/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild
deleted file mode 100644
index 048c6a77c95c..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild b/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
new file mode 100644
index 000000000000..374c4d933dc7
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod versionator
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(get_version_component_range 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 27; then
+		eerror "${PN} require Linux kernel >= 2.6.27"
+		die "Please update your kernel!"
+	fi
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README.md TODO
+}
diff --git a/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild
new file mode 100644
index 000000000000..b24347e1fa6b
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod versionator
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(get_version_component_range 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 27; then
+		eerror "${PN} require Linux kernel >= 2.6.27"
+		die "Please update your kernel!"
+	fi
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README.md TODO
+}
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index df1c1c0a926d..cd63a29eb1c2 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,3 +1,2 @@
-DIST lttng-tools-2.5.0.tar.bz2 867879 SHA256 dad8b8f9d7209dcf91b2bf6ec34a0b31d1cf3c6a81698492a6e9cff2d11e1ca7 SHA512 91ccdcd2f02999c97bb218147aab28a4e8c5e6b4813e97c690da965f8f54c312fc1e0487a200558e2101938096f2ba3e22f09fbbcd6b7abcdd800215f328dfd5 WHIRLPOOL d9af3d5c4267acaadb5296db42322e7a475e1366f4ff7f83b3dcfe7fa5507261eb938920c2bdc95395eff528a1022cee33665f1781a2172958b4e57d96ab764c
-DIST lttng-tools-2.5.2.tar.bz2 876344 SHA256 1f52d342fb5b56a6675748f0b8e8557ec7c4e90732c3d8f5732bd10b920b233d SHA512 c556b54d1b571f9f5e3b95b729536ada179d899227b6fd0f0fb3482572ca775d4d8212aab4782d6048587df225846d90ba947730e1ca0101f4c54de0819f421d WHIRLPOOL e0552e68a2c3b4c50cefafd600c1dd6e5e586e16eb1c64d5b0b6749e197a754a982f2e8a3915ab5f76f92295cb4bcb9a20266a32a178bfbc4adc4c14a3ec3206
-DIST lttng-tools-2.6.0-rc3.tar.bz2 913287 SHA256 c11d6158d8865b6329d9e1eabc938fc81f33b18634d7c9a2a27a82cea1c63f2d SHA512 db40ee1fe0ec7d93a7e35a742f945cbb89399f56c406f276512e5f9a44907ce0dd195c5f6d763adb13015c8beef74e09019ca3535d7be619dd072e5cf5650dab WHIRLPOOL aa331e76cd4f9b035a50a2b65778cf602f9c7f34d318338d2ad20baa95cb798a9077518966fc4a14b5e288be21246ec9ac403c2fca2b37e277e26d0091bb0e48
+DIST lttng-tools-2.6.1.tar.bz2 956120 SHA256 70ec8e24f8ea12f593d77c6bdc5348e4124dcb4897e8c0eb6fba25048fd31137 SHA512 7b2de0a42975e3c8ced67ed877417684892322c477a35a310c13ddbf84fcf125ee87156bae56b802eacec7757a927388d764e917ce8da8e57bfd33fdae3da469 WHIRLPOOL 22596b4572ffddd025c89c51eb234096105526614e2c5616bdc0f0ee97c83aab03852cd02af6890c2cb590b6c003dcd8a02ab87c849d792763624442f45c3b00
+DIST lttng-tools-2.7.1.tar.bz2 984351 SHA256 0c799fb21dfa42475feaa1507ded934608b2e531039b46c40e944a5b81c7b21c SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d WHIRLPOOL cfe0db0679e128888dfe0061bfaeb5b8b337900a1b1e84cf1aaafec230638e67744cc0873f2959456f3cc1c91e6c9c9458f64a10c2fe835e34af4bf2778b956b
diff --git a/dev-util/lttng-tools/lttng-tools-2.5.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.5.0.ebuild
deleted file mode 100644
index b2fdfcd49ec0..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.5.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
-
-inherit linux-info
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild b/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild
deleted file mode 100644
index b2fdfcd49ec0..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.5.2.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 linux-info
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.ebuild b/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.ebuild
deleted file mode 100644
index b2fdfcd49ec0..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.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 linux-info
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
new file mode 100644
index 000000000000..7f5af9aa935a
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info versionator
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( dev-util/lttng-ust:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is -lt 2 6 27; then
+		ewarn "${PN} require Linux kernel >= 2.6.27"
+		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
+		ewarn "   the session daemon. There were introduce in the 2.6.27"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable ust lttng-ust)
+}
diff --git a/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
new file mode 100644
index 000000000000..7f5af9aa935a
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info versionator
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( dev-util/lttng-ust:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is -lt 2 6 27; then
+		ewarn "${PN} require Linux kernel >= 2.6.27"
+		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
+		ewarn "   the session daemon. There were introduce in the 2.6.27"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable ust lttng-ust)
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index dabba7ec1bc2..78622630cee3 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,3 +1,2 @@
-DIST lttng-ust-2.5.0.tar.bz2 583293 SHA256 dcd0bb81a12833e6edea110a0cc97108a7e55b1dc95ff2c97d06796866f5c3aa SHA512 15e614a0b66d668e00de56275f80f67a3ee159642e06a5c2981ac3bd2266c0f3c2cbad8dd3e4b5158ef85070bdcf9b513e17de346dbc628878c2de68768dd634 WHIRLPOOL 3cac7a2d905a2ab913220d13ffd295e442e7e0b676b68e501542b799092a7d6d8e45211fd8cf98939478958aee739e86041b797229207820172cce2726c86677
-DIST lttng-ust-2.5.1.tar.bz2 589487 SHA256 fbd9e2d78641e5c659f1d51f8097c8279c155ff50f8e38a4c57f188ca4b84546 SHA512 718f0f50077ed7d1c9647de7714c237fde619ea23de8160af508fd1e6a60fb3594b0424b93a7ad5cbc47f4106721e7ef75ea82f1976a0a8fbf3305e8179769b6 WHIRLPOOL 38ea8fbdc6461f3a8af914b289cf8496c6a6fa48efcb0ed29be6f404310624602e7b8402b3ec2ad89a2a45c1a441afc162e83b09ecd9cd3654cf1e2638599575
-DIST lttng-ust-2.6.0-rc2.tar.bz2 608934 SHA256 664fabe883c863f8ba1f83b2fa030c097181aed44bd75979431c0fc0e1e71598 SHA512 a7ccf10e03693397168cca34b5008609a2c6dbf1bd88b84e42014861af432379efdbb040a31c77bf20014838d491fcb05ab67ca47c6924c7f74ca539c3019f3b WHIRLPOOL 7fd15c99e57cc21c6d9ce46ecab07da2389a2364d7de5a0b34357465a404bbd15d756d4ce54460ae52a923bb644e6719fcf4527773400e2aeef4c1a70bf84c5f
+DIST lttng-ust-2.6.5.tar.bz2 619053 SHA256 31ad8ae3a63a5009747732b5d015d19cd3fdb9a4524dcdc7b92c6b29b2120d8a SHA512 bf144c987b7ff62f70551db51a5605bc006b1d8a0e7f4197e1a2c7a7d79a1e4e786a658d0ec885f7d56c4d4f405da23717137c8b0d2be6289fc16ca84f06a230 WHIRLPOOL bec7bf92e07c2b606c726b48c691524f4821ce1dd7715a0784603968f40f2e1b01558f92d5a7019e060aa413624c96b35ad8242b261d2e936b0a315ca8529858
+DIST lttng-ust-2.7.1.tar.bz2 643906 SHA256 878438f10a488aa5855615a3108f4759bd123fa795d70c34647146d70103ce16 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee WHIRLPOOL b6f5d40594bddf60c5463167d70d09633b0bca9593c5b018ecf3220819926a0d44af6288340d76c3dfe2aea9b4c29a9301285b98f5aa55884a9efa39f7e82287
diff --git a/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild
deleted file mode 100644
index 88522a591bec..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild
deleted file mode 100644
index 88522a591bec..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.ebuild b/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.ebuild
deleted file mode 100644
index 136b7571b825..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.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
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
new file mode 100644
index 000000000000..c3f261f5db6c
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools versionator
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-libs/userspace-rcu"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
new file mode 100644
index 000000000000..c3f261f5db6c
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools versionator
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-libs/userspace-rcu"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index cd58451961d3..405c02e69d23 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,3 +1,4 @@
+DIST mdds-1.1.0.tar.bz2 258691 SHA256 4253ab93fe8bb579321a50e247f1f800191ab99fe2d8c6c181741b8bd3fb161f SHA512 928cb6dffacdb2fe9e67dde094bbd8191137cb58402172d0fc99ed8c7aa6069668c6b1f06e515366a0843325ea051e8e0650aa2142cbc94b107a748a399d7a47 WHIRLPOOL 79ec5589ad682712244cc235c8ec7f9626208526b43839f07fff9dfc96509e232fccce801664b2c50b00dcde656cb78e8ac1e5db2fde7c807bc5507af410a83b
 DIST mdds_0.10.3.tar.bz2 151389 SHA256 db10932dbe7e9b5b9b3f513bc8165ab7e29c3bf75702b3c3cfff6956c521e0c2 SHA512 52be0fe4eedc8a44f61944e078d8f0d2490bfea27451c5d4772b6d46d71562702d3b90b34c5721d8bdf6de2ea32a4a9126e310614bb36e0d573c047dfc9f3fcb WHIRLPOOL 17a461cf01f286ccb0e8b351e627dc870db5676a3698cf99f1520b01562138a8d74fa99ccca901d81b5f354abf95ff35d2a7957a3bf2dae16d92aee12e62f8b1
 DIST mdds_0.11.2.tar.bz2 154444 SHA256 cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab SHA512 b0e00d50be9b8319dabfe7e607849af27a52be9b46d770849b919444b905bf198d99edcefe1be15e6018b79839443b3a709fe22b84ac11e2267f02bec5139633 WHIRLPOOL a505c4b746c7ffefe3ea74fd0eb7c2ae46b4c598e1136cf9e9cfe44a4c48db2bb1b84528a5f0a86cc1b7a5c9d5b7d82522bd7836ed5e4de61d9664a863e1b014
 DIST mdds_0.12.0.tar.bz2 152285 SHA256 2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 SHA512 462f6e3701eb7cce872ce0a76d826886eedccf5ca20293d03744b6d6d5ff1ef16770c6abce1c9118829e252e90783e206d281006d0d4e7e9b328ed9ae37264c1 WHIRLPOOL f86314644d80ae1b75a4cc1af6ebc4a3df3b65eac4244abc0fbf69893020509abae3be7e758d90a07eafffb866d67dcb75968b38a411e747d7f361a7d2905f0b
diff --git a/dev-util/mdds/mdds-1.1.0.ebuild b/dev-util/mdds/mdds-1.1.0.ebuild
new file mode 100644
index 000000000000..754707aed497
--- /dev/null
+++ b/dev-util/mdds/mdds-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+
+inherit eutils toolchain-funcs ${GITECLASS}
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1/${PV}"
+IUSE="doc valgrind"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="dev-libs/boost:="
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=() # buildsystem installs docs
+
+src_prepare(){
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable valgrind memory_tests) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index e0db9959c3b9..754707aed497 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
@@ -11,27 +11,34 @@ inherit eutils toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE=""
+SLOT="1/${PV}"
+IUSE="doc valgrind"
 
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
+COMMON_DEPEND="dev-libs/boost:="
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)"
+RDEPEND="${COMMON_DEPEND}"
 
-[[ ${PV} == 9999 ]] || S=${WORKDIR}/${P/-/_}
+DOCS=() # buildsystem installs docs
 
 src_prepare(){
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--with-hash-container=boost \
+		$(use_enable doc docs) \
+		$(use_enable valgrind memory_tests) \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
index 4bf2727332a9..c054dfb0bb86 100644
--- a/dev-util/mdds/metadata.xml
+++ b/dev-util/mdds/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="google-code">multidimalgorithm</remote-id>
 	</upstream>
+	<use>
+		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/meld/meld-3.14.2.ebuild b/dev-util/meld/meld-3.14.2.ebuild
index 3ed56a0e0aff..97b12453e52d 100644
--- a/dev-util/meld/meld-3.14.2.ebuild
+++ b/dev-util/meld/meld-3.14.2.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/piklab/Manifest b/dev-util/piklab/Manifest
deleted file mode 100644
index 9561c5a45f86..000000000000
--- a/dev-util/piklab/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST piklab-0.16.2.tar.bz2 1036644 SHA256 51de9edda8edb9d2e9d07ed1c479b83b87eb6fb17c85717477f05fac03a5740e SHA512 8fdf8fdbcedbb0c7b840341575560e6bc3d02b5564cecd043fbe0e1bf6560aa28bd1e92ed2c80ea6d890bb5759dd0d4a72571f68ab7ee0858eb98649097e5f30 WHIRLPOOL be037be4fbf410cb9722d2a20a3b96222f57d63f0a4d7e744b65bd53937a73d3576aa6be80d16f8b478c3fdeb0663964a74be8344678b65adbe0af669eec42ab
diff --git a/dev-util/piklab/metadata.xml b/dev-util/piklab/metadata.xml
deleted file mode 100644
index 1283ddda10dc..000000000000
--- a/dev-util/piklab/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">piklab</remote-id>
-		<bugs-to>http://sourceforge.net/tracker/?group_id=138852</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/piklab/piklab-0.16.2.ebuild b/dev-util/piklab/piklab-0.16.2.ebuild
deleted file mode 100644
index 429f8296ae22..000000000000
--- a/dev-util/piklab/piklab-0.16.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-KDE_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="de cs es fr hu it"
-inherit kde4-base
-
-DESCRIPTION="IDE for applications based on PIC and dsPIC microcontrollers"
-HOMEPAGE="http://piklab.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qt3support:4
-	sys-libs/readline
-	virtual/libusb:0
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changelog README TODO )
-
-src_prepare() {
-	sed -e "/install(FILES README/d" \
-		-i CMakeLists.txt || die
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use !kde QT_ONLY)
-		-DLOCALE_INSTALL_DIR="/usr/share/locale"
-	)
-	kde4-base_src_configure
-}
diff --git a/dev-util/pkgconf/pkgconf-0.9.12.ebuild b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
index d2e7167dcbc9..c1e5f68d306b 100644
--- a/dev-util/pkgconf/pkgconf-0.9.12.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	inherit eutils multilib-minimal
 	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/radare2/radare2-0.10.0.ebuild b/dev-util/radare2/radare2-0.10.0.ebuild
index 8c8badd448ad..c43c45737d8d 100644
--- a/dev-util/radare2/radare2-0.10.0.ebuild
+++ b/dev-util/radare2/radare2-0.10.0.ebuild
@@ -28,3 +28,15 @@ src_configure() {
 	econf \
 		$(use_with ssl openssl)
 }
+
+src_install() {
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+
+	default
+}
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 61fe110f2cac..c0cf022bd4cb 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,2 +1 @@
-DIST RBTools-0.7.4.tar.gz 158594 SHA256 1626d449eae9d03a8e3e5c0125f77a86eefdc615b86ba7ee1368b238521de198 SHA512 c12d254f1eeb7a8d06a1ab7cbb952f45975da355b436a7514cf9fa0c3fe60b713daa79874c8cf7df05b13acb22441cf6ae06e442b238b5481a01cdaf15f6c5c9 WHIRLPOOL b6116eb6445994dadb3c6003e8fdecf60d9fa17257988c9822b69c5cf19ae369e31c9a07315c14e27cdce35697f0eef16207306f0e6a5ec8fa47a9d0aa66680b
 DIST RBTools-0.7.5.tar.gz 160657 SHA256 4f252a3d5ad4a2d25883b9adf0c6ee17ef56146bd9c0586e0aa2a2790748c069 SHA512 f5c795929d8fb09b3f39c18e747096d56205c6fbf73e4a04a5898b5adc058d092e41f835ba6cea8b4b94bc5747cbbdf988131ad66e637cc77e0d59a4509786ef WHIRLPOOL ee414239c9289b1ac17b6fa6e63fcb42c058bde9cd3bb69a8d13e5c038c77a942de48d63091c5e8b499dc47e62f5b469d22ebbba66050138b35c355c02d98d89
diff --git a/dev-util/rbtools/rbtools-0.7.4.ebuild b/dev-util/rbtools/rbtools-0.7.4.ebuild
deleted file mode 100644
index 5f25a92ebbcd..000000000000
--- a/dev-util/rbtools/rbtools-0.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=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="http://www.reviewboard.org/"
-SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-0.7.5.ebuild b/dev-util/rbtools/rbtools-0.7.5.ebuild
index 56d140216a7d..5f25a92ebbcd 100644
--- a/dev-util/rbtools/rbtools-0.7.5.ebuild
+++ b/dev-util/rbtools/rbtools-0.7.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_compon
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-util/reviewboard/Manifest b/dev-util/reviewboard/Manifest
deleted file mode 100644
index 24ba9ecc6a2e..000000000000
--- a/dev-util/reviewboard/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ReviewBoard-1.7.28.tar.gz 2957387 SHA256 69a976e69c1e805b23aa78f43fc1954599b7513dff1d1cfd0bafa6112a946931 SHA512 9e97b56b68da6c06f713d98c70dda321ea3fdf6f26986b4272fbb392c1c633f1ce44170bb515e8b685813b69a0ae8ada9f392b5e776793222dd25c3b7d4fa704 WHIRLPOOL 51a731117b9a84b9f8e1cd785511da516bf4d7216f7f08a8ba83d200af94a235d994d53c630b26f430d28f1ce4a7ca8a47d83b87c241bc4b1f5469f7668cc03d
diff --git a/dev-util/reviewboard/files/1.7.28-docs.patch b/dev-util/reviewboard/files/1.7.28-docs.patch
deleted file mode 100644
index 99741d2e40d0..000000000000
--- a/dev-util/reviewboard/files/1.7.28-docs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Avoid un-needed downloading od object.infv files, fix conf.py for docs/manual
-diff -ur ReviewBoard-1.7.7.1.orig/docs/codebase/conf.py ReviewBoard-1.7.7.1/docs/codebase/conf.py
---- docs/codebase/conf.py	2013-04-22 04:40:29.000000000 +0800
-+++ docs/codebase/conf.py	2013-06-16 15:35:59.639256650 +0800
-@@ -197,7 +197,3 @@
- 
- # If false, no module index is generated.
- #latex_use_modindex = True
--
--
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/dev': None}
-diff -ur ReviewBoard-1.7.7.1.orig/docs/manual/conf.py ReviewBoard-1.7.7.1/docs/manual/conf.py
---- docs/manual/conf.py	2013-04-22 04:40:29.000000000 +0800
-+++ docs/manual/conf.py	2013-06-16 15:36:30.592256658 +0800
-@@ -30,9 +30,14 @@
- 
- import reviewboard
- from reviewboard import settings
-+from reviewboard.settings import EXTENSIONS_STATIC_ROOT, ROOT_URLCONF
- from django.core.management import setup_environ
-+from django import conf
-+from settings_local import DATABASES
-+conf.EXTENSIONS_STATIC_ROOT=EXTENSIONS_STATIC_ROOT
-+conf.settings.DATABASES=DATABASES
- setup_environ(settings)
--
-+conf.settings.ROOT_URLCONF=ROOT_URLCONF
- 
- # If your extensions are in another directory, add it here. If the directory
- # is relative to the documentation root, use os.path.abspath to make it
-@@ -223,7 +223,4 @@
- latex_show_pagerefs = True
-
-
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/dev': None}
--
- todo_include_todos = True
-diff -ur 
-ReviewBoard-1.7.7.1.orig/docs/releasenotes/conf.py 
-ReviewBoard-1.7.7.1/docs/releasenotes/conf.py
---- docs/releasenotes/conf.py	2013-04-22 04:40:29.000000000 +0800
-+++ docs/releasenotes/conf.py	2013-06-16 15:36:53.119256665 +0800
-@@ -202,7 +202,3 @@
- 
- # If false, no module index is generated.
- #latex_use_modindex = True
--
--
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'https://www.reviewboard.org/docs/manual/dev': None}
diff --git a/dev-util/reviewboard/files/CVE-2013-2209-sec.patch b/dev-util/reviewboard/files/CVE-2013-2209-sec.patch
deleted file mode 100644
index 1b41c3c6f0d2..000000000000
--- a/dev-util/reviewboard/files/CVE-2013-2209-sec.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4aaacbb1e628a80803ba1a55703db38fccdf7dbf Mon Sep 17 00:00:00 2001
-From: Christian Hammond <chipx86@chipx86.com>
-Date: Fri, 21 Jun 2013 23:33:16 -0700
-Subject: [PATCH] Fix an XSS vulnerability in the reviews dropdown.
-
-The reviews dropdown had a bad vulnerability where it would assume the
-user's full name is valid HTML. This allowed the user to craft a script
-tag that would be executed every time the name appeared in the dropdown.
-
-This vulnerability exists in 1.6.x, 1.7.x, and the in-development 1.8.
-There are no known attacks in the wild.
-
-This was reported by Craig Young at Tripwire.
-#---
-# reviewboard/htdocs/media/rb/js/reviews.js | 6 ++++--
-# 1 file changed, 4 insertions(+), 2 deletions(-)
- 
-#diff --git a/reviewboard/htdocs/media/rb/js/reviews.js b/reviewboard/htdocs/media/rb/js/reviews.js
-#index 6340744..035872f 100644
-#--- a/reviewboard/htdocs/media/rb/js/reviews.js
-#+++ b/reviewboard/htdocs/media/rb/js/reviews.js
-#@@ -352,10 +352,12 @@ $.fn.reviewsAutoComplete = function(options) {
-#         $(this)
-#             .autocomplete({
-#                 formatItem: function(data) {
-#-                    var s = data[options.nameKey];
-#+                    var s = data[options.nameKey],
-#+                        desc;
-#
-#                     if (options.descKey) {
-#-                        s += " <span>(" + data[options.descKey] + ")</span>";
-#+                        desc = $('<div/>').text(data[options.descKey]).html();
-#+                        s += " <span>(" + desc + ")</span>";
-#                     }
-# 
- #                    return s;
-#-- 
-#1.8.1.6
-diff -ur ReviewBoard-1.7.7.1.orig/reviewboard/htdocs/static/rb/js/reviews.js ReviewBoard-1.7.7.1/reviewboard/htdocs/static/rb/js/reviews.js
---- reviewboard/htdocs/static/rb/js/reviews.js	2013-04-22 04:40:30.000000000 +0800
-+++ reviewboard/htdocs/static/rb/js/reviews.js	2013-06-28 10:38:29.514298074 +0800
-@@ -257,10 +257,12 @@
-         $(this)
-             .rbautocomplete({
-                 formatItem: function(data) {
--                    var s = data[options.nameKey];
-+                    var s = data[options.nameKey],
-+                        desc;
- 
-                     if (options.descKey && data[options.descKey]) {
--                        s += " <span>(" + data[options.descKey] + ")</span>";
-+                        desc = $('<div/>').text(data[options.descKey]).html();
-+                        s += " <span>(" + desc + ")</span>";
-                     }
- 
-                     return s;
-diff -ur ReviewBoard-1.7.7.1.orig/reviewboard/static/rb/js/reviews.js ReviewBoard-1.7.7.1/reviewboard/static/rb/js/reviews.js
---- reviewboard/static/rb/js/reviews.js	2013-04-22 04:40:29.000000000 +0800
-+++ reviewboard/static/rb/js/reviews.js	2013-06-28 10:40:09.922290974 +0800
-@@ -257,10 +257,12 @@
-         $(this)
-             .rbautocomplete({
-                 formatItem: function(data) {
--                    var s = data[options.nameKey];
-+                    var s = data[options.nameKey],
-+                       desc;
- 
-                     if (options.descKey && data[options.descKey]) {
--                        s += " <span>(" + data[options.descKey] + ")</span>";
-+                        desc = $('<div/>').text(data[options.descKey]).html();
-+                        s += " <span>(" + desc + ")</span>";
-                     }
- 
-                     return s;
diff --git a/dev-util/reviewboard/metadata.xml b/dev-util/reviewboard/metadata.xml
deleted file mode 100644
index 411f82cecba0..000000000000
--- a/dev-util/reviewboard/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>
-	<maintainer type="person">
-		<email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
-	</maintainer>
-	<use>
-		<flag name="codebase">Enables a build of the docs/codebase folder</flag>
-		<flag name="manual">Enables a build of the docs/manual folder</flag>
-		<flag name="rnotes">Enables a doc build of the release notes</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/reviewboard/reviewboard-1.7.28.ebuild b/dev-util/reviewboard/reviewboard-1.7.28.ebuild
deleted file mode 100644
index 21b651dbb379..000000000000
--- a/dev-util/reviewboard/reviewboard-1.7.28.ebuild
+++ /dev/null
@@ -1,121 +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 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_PN="ReviewBoard"
-DESCRIPTION="A web-based code review tool that offers developers an easy way to handle code reviews"
-HOMEPAGE="http://www.reviewboard.org/"
-SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/1.7/${MY_PN}-${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="codebase doc manual rnotes test"
-
-LICENSE="MIT"
-SLOT="0"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-RDEPEND=">=dev-python/django-1.4.14[${PYTHON_USEDEP},sqlite]
-	<dev-python/django-1.5[${PYTHON_USEDEP},sqlite]
-	>=dev-python/django-evolution-0.6.9[${PYTHON_USEDEP}]
-	<dev-python/django-evolution-0.7[${PYTHON_USEDEP}]
-	>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
-	>=dev-python/Djblets-0.7.31[${PYTHON_USEDEP}]
-	<dev-python/Djblets-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-memcached[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2012h[${PYTHON_USEDEP}]
-	dev-python/recaptcha-client[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="doc? ( || ( codebase manual rnotes ) )"
-# Tests mostly access the inet and when run mostly fail
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${PV}-docs.patch )
-
-python_prepare_all() {
-	# Running uglify is a problem right now, so skip this step. Rather
-	# have newer versions that compacted javascript.
-	sed -e "s/'pipeline.compressors.uglifyjs.UglifyJSCompressor'/None/" -i reviewboard/settings.py || die
-
-	# https://github.com/reviewboard/reviewboard/commit/b1b8867deb7cd857003d8abbf16e85897b0cb4bf
-	# # The version bordering of python-dateutil is long out of date and wrong since end of March 2012!
-	sed -e 's:==1.5:>=1.5:' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# See https://code.google.com/p/reviewboard/issues/ #3009
-	# until build of manual can find and use ROOT_URLCONF, only possible build path for manual
-	# requires sacrificing the resources section, all of which call on ROOT_URLCONF
-	local msg="Generating docs for"
-	if use doc; then
-		if use manual; then
-			rm -rf docs/manual/webapi//2.0/resources/ || die
-			einfo;einfo "$msg manual"
-			DJANGO_SETTINGS_MODULE="django.conf" emake -C docs/manual html
-		fi
-
-		if use codebase; then
-			pushd docs/codebase &> /dev/null
-			ln -sf ../../contrib/internal/conf/settings_local.py .
-			popd &> /dev/null
-			einfo;einfo "$msg codebase"
-			emake -C docs/codebase html
-		fi
-
-		if use rnotes; then
-			einfo;einfo "$msg release notes"
-			emake -C docs/releasenotes html
-		fi
-	fi
-}
-
-python_test() {
-	pushd ${PN} > /dev/null
-	ln -sf contrib/internal/conf/settings_local.py .
-	"${PYTHON}" manage.py test || die
-}
-
-python_install_all() {
-	if use doc; then
-		if use manual; then
-			insinto /usr/share/doc/${PF}/manual
-			doins -r docs/manual/_build/html/
-		fi
-		if use codebase; then
-			insinto /usr/share/doc/${PF}/codebase
-			doins -r docs/codebase/_build/html/
-		fi
-		if use rnotes; then
-			insinto /usr/share/doc/${PF}/release_notes
-			doins -r docs/releasenotes/_build/html/
-		fi
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "You must install any VCS tool you wish ${PN} to support."
-	elog "dev-util/cvs, dev-vcs/git, dev-vcs/mercurial or dev-util/subversion."
-	elog
-	elog "Enable the mysql, postgres or sqlite USEflag on dev-python/django"
-	elog "to use the corresponding database backend."
-	elog
-	elog "For speed and responsiveness, consider installing net-misc/memcached"
-	elog "and dev-python/python-memcached"
-}
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index 6bcf4449f239..cfdc80c91ddf 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -1 +1 @@
-DIST spec-cleaner-0.7.2.tar.gz 79297 SHA256 e58703a9fba035923396044c4339cc71d1c9023246b7cae5f6445acf908d3cbe SHA512 bd46c64d9473f66a8e4756dfd67b94f902a8884536bb9153a6076b7c5ea9b8c30cc54fdbddc18d4931509effc7e18ef51662ee21b2d1e5fd7bf6a4b5436b3ed0 WHIRLPOOL d087320eb65f1fb9de75074b50469a8531b76f1067acb1b8982c7f69f184ec4b933e8b0d66dc7f64ffe03f766f9d18e4264b52b6df1933282cf038d3fad144c0
+DIST spec-cleaner-0.7.8.tar.gz 89125 SHA256 d9ed8aeefac4836182a4c0a8bcaaaedaf4acad88bc601b2576f3adfad5436528 SHA512 2937c2480b4a24343c5ea8a665f2820e37da3f2816c22e6bc82ebba66711754a59f5e68fb903258750cac3118206a9e02fc5a87051c0bcb4e8396ab658e844d3 WHIRLPOOL 6559460eb869c8428b17611e4005edd59abd24ec105467768191825c6cd232f776e40ce7e5762fcecf9adad6bdfbf24c1790b8fd3d992deeb07a67b44c1665ac
diff --git a/dev-util/spec-cleaner/spec-cleaner-0.7.2.ebuild b/dev-util/spec-cleaner/spec-cleaner-0.7.8.ebuild
index 20592dcd5458..20592dcd5458 100644
--- a/dev-util/spec-cleaner/spec-cleaner-0.7.2.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-0.7.8.ebuild
diff --git a/dev-util/vmtouch/Manifest b/dev-util/vmtouch/Manifest
index ffdd57e5c4d0..ac26980b8cd8 100644
--- a/dev-util/vmtouch/Manifest
+++ b/dev-util/vmtouch/Manifest
@@ -1 +1 @@
-DIST vmtouch-0.8.0.tar.gz 224882 SHA256 6848b9355451e8ab848501b5604f47a396bce1ef1dcb613577feaaaea1dfe262 SHA512 71756a2b93545f916441913b11a6d366fe886df99d131303df2ae2ac382346321f47809620711f57f0a2df4133c175524234128abafdea47747b5c74017062bb WHIRLPOOL 54b645fa1a7eeb5fe86182de0bb3c9f54684698f9da0ad5392910bf8316008560a6f4592bf3c7720519db11bbd3759c306637acfb3f33e76c163b697936e459d
+DIST vmtouch-1.0.2.tar.gz 13404 SHA256 48d41e5b805a0fcac46c12feeb4650e4b9def44b75d528d7c66c2f8b3a747c39 SHA512 df0d8a1599c970540e70e050dab33327589f0dd64548640c7d44607c3ef3397c7b1d2184fe80195ec5cb9a73d7218d7fd1b2cda2cee227ce84a8c20e8874f489 WHIRLPOOL 903813783d93395b637b565a887b8d0d3d5d3b7d548d9a98d49c1ab9bfc82322a495c771937cc7688561de30d0ec2aca6edb6d599508c440bd963547b78915b9
diff --git a/dev-util/vmtouch/vmtouch-0.8.0.ebuild b/dev-util/vmtouch/vmtouch-0.8.0.ebuild
deleted file mode 100644
index 51d07ae29413..000000000000
--- a/dev-util/vmtouch/vmtouch-0.8.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
-HOMEPAGE="http://hoytech.com/vmtouch/"
-SRC_URI="https://github.com/hoytech/${PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_install() {
-	default
-	doman vmtouch.8
-}
diff --git a/dev-util/vmtouch/vmtouch-1.0.2.ebuild b/dev-util/vmtouch/vmtouch-1.0.2.ebuild
new file mode 100644
index 000000000000..f4beade5b671
--- /dev/null
+++ b/dev-util/vmtouch/vmtouch-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
+HOMEPAGE="http://hoytech.com/vmtouch/"
+SRC_URI="https://github.com/hoytech/${PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_install() {
+	local my_prefix="${ED}/usr"
+	emake PREFIX="${my_prefix}" MANDIR="${my_prefix}/share/man" install
+	dodoc CHANGES README.md TODO
+}
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 6c1db4998cef..b7d5903cd85a 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1 +1,2 @@
+DIST fossil-src-1.34.tar.gz 4449452 SHA256 53a6b83e878feced9ac7705f87e5b6ea82727314e3e19202ae1c46c7e4dba49f SHA512 7c2677566527466727e823e5bf59f636b5fd08dd1093a742c3f7f72d398d380288030c3a573ae3c66c60f1e8c194f36f5987fa835251d7ced10533b9779578d7 WHIRLPOOL cb00af705b1f4376e09129091154f847da62817548d1838c03c34422eb223704e8a92cee5038a5cf5f75c600d55ce23fd681ca82f1f0e854b42b23b7c82bc66e
 DIST fossil-src-20150119112900.tar.gz 3973184 SHA256 37969e5a09c1611199921e3518a4ed736fd637a02f2d5810cd45897a4ceb92dc SHA512 9bee82916d98b5d7d81e200ec6616c1e463540de254464a559254ee117a99492a0080003645a99ef93cc551395e38b93dfb12728abbbdbf468f5c2743f67718e WHIRLPOOL 19175692472913bc94bf993956c1e0b8510ff33d6df2c168acf700e64b6f4e62eed34a4888c38e093eabfe582224edf5b7e03dc652b5f1e8824b9e8e5608d492
diff --git a/dev-vcs/fossil/fossil-1.34.ebuild b/dev-vcs/fossil/fossil-1.34.ebuild
new file mode 100644
index 000000000000..03ca17fe7ff3
--- /dev/null
+++ b/dev-vcs/fossil/fossil-1.34.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P=${PN}-src-${PV}
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple, high-reliability, source control management, and more"
+HOMEPAGE="http://www.fossil-scm.org/"
+SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug fusefs json legacy-mv-rm miniz sqlite +ssl static tcl th1-docs th1-hooks"
+
+DEPEND="
+	sys-libs/zlib
+	|| ( sys-libs/readline:0 dev-libs/libedit )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0 )
+	tcl? ( dev-lang/tcl:0= )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	# this is not an autotools situation so don't make it seem like one
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf="--with-openssl=$(usex ssl auto none)"
+	use debug && myconf+=' --fossil-debug'
+	use json   && myconf+=' --json'
+	use sqlite && myconf+=' --disable-internal-sqlite'
+	use static && myconf+=' --static'
+	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
+
+	local u
+	for u in legacy-mv-rm miniz th1-docs th1-hooks; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	use fusefs || myconf+=' --disable-fusefs'
+
+	tc-export CC
+	./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
index 906883880cc5..984129bb9571 100644
--- a/dev-vcs/fossil/metadata.xml
+++ b/dev-vcs/fossil/metadata.xml
@@ -11,10 +11,23 @@
         <description>Co-Maintainer</description>
     </maintainer>
     <use>
+        <flag name="fusefs">Enable the Fuse Filesystem</flag>
         <flag name="json">Enable the JSON API of Fossil's wiki</flag>
+        <flag name="legacy-mv-rm">
+	        Enable legacy behavior for mv/rm (skip checkout files)
+        </flag>
         <flag name="lineedit">Enable line-editing with libedit or readline</flag>
+        <flag name="miniz">
+	        Use the bundled miniz for compression instead of zlib
+        </flag>
         <flag name="sqlite">
             Use the system SQLite instead of the bundled one
         </flag>
+        <flag name="th1-docs">
+	        Enable TH1 for embedded documentation pages
+        </flag>
+        <flag name="th1-hooks">
+	        Enable TH1 hooks for commands and web pages
+        </flag>
     </use>
 </pkgmetadata>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index c7d440e4b541..17474eca2309 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,15 +1,15 @@
 DIST git-2.4.10.tar.xz 3695176 SHA256 b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced WHIRLPOOL 3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b
 DIST git-2.5.4.tar.xz 3747552 SHA256 e08d2d384e1c8c474d336c3583ed5cd396c76455155a4e65bfa97699fc38472a SHA512 25964bc59301b11994c94bab618613bc87ef788d356af55a26c77861a939f2b67cf37be98199e81d5c2a63e8d9c043b4fc6fb481316cc4d8bb6a1f382eddf33e WHIRLPOOL e62efd86c5e0d1b040816978cc28a41d00a7c095513482b0df1d4addc87bd89ce20dbb1b77e3ec3d9bd0722de3237e451b05f687fdb6419fa419708921049222
 DIST git-2.6.5.tar.xz 3822016 SHA256 07ce40131821c42fbcfa8f989b384f30f64f3665c06e8b2c2e2077d730777db5 SHA512 c71a1ad80eced40b007d9a6dc10d081fcf5b9b384f20d5db2e3a2646191838070369b96c172a66d86eaa488634bd4adbe0840f0c4dade51a45eba2fd3a0870a5 WHIRLPOOL 331e8422cdaf0376ea6ff15f8b7abc2d14355fda9871ad8928fd7d46df3cd88e94702da243c5032e1e1e364def92b3fd8b852e8b7aaa98a69bb20599417ba50c
-DIST git-2.7.0.tar.xz 3861524 SHA256 fa9fb34efce9c80527152a40fbae138e83bd04a15ef9111726252259345a7b0d SHA512 e2d51e3d547229bb1e5c3a92c71476695f23420d9c639f9cb1d953fd00579aad92f9bbaf8f3d45f966c9476da73bf4c11dabf18c06f542de6e4d26e12c43dcf3 WHIRLPOOL e0dc8071ebc4e0558a2f2b9d8b32d840f4278e893777367029e84a57bf52d1d00eadb778a3e6df70c93de8cb754b94ff985ae6025ff98d6276629d7d3318aa19
 DIST git-2.7.1.tar.xz 3905876 SHA256 477a8137de342f858d364383266e9551e582718e96b34051a6aaef57606d6bfe SHA512 968a77ed2dd0118a55fdc0715c1dad3edbef59cad15d57d1cd6f8385636480746bf8f934e5bbf4e7cf2264cb59f387260a10e851f0b4a54b0b959e19e8856dbb WHIRLPOOL 9cb5e59eb8dfbad56b6046fac69dcd0e3588558a30c5c8d67499b75afbd4bddf2053bd1907c584a984649b40ae7f67d659ac9abe6658b2d93d4fafcc1042e3ed
+DIST git-2.7.2.tar.xz 3907296 SHA256 b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20 SHA512 fa139b10d134742efa74707ca77111463656000fd3fae52752eb5af1e56b57d9a2a6d21e6c23085af8db830b811387435fe95c1310b28ef280630e99e432fc79 WHIRLPOOL f4b570afb846c01110ee95ee4c9d8104e6ebb65c82e0a81bdf87b08e6f81ae6861e4292840ac6ad18463007134778d12d306a6e8a067c811a0342c4869e7d6ef
 DIST git-htmldocs-2.4.10.tar.xz 996588 SHA256 f2c523ea114caac7c5cf51a20a420a215411762fabff2da9febfc2917af835ef SHA512 60fc5a2b6665ec7fc10680608b5689a24fa211fe7393f010a8099c6fb0a9582f20cebc7cad0653b62750677d79a80fcd6e8e96fb440acb3fc7c7c0ffc00779d3 WHIRLPOOL 30585753a7b08dfa812c74832d35168d3615d8bf71c3c853efb125348538b5fb7cc4b3f1cfef725082ade144b5362394991186967f6026cee8c91dd41e30290e
 DIST git-htmldocs-2.5.4.tar.xz 1009820 SHA256 cb36b3b7198a3fa49f2677bba83f1e57a1a40250a181d9e86232cb8febcc8053 SHA512 af833635632ba5c65524bfef00f291a41fd37ba7bd9ca4b65b4c0eb9329b888d2e8757fe29f33bd25a75e1841d67a20dff49f43d35a502ef3b29599d073dcd6a WHIRLPOOL e5f55c3dbdf69d946295c5c19b95a79168d34645ced8e6a837ec8b5dd948008487288159f63a2f81a36fbdf3f413d3fdefd008b0157785df37431ccb9127284e
 DIST git-htmldocs-2.6.5.tar.xz 1021516 SHA256 40b5ee75a69d834005b36dd190dc0164124593cca233391774a3a9c82af88de5 SHA512 dc796bbe54104821c8be8a7475039a8a6b207d3e3bd20b950d786b02c824801e3f915389af7c267b83800ed2e0d1b037fb543d6c0f942f887c715a361a589728 WHIRLPOOL 3abd96db7ed3368a8903ff89265c6a44c8e5a2127695edca6bdc2511a27dd45c546016400f926c367030602828329a194fc2683785f25c7833c18c9f32ea57f1
-DIST git-htmldocs-2.7.0.tar.xz 1028748 SHA256 a9d30a744eb07392ba3ffe389cca7e57a2bdd718c9ffccdf2d525eeafac548a9 SHA512 e86dd5874c87bd9df9a76a50bc41280dbcaff7b24547d57eae1f68f97645e15dc35027754425013bef6fea1bd4f6e9e23ac0aac80023166a29848deee7d3d4d0 WHIRLPOOL 435b67e536991b6a31f5b70870947f30fe9d2318648bb061ed96608acc0e5deca4d21574cbdcb06548ab90fb2a368e5a629610aaa5f030c91ec9d6e0965be302
 DIST git-htmldocs-2.7.1.tar.xz 1030484 SHA256 9a9b857fb28fef8ad2fd780b263331f2f5d3f09338c64bd902f8a5ec03bbfc89 SHA512 b97223f7fec21d254f0b1b2407341b84d03ec23ed38e3042541e9cb2e2d847a856524e9e5751d2ff4a00c32f0f02ee667e376c3a6ad00252d6b6bee0dde1af4e WHIRLPOOL 42ba0d194a77d5074f57a6936a72a7f4dbd0cbda0d620eb22fc04ea5ef1d0016d777dbf1e9a06265424f870c0241ef6f79e310f758c90ebf081d05b926e810b0
+DIST git-htmldocs-2.7.2.tar.xz 1031152 SHA256 fabf3afa674931c70d6bb2e37497b46046f554c8d5520f0ccb126ce5e748f724 SHA512 ae925a416cda4a28e9c48ca9178ece7c2e6db20c79c00512a0e3fbe15e2fcc965ec37b848d4b613da2ed10cfaabdaa01f2272c3ca43f5ebac229d3bc44354854 WHIRLPOOL 03b6b194d2f30003370eee4ecbf7155037564fb4afa9aaa9d0b3c282d8ca77db139de22a5317db0b3858e054e803f0ebe5cc225895aacbc10fa7ff76d590c653
 DIST git-manpages-2.4.10.tar.xz 373968 SHA256 da712c07d84bb3da10be9fb56c15289c77828d3011179ab71f090e77e52a03d9 SHA512 d5a978109db70f3d50d02ad17c93229206f2d5a2dd3dd7e9fb266ca7b76b85ad92f63120df885b88b5a33fe1dce0686ae92fc50749cb3b6275cb48812eb031a9 WHIRLPOOL decb0b5bf81b25e4562f639e03c2b60b0c470338be0ac298f3d62deb54538de0961a81c6a8ced17ef5877df6de5c17b49fe96e77f00dd2038d2d1189c8f48e7c
 DIST git-manpages-2.5.4.tar.xz 378296 SHA256 bdd8db3b8cd35d01b2631d1f3c1174e5bc1b62b3e0177ae1954d83743aa93ea9 SHA512 ccd675d8d9c117042083800fa4ae7a876a7873cf13844c92f731e46553d316a949d445c80e4b57824792a6b369623085053d25baeb4f8b79801b5849f06eb084 WHIRLPOOL a2149da3217826c1c4951aa0fa0900e388ea806511559d0e01c4e17a565470048e55e988b12e6da3d7b52b11d410d27b4da0cac4d2d88e3f6860f22664cd8ac9
 DIST git-manpages-2.6.5.tar.xz 381620 SHA256 7b0800c0e3d6a7370413ee9ded8466158170a1635dfd434cec8e2d168e5038ef SHA512 c370811ced1b481e66efeb3f5efb00a5091183d3125e2796b883e6f9e1dfb82032ad303eca5a9380882227aab8c63fe0d5c80dfd80228aaa29d7c7ab6afae9b4 WHIRLPOOL 211866bd59f537bd9ba8d51d037b76f3054afee254d92708137105e7360647d244c3558a70254a94ea99cf96397a5d794ff3b80d893d67e1032abbb18e28b11c
-DIST git-manpages-2.7.0.tar.xz 384248 SHA256 b7f255aa17a5d06b9b71f6e3957f65e8f15789b2d31f09b1c2bf697a21458a0d SHA512 ab3af313c6fd88dca34103fdf2d9d3eaf25b57d0cee90b6eedac05130a0c42e79aa31fdd328e35386765e84cdd5d3143cd870fcdc96983581a7531ac7b1a32a5 WHIRLPOOL cf4af0dfc3a39d072f16e1ef4b6025f63ac3788a5db4f5eec48a1889b67c646044e64b4544a961c7616bd56a4dc57e75532f97c3d4cef92d56a3a1cd20afeae0
 DIST git-manpages-2.7.1.tar.xz 384468 SHA256 e6091a4f13f199109e19ef689b5028337419ed7fa5a9dd284d55efda72751e2d SHA512 b0c0469ce9163e10122e5fabb5a39a1b6faa0a1bbe2c24365aae8f02bebb37e9954d477a02be71737510fd82393c4e0aaa7a4cc1caeda3f93735446ee951923e WHIRLPOOL c87331b7e03dad33239cb1bc36d443fb3e5bac3d2cee36cf825b5bd554b72b532af1136b000b1d82b5d4203b7679dd9c263f9b91a4882961aa7dc472dc1b13d9
+DIST git-manpages-2.7.2.tar.xz 384440 SHA256 19a6254a34da516e1ec67bfcbc6da7a1483440a2e8416b30e736f96c3404ff4b SHA512 b99015148706097bc2a8ca0a885473233fc7e1e3846290d456311058853da205f30175b7c158f67e70ea98fca2dac8c2d6844e73db5a51bea1e57d770bc7a15f WHIRLPOOL dc2f751327520077f48d2cc3b5dc82160c968ee91fbffff9b9717be0096bd2d926d325f2eed42fff0574b22c2d1cf41713f0ce53fb4ee7b4d1842e4a4a3230da
diff --git a/dev-vcs/git/git-2.7.0-r2.ebuild b/dev-vcs/git/git-2.7.0-r2.ebuild
deleted file mode 100644
index a8c159be8fe4..000000000000
--- a/dev-vcs/git/git-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,650 +0,0 @@
-# Copyright 1999-2016 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 libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	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 )
-	mediawiki-experimental? ( mediawiki )
-	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
-
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-		epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-		epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-	fi
-
-	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
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.7.1.ebuild b/dev-vcs/git/git-2.7.1.ebuild
index a5175b98fd42..76902100ffec 100644
--- a/dev-vcs/git/git-2.7.1.ebuild
+++ b/dev-vcs/git/git-2.7.1.ebuild
@@ -380,7 +380,6 @@ src_install() {
 	# 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]
-6~
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
diff --git a/dev-vcs/git/git-2.7.2.ebuild b/dev-vcs/git/git-2.7.2.ebuild
new file mode 100644
index 000000000000..d81bed5f51dc
--- /dev/null
+++ b/dev-vcs/git/git-2.7.2.ebuild
@@ -0,0 +1,660 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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 libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	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 )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+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() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	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
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	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
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		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="t8005-blame-i18n.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
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/gitg/gitg-3.18.0.ebuild b/dev-vcs/gitg/gitg-3.18.0.ebuild
index e3fa8872217a..729bfdef8b53 100644
--- a/dev-vcs/gitg/gitg-3.18.0.ebuild
+++ b/dev-vcs/gitg/gitg-3.18.0.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/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 3bc6fdbc5aff..00d8878e0bae 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -10,3 +10,4 @@ DIST gitolite-gentoo-3.6.3.2.tar.bz2 148655 SHA256 b43c0c781053656a65d25fd7f47e1
 DIST gitolite-gentoo-3.6.3.tar.bz2 147531 SHA256 6689cfedb258f61206777eaa83d388eacb670d66384f9294474440d4669f08eb SHA512 4c4f40cf608ea78f76c39701880e53e2f6486fc37478818f5b4f0946fcd9ffe30ef122463b7b6b48a0a9931271fe7ef7aecf6bf23bbce45f36cd1e217e5ec45a WHIRLPOOL 7d7d1a060c9f8d7124df59cdcca9f1cf0a1bc37c2ca3a32c278f122b0b3c9f17c8d7ea2fb58151bc19c2f44f3745d4a82a3ff19ba2ff8e44675b0ba2b39187c8
 DIST gitolite-gentoo-3.6.4.1.tar.bz2 151771 SHA256 352c51f437733f6f79a35c13c207a0f46002c41b97e47cdb06325b58e0b359a5 SHA512 5eec313199f9d757be2c357ae07d8e3a8f7b82dd684a40024a33ec3f3d8806fd0cac7f57fcc740be888285343d965fa2497fccb971d24b0082c772cf1cb1655f WHIRLPOOL dba9907af26aa1677a87d7fb89e6d9533ef751254f3c3a53acc4ac49cc3932ab29014c51f89099e21bcef1c3f835ffccbe80aa1e0f94649236a1507ae6281438
 DIST gitolite-gentoo-3.6.4.tar.bz2 151879 SHA256 7f567bfc92d9ed55505b7fde71a7903a0b3351007b358de84f98e96ed54a4187 SHA512 dcb926f747ce43942c5678390bf0649061d4f779d416fc09980ab8a9b169a9604596f6b7800432636f43707c83aac61472df26cfb1c66cc85d1ff8eaa4db2c19 WHIRLPOOL ca1187b4896b2a1f1364e9525ddcd607a705a2ac6331fd670799c1d89f42d76407abe69999d0f87e887e460fbefc470e60afafd9d02db273c5331ecd71fda0ff
+DIST gitolite-gentoo-3.6.5.tar.bz2 153234 SHA256 60a9687dc788e1d271ddcb52448feba65c3f617f1b013daa4298ebef3b048c40 SHA512 c32f91dcb8ff790c2c59f0cb9ce1f906b17d5012922e0efdb2da1f7b1986f9f82b85b6e232f6b6e65e4d3daecb8f247a408b664b44624a64bf876b416a7b3ca4 WHIRLPOOL fe8fdb7c428d792047f25e0282d82a9191642291a6e8e14da4b7d90ae58cb2d0ce25ee6af5eccd55ed69f79ff45fef045a26e0449e37a20c6ba6be4c9d44975f
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
new file mode 100644
index 000000000000..33df79b8c077
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 8f8bc559e28f..16c5ef9ce20e 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -3,4 +3,5 @@ DIST gitolite-3.6.1.tar.gz 165506 SHA256 7ee03d715cc4d87c0b6dbca5d79daf6f50f657a
 DIST gitolite-3.6.2.tar.gz 167670 SHA256 012c372b53d765558131ae0df23a590d41b042c8b88e38e952992caf52fc4fbf SHA512 f8f041fde1b7c533fcb9cc32beec99dd83bc0a81795115e7205585bbe2f25135e2347df437e123349525a0186fe702f265330b259d336389b437cecf0e894629 WHIRLPOOL 319a4d91950ad123fd9cd76c1bb0a2afc44843b42a8ff0309aef9eee0f15ae9b830286cd1040219ff7cd1c93e0818f9e0191e34b3f41037ea165a4e0d850601c
 DIST gitolite-3.6.3.tar.gz 174689 SHA256 9b20eb6ae84358c5f063b02da64e49bef4605c9bfc7fb3700a2766dba58b9d99 SHA512 afb8bcf27052d46725c4b3a6dd483e98ac3e574651bfe2ee35b442f044791acae8a17cbbab4237992a9755367e37f5160514d67cd2d863d623d32ed5fdf39362 WHIRLPOOL 8f2495b9cc462760632e58cdfeec3759070fcaad9f7c31faab13bb72de5e680967cba10ed5a79841f81fd257b056d520a36415619107f15919787711628ce9c8
 DIST gitolite-3.6.4.tar.gz 180619 SHA256 15b19181dcc00233e4d031f07d769cf930e93963a925a71d684748068f38dd63 SHA512 7c709372f66c4620109824191d6bf736b1066d74e5acd481fa552a6f010a38d6d7d17629a92fe7b944b43c6cac864db80217cefadc0e3a6dbf63530cff89cd6d WHIRLPOOL 2896dbb669dd71ee4cf184c90e9b87b7d69588789cfc16c5bcd26f3defb64a6812c8493df5e769a9a0c434f92b17d48ccccb9dd5c56507239a176a6832a66908
+DIST gitolite-3.6.5.tar.gz 182496 SHA256 15f367591cc6782cde8b0b8c2206ada5714e83998b96de61838d64ff0878f876 SHA512 60796663a87c2b169c08e4e26edfb76408428887d3e932677f4ca95a8c7f82e9e300a7400d3d900c371628b23972be063444b7c036218f6ff0ab13626a886f90 WHIRLPOOL dcc5b7ebf64fb9334d5062e9dd0c7b678ea4b1bc0d014b636a8bc346e9931888e43e32d7a21fe4b10528a0f6657e6ed5e0185427ba6cfd5e32d964ab5627f1a4
 DIST gitolite-3.6.tar.gz 156481 SHA256 ae9180a180a05cad344788eadc8340d6ebcb4cc60d96a1f5ab5fc355d395ba4b SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f WHIRLPOOL 79b3a553dd25db9a3e99d7725c0932bb0b126f30bd013b9cc53d69f60d0c906eac4134b25f6759d9635e50df3324d731f16c30fb44c25e89df7e35560a3e00b1
diff --git a/dev-vcs/gitolite/gitolite-3.6.5.ebuild b/dev-vcs/gitolite/gitolite-3.6.5.ebuild
new file mode 100644
index 000000000000..14f8bc719a76
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://github.com/sitaramc/gitolite.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 56a2b8149750..975d8445111a 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -2,3 +2,4 @@ DIST hg-git-0.7.0.tar.gz 42956 SHA256 9db9cd87b9b173c192b29336b4029122a4fe2858c3
 DIST hg-git-0.8.2.tar.gz 48461 SHA256 fea6f48da28cef3fc30a51b1cfec0a52df405b35c85b2d92607158f6b089e043 SHA512 7315e60d494b73862e6c3a90624f5ba0698c885f9b66e4bfe636bb74cd178a0d5a23614c647b6d16db7f78c06516e9a8415c443effb6cc1a102cf87ac76aa041 WHIRLPOOL 1437bfa6a0ccf2e15cc3eef195a6b176606f2be74d2b1381524a1fef3431e1f8b8e0c537325daa5a11d1b709630cc282acebdffddbf602144f115e76aea61270
 DIST hg-git-0.8.3.tar.gz 48198 SHA256 5c624af512c969ac3628fd658670e9170812f570eb02d2a6c76c216b80341179 SHA512 857961004103ccdabb7d15d778ef7044a5f17dd0dd045f402269b5cbf8faf1a9a4f56d2d0d5b9d24a2d6c54a0d791ad079598d5f930f4d12d3290ad3f9b90207 WHIRLPOOL 657d5cb85fe003596919db44bd53eba60e88b56fd7ca6ef8f8833c37a9b5088cceea180e83e8edde9e2a8ccd3a356722d6d01d7980819aac6460ea789fdb4406
 DIST hg-git-0.8.4.tar.gz 96421 SHA256 aa8f1d4ccf110480950a7de82f30c1233e20c8148a384f0a8f43779686cfd90c SHA512 9a6d01489eaf9252a09c3778ddbde562f31637a7d8d9b67f544af5aaec31426ab74f05e065405c56ad37d58ae82ef702ef5a6e1ad9a9ea5aa23af98cf42726b1 WHIRLPOOL beb6b37911f9b4cff902fa35a857eb79b6eb4adca0077c2413801b93f64b6f450df5781716c31ccc6075313ab3d08ded2ea3011f767442945f694f414bdfe0fc
+DIST hg-git-0.8.5.tar.gz 96675 SHA256 f5cab3cc610926458733a2321ad3df5a7c56870bbf0c6d962dfa742e6ea04782 SHA512 f03c118b58c1ba4cb34ba8c953c7b1d57207548cd613d1f9f716691cbd131008b802ef21baee484881c72318f46c78b946c2d3fa77ebf5efb3ab0b7e1b9d4ca2 WHIRLPOOL cf5c2e8b69b2489aa459b9c25a51dae67bc044075f2271b1ae1006113651a0053d748a1c8801fecf7d8e8d57f219a1d04ad7cd5256acfc96feecbb7d62bae264
diff --git a/dev-vcs/hg-git/hg-git-0.8.5.ebuild b/dev-vcs/hg-git/hg-git-0.8.5.ebuild
new file mode 100644
index 000000000000..55574ccc9689
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index fc1511e02a62..1028e7fd23cc 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,3 +1,4 @@
 DIST hgsubversion-1.4.tar.gz 133564 SHA256 e3febee217ce321d316712c4c75236dcc2f2769c329c687114e2c37d303f1c0f SHA512 23305b210e2f51cbcd866a5d87caa23f8e5d405532b3139f5700572f13f5a52c1699d937e8c87a8580274ddc1240f51b773334083ced44da98fe7bf270f006fb WHIRLPOOL 5c7b4b9a5537ce4b65f806db23ab4e0ad920b394b44a015d8144c8da9456ad3ed8f3cc8911d539a2488fbd1e446aa7cb6ad5af0c195461ad580ee497cf793a91
 DIST hgsubversion-1.8.2.tar.gz 179341 SHA256 1725a02f4334eceb4930cc0aee46556e11b38515e9b742be3ac3b7dcf9fbf699 SHA512 4e94e5daaf252ecbbda331e5d022be4cc24b6c6cd7ae49eb19e0acd57aa926e0a68bb9f1ef69b43b074af6dc5764ff56a4bc018c2036c2dd8fcbd8e264d78581 WHIRLPOOL 204c0f3e3a680fce42cb4b1d6ed2f394a76197279cf42042908dcf565c04419c4958f6fc7b9eba050bab791e6a2ef28c22364ceabed99650a9011aa408414da8
 DIST hgsubversion-1.8.3.tar.gz 179464 SHA256 8a64bff00146bd7e03432f802f6b555cdf502d955a7f893c2e30f6b47079998d SHA512 dd712f39b2851b2466a6776cb986eddd92e32ad3b5be22e4429ab5f7a684982c4d2b3a6752fc16ac4211c4a2237f721b8672d8943bc297f591997345975ecd65 WHIRLPOOL 57848cfd343b7c9db41b0265bd05fb1bc7c5180a1704d45e51363d9e7586fb69d210302d3d7474dcbbd5ec3a611641c9c91a870edc5332fe777ad4932596206c
+DIST hgsubversion-1.8.5.tar.gz 179639 SHA256 2e2a9e5c05945ba2bd2eef444ad34cc2aeac101fa43157676d72e66869042ce5 SHA512 1d3f0824c3b83a2e00485ef3f412767bdb378a5a545f2fcf533eafebb20cbd40becf54cf9a29705200d221d6d6c0eb284fae0692354b1795feb391de2a02ca0c WHIRLPOOL 1d17810ccaa0d2860c6723ad7629676e6fc01d9fc3d251934c7b0132b1fe56dcccac8e2be8c599df88d5adfd5684242cef72faecaa48d46576d8ccf270302572
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
new file mode 100644
index 000000000000..4b4ce127570a
--- /dev/null
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test"
+
+# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
+RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
+	dev-vcs/mercurial[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
+		>=dev-vcs/subversion-1.5[python] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( README )
+
+#python_test() {
+#	"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
+#}
diff --git a/dev-vcs/hgview/Manifest b/dev-vcs/hgview/Manifest
index 8c7ff2385e58..51a1a0ee33dd 100644
--- a/dev-vcs/hgview/Manifest
+++ b/dev-vcs/hgview/Manifest
@@ -1,2 +1 @@
-DIST hgview-1.8.2.tar.gz 178453 SHA256 0f4c2d7e40d3c6ab7a444502366ee262fdb6caca97c321e78d4e430e71a04655 SHA512 9bab867ebda22d730ea6e846523c2426ea88275a56ddc8546bd874266d2a9742abcb22bcd4a8f4bbd6b6deffbaac7b4a365117dd7a040a86f68e4f43bd793b6f WHIRLPOOL 744b3ab9af3cefa92d53645febaacf9b4e33ec1eb174763fe6e20e5f8c9ae610d9e84c898fe53dde14a5d58a8ee6f1d359731b656c92ed7ca0e38d079e05355a
 DIST hgview-1.9.0.tar.gz 181130 SHA256 8b2e5e10544deaa79ba9ef3f6339e103af357edbeb4b2594be079fddf7b8e6ed SHA512 604631776e096daf27241e8387d6fddfb9b3f2c54dbfccc95e770ebf2d5d27f64009c3698cf0d427f9a89e073db0d8d7623d57969ca6fcf036d5cb1dbd74eece WHIRLPOOL 01d29625a136664f35f2241c546b4af52853ea78fff31089d83ebb4a1718e4d64571df6a61f217aec6919b6bb27c35cf092195fa56efcffb3ad16e1bb714a397
diff --git a/dev-vcs/hgview/hgview-1.8.2.ebuild b/dev-vcs/hgview/hgview-1.8.2.ebuild
deleted file mode 100644
index 25ee8c32cabf..000000000000
--- a/dev-vcs/hgview/hgview-1.8.2.ebuild
+++ /dev/null
@@ -1,61 +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_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="A Mercurial interactive history viewer"
-HOMEPAGE="http://www.logilab.org/project/hgview/ https://pypi.python.org/pypi/hgview/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses +qt4"
-REQUIRED_USE="|| ( ncurses qt4 )"
-
-RDEPEND="dev-vcs/mercurial[${PYTHON_USEDEP}]
-	ncurses? (
-		>=dev-python/urwid-1.0.0[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-	qt4? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-python_configure_all() {
-	mydistutilsargs=(
-		build $(use doc || echo --no-doc)
-		build $(use ncurses || echo --no-curses)
-		build $(use qt4 || echo --no-qt)
-	)
-}
-
-src_prepare() {
-	# https://www.logilab.org/ticket/103668
-	sed -i \
-		-e 's:MANDIR=$(PREFIX)/man:MANDIR=$(PREFIX)/share/man:' \
-		-e 's:$(INSTALL) $$i:$(INSTALL) -m 644 $$i:' \
-		doc/Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Install Mercurial extension config file
-	insinto /etc/mercurial/hgrc.d
-	doins hgext/hgview.rc
-}
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index deec3f6eb59b..3e40e3389037 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -21,7 +21,7 @@
 
 # EAPI=5 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	5) ;;
+	5|6) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index d23a5b7db8fe..0004c2cd764f 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1731,7 +1731,7 @@ epatch_user() {
 
 	# don't clobber any EPATCH vars that the parent might want
 	local EPATCH_SOURCE check
-	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do
+	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do
 		EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check}
 		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check}
 		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check}
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 66b81005c5a1..e2f64106ecb4 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -27,6 +27,13 @@
 #
 # FORTRAN_NEED_OPENMP=1
 
+inherit eutils toolchain-funcs
+
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
 if [[ ! ${_FORTRAN_2_CLASS} ]]; then
 
 # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
@@ -56,8 +63,6 @@ if [[ ! ${_FORTRAN_2_CLASS} ]]; then
 # If unset, we always depend on virtual/fortran.
 : ${FORTRAN_NEEDED:=always}
 
-inherit eutils toolchain-funcs
-
 for _f_use in ${FORTRAN_NEEDED}; do
 	case ${_f_use} in
 		always)
@@ -194,7 +199,7 @@ _fortran_die_msg() {
 	eerror "set FC variable accordingly and take care that the necessary"
 	eerror "fortran dialects are supported."
 	echo
-	die "Currently no working fortran compiler is available"
+	die "Currently no working fortran compiler is available (see ${T}/_fortran_compile_test.log for information)"
 }
 
 # @FUNCTION: _fortran_test_function
@@ -286,10 +291,5 @@ fortran-2_pkg_setup() {
 	esac
 }
 
-case ${EAPI:-0} in
-	0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
 _FORTRAN_2_ECLASS=1
 fi
diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
index aea1f10d96e4..bca37c0e9cce 100644
--- a/eclass/gnustep-base.eclass
+++ b/eclass/gnustep-base.eclass
@@ -62,6 +62,8 @@ gnustep-base_src_prepare() {
 			GNUmakefile
 		eend $?
 	fi
+
+	has ${EAPI:-0} 6 && default
 }
 
 gnustep-base_src_configure() {
diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass
index 00e52a083e22..d23b0031e01a 100644
--- a/eclass/intel-sdp.eclass
+++ b/eclass/intel-sdp.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,6 +8,13 @@
 # Sci Team <sci@gentoo.org>
 # @BLURB: Handling of Intel's Software Development Products package management
 
+if [[ ! ${_INTEL_SDP_ECLASS_} ]]; then
+
+case "${EAPI:-0}" in
+	4|5) ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
 # @ECLASS-VARIABLE: INTEL_DID
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -42,7 +49,6 @@
 # Must be defined before inheriting the eclass
 
 # @ECLASS-VARIABLE: INTEL_TARX
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # The package extention.
 # To find out its value, see the links to download in
@@ -78,7 +84,6 @@
 : ${INTEL_X86:=i486}
 
 # @ECLASS-VARIABLE: INTEL_BIN_RPMS
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Functional name of rpm without any version/arch tag
 #
@@ -88,9 +93,9 @@
 # specify the full path
 #
 # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli
+: ${INTEL_BIN_RPMS:=""}
 
 # @ECLASS-VARIABLE: INTEL_DAT_RPMS
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Functional name of rpm of common data which are arch free
 # without any version tag
@@ -101,6 +106,7 @@
 # specify the full path
 #
 # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common
+: ${INTEL_DAT_RPMS:=""}
 
 # @ECLASS-VARIABLE: INTEL_SINGLE_ARCH
 # @DESCRIPTION:
@@ -144,13 +150,11 @@ _INTEL_SDP_YEAR=${INTEL_DPV%_update*}
 _INTEL_SDP_YEAR=${INTEL_DPV%_sp*}
 
 # @ECLASS-VARIABLE: INTEL_SDP_DIR
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Full rootless path to installation dir
 INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}.${_INTEL_PV3}.${_INTEL_PV4}"
 
 # @ECLASS-VARIABLE: INTEL_SDP_EDIR
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Full rooted path to installation dir
 INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}"
@@ -171,6 +175,8 @@ QA_PREBUILT="${INTEL_SDP_DIR}/*"
 # @DESCRIPTION:
 # Creating necessary links to use intel compiler with eclipse
 _isdp_link_eclipse_plugins() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local c f
 	pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null || die
 		for c in cdt*; do
@@ -198,6 +204,8 @@ _isdp_link_eclipse_plugins() {
 # @DESCRIPTION:
 # warn user that we really require a license
 _isdp_big-warning() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	case ${1} in
 		pre-check )
 			echo ""
@@ -233,6 +241,8 @@ _isdp_big-warning() {
 # @DESCRIPTION:
 # Testing for valid license by asking for version information of the compiler
 _isdp_version_test() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local comp comp_full arch warn
 	case ${PN} in
 		ifc )
@@ -272,8 +282,11 @@ _isdp_version_test() {
 
 # @FUNCTION: _isdp_run-test
 # @INTERNAL
+# @DESCRIPTION:
 # Test if installed compiler is working
 _isdp_run-test() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
 		case ${PN} in
 			ifc | icc )
@@ -287,11 +300,13 @@ _isdp_run-test() {
 
 # @FUNCTION: intel-sdp_pkg_pretend
 # @DESCRIPTION:
-# @CODE
+#
 # * Check that the user has a (valid) license file before going on.
+#
 # * Check for space requirements being fullfilled
-# @CODE
 intel-sdp_pkg_pretend() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local warn=1 dir dirs ret arch a p
 
 	: ${CHECKREQS_DISK_BUILD:=256M}
@@ -333,6 +348,7 @@ intel-sdp_pkg_pretend() {
 # @DESCRIPTION:
 # Setting up and sorting some internal variables
 intel-sdp_pkg_setup() {
+	debug-print-function ${FUNCNAME} "${@}"
 	local arch a p
 
 	if use x86; then
@@ -416,6 +432,8 @@ intel-sdp_src_unpack() {
 # @DESCRIPTION:
 # Install everything
 intel-sdp_src_install() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	if path_exists "${INTEL_SDP_DIR}"/uninstall*; then
 		ebegin "Cleaning out uninstall information"
 		find "${INTEL_SDP_DIR}"/uninstall* -delete || die
@@ -478,6 +496,8 @@ intel-sdp_src_install() {
 # @DESCRIPTION:
 # Add things to intel database
 intel-sdp_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	# add product registry to intel "database"
 	local l r
 	for r in ${INTEL_RPMS}; do
@@ -497,6 +517,8 @@ intel-sdp_pkg_postinst() {
 # @DESCRIPTION:
 # Sanitize intel database
 intel-sdp_pkg_postrm() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	# remove from intel "database"
 	if [[ -e ${INTEL_SDP_DB} ]]; then
 		local r
@@ -514,8 +536,6 @@ intel-sdp_pkg_postrm() {
 }
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend
-case "${EAPI:-0}" in
-	0|1|2|3)die "EAPI=${EAPI} is not supported anymore" ;;
-	4|5) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
+
+_INTEL_SDP_ECLASS_=1
+fi
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 5be7e172c7d7..cb1c1d8b1301 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -262,7 +262,7 @@ java-pkg_addres() {
 	shift 2
 
 	pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
-	find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -0 jar uf "${jar}" || die "jar failed"
+	find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -r0 jar uf "${jar}" || die "jar failed"
 	popd > /dev/null || die "popd failed"
 }
 
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 299ac3e7c329..b6258da4dbfb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -465,6 +465,9 @@ _calculate_src_uri() {
 				4.14.16)
 					# Part of 15.12.1 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.12.1/src/${_kmname_pv}.tar.xz" ;;
+				15.04.3)
+					# Files moved to Attic
+					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index cf1d9fb3d0d3..ffdac918e4df 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -93,18 +93,19 @@ _check_gcc_version() {
 	fi
 }
 
-# @FUNCTION: _add_kdecategory_dep
+# @FUNCTION: _add_category_dep
 # @INTERNAL
 # @DESCRIPTION:
-# Implementation of add_plasma_dep and add_frameworks_dep.
-_add_kdecategory_dep() {
+# Implementation of add_plasma_dep, add_frameworks_dep, add_kdeapps_dep,
+# and finally, add_qt_dep.
+_add_category_dep() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local category=${1}
 	local package=${2}
 	local use=${3}
 	local version=${4}
-	local slot=
+	local slot=${5}
 
 	if [[ -n ${use} ]] ; then
 		local use="[${use}]"
@@ -115,8 +116,10 @@ _add_kdecategory_dep() {
 		local version="-$(get_version_component_range 1-3 ${version})"
 	fi
 
-	if [[ ${SLOT} = 4 || ${SLOT} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
-		slot=":${SLOT}"
+	if [[ -n ${slot} ]] ; then
+		slot=":${slot}"
+	elif [[ ${SLOT%\/*} = 4 || ${SLOT%\/*} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
+		slot=":${SLOT%\/*}"
 	fi
 
 	echo " ${operator}${category}/${package}${version}${slot}${use}"
@@ -126,9 +129,11 @@ _add_kdecategory_dep() {
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-frameworks/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -145,16 +150,18 @@ add_frameworks_dep() {
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
-	_add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}"
+	_add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_plasma_dep
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-base/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -171,16 +178,18 @@ add_plasma_dep() {
 		version=${PLASMA_MINIMAL}
 	fi
 
-	_add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}"
+	_add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_kdeapps_dep
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-apps/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -202,7 +211,33 @@ add_kdeapps_dep() {
 		fi
 	fi
 
-	_add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"
+	_add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}"
+}
+
+# @FUNCTION: add_qt_dep
+# @USAGE: <package> [USE flags] [minimum version]
+# @DESCRIPTION:
+# Create proper dependency for dev-qt/ dependencies.
+# This takes 1 to 4 arguments. The first being the package name, the optional
+# second is additional USE flags to append, and the optional third is the
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
+# The output of this should be added directly to DEPEND/RDEPEND, and may be
+# wrapped in a USE conditional (but not an || conditional without an extra set
+# of parentheses).
+add_qt_dep() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local version
+
+	if [[ -n ${3} ]]; then
+		version=${3}
+	elif [[ -z "${version}" ]] ; then
+		version=${QT_MINIMAL}
+	fi
+
+	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: get_kde_version
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e75f20cf60b7..1caeb38e1692 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -19,7 +19,7 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit kde5-functions fdo-mime flag-o-matic gnome2-utils versionator virtualx eutils cmake-utils
+inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
@@ -574,6 +574,7 @@ kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 # @FUNCTION: kde5_pkg_postinst
@@ -583,7 +584,7 @@ kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_pkg_postinst
 }
 
 # @FUNCTION: kde5_pkg_postrm
@@ -593,7 +594,7 @@ kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_pkg_postrm
 }
 
 fi
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index eb9642a68f1e..e9560496aa7e 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -18,7 +18,7 @@
 inherit eutils multilib toolchain-funcs multiprocessing
 
 case ${EAPI:-0} in
-	4|5) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
+	4|5|6) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/games-action/atanks/atanks-6.4.ebuild b/games-action/atanks/atanks-6.4.ebuild
index 9dae0c23942b..7fb379329e05 100644
--- a/games-action/atanks/atanks-6.4.ebuild
+++ b/games-action/atanks/atanks-6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="media-libs/allegro:0[X]"
diff --git a/games-action/poopmup/Manifest b/games-action/poopmup/Manifest
deleted file mode 100644
index 4f2ea5a49486..000000000000
--- a/games-action/poopmup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST poopmup-1.2.tar.gz 1461794 SHA256 d2f1515c981d49e18fba6f6d7b4ab354d21def62587eab8dcb048c9eb8a7ff3b SHA512 1c9453ec7487b968dacf6b1bc000835fcd39d1b6f8a42c458ff4cce96a6b48881b11d7df1733fca21bfb213c18cb6f793075a59d4f8a856d06d27a9781c84e88 WHIRLPOOL 03caf2e84518121df17378aff3f9995d57e7c63bc25874e1a9ed2a98c9274ef3d85b0a3c930df0868676772225067a309596253feaa536a05bbf657923e37ce3
diff --git a/games-action/poopmup/files/poopmup-1.2-freeglut.patch b/games-action/poopmup/files/poopmup-1.2-freeglut.patch
deleted file mode 100644
index 615558963efd..000000000000
--- a/games-action/poopmup/files/poopmup-1.2-freeglut.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- poopmup.cpp
-+++ poopmup.cpp
-@@ -582,6 +582,7 @@
-   getConfiguration();
-   //Will overwrite the conf file params.
-   ParseCommandLine(argc, argv); 
-+  glutInit(&argc, argv);
-   InitializeGL(argc, argv);	
-   InitializeWorld();	
-   InitMenu();
diff --git a/games-action/poopmup/files/poopmup-1.2-gcc43.patch b/games-action/poopmup/files/poopmup-1.2-gcc43.patch
deleted file mode 100644
index da4a455673a4..000000000000
--- a/games-action/poopmup/files/poopmup-1.2-gcc43.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- common.h
-+++ common.h
-@@ -38,7 +38,7 @@
- #define STDCALL 
- #endif
- 
--#include <iostream.h>
-+#include <iostream>
- #include "includes/base/myDisplayLists.h"
- #include "myTimeStats.h"

- 
---- includes/base/myMatrix.h
-+++ includes/base/myMatrix.h
-@@ -57,7 +57,7 @@
- #include "my3dPoint.h"
- #include "myVector.h"
- 
--#include <iostream.h>
-+#include <iostream>
- #include <math.h>
- 
- /**
---- includes/osd/menu.h
-+++ includes/osd/menu.h
-@@ -21,6 +21,7 @@
- #define POOPMUP_MENU_H
- 
- #include <stdio.h>
-+#include <cstring>
- #include "../base/myColor.h"
- #include "formElem/button.h"
- #include "formElem/intSelector.h"
---- includes/osd/onScreenDisplay.h
-+++ includes/osd/onScreenDisplay.h
-@@ -21,6 +21,7 @@
- #define ONSCREENDISPLAY_H
- 
- #include <stdio.h>
-+#include <cstring>
- #include "../base/my3dPoint.h"
- #include "../base/myColor.h"
- 
diff --git a/games-action/poopmup/files/poopmup-1.2-ldflags.patch b/games-action/poopmup/files/poopmup-1.2-ldflags.patch
deleted file mode 100644
index e831a4fc34dd..000000000000
--- a/games-action/poopmup/files/poopmup-1.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-10-01 00:05:06.000000000 +0200
-+++ Makefile	2010-10-01 00:05:30.000000000 +0200
-@@ -7,7 +7,7 @@
- OBJ =poopmup.o 

- 

- all:

--	$(CC) $(SOURCE) -o $(OBJ) -lglut -lGL -lGLU -L/usr/X11R6/lib -lXmu -lXext -lXt -lXi -lX11

-+	$(CC) $(LDFLAGS) $(SOURCE) -o $(OBJ) -lglut -lGL -lGLU -L/usr/X11R6/lib -lXmu -lXext -lXt -lXi -lX11

- 

- 

- clean:

diff --git a/games-action/poopmup/metadata.xml b/games-action/poopmup/metadata.xml
deleted file mode 100644
index 3b39a28e968e..000000000000
--- a/games-action/poopmup/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 type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">poopmup</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/poopmup/poopmup-1.2.ebuild b/games-action/poopmup/poopmup-1.2.ebuild
deleted file mode 100644
index a4f235ced1a2..000000000000
--- a/games-action/poopmup/poopmup-1.2.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
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="You are now free to fly around the city and poop on passers-by"
-HOMEPAGE="http://poopmup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="media-libs/freeglut
-	x11-libs/libXi
-	x11-libs/libXmu
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i \
-		-e "s:textures/:${GAMES_DATADIR}/${PN}/:" \
-		includes/textureLoader.h || die
-	sed -i \
-		-e "s:config/:${GAMES_SYSCONFDIR}/:" \
-		myConfig.h || die
-	sed -i \
-		-e '/clear/d' \
-		Makefile || die # bug #120907
-
-	epatch \
-		"${FILESDIR}"/${P}-freeglut.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	ecvs_clean
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX) ${CFLAGS}"
-}
-
-src_install() {
-	newgamesbin poopmup.o poopmup
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins textures/*
-
-	insinto "${GAMES_SYSCONFDIR}"
-	doins config/*
-
-	dodoc README docs/*.doc
-	dohtml docs/userman.htm
-
-	prepgamesdirs
-}
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
index c1e031fadedf..92f0904f1611 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.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.18.1.ebuild b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
index 4531af901fe9..ce5433864266 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.18.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/supertux/supertux-0.4.0.ebuild b/games-arcade/supertux/supertux-0.4.0.ebuild
index 210b61b0cef9..8c4f5dcecbbc 100644
--- a/games-arcade/supertux/supertux-0.4.0.ebuild
+++ b/games-arcade/supertux/supertux-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="dev-games/physfs
diff --git a/games-board/ccgo/Manifest b/games-board/ccgo/Manifest
index eebb9d75fa2b..fb471fbff2b3 100644
--- a/games-board/ccgo/Manifest
+++ b/games-board/ccgo/Manifest
@@ -1,2 +1 @@
-DIST ccgo-0.3.6.4.tar.gz 620246 SHA256 1975a4e9b6661f6613dd3a00b3ee7e176b80244f555a184b258b50ef4352a890 SHA512 54625bbf7036c18f4a9e92df0d7f2d67772138a940c5fdbbffa3d1c2e5c558cad5394d2c556c06388516e53d1f3502cf6369bcd95b1139d4ca5ec4210dcac5c2 WHIRLPOOL dd1b63c6c4360da99f66772373d2b9a0b39b495c57893d89cd69a4db8c0b8c53db059350c906f17a9e1402bacd473827fcce1be4d607c4afa3b1b9eb36de8f9d
 DIST ccgo-0.3.6.5.tar.gz 639238 SHA256 d12be7fb9170d650ae78197983fac05af21ddbf47f7b1a2a14de9aa832ed602c SHA512 268c228eee9c42e49df333bfa0707e7b72c39731ccd64239e3c426958f6c17b65658db91bc7ab89548c4cc647ade791a7c67c30c410a5b3935c8fd3f326bf36b WHIRLPOOL 2baa70d05da8698a6115096800ccfd64dfb825c6b819fe9141141334eda53195632ae3dd5ee0031e1c145dbd9e697d6a5bdb8d9f40218c3653dda10d814e9f8d
diff --git a/games-board/ccgo/ccgo-0.3.6.4.ebuild b/games-board/ccgo/ccgo-0.3.6.4.ebuild
deleted file mode 100644
index 6d6978490227..000000000000
--- a/games-board/ccgo/ccgo-0.3.6.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
-inherit autotools eutils toolchain-funcs flag-o-matic games
-
-DESCRIPTION="An IGS client written in C++"
-HOMEPAGE="http://ccdw.org/~cjj/prog/ccgo/"
-SRC_URI="http://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND=">=dev-cpp/gtkmm-2.4:2.4
-	>=dev-cpp/gconfmm-2.6
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Categories/ { s/Application;//; s/$/GTK;/ }' \
-		ccgo.desktop.in || die
-	sed -i \
-		-e '/^localedir/s/=.*/=@localedir@/' \
-		-e '/^appicondir/s:=.*:=/usr/share/pixmaps:' \
-		-e '/^desktopdir/s:=.*:=/usr/share/applications:' \
-		Makefile.am || die
-	# cargo cult from bug #569528
-	append-cxxflags -std=c++11 -fpermissive
-	find . -name '*.hh' -exec sed -i -e '/sigc++\/object.h/d' {} +
-	find . -name '*.cc' -exec sed -i -e 's/(bind(/(sigc::bind(/' {} +
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--localedir=/usr/share/locale \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-board/ccgo/ccgo-0.3.6.5.ebuild b/games-board/ccgo/ccgo-0.3.6.5.ebuild
index 02123b3e5358..2476edc294b1 100644
--- a/games-board/ccgo/ccgo-0.3.6.5.ebuild
+++ b/games-board/ccgo/ccgo-0.3.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-cpp/gtkmm-2.4:2.4
diff --git a/games-board/ccgo/files/ccgo-0.3.6.4-gcc4.patch b/games-board/ccgo/files/ccgo-0.3.6.4-gcc4.patch
deleted file mode 100644
index f7a049df768e..000000000000
--- a/games-board/ccgo/files/ccgo-0.3.6.4-gcc4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/board.cc.orig
-+++ gtk/board.cc
-@@ -20,9 +20,7 @@
-  */
- 
- #include <config.hh>
--extern "C" {
- #include <gettext.h>
--}
- #define _(String) Glib::locale_to_utf8(gettext(String))
- 
- #include <board.hh>
diff --git a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
index 115c3c7ee445..6ca9645387b9 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.18.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.18.0.ebuild b/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
index 3a207474dbc0..23e686927558 100644
--- a/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.18.0.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.18.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
index 83764b827d69..f297072c2ddc 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.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.18.2.ebuild b/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
index adab7c3da0a2..147a54be19fc 100644
--- a/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.18.2.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/gtkatlantic/gtkatlantic-0.6.1.ebuild b/games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild
index 89f73138d187..614c78875aca 100644
--- a/games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild
+++ b/games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:3
diff --git a/games-board/iagno/iagno-3.18.2.ebuild b/games-board/iagno/iagno-3.18.2.ebuild
index df514b4bedf6..bc814400a87c 100644
--- a/games-board/iagno/iagno-3.18.2.ebuild
+++ b/games-board/iagno/iagno-3.18.2.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/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild
index 977229daf5b5..357ab9dd6e17 100644
--- a/games-board/pokerth/pokerth-1.1.1-r1.ebuild
+++ b/games-board/pokerth/pokerth-1.1.1-r1.ebuild
@@ -23,13 +23,13 @@ RDEPEND="dev-db/sqlite:3
 	>=net-libs/libircclient-1.6-r2
 	>=net-misc/curl-7.16
 	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
 	virtual/gsasl
 	!dedicated? (
 		media-libs/libsdl:0
 		media-libs/sdl-mixer[mod,vorbis]
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
-		dev-qt/qtnetwork:5
 	)"
 DEPEND="${RDEPEND}
 	!dedicated? ( dev-qt/qtsql:5 )
diff --git a/games-board/tali/tali-3.18.0.ebuild b/games-board/tali/tali-3.18.0.ebuild
index a506ced19196..8b9394f02f67 100644
--- a/games-board/tali/tali-3.18.0.ebuild
+++ b/games-board/tali/tali-3.18.0.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/fceux/fceux-2.2.2-r1.ebuild b/games-emulation/fceux/fceux-2.2.2-r1.ebuild
index 30c9e82db0a1..432e19d926b9 100644
--- a/games-emulation/fceux/fceux-2.2.2-r1.ebuild
+++ b/games-emulation/fceux/fceux-2.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk logo +lua +opengl"
 
 DEPEND="lua? ( dev-lang/lua:0 )
diff --git a/games-emulation/fceux/fceux-2.2.2.ebuild b/games-emulation/fceux/fceux-2.2.2.ebuild
deleted file mode 100644
index 0a3cbb5cd715..000000000000
--- a/games-emulation/fceux/fceux-2.2.2.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 eutils scons-utils games
-
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="http://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk +lua +opengl"
-
-DEPEND="lua? ( dev-lang/lua:0 )
-	media-libs/libsdl[opengl?,video]
-	opengl? ( virtual/opengl )
-	gtk? ( x11-libs/gtk+:3 )
-	sys-libs/zlib[minizip]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-warnings.patch
-}
-
-src_compile() {
-	escons \
-		GTK=0 \
-		CREATE_AVI=1 \
-		SYSTEM_LUA=1 \
-		SYSTEM_MINIZIP=1 \
-		$(use_scons gtk GTK3) \
-		$(use_scons opengl OPENGL) \
-		$(use_scons lua LUA)
-}
-
-src_install() {
-	dogamesbin bin/fceux
-
-	doman documentation/fceux.6
-	docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm
-	dodoc -r Authors changelog.txt TODO-SDL bin/fceux.chm documentation
-	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
-	make_desktop_entry fceux FCEUX
-	doicon fceux.png
-	prepgamesdirs
-}
diff --git a/games-emulation/lxdream/lxdream-0.9.1-r2.ebuild b/games-emulation/lxdream/lxdream-0.9.1-r2.ebuild
index 4147ddf51d7c..3b7b703d5eb4 100644
--- a/games-emulation/lxdream/lxdream-0.9.1-r2.ebuild
+++ b/games-emulation/lxdream/lxdream-0.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
-inherit eutils games
+EAPI=5
+inherit eutils flag-o-matic games
 
 DESCRIPTION="An emulator for the Sega Dreamcast system"
 HOMEPAGE="http://www.lxdream.org/"
@@ -16,7 +16,7 @@ IUSE="debug lirc profile pulseaudio sdl"
 
 RDEPEND="lirc? ( app-misc/lirc )
 	media-libs/alsa-lib
-	media-libs/libpng
+	media-libs/libpng:0
 	pulseaudio? ( media-sound/pulseaudio )
 	sdl? ( media-libs/libsdl[sound] )
 	virtual/opengl
@@ -35,13 +35,14 @@ src_prepare() {
 		-e '/Encoding/d' \
 		-e '/FilePattern/d' \
 		-e '/Categories/s|$|;|' \
-		${PN}.desktop || die "sed failed"
+		${PN}.desktop || die
 	# Do not override user-specified CFLAGS
 	sed -i \
 		-e s/'CFLAGS=\"-g -fexceptions\"'/'CFLAGS=\"${CFLAGS} -g -fexceptions\"'/ \
 		-e '/CCOPT/d' \
 		-e '/OBJCOPT/d' \
-		configure || die "sed failed"
+		configure || die
+	append-libs -lX11 -lm
 }
 
 src_configure() {
@@ -57,7 +58,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog NEWS README
+	default
 	prepgamesdirs
 }
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index dd9924b71846..c90f08f5f611 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,2 +1 @@
-DIST mednafen-0.9.38.4.tar.bz2 3820560 SHA256 3298e2d5c03efbe638c2a98bf74435e306768461c65d2bb9b9a95e99dc463105 SHA512 3eb19a10e97cd285387fcf86eae09f550d248ab9c070750b1c0af0f334cce47ea375227df72cf7cdbc2193b311bab5e09108388a15634f694ef398b1a77ac3df WHIRLPOOL 17ae061668052fa33ce08b56d1aac75935bb91d02961d3dad042c07537ef15aa4374730652508941408764e7deb7cfe0969f80f32e6d642d20a32ac053bba491
 DIST mednafen-0.9.38.7.tar.bz2 3882418 SHA256 1bb3beef883a325c35d1a1ce14959c307a4c321f2ea29d4ddb216c6dd03aded8 SHA512 759c83928ef7a9e856dc7f546542ab1e7cbe944d0184a7693ce3b1466220233eb40c2b215100920920754eb5a93587bd8e2d8150e00ec9c93da1d518107e0d76 WHIRLPOOL 0cb94abdaa697558f3575c8e4d6e0a816888ace2b860797a8a947ddca3ae66e517dd044f9ce266e7a19ac6e16a56f91bc93db2bbc7a9817e5afcc75a93cb2f42
diff --git a/games-emulation/mednafen/files/mednafen-0.9.38.4-automake-1.13.patch b/games-emulation/mednafen/files/mednafen-0.9.38.4-automake-1.13.patch
deleted file mode 100644
index 14c69d94ef0e..000000000000
--- a/games-emulation/mednafen/files/mednafen-0.9.38.4-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mednafen-0.9.28-wip/mednafen/configure.ac
-+++ mednafen-0.9.28-wip/mednafen/configure.ac
-@@ -13,7 +13,7 @@
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE([mednafen], $MEDNAFEN_VERSION)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
--AM_CONFIG_HEADER([include/config.h:include/config.h.in])
-+AC_CONFIG_HEADERS([include/config.h:include/config.h.in])
- 
- AC_PROG_CC
- AC_PROG_CPP
diff --git a/games-emulation/mednafen/files/mednafen-0.9.38.4-cflags.patch b/games-emulation/mednafen/files/mednafen-0.9.38.4-cflags.patch
deleted file mode 100644
index c43af818b6b8..000000000000
--- a/games-emulation/mednafen/files/mednafen-0.9.38.4-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -80,25 +80,6 @@
- AC_CHECK_LIB([z], [zlibVersion],[], AC_MSG_ERROR([*** zlib not found!]))
- LIBS="$LIBS -lz"
- 
--OPTIMIZER_FLAGS=""
--
--dnl -ffast-math removed January 12, 2013.  Don't re-add it, nor any of its sub-options(ESPECIALLY not -funsafe-math-optimizations),
--dnl it messes up certain code(NES resampler, for example) under certain conditions and alignments of the great celestial squid.
--dnl
--dnl In fact, let's explicitly disable it here with -fno-fast-math.
--dnl
--dnl -fomit-frame-pointer is required for some x86 inline assembly to compile.
--dnl
--dnl November 28, 2014: Use -fwrapv unconditionally instead of -fno-strict-overflow, -fno-strict-overflow is buggy
--dnl and does not work as documented/implied.
--dnl
--AX_CFLAGS_GCC_OPTION([-fno-fast-math], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([-fno-unsafe-math-optimizations], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([-fno-aggressive-loop-optimizations], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([-fomit-frame-pointer], OPTIMIZER_FLAGS)
--AX_CFLAGS_GCC_OPTION([-fwrapv], OPTIMIZER_FLAGS)
--
--
- WARNING_FLAGS=""
- AX_CFLAGS_GCC_OPTION([-Wall], WARNING_FLAGS)
- AX_CFLAGS_GCC_OPTION([-Wshadow], WARNING_FLAGS)
diff --git a/games-emulation/mednafen/files/mednafen-0.9.38.4-zlib.patch b/games-emulation/mednafen/files/mednafen-0.9.38.4-zlib.patch
deleted file mode 100644
index 5d930dae1b2c..000000000000
--- a/games-emulation/mednafen/files/mednafen-0.9.38.4-zlib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- mednafen.orig/src/compress/Makefile.am.inc
-+++ mednafen/src/compress/Makefile.am.inc
-@@ -1 +1 @@
--mednafen_SOURCES	+=	compress/minilzo.c compress/ioapi.c compress/unzip.c compress/GZFileStream.cpp compress/ZLInflateFilter.cpp
-+mednafen_SOURCES	+=	compress/minilzo.c compress/ioapi.c compress/GZFileStream.cpp compress/ZLInflateFilter.cpp
---- mednafen.orig/src/file.cpp
-+++ mednafen/src/file.cpp
-@@ -29,7 +29,7 @@
- #include <errno.h>
- #include <trio/trio.h>
- 
--#include "compress/unzip.h"
-+#include <minizip/unzip.h>
- 
- #include "file.h"
- #include "general.h"
---- mednafen.orig/src/Makefile.am
-+++ mednafen/src/Makefile.am
-@@ -6,7 +6,7 @@
- bin_PROGRAMS	=	mednafen
- 
- mednafen_SOURCES 	= 	debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp mednafen.cpp git.cpp file.cpp general.cpp memory.cpp netplay.cpp state.cpp state_rewind.cpp movie.cpp player.cpp PSFLoader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.cpp IPSPatcher.cpp
--mednafen_LDADD 		= 	trio/libtrio.a
-+mednafen_LDADD 		= 	trio/libtrio.a -lminizip
- mednafen_DEPENDENCIES	=	trio/libtrio.a
- 
- if HAVE_SDL
diff --git a/games-emulation/mednafen/mednafen-0.9.38.4.ebuild b/games-emulation/mednafen/mednafen-0.9.38.4.ebuild
deleted file mode 100644
index 077a4b3af8cc..000000000000
--- a/games-emulation/mednafen/mednafen-0.9.38.4.ebuild
+++ /dev/null
@@ -1,72 +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 pax-utils games
-
-DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator"
-HOMEPAGE="http://mednafen.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mednafen/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa altivec cjk debugger jack nls pax_kernel"
-
-RDEPEND="virtual/opengl
-	media-libs/libsndfile
-	dev-libs/libcdio
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-net
-	sys-libs/zlib[minizip]
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-pkg_pretend() {
-	if has ccache ${FEATURES} ; then
-		ewarn
-		ewarn "If you experience build failure, try turning off ccache in FEATURES."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:$(datadir)/locale:/usr/share/locale:' \
-		$(find . -name Makefile.am) \
-		intl/Makefile.in || die
-	epatch \
-		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-automake-1.13.patch
-	eautoreconf
-}
-
-src_configure() {
-	# very sensitive code (bug #539992)
-	strip-flags
-	append-flags -fomit-frame-pointer -fwrapv
-	egamesconf \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable cjk cjk-fonts) \
-		$(use_enable debugger) \
-		$(use_enable jack) \
-		$(use_enable nls)
-}
-
-src_install() {
-	DOCS="Documentation/cheats.txt ChangeLog TODO" \
-		default
-	if use pax_kernel; then
-		pax-mark m "${D}${GAMES_BINDIR}"/mednafen || die
-	fi
-	prepgamesdirs
-}
diff --git a/games-emulation/mednafen/mednafen-0.9.38.7.ebuild b/games-emulation/mednafen/mednafen-0.9.38.7.ebuild
index 0c898195d73b..bc66552b9289 100644
--- a/games-emulation/mednafen/mednafen-0.9.38.7.ebuild
+++ b/games-emulation/mednafen/mednafen-0.9.38.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mednafen.fobby.net/releases/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa altivec cjk debugger jack nls pax_kernel"
 
 RDEPEND="virtual/opengl
diff --git a/games-emulation/mednaffe/mednaffe-0.8.ebuild b/games-emulation/mednaffe/mednaffe-0.8.ebuild
index ee89770ab016..8014e09a28ba 100644
--- a/games-emulation/mednaffe/mednaffe-0.8.ebuild
+++ b/games-emulation/mednaffe/mednaffe-0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AmatCoder/mednaffe/archive/v$PV.zip -> ${P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
deleted file mode 100644
index c9e755ddba67..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/linux_x86.sh.orig	2016-01-04 21:44:11.540084990 +0800
-+++ ffmpeg/linux_x86.sh	2016-01-04 21:44:56.560085770 +0800
-@@ -72,7 +72,7 @@
- ./configure \
-     --prefix=./linux/${ARCH} \
-     ${GENERAL} \
--    --extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
-+    --extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
-     --enable-zlib \
- 	--disable-yasm \
-     --disable-everything \
diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
deleted file mode 100644
index 45bd877919a6..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/linux_x86-64.sh.orig	2016-01-04 21:42:14.220082959 +0800
-+++ ffmpeg/linux_x86-64.sh	2016-01-04 21:42:31.940083265 +0800
-@@ -71,7 +71,7 @@
- ./configure \
-     --prefix=./linux/${ARCH} \
-     ${GENERAL} \
--    --extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
-+    --extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
-     --enable-zlib \
-     --enable-pic \
- 	--disable-yasm \
diff --git a/games-emulation/ppsspp/files/ppsspp-qt.patch b/games-emulation/ppsspp/files/ppsspp-qt.patch
deleted file mode 100644
index e372f15df813..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-qt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Qt/Settings.pri.orig	2016-01-04 21:37:36.600078151 +0800
-+++ Qt/Settings.pri	2016-01-04 21:37:57.430078511 +0800
-@@ -64,7 +64,7 @@
- 	else: QMAKE_CXXFLAGS += -std=c++11
- 	QMAKE_CFLAGS_RELEASE ~= s/-O.*/
- 	QMAKE_CXXFLAGS_RELEASE ~= s/-O.*/
--	QMAKE_ALLFLAGS_RELEASE += -O3 -ffast-math
-+	QMAKE_ALLFLAGS_RELEASE += -O2 -ffast-math
- }
- 
- contains(QT_CONFIG, opengles.) {
diff --git a/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
deleted file mode 100644
index 4d8db28fecf2..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils qt4-r2 git-r3
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="http://www.ppsspp.org/"
-EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
-EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5 +sdl"
-REQUIRED_USE="
-	?? ( qt4 qt5 sdl )
-"
-
-RDEPEND=""
-
-DEPEND="
-	sys-libs/zlib
-	sdl? (
-		dev-util/cmake
-		media-libs/libsdl
-		media-libs/libsdl2
-	)
-	qt4? (
-		dev-qt/qtsvg:4
-		dev-qt/qtgui:4
-		dev-qt/qtcore:4
-		dev-qt/qtopengl:4
-		dev-qt/qtmultimedia:4
-		dev-qt/qt-mobility[multimedia]
-	)
-	qt5? (
-		dev-qt/qtsvg:5
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtopengl:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		dev-qt/qt-mobility[multimedia]
-	)
-"
-
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_unpack
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Bug 574000
-	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-
-	epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
-	epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
-	epatch "$FILESDIR"/ppsspp-qt.patch
-
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_prepare
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_prepare
-	else
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_configure
-		eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_configure
-		eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
-	else
-		cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_compile
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_compile
-	else
-		cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	if use qt4 ; then
-		exeinto /usr/games/bin
-		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
-	elif use qt5 ; then
-		exeinto /usr/games/bin
-		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
-	else
-		exeinto /usr/games
-		dobin "${FILESDIR}"/ppsspp
-		exeinto /usr/share/games/"${PN}"
-		doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL
-		insinto /usr/share/games/"${PN}"
-		doins -r "${WORKDIR}"/"${P}"_build/assets
-		doins -r "${WORKDIR}"/"${P}"/lang
-	fi
-	insinto /usr/share/icons/
-	newins "${WORKDIR}"/"${P}"/source_assets/image/icon_regular_72.png ppsspp-icon.png
-	domenu "${FILESDIR}"/ppsspp.desktop
-}
-
-pkg_postinst() {
-	elog "Remember, in order to play games, you have to "
-	elog "be in the 'games' group. "
-	elog "Just run 'gpasswd -a <USER> games', then have <USER> re-login. "
-}
diff --git a/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild
deleted file mode 100644
index 4d8db28fecf2..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils qt4-r2 git-r3
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="http://www.ppsspp.org/"
-EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
-EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5 +sdl"
-REQUIRED_USE="
-	?? ( qt4 qt5 sdl )
-"
-
-RDEPEND=""
-
-DEPEND="
-	sys-libs/zlib
-	sdl? (
-		dev-util/cmake
-		media-libs/libsdl
-		media-libs/libsdl2
-	)
-	qt4? (
-		dev-qt/qtsvg:4
-		dev-qt/qtgui:4
-		dev-qt/qtcore:4
-		dev-qt/qtopengl:4
-		dev-qt/qtmultimedia:4
-		dev-qt/qt-mobility[multimedia]
-	)
-	qt5? (
-		dev-qt/qtsvg:5
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtopengl:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		dev-qt/qt-mobility[multimedia]
-	)
-"
-
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_unpack
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Bug 574000
-	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-
-	epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
-	epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
-	epatch "$FILESDIR"/ppsspp-qt.patch
-
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_prepare
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_prepare
-	else
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_configure
-		eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_configure
-		eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
-	else
-		cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_compile
-	elif use qt5 ; then
-		cd "${WORKDIR}"/"${P}"/Qt || die
-		qt4-r2_src_compile
-	else
-		cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	if use qt4 ; then
-		exeinto /usr/games/bin
-		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
-	elif use qt5 ; then
-		exeinto /usr/games/bin
-		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
-	else
-		exeinto /usr/games
-		dobin "${FILESDIR}"/ppsspp
-		exeinto /usr/share/games/"${PN}"
-		doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL
-		insinto /usr/share/games/"${PN}"
-		doins -r "${WORKDIR}"/"${P}"_build/assets
-		doins -r "${WORKDIR}"/"${P}"/lang
-	fi
-	insinto /usr/share/icons/
-	newins "${WORKDIR}"/"${P}"/source_assets/image/icon_regular_72.png ppsspp-icon.png
-	domenu "${FILESDIR}"/ppsspp.desktop
-}
-
-pkg_postinst() {
-	elog "Remember, in order to play games, you have to "
-	elog "be in the 'games' group. "
-	elog "Just run 'gpasswd -a <USER> games', then have <USER> re-login. "
-}
diff --git a/games-emulation/ppsspp/ppsspp-1.2.1.ebuild b/games-emulation/ppsspp/ppsspp-1.2.1.ebuild
new file mode 100644
index 000000000000..6d080208e6ec
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.2.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils qt4-r2 git-r3
+
+DESCRIPTION="A PSP emulator written in C++."
+HOMEPAGE="http://www.ppsspp.org/"
+EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
+EGIT_COMMIT="v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4 qt5 +sdl"
+REQUIRED_USE="
+	?? ( qt4 qt5 sdl )
+"
+
+RDEPEND=""
+
+DEPEND="
+	sys-libs/zlib
+	sdl? (
+		dev-util/cmake
+		media-libs/libsdl
+		media-libs/libsdl2
+	)
+	qt4? (
+		dev-qt/qtsvg:4
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		dev-qt/qtopengl:4
+		dev-qt/qtmultimedia:4
+		dev-qt/qt-mobility[multimedia]
+	)
+	qt5? (
+		dev-qt/qtsvg:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtwidgets:5
+		dev-qt/qt-mobility[multimedia]
+	)
+"
+
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout
+	if use qt4 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_unpack
+	elif use qt5 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_unpack
+	fi
+}
+
+src_prepare() {
+	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
+	sed -i -e "s#-O3#-O2#g;" "${S}"/Qt/Settings.pri || die
+	sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
+
+	if use qt4 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_prepare
+	elif use qt5 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_prepare
+	else
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	if use qt4 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_configure
+		eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
+	elif use qt5 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_configure
+		eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
+	else
+		cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	if use qt4 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_compile
+	elif use qt5 ; then
+		cd "${WORKDIR}"/"${P}"/Qt || die
+		qt4-r2_src_compile
+	else
+		cmake-utils_src_compile
+	fi
+}
+
+src_install() {
+	if use qt4 ; then
+		exeinto /usr/games/bin
+		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
+	elif use qt5 ; then
+		exeinto /usr/games/bin
+		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
+	else
+		exeinto /usr/games
+		dobin "${FILESDIR}"/ppsspp
+		exeinto /usr/share/games/"${PN}"
+		doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL
+		insinto /usr/share/games/"${PN}"
+		doins -r "${WORKDIR}"/"${P}"_build/assets
+		doins -r "${WORKDIR}"/"${P}"/lang
+	fi
+	insinto /usr/share/icons/
+	newins "${WORKDIR}"/"${P}"/source_assets/image/icon_regular_72.png ppsspp-icon.png
+	domenu "${FILESDIR}"/ppsspp.desktop
+}
+
+pkg_postinst() {
+	elog "Remember, in order to play games, you have to "
+	elog "be in the 'games' group. "
+	elog "Just run 'gpasswd -a <USER> games', then have <USER> re-login. "
+}
diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
index a3d3bccdde5d..64e75baaa156 100644
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ b/games-emulation/ppsspp/ppsspp-9999.ebuild
@@ -59,12 +59,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Bug 574000
 	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-
-	epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
-	epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
-	epatch "$FILESDIR"/ppsspp-qt.patch
+	sed -i -e "s#-O3#-O2#g;" "${S}"/Qt/Settings.pri || die
+	sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
 
 	if use qt4 ; then
 		cd "${WORKDIR}"/"${P}"/Qt || die
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 80dcd9532468..27c42ad74732 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,5 +1 @@
 DIST mame-0.168.zip 82770536 SHA256 f91e014c3d3bf3da790284a25437f231a84228a6adbf42db35ca34a57f8a3092 SHA512 14b0519682f8aeb2379cd29b9e0ad8f3c54866296ac158876435425b79c3bf19a2dc520df7a44fe301a8e8cbbc335185602f4998edf6e95324f527c50c72411e WHIRLPOOL 41ddbe191423e3653a52f7734cc85088f1c663fd9aefdbd00ceefbe86f27bde190d14505be7fa69f76c7a39c6bbb5ab196685c2e001c8517cb90f4f7f27e8a51
-DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a
-DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5
-DIST sdlmame-ui.bdf.gz 114727 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e SHA512 67ba1bc632c1ac51b97acf8c1061477edd3519fea3d1233951723741c926ff72e259c274babb036abf4db92f217db507c58a6fc6e438db4b14c5fe5789b2ed64 WHIRLPOOL 2150053b38d8318804bf40cdcd9cdefdd2976c4cfab563c90021f0d9be0a0a57174166ece8b51658d9f2192e07343f198358299667a1db32f146c9fb9c528956
-DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531
diff --git a/games-emulation/sdlmame/files/mame-0.139.ini.in b/games-emulation/sdlmame/files/mame-0.139.ini.in
deleted file mode 100644
index 7b69f182a356..000000000000
--- a/games-emulation/sdlmame/files/mame-0.139.ini.in
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# CORE CONFIGURATION OPTIONS
-#
-readconfig                1
-writeconfig               0
-
-#
-# CORE SEARCH PATH OPTIONS
-#
-rompath                   $HOME/.sdlmame/roms;@GAMES_DATADIR@/sdlmame/roms
-samplepath                $HOME/.sdlmame/samples;@GAMES_DATADIR@/sdlmame/samples
-artpath                   $HOME/.sdlmame/artwork;@GAMES_DATADIR@/sdlmame/artwork
-ctrlrpath                 $HOME/.sdlmame/ctrlr;@GAMES_SYSCONFDIR@/sdlmame/ctrlr;@GAMES_DATADIR@/sdlmame/ctrlr
-inipath                   $HOME/.sdlmame;@GAMES_SYSCONFDIR@/sdlmame
-fontpath                  $HOME/.sdlmame;@GAMES_DATADIR@/sdlmame
-cheatpath                 $HOME/.sdlmame/cheats;@GAMES_SYSCONFDIR@/sdlmame/cheats;@GAMES_DATADIR@/sdlmame/cheats
-crosshairpath             $HOME/.sdlmame/crosshair;@GAMES_DATADIR@/sdlmame/crosshair
-
-#
-# CORE OUTPUT DIRECTORY OPTIONS
-#
-cfg_directory             $HOME/.sdlmame/cfg
-nvram_directory           $HOME/.sdlmame/nvram
-memcard_directory         $HOME/.sdlmame/memcard
-input_directory           $HOME/.sdlmame/inp
-state_directory           $HOME/.sdlmame/sta
-snapshot_directory        $HOME/.sdlmame/snap
-diff_directory            $HOME/.sdlmame/diff
-comment_directory         $HOME/.sdlmame/comments
-
-#
-# CORE STATE/PLAYBACK OPTIONS
-#
-state                     
-autosave                  0
-playback                  
-record                    
-mngwrite                  
-aviwrite                  
-wavwrite                  
-snapname                  %g/%i
-snapsize                  auto
-snapview                  internal
-burnin                    0
-
-#
-# CORE PERFORMANCE OPTIONS
-#
-autoframeskip             0
-frameskip                 0
-seconds_to_run            0
-throttle                  1
-sleep                     1
-speed                     1.0
-refreshspeed              0
-
-#
-# CORE ROTATION OPTIONS
-#
-rotate                    1
-ror                       0
-rol                       0
-autoror                   0
-autorol                   0
-flipx                     0
-flipy                     0
-
-#
-# CORE ARTWORK OPTIONS
-#
-artwork_crop              0
-use_backdrops             1
-use_overlays              1
-use_bezels                1
-
-#
-# CORE SCREEN OPTIONS
-#
-brightness                1.0
-contrast                  1.0
-gamma                     1.0
-pause_brightness          0.65
-
-#
-# CORE VECTOR OPTIONS
-#
-antialias                 1
-beam                      1.0
-flicker                   0
-
-#
-# CORE SOUND OPTIONS
-#
-sound                     1
-samplerate                48000
-samples                   1
-volume                    0
-
-#
-# CORE INPUT OPTIONS
-#
-coin_lockout              1
-ctrlr                     
-mouse                     0
-joystick                  1
-lightgun                  0
-multikeyboard             0
-multimouse                0
-steadykey                 0
-offscreen_reload          0
-joystick_map              auto
-joystick_deadzone         0.3
-joystick_saturation       0.85
-natural                   0
-uimodekey                 auto
-
-#
-# CORE INPUT AUTOMATIC ENABLE OPTIONS
-#
-paddle_device             keyboard
-adstick_device            keyboard
-pedal_device              keyboard
-dial_device               keyboard
-trackball_device          keyboard
-lightgun_device           keyboard
-positional_device         keyboard
-mouse_device              mouse
-
-#
-# CORE DEBUGGING OPTIONS
-#
-log                       0
-verbose                   0
-update_in_pause           0
-debug                     0
-debugscript               
-debug_internal            0
-
-#
-# CORE MISC OPTIONS
-#
-bios                      
-cheat                     0
-skip_gameinfo             0
-
-#
-# DEBUGGING OPTIONS
-#
-oslog                     0
-
-#
-# PERFORMANCE OPTIONS
-#
-multithreading            0
-numprocessors             auto
-sdlvideofps               0
-
-#
-# VIDEO OPTIONS
-#
-video                     soft
-numscreens                1
-window                    0
-maximize                  1
-keepaspect                1
-unevenstretch             1
-effect                    none
-centerh                   1
-centerv                   1
-waitvsync                 0
-scalemode                 none
-
-#
-# OpenGL-SPECIFIC OPTIONS
-#
-filter                    1
-prescale                  1
-gl_forcepow2texture       0
-gl_notexturerect          0
-gl_vbo                    1
-gl_pbo                    1
-gl_glsl                   0
-gl_glsl_filter            1
-glsl_shader_mame0         none
-glsl_shader_mame1         none
-glsl_shader_mame2         none
-glsl_shader_mame3         none
-glsl_shader_mame4         none
-glsl_shader_mame5         none
-glsl_shader_mame6         none
-glsl_shader_mame7         none
-glsl_shader_mame8         none
-glsl_shader_mame9         none
-glsl_shader_screen0       none
-glsl_shader_screen1       none
-glsl_shader_screen2       none
-glsl_shader_screen3       none
-glsl_shader_screen4       none
-glsl_shader_screen5       none
-glsl_shader_screen6       none
-glsl_shader_screen7       none
-glsl_shader_screen8       none
-glsl_shader_screen9       none
-gl_glsl_vid_attr          1
-
-#
-# PER-WINDOW VIDEO OPTIONS
-#
-screen                    auto
-aspect                    auto
-resolution                auto
-view                      auto
-screen0                   auto
-aspect0                   auto
-resolution0               auto
-view0                     auto
-screen1                   auto
-aspect1                   auto
-resolution1               auto
-view1                     auto
-screen2                   auto
-aspect2                   auto
-resolution2               auto
-view2                     auto
-screen3                   auto
-aspect3                   auto
-resolution3               auto
-view3                     auto
-
-#
-# FULL SCREEN OPTIONS
-#
-switchres                 0
-useallheads               0
-
-#
-# SOUND OPTIONS
-#
-audio_latency             3
-
-#
-# SDL KEYBOARD MAPPING
-#
-keymap                    0
-keymap_file               $HOME/.sdlmame/keymap.dat
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-be.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-ch.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-de.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-fr.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km_it.txt
-
-#
-# SDL JOYSTICK MAPPING
-#
-joy_idx1                  auto
-joy_idx2                  auto
-joy_idx3                  auto
-joy_idx4                  auto
-joy_idx5                  auto
-joy_idx6                  auto
-joy_idx7                  auto
-joy_idx8                  auto
-sixaxis                   0
-
-#
-# SDL LOWLEVEL DRIVER OPTIONS
-#
-videodriver               auto
-audiodriver               auto
-gl_lib                    auto
diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
deleted file mode 100644
index f69cfe437441..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- work.orig/makefile	2011-11-09 22:40:30.000000000 -0500
-+++ work/makefile	2011-11-16 19:24:24.615419949 -0500
-@@ -435,9 +435,6 @@
- CPPONLYFLAGS += -x c++ -std=gnu++98

- COBJFLAGS += -x objective-c++

- 

--# this speeds it up a bit by piping between the preprocessor/compiler/assembler

--CCOMFLAGS += -pipe

--

- # add -g if we need symbols, and ensure we have frame pointers

- ifdef SYMBOLS

- CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer

-@@ -442,7 +442,6 @@
- 

- # add -v if we need verbose build information

- ifdef VERBOSE

--CCOMFLAGS += -v

- endif

- 

- # add profiling information for the compiler

-@@ -453,23 +450,6 @@
- CCOMFLAGS += -pg

- endif

- 

--# add the optimization flag

--CCOMFLAGS += -O$(OPTIMIZE)

--

--# if we are optimizing, include optimization options

--# and make all errors into warnings

--ifneq ($(OPTIMIZE),0)

--ifneq ($(TARGETOS),os2)

--ifndef NOWERROR

--CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)

--else

--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)

--endif

--else

--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)

--endif

--endif

--

- # add a basic set of warnings

- CCOMFLAGS += \

- 	-Wall \

-@@ -524,20 +504,6 @@
- endif

- 

- 

--#-------------------------------------------------

--# linking flags

--#-------------------------------------------------

--

--# LDFLAGS are used generally; LDFLAGSEMULATOR are additional

--# flags only used when linking the core emulator

--LDFLAGS =

--ifneq ($(TARGETOS),macosx)

--ifneq ($(TARGETOS),os2)

--ifneq ($(TARGETOS),solaris)

--LDFLAGS = -Wl,--warn-common

--endif

--endif

--endif

- LDFLAGSEMULATOR =

- 

- # add profiling information for the linker

-@@ -545,13 +511,6 @@
- LDFLAGS += -pg

- endif

- 

--# strip symbols and other metadata in non-symbols and non profiling builds

--ifndef SYMBOLS

--ifneq ($(TARGETOS),macosx)

--LDFLAGS += -s

--endif

--endif

--

- # output a map file (emulator only)

- ifdef MAP

- LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map

diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
deleted file mode 100644
index 87eeae5b50c7..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/osd/sdl/osdsdl.h.orig
-+++ ./src/osd/sdl/osdsdl.h
-@@ -225,6 +225,8 @@
- 	const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
- #if USE_OPENGL
- 	const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
-+#else
-+	const char *gl_lib() const { return NULL; }
- #endif
- 
- private:
diff --git a/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch
deleted file mode 100644
index 7ba59692f2e3..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch
+++ /dev/null
@@ -1,177 +0,0 @@
---- makefile
-+++ makefile
-@@ -314,13 +314,14 @@
- endif
- 
- # compiler, linker and utilities
--AR = @ar
--CC = @gcc
--LD = @g++
-+AR ?= @ar
-+CC ?= @gcc
-+CXX ?= @g++
-+LD = $(CXX)
- MD = -mkdir$(EXE)
- RM = @rm -f
- OBJDUMP = @objdump
--PYTHON = @python
-+PYTHON ?= @python
- 
- 
- #-------------------------------------------------
-@@ -455,7 +456,7 @@
- 
- # CFLAGS is defined based on C or C++ targets
- # (remember, expansion only happens when used, so doing it here is ok)
--CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
-+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
- 
- # we compile C-only to C89 standard with GNU extensions
- # we compile C++ code to C++98 standard with GNU extensions
-@@ -463,9 +464,6 @@
- CPPONLYFLAGS += -x c++ -std=gnu++98
- COBJFLAGS += -x objective-c++
- 
--# this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CCOMFLAGS += -pipe
--
- # add -g if we need symbols, and ensure we have frame pointers
- ifdef SYMBOLS
- CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
-@@ -479,19 +477,6 @@
- # add profiling information for the compiler
- ifdef PROFILE
- CCOMFLAGS += -pg
--endif
--
--# add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
--
--# add the error warning flag
--ifndef NOWERROR
--CCOMFLAGS += -Werror
--endif
--
--# if we are optimizing, include optimization options
--ifneq ($(OPTIMIZE),0)
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
- endif
- 
- # add a basic set of warnings
-@@ -565,26 +550,11 @@
- 
- # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
- # flags only used when linking the core emulator
--LDFLAGS =
--ifneq ($(TARGETOS),macosx)
--ifneq ($(TARGETOS),os2)
--ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
--endif
--endif
--endif
- LDFLAGSEMULATOR =
- 
- # add profiling information for the linker
- ifdef PROFILE
- LDFLAGS += -pg
--endif
--
--# strip symbols and other metadata in non-symbols and non profiling builds
--ifndef SYMBOLS
--ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
--endif
- endif
- 
- # output a map file (emulator only)
---- src/osd/sdl/sdl.mak
-+++ src/osd/sdl/sdl.mak
-@@ -24,6 +24,8 @@
- # uncomment and edit next line to specify a distribution
- # supported debian-stable, ubuntu-intrepid
- 
-+PKG_CONFIG ?= pkg-config
-+
- # DISTRO = debian-stable
- # DISTRO = ubuntu-intrepid
- # DISTRO = gcc44-generic
-@@ -91,9 +93,9 @@
- endif
- 
- ifdef SDL_INSTALL_ROOT
--SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
-+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
- else
--SDL_CONFIG = $(SDL_LIBVER)-config
-+SDL_CONFIG ?= $(SDL_LIBVER)-config
- endif
- 
- ifeq ($(SDL_LIBVER),sdl2)
-@@ -190,8 +192,8 @@
- SDL_NETWORK = taptun
- 
- ifndef NO_USE_MIDI
--INCPATH += `pkg-config --cflags alsa`
--LIBS += `pkg-config --libs alsa`
-+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
-+LIBS += $(shell $(PKG_CONFIG) --libs alsa)
- endif
- 
- endif
-@@ -476,10 +478,10 @@
- # Remove the "/SDL" component from the include path so that we can compile
- # files (header files are #include "SDL/something.h", so the extra "/SDL"
- # causes a significant problem)
--INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
-+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
- CCOMFLAGS += -DNO_SDL_GLEXT
- # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
--LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
-+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
- DEFS += -DMACOSX_USE_LIBSDL
- endif   # MACOSX_USE_LIBSDL
- 
-@@ -532,8 +534,8 @@
- endif
- endif
- 
--INCPATH += `pkg-config --cflags fontconfig`
--LIBS += `pkg-config --libs fontconfig`
-+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
-+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
- 
- ifeq ($(SDL_LIBVER),sdl2)
- LIBS += -lSDL2_ttf
-@@ -616,8 +618,8 @@
- 
- ifeq ($(BASE_TARGETOS),os2)
- 
--INCPATH += `sdl-config --cflags`
--LIBS += `sdl-config --libs`
-+INCPATH += $(shell $(SDL_CONFIG) --cflags)
-+LIBS += $(shell $(SDL_CONFIG) --libs)
- 
- endif # OS2
- 
-@@ -690,15 +692,15 @@
- 
- # the new debugger relies on GTK+ in addition to the base SDLMAME needs
- # Non-X11 builds can not use the debugger
--INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
--CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
--LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
-+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
-+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
-+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
- #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
- 
- # The newer debugger uses QT
- ifdef USE_QTDEBUG
--INCPATH += `pkg-config QtGui --cflags`
--LIBS += `pkg-config QtGui --libs`
-+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
-+LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
- endif
- 
- # some systems still put important things in a different prefix
diff --git a/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch
deleted file mode 100644
index 7b339ba71a59..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
---- a/src/osd/sdl/osdsdl.h	2012-07-11 20:49:55.070264487 +0200
-+++ b/src/osd/sdl/osdsdl.h	2012-07-11 20:51:45.976264395 +0200
-@@ -216,6 +216,8 @@
- 	const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
- #if USE_OPENGL
- 	const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
-+#else
-+    const char *gl_lib() const { return NULL; }
- #endif
- 
- private:
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch b/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch
deleted file mode 100644
index 97e4b8f41c10..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-commit 938cfdf1f01bcc9ac736249ee6458a774d560738
-Author: hasufell <hasufell@gentoo.org>
-Date:   Tue Jun 25 23:48:02 2013 +0200
-
-    QA: respect several environment variables
-    
-    such as CC,CFLAGS,PKG_CONFIG...
-
-diff --git a/makefile b/makefile
-index ad6ae2d..dd4598d 100644
---- a/makefile
-+++ b/makefile
-@@ -317,13 +317,15 @@ BUILD_EXE = $(EXE)
- endif
- 
- # compiler, linker and utilities
--AR = @ar
--CC = @gcc
--LD = @g++
-+AR ?= @ar
-+CC ?= @gcc
-+CXX ?= @g++
-+LD = $(CXX)
- MD = -mkdir$(EXE)
- RM = @rm -f
- OBJDUMP = @objdump
--PYTHON = @python
-+PYTHON ?= @python
-+PKG_CONFIG ?= pkg-config
- 
- 
- #-------------------------------------------------
-@@ -458,7 +460,7 @@ CPPONLYFLAGS =
- 
- # CFLAGS is defined based on C or C++ targets
- # (remember, expansion only happens when used, so doing it here is ok)
--CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
-+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
- 
- # we compile C-only to C89 standard with GNU extensions
- # we compile C++ code to C++98 standard with GNU extensions
-@@ -466,9 +468,6 @@ CONLYFLAGS += -std=gnu89
- CPPONLYFLAGS += -x c++ -std=gnu++98
- COBJFLAGS += -x objective-c++
- 
--# this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CCOMFLAGS += -pipe
--
- # add -g if we need symbols, and ensure we have frame pointers
- ifdef SYMBOLS
- CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
-@@ -484,19 +483,6 @@ ifdef PROFILE
- CCOMFLAGS += -pg
- endif
- 
--# add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
--
--# add the error warning flag
--ifndef NOWERROR
--CCOMFLAGS += -Werror
--endif
--
--# if we are optimizing, include optimization options
--ifneq ($(OPTIMIZE),0)
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
--endif
--
- # add a basic set of warnings
- CCOMFLAGS += \
- 	-Wall \
-@@ -576,14 +562,6 @@ endif
- 
- # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
- # flags only used when linking the core emulator
--LDFLAGS =
--ifneq ($(TARGETOS),macosx)
--ifneq ($(TARGETOS),os2)
--ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
--endif
--endif
--endif
- LDFLAGSEMULATOR =
- 
- # add profiling information for the linker
-@@ -591,13 +569,6 @@ ifdef PROFILE
- LDFLAGS += -pg
- endif
- 
--# strip symbols and other metadata in non-symbols and non profiling builds
--ifndef SYMBOLS
--ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
--endif
--endif
--
- # output a map file (emulator only)
- ifdef MAP
- LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
-diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
-index 84332ef..36655d3 100644
---- a/src/osd/sdl/sdl.mak
-+++ b/src/osd/sdl/sdl.mak
-@@ -24,6 +24,8 @@
- # uncomment and edit next line to specify a distribution
- # supported debian-stable, ubuntu-intrepid
- 
-+PKG_CONFIG ?= pkg-config
-+
- # DISTRO = debian-stable
- # DISTRO = ubuntu-intrepid
- # DISTRO = gcc44-generic
-@@ -88,9 +90,9 @@ SDL_LIBVER = sdl
- endif
- 
- ifdef SDL_INSTALL_ROOT
--SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
-+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
- else
--SDL_CONFIG = $(SDL_LIBVER)-config
-+SDL_CONFIG ?= $(SDL_LIBVER)-config
- endif
- 
- ifeq ($(SDL_LIBVER),sdl2)
-@@ -187,8 +189,8 @@ SYNC_IMPLEMENTATION = tc
- SDL_NETWORK = taptun
- 
- ifndef NO_USE_MIDI
--INCPATH += `pkg-config --cflags alsa`
--LIBS += `pkg-config --libs alsa`
-+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
-+LIBS += $(shell $(PKG_CONFIG) --libs alsa)
- endif
- 
- endif
-@@ -478,10 +480,10 @@ else
- # Remove the "/SDL" component from the include path so that we can compile
- # files (header files are #include "SDL/something.h", so the extra "/SDL"
- # causes a significant problem)
--INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
-+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
- CCOMFLAGS += -DNO_SDL_GLEXT
- # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
--LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
-+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
- DEFS += -DMACOSX_USE_LIBSDL
- endif   # MACOSX_USE_LIBSDL
- 
-@@ -534,8 +536,8 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb
- endif
- endif
- 
--INCPATH += `pkg-config --cflags fontconfig`
--LIBS += `pkg-config --libs fontconfig`
-+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
-+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
- 
- ifeq ($(SDL_LIBVER),sdl2)
- LIBS += -lSDL2_ttf
-@@ -620,8 +622,8 @@ endif   # Win32
- 
- ifeq ($(BASE_TARGETOS),os2)
- 
--INCPATH += `sdl-config --cflags`
--LIBS += `sdl-config --libs`
-+INCPATH += $(shell $(SDL_CONFIG) --cflags)
-+LIBS += $(shell $(SDL_CONFIG) --libs)
- 
- endif # OS2
- 
-@@ -696,14 +698,14 @@ LIBS += -lX11 -lXinerama
- 
- # The newer debugger uses QT
- ifndef NO_USE_QTDEBUG
--INCPATH += `pkg-config QtGui --cflags`
--LIBS += `pkg-config QtGui --libs`
-+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
-+LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
- else
- # the old-new debugger relies on GTK+ in addition to the base SDLMAME needs
- # Non-X11 builds can not use the debugger
--INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
--CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
--LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
-+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
-+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
-+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
- endif
- 
- # some systems still put important things in a different prefix
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch b/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch
deleted file mode 100644
index 6c7cd5d64199..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit ec92ac2b0180b101c30748e62eb8b76cdf0cb439
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jun 26 14:33:01 2013 +0200
-
-    remove unneeded linking
-    
-    if we don't build the debugger, we don't want gtk+ linking
-
-diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
-index 36655d3..2089707 100644
---- a/src/osd/sdl/sdl.mak
-+++ b/src/osd/sdl/sdl.mak
-@@ -696,6 +696,7 @@ else
- DEFS += -DSDLMAME_X11
- LIBS += -lX11 -lXinerama
- 
-+ifneq ($(NO_DEBUGGER),1)
- # The newer debugger uses QT
- ifndef NO_USE_QTDEBUG
- INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
-@@ -707,6 +708,7 @@ INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
- CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
- LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
- endif
-+endif # NO_DEBUGGER
- 
- # some systems still put important things in a different prefix
- LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch
deleted file mode 100644
index cd32cd35d075..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6ee372b3693857372a7b4855039ad1a94d3aebca
-Author: hasufell <hasufell@gentoo.org>
-Date:   Tue Jun 25 23:51:12 2013 +0200
-
-    fix for disabled opengl
-
-diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
-index ed0b66b..03d68f9 100644
---- a/src/osd/sdl/osdsdl.h
-+++ b/src/osd/sdl/osdsdl.h
-@@ -219,6 +219,8 @@ public:
- 	const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
- #if USE_OPENGL
- 	const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
-+#else
-+    const char *gl_lib() const { return NULL; }
- #endif
- 
- private:
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch b/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch
deleted file mode 100644
index 8460497f1d68..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit ea514c9ded266aa365976649d88fa5593ef7ebf5
-Author: hasufell <hasufell@gentoo.org>
-Date:   Tue Jun 25 23:48:26 2013 +0200
-
-    add switch to use system lua
-
-diff --git a/makefile b/makefile
-index dd4598d..bdf22d2 100644
---- a/makefile
-+++ b/makefile
-@@ -228,6 +228,9 @@ BUILD_JPEGLIB = 1
- # uncomment next line to build PortMidi as part of MAME/MESS build
- BUILD_MIDILIB = 1
- 
-+# uncomment next line to build Lua-5.2 as part of MAME/MESS build
-+BUILD_LUA = 1
-+
- # uncomment next line to include the symbols
- # SYMBOLS = 1
- 
-@@ -664,7 +667,12 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a
- FORMATS_LIB = $(OBJ)/libformats.a
- 
- # add LUA library
-+ifeq ($(BUILD_LUA),1)
- LUA_LIB = $(OBJ)/liblua.a
-+else
-+LIBS += $(shell $(PKG_CONFIG) --libs lua)
-+INCPATH += $(shell $(PKG_CONFIG) --cflags lua)
-+endif
- 
- # add PortMidi MIDI library
- ifeq ($(BUILD_MIDILIB),1)
diff --git a/games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild b/games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild
deleted file mode 100644
index bedc691a2b04..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild
+++ /dev/null
@@ -1,186 +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 flag-o-matic python-any-r1 games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=sdlmame${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-
-# patches
-SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip"
-if [[ ${PN} == "sdlmame" ]] ; then
-	SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-fi
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="X alsa debug opengl"
-REQUIRED_USE="debug? ( X )"
-
-RDEPEND="dev-libs/expat
-	media-libs/fontconfig
-	media-libs/flac
-	>=media-libs/libsdl-1.2.10[X,sound,joystick,opengl?,video]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		gnome-base/gconf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXinerama
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	media-libs/alsa-lib
-	virtual/pkgconfig
-	X? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i \
-		-e "/$1.*=/s:^:# :" \
-		"${S}"/makefile \
-		|| die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i \
-		-e "/^#.*$1.*=/s:^#::"  \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-pkg_setup() {
-	games_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	unpack ./mame.zip
-	rm -f mame.zip
-}
-
-src_prepare() {
-	if [[ $PV == *_p* ]] ; then
-		edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
-		einfo "Patching release with source updates"
-		epatch ${MY_PV%%_p*}*.diff
-	fi
-	edos2unix src/osd/sdl/osdsdl.h
-
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-no-opengl.patch
-
-	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: expat, flac, jpeg, zlib"
-	disable_feature BUILD_EXPAT
-	disable_feature BUILD_FLAC
-	disable_feature BUILD_JPEG
-	disable_feature BUILD_ZLIB
-
-	if use amd64; then
-		einfo "Enabling 64-bit support"
-		enable_feature PTR64
-	fi
-
-	if use ppc; then
-		einfo "Enabling PPC support"
-		enable_feature BIGENDIAN
-	fi
-
-	if use debug; then
-		einfo "Enabling debug support"
-		enable_feature DEBUG
-	fi
-
-	if ! use opengl ; then
-		einfo "Disabling opengl support"
-		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
-	fi
-
-	if ! use alsa ; then
-		einfo "Disabling alsa midi support"
-		enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
-	fi
-
-	if ! use X ; then
-		einfo "Disabling X support"
-		enable_feature NO_X11 src/osd/sdl/sdl.mak
-	fi
-}
-
-src_compile() {
-	emake \
-		TARGET="${PN#sdl}" \
-		NAME="${PN}" \
-		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \
-		NO_DEBUGGER=$(usex debug "0" "1") default
-}
-
-src_install() {
-	newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN}
-
-	newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r src/osd/sdl/keymaps
-	[[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}"/vector.ini
-
-	sed \
-		-e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
-		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
-		"${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
-		|| die "sed failed"
-
-	dodoc docs/{config,mame,newvideo}.txt
-	if [[ ${PN} == "sdlmame" ]] ; then
-		dodoc whatsnew*.txt
-	else
-		dodoc messnew*.txt
-	fi
-
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "optional dependencies:"
-	elog "  games-emulation/sdlmametools (development tools)"
-	echo
-	elog "It's strongly recommended that you change either the system-wide"
-	elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
-
-	if use opengl; then
-		echo
-		elog "You built ${PN} with opengl support and should set"
-		elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
-	fi
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.149.ebuild b/games-emulation/sdlmame/sdlmame-0.149.ebuild
deleted file mode 100644
index 5ee488b27a7c..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.149.ebuild
+++ /dev/null
@@ -1,194 +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 flag-o-matic python-any-r1 games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=sdlmame${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-
-# patches
-SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip"
-if [[ ${PN} == "sdlmame" ]] ; then
-	SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-fi
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X alsa debug opengl"
-REQUIRED_USE="debug? ( X )"
-
-RDEPEND=">=dev-lang/lua-5.2
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/flac
-	>=media-libs/libsdl-1.2.10[sound,joystick,opengl?,video]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
-	debug? (
-		x11-libs/gtk+:2
-		gnome-base/gconf
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXinerama
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	virtual/pkgconfig
-	X? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i \
-		-e "/$1.*=/s:^:# :" \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i \
-		-e "/^#.*$1.*=/s:^#::"  \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-pkg_setup() {
-	games_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	unpack ./mame.zip
-	rm -f mame.zip
-}
-
-src_prepare() {
-	if [[ $PV == *_p* ]] ; then
-		edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
-		einfo "Patching release with source updates"
-		epatch ${MY_PV%%_p*}*.diff
-	fi
-	edos2unix makefile src/osd/sdl/{osdsdl.h,sdl.mak}
-
-	epatch \
-		"${FILESDIR}"/${P}-QA.patch \
-		"${FILESDIR}"/${P}-system-lua.patch \
-		"${FILESDIR}"/${P}-no-opengl.patch \
-		"${FILESDIR}"/${P}-debugger-linking.patch
-
-	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: expat, flac, jpeg, zlib, lua"
-	disable_feature BUILD_EXPAT
-	disable_feature BUILD_FLAC
-	disable_feature BUILD_JPEG
-	disable_feature BUILD_ZLIB
-	disable_feature BUILD_LUA
-
-	if use amd64; then
-		einfo "Enabling 64-bit support"
-		enable_feature PTR64
-	fi
-
-	if use ppc; then
-		einfo "Enabling PPC support"
-		enable_feature BIGENDIAN
-	fi
-
-	if use debug; then
-		einfo "Enabling debug support"
-		enable_feature DEBUG
-		enable_feature DEBUG src/osd/sdl/sdl.mak
-	fi
-
-	enable_feature NO_USE_QTDEBUG src/osd/sdl/sdl.mak
-
-	if ! use opengl ; then
-		einfo "Disabling opengl support"
-		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
-	fi
-
-	if ! use alsa ; then
-		einfo "Disabling alsa midi support"
-		enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
-	fi
-
-	if ! use X ; then
-		einfo "Disabling X support"
-		enable_feature NO_X11 src/osd/sdl/sdl.mak
-	fi
-}
-
-src_compile() {
-	emake \
-		TARGET="${PN#sdl}" \
-		NAME="${PN}" \
-		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \
-		NO_DEBUGGER=$(usex debug "0" "1") default
-}
-
-src_install() {
-	newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN}
-
-	newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r src/osd/sdl/keymaps
-	[[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}"/vector.ini
-
-	sed \
-		-e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
-		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
-		"${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
-		|| die "sed failed"
-
-	dodoc docs/{config,mame,newvideo}.txt
-	if [[ ${PN} == "sdlmame" ]] ; then
-		dodoc whatsnew*.txt
-	else
-		dodoc messnew*.txt
-	fi
-
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "optional dependencies:"
-	elog "  games-emulation/sdlmametools (development tools)"
-	echo
-	elog "It's strongly recommended that you change either the system-wide"
-	elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
-
-	if use opengl; then
-		echo
-		elog "You built ${PN} with opengl support and should set"
-		elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
-	fi
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.168.ebuild b/games-emulation/sdlmame/sdlmame-0.168.ebuild
index 1bec2da7df85..71cb5b6daa49 100644
--- a/games-emulation/sdlmame/sdlmame-0.168.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.168.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mamedev/mame/releases/download/mame${MY_PV}/mame${MY
 
 LICENSE="XMAME"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X alsa +arcade debug +mess opengl tools"
 REQUIRED_USE="|| ( arcade mess )
 		debug? ( X )"
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
index 1c5d4c81bcd5..69834c24a7b4 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="gtk cpu_flags_x86_mmx nls"
 
 RDEPEND="media-libs/libpng:0
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index 41da1b024f2b..e4f1d0c72c76 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,2 +1 @@
-DIST AlephOne-20100424.tar.bz2 3180896 SHA256 d97089890ce99952027eaf6185baa6cb01b26c2882dfca9e68816dfe7076a5e6 SHA512 b246b662f4bf820238c09fbb6bc55289d0db0a9b5ba15ab2b91a53f93666e81583834fd8a64497074a2e270a2055de24b3be93bb56d58715f9d213b1f4c92494 WHIRLPOOL 3074f6c4ba4925b8a0f7718bdfb0d1084155421397a7604febfeae473635b970b3842152b9a3e200f2bc642790a0dc51e689aa3b18de2235d5697105060c7f93
 DIST AlephOne-20150620.tar.bz2 5031898 SHA256 c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133 SHA512 fb47969137b791f83b111171d7b92b3708597db294ce19fb682ce28c49edcd4cb84a6ce4dcceb6630812a8c676dfe7f39f3fb4642f40ef7086a0d6c6fdeba8df WHIRLPOOL a00150e8c28763d7d01a5d805e449247dc9ff612eb0e9f0aa2d10e7fcf17654342fa31eb5a2eeb3bc756c80cce84dd9664179977900d635e67401036c71a7c10
diff --git a/games-fps/alephone/alephone-20100424.ebuild b/games-fps/alephone/alephone-20100424.ebuild
deleted file mode 100644
index b1214d157211..000000000000
--- a/games-fps/alephone/alephone-20100424.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils games
-
-MY_P=AlephOne-${PV}
-DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
-HOMEPAGE="http://source.bungie.org/"
-SRC_URI="mirror://sourceforge/marathon/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="alsa mad mpeg sndfile speex truetype vorbis"
-
-RDEPEND="media-libs/sdl-net
-	media-libs/sdl-image
-	media-libs/libsdl[video]
-	dev-libs/expat
-	dev-libs/zziplib
-	media-libs/libpng:0
-	alsa? ( media-libs/alsa-lib )
-	mad? ( media-libs/libmad )
-	mpeg? ( media-libs/smpeg )
-	virtual/opengl
-	virtual/glu
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex )
-	truetype? ( media-libs/sdl-ttf )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed "s:GAMES_DATADIR:${GAMES_DATADIR}:g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh \
-		|| die
-
-	# try using the system expat - bug #251108
-	sed -i \
-		-e '/SUBDIRS/ s/Expat//' \
-		-e 's/Expat\/libexpat.a/-lexpat/' \
-		Source_Files/Makefile.am \
-		|| die
-	sed -i \
-		-e '/Expat/d' \
-		configure.ac \
-		|| die
-	rm -rf Source_Files/Expat
-
-	# for automake 1.12 compability - bug #422557
-	sed -i -e 's:AC_PROG_CC:&\nAC_PROG_OBJCXX:' configure.ac || die
-
-	epatch \
-		"${FILESDIR}"/${P}-boost_145.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-png15.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--enable-lua \
-		$(use_enable alsa) \
-		$(use_enable mad) \
-		$(use_enable mpeg smpeg) \
-		--enable-opengl \
-		$(use_enable sndfile) \
-		$(use_enable speex) \
-		$(use_enable truetype ttf) \
-		$(use_enable vorbis)
-}
-
-src_install() {
-	default
-	dogamesbin "${T}"/${PN}.sh
-	doman docs/${PN}.6
-	dohtml docs/*.html
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Read the docs and install the data files accordingly to play."
-	echo
-	elog "If you only want to install one scenario, read"
-	elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Single_scenario_3"
-	elog "If you want to install multiple scenarios, read"
-	elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Multiple_scenarios_3"
-	echo
-}
diff --git a/games-fps/alephone/alephone-20150620.ebuild b/games-fps/alephone/alephone-20150620.ebuild
index afaa7a3e6237..0f06cebb0f39 100644
--- a/games-fps/alephone/alephone-20150620.ebuild
+++ b/games-fps/alephone/alephone-20150620.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/releas
 
 LICENSE="GPL-3+ BitstreamVera OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="alsa curl ffmpeg mad mpeg sndfile speex vorbis"
 
 RDEPEND="media-libs/sdl-net
diff --git a/games-fps/alephone/files/alephone-20100424-boost_145.patch b/games-fps/alephone/files/alephone-20100424-boost_145.patch
deleted file mode 100644
index 30d8b78594df..000000000000
--- a/games-fps/alephone/files/alephone-20100424-boost_145.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source_Files/Network/Metaserver/network_metaserver.h.old	2011-01-20 23:29:21.000000000 +0100
-+++ Source_Files/Network/Metaserver/network_metaserver.h	2011-01-20 23:30:07.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <map>
- #include <memory> // auto_ptr
- #include <set>
-+#include <stdexcept>
- 
- #include "Logging.h"
- 
diff --git a/games-fps/alephone/files/alephone-20100424-gcc47.patch b/games-fps/alephone/files/alephone-20100424-gcc47.patch
deleted file mode 100644
index 1347d64592f9..000000000000
--- a/games-fps/alephone/files/alephone-20100424-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Source_Files/Lua/lua_templates.h.old	2012-10-15 09:55:32.395310163 +0200
-+++ Source_Files/Lua/lua_templates.h	2012-10-15 09:56:14.991129122 +0200
-@@ -496,7 +496,7 @@
- 	static index_t ToIndex(lua_State *L, int index) {
- 		index_t to;
- 		if(lua_isnil(L, index)) return -1;
--		else if(_lookup(L, index, to)) return to;
-+		else if(L_LazyEnum::_lookup(L, index, to)) return to;
- 		else {
- 			std::string error;
- 			if(lua_isnumber(L, index) || lua_isstring(L, index))
diff --git a/games-fps/alephone/files/alephone-20100424-png15.patch b/games-fps/alephone/files/alephone-20100424-png15.patch
deleted file mode 100644
index da99a8454102..000000000000
--- a/games-fps/alephone/files/alephone-20100424-png15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Source_Files/RenderOther/IMG_savepng.c.old	2011-09-13 10:20:56.395157142 +0200
-+++ Source_Files/RenderOther/IMG_savepng.c	2011-09-13 10:23:00.630142397 +0200
-@@ -29,6 +29,7 @@
- #include <SDL/SDL.h>
- #include <SDL/SDL_byteorder.h>
- #include <png.h>
-+#include <zlib.h>
- #include "IMG_savepng.h"
- 
- int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression, struct IMG_PNG_text* text, int num_text){
-@@ -85,7 +86,7 @@
- 		goto savedone;
- 	}
- 	/* setup custom writer functions */
--	png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL);
-+	png_set_write_fn(png_ptr,(png_voidp)src,png_write_data,NULL);
- 
- 	if (setjmp(png_jmpbuf(png_ptr))){
- 		SDL_SetError("Unknown error writing PNG");
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index 11278a8e0244..7a01645c3858 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,2 +1 @@
-DIST alienarena-7.60-linux20120629.tar.gz 510316326 SHA256 05e4ce83574996e20ab8047dc30a20bf3fae72c39727a3a0bcc04a25bf746e04 SHA512 ec16e2546f34115e31ab24de3b5100c014910c773d200fdaf4302cf2b6930a1487aeffa504bed10a8310d62e15fed1ff67c3d679c1abd5a9750e34cfcac55ffd WHIRLPOOL b0df1c364db4b3d3ae4b603d3c7b3f9cdea416b0cbd7bbc71a573291df2f5c35e6147efa4406fcb9d57829407280d79b0b30581a03f23ac253c7c026060e3810
 DIST alienarena-7.66-linux20130827.tar.gz 617636649 SHA256 29086098eacb18319e6dcc9156355c44db4b1aa8a4f7b0bb63e6856d8128b012 SHA512 6b86387b12fc82c01cf7945df5da7beb1a60e42a492b70096c64ace254d6300107a4b40762d20969eefbfe11c7365fbb3a5603b71f288e2330410feef48141a3 WHIRLPOOL 986774a9eb97c6ee0b325cc23801a5320c541ea201b51bf90aa8e13a37c03c24251f8d9f2f1efb2c33a8ff3257926265d440200984087264fee666691f1ee55b
diff --git a/games-fps/alienarena/alienarena-20120629.ebuild b/games-fps/alienarena/alienarena-20120629.ebuild
deleted file mode 100644
index c0040edecdf5..000000000000
--- a/games-fps/alienarena/alienarena-20120629.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit autotools eutils games
-
-MY_PN=alienarena-7.60
-DESCRIPTION="Fast-paced multiplayer deathmatch game"
-HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated +dga +vidmode"
-
-UIRDEPEND="virtual/jpeg
-	media-libs/openal
-	media-libs/libvorbis
-	media-libs/freetype:2
-	virtual/glu
-	virtual/opengl
-	dga? ( x11-libs/libXxf86dga )
-	vidmode? ( x11-libs/libXxf86vm )
-	net-misc/curl"
-UIDEPEND="dga? ( x11-proto/xf86dgaproto )
-	vidmode? ( x11-proto/xf86vidmodeproto )"
-RDEPEND="!dedicated? ( ${UIRDEPEND} )"
-DEPEND="${RDEPEND}
-	!dedicated? ( ${UIDEPEND} )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN/_/.}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nodocs.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		--with-icondir=/usr/share/pixmaps \
-		--without-system-libode \
-		$(use_enable !dedicated client) \
-		$(use_with dga xf86dga) \
-		$(use_with vidmode xf86vm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if ! use dedicated ; then
-		make_desktop_entry ${PN} "Alien Arena"
-	fi
-	dodoc docs/README.txt README
-	prepgamesdirs
-}
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild b/games-fps/alienarena/alienarena-20130827.ebuild
index 4e19f1af1ac7..8b0df9b79896 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
 
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dedicated +dga +vidmode +zlib"
 
 UIRDEPEND="virtual/jpeg:0
diff --git a/games-fps/alienarena/files/alienarena-20120629-nodocs.patch b/games-fps/alienarena/files/alienarena-20120629-nodocs.patch
deleted file mode 100644
index 807e3b2aaa1f..000000000000
--- a/games-fps/alienarena/files/alienarena-20120629-nodocs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru alienarena-7.51.orig/Makefile.am alienarena-7.51/Makefile.am
---- alienarena-7.51.orig/Makefile.am	2011-03-05 19:34:07.000000000 -0500
-+++ alienarena-7.51/Makefile.am	2011-03-13 01:39:37.179366503 -0500
-@@ -23,12 +23,6 @@
- ACLOCAL_AMFLAGS = -I m4 
- 
- # Alien Arena documents to be installed in $docdir
--if INSTALL_DOCS
--dist_doc_DATA = \
--	docs/license.txt \
--	docs/README.txt \
--	README
--endif
- 
- # FUSE game server browser and Server management scripts
- # COPYING and INSTALL are GNU/FSF-supplied documents.
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 3c5e0cf982a5..1f2c11099f28 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,4 +1,3 @@
-DIST darkplacesengine20110628.zip 23377408 SHA256 d2464c681e3fdcc66cb090e79c44c0c173a43b6f181a12e500b0b1fd7d73ffce SHA512 bf44933470be2856a80ebd73a0cb531c6d22e69da5be24bc52175998ab687b4112c88423a6b42a9a4ed746e0f96c1bb39e188a037a98ea596cf7b6183e390038 WHIRLPOOL b4214be8a9c9aadf02a92c9b7e54d508df38f9e38f650f839a8ea43d9c0768641dbf59c71b210d337f591fac2d77a21a14e7900a3038d1af828f064bf3368071
 DIST darkplacesengine20140513.zip 28113487 SHA256 69e5a50991884196e403bd6aab4a33bba553a934a167be366672ab4e223b06c9 SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c WHIRLPOOL 0fca6d87c9d3482112992965b70f829dfd6ecd926d940ad66f5f75aec4438c2b5b33fb6ac51f69c5199f06d53fbc16f1c8d0780db40b8cbd71c7ceb0e67a4048
 DIST fuhquake-lits.rar 8388829 SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925 WHIRLPOOL d398b57c03d02c8180f8ca93f6964ac2118ef50cace3ecbc9da9113b1e91ed3a7b7e5473ebb9ad2f5198828eb8565c7c0470aea2095152b2898335562bef821d
 DIST id1.pk3 350470 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331 WHIRLPOOL 30fe7e6d6ac6408c54e704586d4f4e15d139c0330e4f3e758651bfc2e6582eadae08c590e87264cfb26faae56a7033b383d51f93bf54ddfce7db38e47d569280
diff --git a/games-fps/darkplaces/darkplaces-20110628.ebuild b/games-fps/darkplaces/darkplaces-20110628.ebuild
deleted file mode 100644
index 5c7aa762e901..000000000000
--- a/games-fps/darkplaces/darkplaces-20110628.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit unpacker eutils flag-o-matic games
-
-# Latest versions are in http://icculus.org/twilight/darkplaces/files/
-MY_PV=${PV/_beta/beta}
-MY_ENGINE="${PN}engine${MY_PV}.zip"
-
-# Different Quake 1 engines expect the lights in different directories
-# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
-MY_LIGHTS="fuhquake-lits.rar"
-
-DESCRIPTION="Enhanced engine for iD Software's Quake 1"
-HOMEPAGE="http://icculus.org/twilight/darkplaces/"
-SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
-	lights? (
-		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
-		http://www.kgbsyndicate.com/romi/id1.pk3 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
-
-UIRDEPEND="virtual/jpeg
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl )
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
-UIDEPEND="x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xproto"
-RDEPEND="net-misc/curl
-	cdinstall? ( games-fps/quake1-data )
-	demo? ( games-fps/quake1-demodata )
-	textures? ( >=games-fps/quake1-textures-20050820 )
-	opengl? ( ${UIRDEPEND} )
-	!opengl? ( sdl? ( ${UIRDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )"
-DEPEND="lights? ( || (
-			app-arch/unrar
-			app-arch/rar ) )
-	opengl? (
-		${UIRDEPEND}
-		${UIDEPEND} )
-	!opengl? ( sdl? (
-		${UIRDEPEND}
-		${UIDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? (
-		${UIRDEPEND}
-		${UIDEPEND} ) ) )
-	virtual/pkgconfig
-	app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-dir=${GAMES_DATADIR}/quake1
-
-opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
-
-src_unpack() {
-	if use lights ; then
-		unpack "${MY_LIGHTS}"
-		unpack_zip "${DISTDIR}"/id1.pk3
-		mv *.lit maps/ || die
-		mv ReadMe.txt rtlights.txt
-	fi
-	unpack "${MY_ENGINE}"
-
-	unpack ./${PN}*.zip
-}
-
-src_prepare() {
-	rm "${WORKDIR}"/README-SDL.txt
-	cd "${S}"
-	rm mingw_note.txt
-
-	strip-flags
-
-	# Only additional CFLAGS optimization is the -march flag
-	local march=$(get-flag -march)
-	sed -i \
-		-e "s:-lasound:$(pkg-config --libs alsa):" \
-		-e "/^CPUOPTIMIZATIONS/d" \
-		-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
-		-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
-		-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
-		-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
-		-e "s:strip:true:" \
-		makefile.inc || die "sed makefile.inc failed"
-
-	if ! use cdsound ; then
-		# Turn the CD accesses off
-		sed -i \
-			-e "s:/dev/cdrom:/dev/null:" \
-			cd_linux.c || die "sed cd_linux.c failed"
-		sed -i \
-			-e 's:COM_CheckParm("-nocdaudio"):1:' \
-			cd_shared.c || die "sed cd_shared.c failed"
-	fi
-}
-
-src_compile() {
-	local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
-
-	# Preferred sound is alsa
-	local sound_api="NULL"
-	use oss && sound_api="OSS"
-	use alsa && sound_api="ALSA"
-	opts="${opts} DP_SOUND_API=${sound_api}"
-
-	local type="release"
-	use debug && type="debug"
-
-	# Only compile a maximum of 1 client
-	if use sdl ; then
-		emake ${opts} "sdl-${type}" || die "emake sdl-${type} failed"
-	elif opengl_client ; then
-		emake ${opts} "cl-${type}" || die "emake cl-${type} failed"
-	fi
-
-	if use dedicated ; then
-		emake ${opts} "sv-${type}" || die "emake sv-${type} failed"
-	fi
-}
-
-src_install() {
-	if opengl_client || use sdl ; then
-		local type=glx
-
-		use sdl && type=sdl
-
-		# darkplaces executable is needed, even just for demo
-		newgamesbin "${PN}-${type}" ${PN} || die "newgamesbin client failed"
-		newicon darkplaces72x72.png ${PN}.png || die "newicon failed"
-
-		if use demo ; then
-			# Install command-line for demo, even if not desktop entry
-			games_make_wrapper ${PN}-demo "${PN} -game demo"
-		fi
-
-		if use demo && ! use cdinstall ; then
-			make_desktop_entry ${PN}-demo "Dark Places (Demo)"
-		else
-			# Full version takes precedence over demo
-			make_desktop_entry ${PN} "Dark Places"
-		fi
-	fi
-
-	if use dedicated ; then
-		newgamesbin ${PN}-dedicated ${PN}-ded || die "newgamesbin ded failed"
-	fi
-
-	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
-
-	if use lights ; then
-		insinto "${dir}"/id1
-		doins -r "${WORKDIR}"/{cubemaps,maps} || die "doins cubemaps maps failed"
-		if use demo ; then
-			# Set up symlinks, for the demo levels to include the lights
-			local d
-			for d in cubemaps maps ; do
-				dosym "${dir}/id1/${d}" "${dir}/demo/${d}"
-			done
-		fi
-	fi
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall && ! use demo ; then
-		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
-	fi
-
-	if use sdl ; then
-		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
-	fi
-}
diff --git a/games-fps/darkplaces/darkplaces-20140513.ebuild b/games-fps/darkplaces/darkplaces-20140513.ebuild
index 4ca3ca9273f5..fca6c7bb317e 100644
--- a/games-fps/darkplaces/darkplaces-20140513.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
 
 UIRDEPEND="virtual/jpeg:0
diff --git a/games-fps/quake1-movies/Manifest b/games-fps/quake1-movies/Manifest
deleted file mode 100644
index 61244e71df0e..000000000000
--- a/games-fps/quake1-movies/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST artifact.zip 5102445 SHA256 ad796926dd9eafb41f3d4ecfcce4e25d64f8f8daf14c848253aa27da2c0ab6b0 SHA512 99abd5edabf63d1c7d40ef58489fc117603e9d3b573acda6e2bea988315e0d2956dd0cccf528e69ef3280dedd0f705e0bcc0b995de6425088b79acb9f4345365 WHIRLPOOL e516d602ddfb92e67154dc6312e5db6e416e55ccfbfc43826b7d3749e6e7ec7173d0f4b3c5a25e40a2807ad33c21202176de03808417d3aa9f3cebf793d7594d
-DIST blahmov.zip 11384242 SHA256 19019054151dbe0193437280dcc09ca1e547d920d71178b3fe212d576b72afb8 SHA512 5049eb61198f63fa93fec04f193dc0658ea58adcd05113ae1f73d465686baf5295d3e1320f1ba13b06604c46a32fbecee147eab5e7552e6867b9ed4976c374f3 WHIRLPOOL de0a9f595e8243c467977350a0703a4e1385f90191e812359b51c9a7bd93bfde828866677aabdf15633e798e72587ffeaf60100060ba31ae30d33688bad8bc78
-DIST blahouts.zip 7409083 SHA256 13635fd9969028616231c7a8d3e0b80a09fedd800de831b6035ab98008797b75 SHA512 a694cddc002da065d1fa93ea81e8031dbfc8f8ddace3ff05a11efb50a93067601b1324be9c5f07cf46c41b608f7e013ea7b4c6a36ef3913612d58e6c7fba41f2 WHIRLPOOL 6a338ec9df5ecfd470dc5fc7f7b89a99d83596b863dab610ca8aeda0e84ecc01c4f13194f041ccc75983243e0e035f476e96e47ae532baeab12931ad60e127a7
-DIST camper.zip 38865 SHA256 e5b5ae712dff02966186e141c1c1b56b885e25f9609f7274b9a30bf946dd38a4 SHA512 101aa3e3d0077128f970102e5e04b26b946f05b97a58e3771ec0141f3229be7245b43a0d13223a416027828a41fe00572cfff0407ea8827bc455c6b07426cc81 WHIRLPOOL 0f0e849c762b4673b97994d99cab033ea15aeeaa6e6a841a7f8a50dd344ff9bf85a3505e2d8a44918fad7e0c18f1ccaf2fbd2721efd7e9c695ab45cf2d652a6a
-DIST op_bays.zip 3117448 SHA256 240a69cac6fe2aa6e388cedd4289c64258c7a7134a0cfacae446635890cd66e4 SHA512 07616ad170254b7c059bdaf63a630cac2bea138327afc85fdb3a8bed89d5a4d55daec02abf01f21cd8a9fa85ac1462d6329595beb09daf2abcc2188aca4c9921 WHIRLPOOL 0b20f9c0d55e6fcf5575c78bf4c8c31e28f1be03f738797cea77c43902d5cb5072ce18f9b5f27ad8eeb72a73033c93450687afe250cecca4e401f2c316a96dba
-DIST rgb.zip 189044 SHA256 0664e669636d1ff657e9cad2c094941fec7d523259e53d36b1ba8ba801093198 SHA512 b7b9d55672a0b6585961c0e1e6f80357a5d6d2b977fba7000209df71bd0efecced2ffb0d3f6aff042a922699b0ec95f83b47cc13fd6245dd19d328c1b14ba8f0 WHIRLPOOL 1cf3d95d5e87fba133936dfd453459cd86a2855b31c76a7af4d5a1306908a4763f4c862ebc00aa18d18c5eac9f1243c35cc04033a79660f14da4309a676d9abf
-DIST rgb2.zip 308016 SHA256 a695bf2187d4ed5a7b762d9eb688a8384c12ba34d6f849c447d09cb2e2740595 SHA512 e8aa441a48169d9d8832ba705a0da3349d5784952ca7a4bf1a51457958e2e1c829231f9162f531d600d7683f84acd7471c75d85c4e1a538c96f63e46fbb4ea3c WHIRLPOOL aef9972ae792f0d69340525687604cb74d451569e1cb48781ada17ff3b427fa92ac49dde0531fe2f6d0700ac6d3636243b311b342c7a57440ea5b21dcc648c98
-DIST rgb3_preview.zip 7901556 SHA256 23b9ef1e3793aab03cb8ebc74b290a90dfbd068e3e1eab6ee412092e49703f8a SHA512 be94ed20d99c420a1899fbaa078b80bc95e95e74a25aef6cf63b02a99aea411879a5a99b8fe0b47ebd307c0112ef23d3a17802c049ecce8758fc7cf122e155c6 WHIRLPOOL 12fd782d3b9526abdd92f8c05dba2f8314f05f572ed99343990342c37ceb5c7f164246600705667a68de77b7d2cc173c0032639df7403c172fee2490cc7a8873
-DIST ta2.zip 1841879 SHA256 2bd99488d6a96302a0d9fbf61ae4b15f9b969d2de13d3f7a0bef3cd560a7d250 SHA512 99d4834d79d9a6502b48f4b7e5ccfdfe31a341d03ae6d22a0057bd2d5594b79b900e4fb28fc69145433447247dd886166f4a026d06ef475fe9d644b0af1a746a WHIRLPOOL 5612fd5f025272b66650704f6827d7635c9abef91a7c46e80c0d6f4430bd6bac2dacb479d1464e172b55900cf45357ccba072c7a25e7e30c83990d2d9cbbdadc
diff --git a/games-fps/quake1-movies/metadata.xml b/games-fps/quake1-movies/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake1-movies/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake1-movies/quake1-movies-0.ebuild b/games-fps/quake1-movies/quake1-movies-0.ebuild
deleted file mode 100644
index e67dc76c35f9..000000000000
--- a/games-fps/quake1-movies/quake1-movies-0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils games
-
-DESCRIPTION="a collection of all the greatest Quake movies"
-HOMEPAGE="http://www.planetquake.com/cineplex/history.html"
-SRC_URI="https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/camper.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/rgb.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/rgb2.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/rgb3_preview.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/ta2.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/op_bays.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/cineplex/artifact.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/blah/blahmov.zip
-	https://ftp.se.kde.org/pub/pc/games/idgames2/planetquake/blah/blahouts.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-myunpack() {
-	echo ">>> Unpacking $1 to ${PWD}"
-	unzip -qoLL "${DISTDIR}"/$1 || die "unpacking $1 failed"
-}
-
-src_unpack() {
-	cd "${S}"
-	einfo "Diary of a Camper ..."
-	mkdir id1
-	cd id1
-	myunpack camper.zip
-	mv movies.txt movies-camper.txt
-
-	cd "${S}"
-	einfo "Ranger Gone Bad ..."
-	cd id1
-	myunpack rgb.zip
-	mv movies.txt movies-rgb.txt
-	myunpack rgb2.zip
-	mv movies.txt movies-rgb2.txt
-	cd ..
-	myunpack rgb3_preview.zip
-	rm *.bat
-	mkdir ta2
-	cd ta2
-	myunpack ta2.zip
-
-	cd "${S}"
-	einfo "Operation Bayshield ..."
-	mkdir op_bays
-	cd op_bays
-	myunpack op_bays.zip
-
-	cd "${S}"
-	einfo "The Artifact ..."
-	mkdir artifact
-	cd artifact
-	myunpack artifact.zip
-
-	cd "${S}"
-	einfo "Blahbalicious ..."
-	myunpack blahmov.zip
-	rm *.bat
-	cd blah
-	myunpack blahouts.zip
-
-	cd "${S}"
-	edos2unix $(find . -name '*.txt' -o -name '*.cfg')
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/quake1"
-	doins -r * || die "doins"
-	prepgamesdirs
-}
diff --git a/games-fps/quake3-defrag/Manifest b/games-fps/quake3-defrag/Manifest
index d409d10ca447..0957c7696a27 100644
--- a/games-fps/quake3-defrag/Manifest
+++ b/games-fps/quake3-defrag/Manifest
@@ -1,4 +1,3 @@
-DIST defrag_1.91.20.zip 4003519 SHA256 8eec5a9b112b0ac8d3ddad5ed019cb00313445fd2757c121dbd8099a124401a6 SHA512 03fc840e3f743e7a0fac47aad0ee4aa015ac8fd75b2788c4e85347ee009f6b753d1c5bb140831c3225244877ca08b8e9d4cce54e840849047e82cb55b04d4214 WHIRLPOOL a4c7d06584378817f32e91cc21d37f936ba834c6791e3d653bda485d2507ec973552824ee3ed8ba8ab576ad620c20bbe04b846605c1508f25d84b2b14c1e3d26
 DIST defrag_1.91.21.zip 4035256 SHA256 9f9b92eda597ce14e1135aa964a3b8bb35371875922dc0403a1844ae948f4c79 SHA512 bfc1614b0e2f2dd674369c9c162c412249e6c514f878eaf82a456c882e2081867d6a7260f62ce4a143c23ff28f4f3a5e75a152db788d66b7a0978225bf4417b8 WHIRLPOOL 1089bef0c0c7dd1ff020bc82c0e7b685aa6b17855193422cd81e4a49bd50fafb68adb47005f340d7db1debae69afe6443403a425b13b58a67f779798c9c3cef5
 DIST defragcpmpak01.zip 8567363 SHA256 9de7a8d34d2a31db3c6593d1383c449b0b0cb09768062988736c9f75aad0028f SHA512 2ad013e27886bd5547ac1555711c026b27131311d0261e36f50ee2cc715a21f2781fc57d90fb398b5b6b49eb2b9cdad212fd3da9828c4680dd3ad684d0348cf5 WHIRLPOOL 9aff111d05ca0b686a9dcf1d927f5c5adac751277f0e9b310b98f8eb239dce917cea441a5e7c3b7a9cf66ca2ec61bb7b276e40bee0baf5209c8ec7243ae324ab
 DIST defragpak1.zip 3778055 SHA256 0d013be5b338bb6070502fa4d5b20f3f4ac9b7c1b72ccf64a10dd143dece0b7e SHA512 9c42035db51d70f66d2526a67e5a83f1bbfb61a91b73c6f52308d4cc4c84d7322c3a6372392a87de531684c6c75b25955d17121166b0ba4f2e3e1f5b09b12cee WHIRLPOOL 5b26c6316d24d66dc517f652c5513a94bfcb7495d524fe415dab1402e90f93bfffce8f77e919f39c664a544b2952cec8ca1fa7f364c246236629523ba75a732f
diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild
deleted file mode 100644
index 8ae650100623..000000000000
--- a/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MOD_DESC="Trickjumping challenges for Quake III"
-MOD_NAME="Defrag"
-MOD_DIR="defrag"
-
-inherit games games-mods
-
-HOMEPAGE="http://cggdev.org/"
-SRC_URI="http://q3defrag.org/files/defrag/defrag_${PV}.zip
-	http://www.german-defrag.de/files/defrag/defragcpmpak01.zip
-	http://www.german-defrag.de/files/defrag/df-extras002.zip
-	http://www.german-defrag.de/files/defrag/defragpak1.zip
-	http://www.german-defrag.de/files/defrag/defragpak2.zip
-	http://www.german-defrag.de/files/defrag/defragpak3.zip
-	http://www.german-defrag.de/files/defrag/defragpak4.zip
-	http://www.german-defrag.de/files/defrag/defragpak5.zip
-	http://www.german-defrag.de/files/defrag/defragpak7.zip
-	http://www.german-defrag.de/files/defrag/defragpak8.zip
-	http://www.german-defrag.de/files/defrag/defragpak9.zip
-	http://www.german-defrag.de/files/defrag/defragpak10.zip
-	http://www.german-defrag.de/files/defrag/defragpak11.zip"
-
-LICENSE="freedist"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	unpack defrag_${PV}.zip
-	cd ${MOD_DIR}
-	unpack defragpak{1,2,3,4,5,7,8,9,10,11}.zip
-	unpack defragcpmpak01.zip
-	unpack df-extras002.zip
-}
-
-src_prepare() {
-	cd ${MOD_DIR}
-	mv -f DeFRaG/* . || die
-	rm -rf DeFRaG
-	mv -f *.txt docs/ || die
-	rm -rf misc/{mirc-script,misc,tools}
-}
diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
index 4dff62a594c3..7b480e30d8be 100644
--- a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
+++ b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
@@ -25,7 +25,7 @@ SRC_URI="http://q3defrag.org/files/defrag/defrag_${PV}.zip
 	http://www.german-defrag.de/files/defrag/defragpak11.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
index fd90c09e6882..01c665785c00 100644
--- a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
+++ b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.excessiveplus.net/"
 SRC_URI="http://www.excessiveplus.net/files/release/xp-${PV}.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
index a1d3bc305c27..a2ef2c99e2e0 100644
--- a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
+++ b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="http://www.lrctf.com/"
 SRC_URI="http://lrctf.com/release/LRCTF_Q3A_v${PV}_full.zip"
 
 LICENSE="LRCTF"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
index 7a47be9e87c5..259fedd18e39 100644
--- a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
+++ b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
@@ -17,5 +17,5 @@ SRC_URI="
 	"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/ut2004-alienswarm/Manifest b/games-fps/ut2004-alienswarm/Manifest
deleted file mode 100644
index 7ada802109e6..000000000000
--- a/games-fps/ut2004-alienswarm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST AlienSwarm-v13.zip 127132998 RMD160 9f12c43aa08f216a4f943a9036217acc060594de SHA1 7fd2636246a46e05429c65337aa02b4742478345 SHA256 ee869f60844b479517310627c475d6f78d2cc4163455f2d0f4835d289a859168
-DIST AlienSwarm_13_or_131_to_132_Patch.zip 4147912 RMD160 fd0f0c58b3d9e1149dd2ea1b0a7cb84f4bb049f6 SHA1 8659636dfd7088f69496bdd5c4f5fab9d768100b SHA256 bcb82a22ceb2eb31cfd58fd6c7864b9afa6ffdbd52bf3cd696572b018f106fe8
-DIST TelicCampaign_1_1.zip 102141499 RMD160 4f0394bd4c2611a95910931460556d902713cc0a SHA1 dbde1b3776ca4a2d81beac70137d5fa2b61e216f SHA256 37c956131bf1ba0578488183d02bdd796b889fa99334e2d7d0efddec5e2ccd26
-DIST phalanxaswcampaign10.zip 14055318 RMD160 6a9977cc231e9258c11352b0e83529d228d7f814 SHA1 27746b774c5deec8ca8b7e14ee0c8cb0f7a496ff SHA256 c204f0b7b92b5183e6283cab6e19ef0276b6f668de7666c5978bae6711c0fbe7
diff --git a/games-fps/ut2004-alienswarm/metadata.xml b/games-fps/ut2004-alienswarm/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-alienswarm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-alienswarm/ut2004-alienswarm-1.32.ebuild b/games-fps/ut2004-alienswarm/ut2004-alienswarm-1.32.ebuild
deleted file mode 100644
index e3fb3fa5f586..000000000000
--- a/games-fps/ut2004-alienswarm/ut2004-alienswarm-1.32.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-MOD_DESC="an overhead-view tactical squad-based shooter"
-MOD_NAME="Alien Swarm"
-MOD_DIR="AlienSwarm"
-MOD_ICON="Help/Linux Icons/as-icon-64.png"
-
-inherit games games-mods
-
-MY_PV=${PV/.}
-AS_V="13"
-PC_V="10"
-TC_V="1_1"
-N_SRC="http://www.night-blade.com/AS"
-IAF_SRC="http://www.iaf-database.com/maps"
-
-HOMEPAGE="http://www.blackcatgames.com/swarm/"
-SRC_URI="${N_SRC}/AlienSwarm-v${AS_V}.zip
-	mirror://gentoo/phalanxaswcampaign${PC_V}.zip
-	${IAF_SRC}/TelicCampaign_${TC_V}.zip
-	http://www.bliny.co.uk/mirror/swarm/TelicCampaign_${TC_V}.zip
-	${N_SRC}/AlienSwarm_13_or_131_to_${MY_PV}_Patch.zip"
-
-LICENSE="freedist"
-KEYWORDS="amd64 x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	# It is (surprisingly) deliberate to have Music & System dirs
-	# outside of the main AlienSwarm dir. Not sure why. Is same with
-	# LIFLG installer.
-	unpack AlienSwarm-v${AS_V}.zip
-
-	# Phalanx is the only file meant to be unzipped within AlienSwarm
-	cd ${MOD_DIR} || die
-	unpack phalanxaswcampaign${PC_V}.zip
-	cd ..
-
-	unpack TelicCampaign_${TC_V}.zip
-	unpack AlienSwarm_13_or_131_to_${MY_PV}_Patch.zip
-}
-
-src_prepare() {
-	rm -f SwarmReadMe.txt ${MOD_DIR}/{*.{bat,exe},Alien-Swarm-Linux}
-}
diff --git a/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
index bdfb686236d8..ae3f99e4a745 100644
--- a/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.18.0.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.18.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
index 59a0b5b46285..dbf478873464 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.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.18.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
index a508e907794d..3141af6a0ad1 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.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.18.2.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
index f3a7d62124c4..1119c5955504 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.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.18.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
index 1a8a1270852a..5b65ff7a0063 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.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.2.ebuild b/games-puzzle/hitori/hitori-3.16.2.ebuild
index 585280676c3d..c49dee8548a5 100644
--- a/games-puzzle/hitori/hitori-3.16.2.ebuild
+++ b/games-puzzle/hitori/hitori-3.16.2.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.18.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
index cad864f179f8..c03826800fae 100644
--- a/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.18.0.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.18.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
index 788092c5d3c8..be61444993d7 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.18.0.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/swell-foop-3.18.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
index ed3670db22fa..33ebd862168f 100644
--- a/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 9a42258fabb8..e842aaca7f2a 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,2 @@
 DIST df_40_24_linux.tar.bz2 12921246 SHA256 da37c6263a679123e6ac57fe0dd6def11f1d61efee3c5913de09495c88ce9234 SHA512 2242e471b7dbc996e819e2f74b2bbfda30a9a301755bc025ddcccdffdd3afe2e48bbedca31a332283ef829d023069398e57d6a87e26c582ddbce4a67ff7fd755 WHIRLPOOL 03cb652a2564d2b0c809be8252f7754d893f69ac1b95124ea108ed0fde9ac742c498d9e369339775695861e430a2ded0741b018f85551d48731730f98303dc69
-DIST df_42_05_linux.tar.bz2 13794886 SHA256 9ab33ef4ad0f73ce90109c59e13200fa2d9366f6088b00bbcf49624dc506f93c SHA512 6c2b12dddadb8cffce4ed2077302f36e0bdfbb1f847a72eafb9bcf36ac3da2fc973573f23090a7f1211d3d756688640334116c6ee5148228ee37966ae5cdb562 WHIRLPOOL fc8dd05e704f3853c07aff0d03004ce6fab03d5c9af0b0ef22cc588934d723b886247099261c528a03f5426df1b006c3c9ea4a6b8589225e1f1cb637ef489f22
+DIST df_42_06_linux.tar.bz2 13857747 SHA256 03df8e73bf81e4f7bec9e789a83f8bd20b0b968d73131e4051e005db13fec99f SHA512 dfeb1406dcbd74091170eee4392c8eb876516d723b17e8aa291cab5b670be9fca4e22122788656e37afc03cd0e827e42b8cd27bc148d32639ebb7b8b7fa2bbf4 WHIRLPOOL d8fd93e9d90b4bee942c9a3751d1d03180157e4ecf406cf1cf31441946588990b2385a0b8d376f2a5386d7514d28b7ba5a6fbd2879e3a1e87124d902759909c3
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.05.ebuild
deleted file mode 100644
index b0b9b37e9118..000000000000
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.05.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils games multilib versionator
-
-MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
-MY_PN=df
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves"
-SRC_URI="http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2"
-
-LICENSE="free-noncomm BSD BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
-IUSE="debug"
-
-RDEPEND="media-libs/glew[abi_x86_32(-)]
-	media-libs/libsdl[abi_x86_32(-),opengl,video,X]
-	media-libs/libsndfile[abi_x86_32(-),alsa]
-	media-libs/sdl-image[abi_x86_32(-),jpeg,png,tiff]
-	media-libs/sdl-ttf[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	virtual/glu[abi_x86_32(-)]
-	x11-libs/gtk+:2[abi_x86_32(-)]"
-# Yup, openal and ncurses are only needed at compile-time; the code dlopens it at runtime
-# if requested.
-DEPEND="${RDEPEND}
-	media-libs/openal[abi_x86_32(-)]
-	sys-libs/ncurses[abi_x86_32(-),unicode]
-	virtual/pkgconfig
-	x11-proto/kbproto[abi_x86_32(-)]
-	x11-proto/xproto[abi_x86_32(-)]"
-
-S=${WORKDIR}/${MY_PN}_linux
-
-gamesdir="${GAMES_PREFIX_OPT}/${PN}"
-QA_PRESTRIPPED="${gamesdir}/libs/Dwarf_Fortress"
-RESTRICT="strip"
-
-pkg_setup() {
-	games_pkg_setup
-
-	multilib_toolchain_setup x86
-}
-
-src_prepare() {
-	rm libs/*.so*
-	cp "${FILESDIR}"/{dwarf-fortress,Makefile} .
-	epatch_user
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
-}
-
-src_compile() {
-	default
-	sed -i -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" ${PN} || die
-}
-
-src_install() {
-	# install data-files and libs
-	insinto "${gamesdir}"
-	doins -r raw data libs
-
-	# install our wrapper
-	dogamesbin ${PN}
-
-	# install docs
-	dodoc README.linux *.txt
-
-	prepgamesdirs
-
-	fperms 750 "${gamesdir}"/libs/Dwarf_Fortress
-}
-
-pkg_postinst() {
-	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
-	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
-	elog "For more information on what exactly is replaced, see ${GAMES_BINDIR}/${PN}."
-	elog "Note: This means that the primary entry point is ${GAMES_BINDIR}/${PN}."
-	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
-	elog
-	elog "Optional runtime dependencies: install sys-libs/ncurses[$(use amd64 && echo "abi_x86_32,")unicode]"
-	elog "for [PRINT_MODE:TEXT]. Install media-libs/openal$(use amd64 && echo "[abi_x86_32]") for audio output."
-	elog
-	games_pkg_postinst
-}
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.06.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.06.ebuild
new file mode 100644
index 000000000000..7c76f0cfec01
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.06.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils games multilib versionator
+
+MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
+MY_PN=df
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="A single-player fantasy game"
+HOMEPAGE="http://www.bay12games.com/dwarves"
+SRC_URI="http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2"
+
+LICENSE="free-noncomm BSD BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE="debug"
+
+RDEPEND="media-libs/glew[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-),opengl,video,X]
+	media-libs/libsndfile[abi_x86_32(-),alsa]
+	media-libs/sdl-image[abi_x86_32(-),jpeg,png,tiff]
+	media-libs/sdl-ttf[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]"
+# Yup, openal and ncurses are only needed at compile-time; the code dlopens it at runtime
+# if requested.
+DEPEND="${RDEPEND}
+	media-libs/openal[abi_x86_32(-)]
+	sys-libs/ncurses[abi_x86_32(-),unicode]
+	virtual/pkgconfig
+	x11-proto/kbproto[abi_x86_32(-)]
+	x11-proto/xproto[abi_x86_32(-)]"
+
+S=${WORKDIR}/${MY_PN}_linux
+
+gamesdir="${GAMES_PREFIX_OPT}/${PN}"
+QA_PRESTRIPPED="${gamesdir}/libs/Dwarf_Fortress"
+RESTRICT="strip"
+
+pkg_setup() {
+	games_pkg_setup
+
+	multilib_toolchain_setup x86
+}
+
+src_prepare() {
+	rm libs/*.so*
+	cp "${FILESDIR}"/{dwarf-fortress,Makefile} .
+	epatch_user
+}
+
+src_configure() {
+	tc-export CXX PKG_CONFIG
+	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
+}
+
+src_compile() {
+	default
+	sed -i -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" ${PN} || die
+}
+
+src_install() {
+	# install data-files and libs
+	insinto "${gamesdir}"
+	doins -r raw data libs
+
+	# install our wrapper
+	dogamesbin ${PN}
+
+	# install docs
+	dodoc README.linux *.txt
+
+	prepgamesdirs
+
+	fperms 750 "${gamesdir}"/libs/Dwarf_Fortress
+}
+
+pkg_postinst() {
+	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
+	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
+	elog "For more information on what exactly is replaced, see ${GAMES_BINDIR}/${PN}."
+	elog "Note: This means that the primary entry point is ${GAMES_BINDIR}/${PN}."
+	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
+	elog
+	elog "Optional runtime dependencies: install sys-libs/ncurses[$(use amd64 && echo "abi_x86_32,")unicode]"
+	elog "for [PRINT_MODE:TEXT]. Install media-libs/openal$(use amd64 && echo "[abi_x86_32]") for audio output."
+	elog
+	games_pkg_postinst
+}
diff --git a/games-roguelike/slashem/Manifest b/games-roguelike/slashem/Manifest
deleted file mode 100644
index a4c05df8856f..000000000000
--- a/games-roguelike/slashem/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST conf12s.tar.gz 4788 SHA256 76b5d0527434276db4876610651a0dc73698012b1cf93449c63a516355cd06f5 SHA512 97a2ad0a65e43d89d7e1c4d47bcad87dcd55db83c1bb970d1625312b381ed07767669803f9c7a8b60079f131570cca9a7619401a3b11279cc6d19119ff633cb2 WHIRLPOOL 5f6c3574b1867a1b277d5cce34cb796550caf0d6eeb8266c03a774e7adee0464b09070b3018a0e5a16c86292df6b42fb01cdb052a04a68cbdf4fe31997c3cbdd
-DIST se007e7f2.tar.gz 5218698 SHA256 a520817f1fe19302f27db22a9c1762c27a669f7491e84bd22790ea4f67136b49 SHA512 a156ed5c4e912aba83e6229e2d51c79efc8de3f95b48e17d6e2530733fe26865fa41da182cf8c4b15919b14147d9c1c338251b8e80ba5aea2128dbe403e09fa7 WHIRLPOOL 782c64cf31bf4e025ad3091a7d195ccfe35573537f28c1355a39276419cc47d78cd0f82f7b42825e4081e73c8bbc786c4b4a92abe6b5f2551a01fd5c9da30476
diff --git a/games-roguelike/slashem/files/0.0.7E7/GTK.configure b/games-roguelike/slashem/files/0.0.7E7/GTK.configure
deleted file mode 100644
index 49c14fe6e5a0..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/GTK.configure
+++ /dev/null
@@ -1,22 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	undefine GNOME_GRAPHICS
-	define GTK_GRAPHICS
-	define GTK_PROXY
-END
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	undefine WINGNOMESRC
-	undefine WINGNOMEOBJ
-	undefine WINGNOMELIB
-	define WINGTKSRC
-	define WINGTKOBJ
-	define WINGTKLIB
-END
-
-configure Makefile $toplevel/Makefile
-BEGIN
-	undefine CNF_SHARE_GNOMEND
-	define CNF_SHARE_GTKND
-	define CNF_SHARE_GTKPROXYND
-END
diff --git a/games-roguelike/slashem/files/0.0.7E7/Gentoo.configure b/games-roguelike/slashem/files/0.0.7E7/Gentoo.configure
deleted file mode 100644
index f10d73df2893..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/Gentoo.configure
+++ /dev/null
@@ -1,5 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	redefine COMPRESS \"/bin/gzip\"
-END
-
diff --git a/games-roguelike/slashem/files/0.0.7E7/Proxy.configure b/games-roguelike/slashem/files/0.0.7E7/Proxy.configure
deleted file mode 100644
index 56e79cbf3fcb..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/Proxy.configure
+++ /dev/null
@@ -1,24 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	define PROXY_GRAPHICS
-END
-
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	define WINPROXYSRC
-	define PROXYUTLSRC
-	define PROXYCOMSRC
-	define PROXYCLNTSRC
-
-	define WINPROXYOBJ
-	define PROXYUTLOBJ
-	define PROXYCOMOBJ
-	define PROXYCLNTOBJ
-
-	define WINPROXYLIB
-END
-
-configure Makefile $toplevel/Makefile
-BEGIN
-	define CNF_SHARE_PROXYND
-END
diff --git a/games-roguelike/slashem/files/0.0.7E7/X11.configure b/games-roguelike/slashem/files/0.0.7E7/X11.configure
deleted file mode 100644
index 8c9e362eb9ff..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/X11.configure
+++ /dev/null
@@ -1,18 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	define X11_GRAPHICS
-END
-
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	define WINX11SRC
-	define WINX11OBJ
-	define WINX11LIB
-	redefine WINX11LIB "-lXaw -lXmu -lXext -lXt -lXpm -lX11"
-END
-
-configure Makefile $toplevel/Makefile
-BEGIN
-	define CNF_SHARE_X11ND
-	redefine CNF_SHARE_X11ND "x11bigtiles x11tiles SlashEM.ad pet_mark.xbm rip.xpm"
-END
diff --git a/games-roguelike/slashem/files/0.0.7E7/dot.slashemrc b/games-roguelike/slashem/files/0.0.7E7/dot.slashemrc
deleted file mode 100644
index 518e8d67addc..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/dot.slashemrc
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# Slash'EM configuration file.
-#
-# Naming this file $(HOME)/.slashemrc (for UNIX) or setting the environment
-# variable SLASHEMOPTIONS to point to its full path name elsewhere tells
-# Slash'EM to use X11 windowing and fonts (provided the executable was
-# compiled with that ability).
-#
-# SET YOUR WINDOW TYPE
-# Your windowtype choices are: GENTOO_WINDOWTYPES
-#
-OPTIONS=windowtype:tty
-
-TILESET=name:Small, file:x11tiles
-TILESET=name:Big, file:x11bigtiles, transparent
-TILESET=name:Big 3D, file:x11big3dtiles, transparent, pseudo3D
-
-# These tile definitions are used by the SDL/GL interface
-TILESET=name:gl 3D, file:gltile64.png, transparent, pseudo3D
-TILESET=name:gl Big, file:gltile32.png, transparent
-TILESET=name:gl Small, file:gltile16.png, transparent
-
-OPTIONS=tiles:Big
-#
-#
-#OPTIONS=toptenwin,hilite_pet,color,number_pad:2,verbose,news
-#OPTIONS=confirm,fixinv,noautopickup,safe_pet,sortpack,tombstone
-#OPTIONS=fruit:pineapple,dogname:Dhairrhuwyth
-#OPTIONS=male,catname:Ghisteslwchlohm
-#
-# There are 17 object symbols and various graphics symbols.
-# The descriptions of these symbols can be found in dat/opthelp.
-#
-#
-# Font: nh10 (10x20)
-#
-#OBJECTS= 180 183 188 192 181 184 182 189 190 196 \
-#	 191 194 193 187 185 186 195
-#
-#DUNGEON= 032 025 018 013 012 014 011 015 023 024 \
-#	 022 021 128 129 130 131 132 035 035 133 \
-#	 134 135 136 137 145 146 144 124 143 142 \
-#	 143 141 140 149 150 031 031 147 148 031 \
-#	 161 140
-#
-#TRAPS=	 138 138 138 138 138 138 138 138 138 138 \
-#	 138 138 138 138 138 139 138 138 138 138 \
-#	 138 138
-#
-#EFFECTS= 151 152 153 154 155 156 157 158	 \
-#	 159 160 161 162			 \
-#	 163 164 165 166 167 168 169 170	 \
-#	 171 172 173 174 175 176 177 178 179	 \
-#	 171 172 173 174 175 176 177 178 179	 \
-#	 171 172 173 174 175 176 177 178 179	 \
-#	 171 172 173 174 175 176 177 178 179	 \
-#	 171 172 173 174 175 176 177 178 179	 \
-#	 171 172 173 174 175 176 177 178 179	 \
-#	 171 172 173 174 175 176 177 178 179
-#
-#
-# Font: ibm (8x14)
-#
-#OBJECTS= 207 210 215 219 208 211 209 216 217 223 \
-#	 218 221 220 214 212 213 222
-#
-#DUNGEON= 032 128 129 130 131 132 133 134 135 136 \
-#	  137 138 139 045 124 142 143 035 035 144 \
-#	  145 146 147 148 155 156 227 124 154 153 \
-#	  154 152 151 159 160 200 200 157 158 250 \
-#	  170 151
-#
-#TRAPS=   149 149 149 149 149 149 149 149 149 149 \
-#	  149 149 149 149 149 150 149 149 149 149 \
-#	  149 149
-#
-#EFFECTS= 161 162 163 164 165 166 167 168	  \
-#	  169 170 171 172			  \
-#	  173 174 175 176 177 178 179 180	  \
-#	  181 182 183 184 185 186 187 188 189	  \
-#	  181 182 183 184 185 186 187 188 189	  \
-#	  181 182 183 184 185 186 187 188 189	  \
-#	  181 182 183 184 185 186 187 188 189	  \
-#	  181 182 183 184 185 186 187 188 189	  \
-#	  181 182 183 184 185 186 187 188 189	  \
-#	  181 182 183 184 185 186 187 188 189
-#
-#
-# Font: a "standard" font like 6x13
-# Note that this version is unlikely to work on a tty on a Unix system because
-# many of these characters are also control characters.
-#
-#DUNGEON = 032 025 018 013 012 014 011 015 023 024 \
-#	   022 021 031 045 124 043 043 035 035 031 \
-#	   035 001 060 062 060 062 019 124 092 035 \
-#	   092 123 125 031 125 046 046 035 035 046 \
-#	   127 125
-#
-#TRAPS=    094 094 094 094 094 094 094 094 094 094 \
-#	   094 094 094 094 094 002 094 094 094 094 \
-#	   094 094
-#
-#EFFECTS=  124 045 092 047 042 033 041 040	   \
-#	   048 035 064 042			   \
-#	   047 045 092 124 124 092 045 047         \
-#	   047 064 092 064 064 064 092 064 047	   \
-#	   047 064 092 064 064 064 092 064 047	   \
-#	   047 064 092 064 064 064 092 064 047	   \
-#	   047 064 092 064 064 064 092 064 047	   \
-#	   047 064 092 064 064 064 092 064 047	   \
-#	   047 064 092 064 064 064 092 064 047	   \
-#	   047 064 092 064 064 064 092 064 047
diff --git a/games-roguelike/slashem/files/0.0.7E7/gnome.configure b/games-roguelike/slashem/files/0.0.7E7/gnome.configure
deleted file mode 100644
index a3178b28d04f..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/gnome.configure
+++ /dev/null
@@ -1,21 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	define GNOME_GRAPHICS
-	undefine GTK_GRAPHICS
-END
-
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	undefine WINGTKSRC
-	undefine WINGTKOBJ
-	undefine WINGTKLIB
-	define WINGNOMESRC
-	define WINGNOMEOBJ
-	define WINGNOMELIB
-END
-
-configure Makefile $toplevel/Makefile
-BEGIN
-	undefine CNF_SHARE_GTKND
-	define CNF_SHARE_GNOMEND
-END
diff --git a/games-roguelike/slashem/files/0.0.7E7/makefile.patch b/games-roguelike/slashem/files/0.0.7E7/makefile.patch
deleted file mode 100644
index 4f5af5534987..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naurd slashem/sys/unix/Makefile.top slashem-0.0.7E6/sys/unix/Makefile.top
---- slashem/sys/unix/Makefile.top	2003-12-02 13:46:08.000000000 +0200
-+++ slashem-0.0.7E6/sys/unix/Makefile.top	2004-03-02 21:08:55.718790760 +0200
-@@ -290,7 +290,7 @@
- 	$(MAKE) dofiles-$${target-nodlb}
- 	cp src/$(GAME) $(FILE_AREA_UNSHARE)
- 	cp util/recover $(FILE_AREA_UNSHARE)
--	cp dat/license doc/Guidebook.txt $(FILE_AREA_DOC)
-+#	cp dat/license doc/Guidebook.txt $(FILE_AREA_DOC)
- #	cp win/Qt/KDE/kslashem.kdelnk $(KDEDIR)/share/applnk/Games
- 	-rm -f $(SHELLDIR)/$(GAME)
- 	sed -e 's;/usr/games/lib/nethackdir;$(FILE_AREA_UNSHARE);' \
-@@ -302,10 +302,10 @@
- 			$(CHGRP) $(GAMEGRP) $(GAME) recover )
- 	chmod $(GAMEPERM) $(FILE_AREA_UNSHARE)/$(GAME)
- 	chmod $(EXEPERM) $(FILE_AREA_UNSHARE)/recover
--	-( cd $(FILE_AREA_DOC) ; \
--			$(CHOWN) $(GAMEUID) license Guidebook.txt ; \
--			$(CHGRP) $(GAMEGRP) license Guidebook.txt ; \
--			chmod $(FILEPERM) license Guidebook.txt )
-+#	-( cd $(FILE_AREA_DOC) ; \
-+#			$(CHOWN) $(GAMEUID) license Guidebook.txt ; \
-+#			$(CHGRP) $(GAMEGRP) license Guidebook.txt ; \
-+#			chmod $(FILEPERM) license Guidebook.txt )
- 	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
- 	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
- 	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
diff --git a/games-roguelike/slashem/files/0.0.7E7/opengl.configure b/games-roguelike/slashem/files/0.0.7E7/opengl.configure
deleted file mode 100644
index 37466c28655c..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/opengl.configure
+++ /dev/null
@@ -1,10 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	define GL_GRAPHICS
-END
-
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	define WINGLLIB
-END
-
diff --git a/games-roguelike/slashem/files/0.0.7E7/prepare-gui.configure b/games-roguelike/slashem/files/0.0.7E7/prepare-gui.configure
deleted file mode 100644
index 803bd67a7354..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/prepare-gui.configure
+++ /dev/null
@@ -1,67 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	undefine X11_GRAPHICS
-	undefine QT_GRAPHICS
-	undefine GTK_GRAPHICS
-	undefine GNOME_GRAPHICS
-	undefine SDL_GRAPHICS
-	undefine GL_GRAPHICS
-	undefine PROXY_GRAPHICS
-END
-
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	undefine WINX11SRC
-	undefine WINX11OBJ
-	undefine WINX11LIB
-
-	undefine WINQTSRC
-	undefine WINQTOBJ
-	undefine WINQTLIB
-
-	undefine WINGTKSRC
-	undefine WINGTKOBJ
-	undefine WINGTKLIB
-
-	undefine WINGNOMESRC
-	undefine WINGNOMEOBJ
-	undefine WINGNOMELIB
-
-	undefine WINPROXYSRC
-	undefine PROXYUTLSRC
-	undefine PROXYCOMSRC
-	undefine PROXYCLNTSRC
-
-	undefine WINPROXYOBJ
-	undefine PROXYUTLOBJ
-	undefine PROXYCOMOBJ
-	undefine PROXYCLNTOBJ
-
-	undefine WINPROXYLIB
-
-	undefine WINGLSRC
-	undefine WINGLOBJ
-	undefine WINGLLIB
-	undefine WINSDLLIB
-
-	undefine WINSRC
-	undefine WINOBJ
-	undefine WINLIB
-	define -C "to support all standard windowing systems" WINSRC
-	define -C "to support all standard windowing systems" WINOBJ
-	define -C "to support all standard windowing systems" WINLIB
-END
-
-configure Makefile $toplevel/Makefile
-BEGIN
-	undefine CNF_SHARE_QTND
-	undefine CNF_SHARE_X11ND
-	undefine CNF_SHARE_GTKND
-	undefine CNF_SHARE_GTKPROXYND
-	undefine CNF_SHARE_GLND
-	undefine CNF_SHARE_GNOMEND
-	undefine CNF_SHARE_PROXYND
-	redefine CNF_SHARE_DATND " \$(CNF_SHARE_QTND) \$(CNF_SHARE_X11ND) \\\
-	\$(CNF_SHARE_GTKND) \$(CNF_SHARE_GTKPROXYND) \$(CNF_SHARE_GLND) \\\
-	\$(CNF_SHARE_GNOMEND) \$(CNF_SHARE_PROXYND) "
-END
diff --git a/games-roguelike/slashem/files/0.0.7E7/proxy.slashemrc b/games-roguelike/slashem/files/0.0.7E7/proxy.slashemrc
deleted file mode 100644
index f28cdafb7b07..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/proxy.slashemrc
+++ /dev/null
@@ -1,4 +0,0 @@
-TILESET=name:Small tiles, file:gltile16.png, transparent
-TILESET=name:Big tiles, file:gltile32.png, transparent
-TILESET=name:Big 3D tiles, file:gltile64.png, transparent, pseudo3D
-OPTIONS=tiles:Big 3D tiles
diff --git a/games-roguelike/slashem/files/0.0.7E7/qt.configure b/games-roguelike/slashem/files/0.0.7E7/qt.configure
deleted file mode 100644
index 8e96c5004431..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/qt.configure
+++ /dev/null
@@ -1,23 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	define QT_GRAPHICS
-END
-
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	define WINQTSRC
-	define WINQTOBJ
-	define WINQTLIB
-	define QTDIR
-	qtdir2=`echo /usr/lib/qt-2.*`
-	define QTDIR "${QTDIR:-$qtdir2}"
-	undefine CXXFLAGS
-	define CXXFLAGS
-	undefine LINK
-	define -C "Qt is C++" LINK
-END
-
-configure Makefile $toplevel/Makefile
-BEGIN
-	define CNF_SHARE_QTND
-END
diff --git a/games-roguelike/slashem/files/0.0.7E7/sdl.configure b/games-roguelike/slashem/files/0.0.7E7/sdl.configure
deleted file mode 100644
index f0c9e187ce14..000000000000
--- a/games-roguelike/slashem/files/0.0.7E7/sdl.configure
+++ /dev/null
@@ -1,16 +0,0 @@
-configure config_h $toplevel/include/config.h
-BEGIN
-	define SDL_GRAPHICS
-END
-
-configure src_Makefile $toplevel/src/Makefile
-BEGIN
-	define WINGLSRC
-	define WINGLOBJ
-	define WINSDLLIB
-END
-
-configure Makefile $toplevel/Makefile
-BEGIN
-	define CNF_SHARE_GLND
-END
diff --git a/games-roguelike/slashem/metadata.xml b/games-roguelike/slashem/metadata.xml
deleted file mode 100644
index de478ca391ca..000000000000
--- a/games-roguelike/slashem/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 type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">slashem</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-roguelike/slashem/slashem-0.0.772.ebuild b/games-roguelike/slashem/slashem-0.0.772.ebuild
deleted file mode 100644
index a8d0a2662a01..000000000000
--- a/games-roguelike/slashem/slashem-0.0.772.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic games
-
-SE_VER="0.0.7E7"
-SE_FIXVER="${SE_VER}F2"
-SE_PN="se007e7f2.tar.gz"
-SE_CONF="conf12s.tar.gz"
-
-DESCRIPTION="Super Lotsa Added Stuff Hack - Extended Magic. A Nethack Variant"
-HOMEPAGE="http://www.slashem.org/"
-#SRC_URI="http://www.juiblex.co.uk/nethack/slashem/${SE_PN}"
-SRC_URI="mirror://sourceforge/slashem/${SE_PN}
-	http://www.juiblex.co.uk/nethack/config/${SE_CONF}"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X sdl opengl"
-
-XDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm
-	x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libXdmcp"
-
-#	qt? ( =dev-qt/qt2* ) this version has overflow bugs #79720
-RDEPEND=">=sys-libs/ncurses-5.2-r5
-	X? ( ${XDEPEND} )
-	opengl? ( virtual/opengl
-		media-libs/libsdl )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
-	dev-util/yacc"
-
-HACKDIR=${GAMES_STATEDIR}/${PN}
-S=${WORKDIR}/slashem-${SE_FIXVER}
-
-src_unpack() {
-	unpack ${SE_PN}
-	cd "${S}"
-	EPATCH_SUFFIX="patch"
-	epatch "${FILESDIR}"/${SE_VER}
-
-	# This copies the /sys/unix Makefile.*s to their correct places for
-	# seding and compiling.
-	append-flags -I../include -I/usr/X11R6/include
-
-	cd "${S}"/sys/unix
-	source setup.sh || die
-
-	unpack ${SE_CONF}
-	cp -f "${FILESDIR}"/${SE_VER}/*.configure . || die
-	for c in RedHat9 FHS20 Gentoo prepare-gui Proxy ; do
-		./config ${c} ../..
-	done
-
-	if use X ; then
-		./config X11 ../.. || die "X config"
-	fi
-	# SDL require X11
-	for v in sdl ; do #qt
-		use ${v} && { ./config ${v} ../.. || die "${v} config"; }
-		./config X11 ../.. || die "X config"
-	done
-	# OpenGL requires SDL
-	if use opengl ; then
-		./config opengl ../.. || die "opengl config"
-		./config sdl ../.. || die "sdl config"
-		./config X11 ../.. || die "X config"
-	fi
-
-	cd "${S}"
-	sed -i \
-		-e "s:^\(\#  define HACKDIR \).*:\1 \"${HACKDIR}\":" \
-		include/config.h || die "config.h sed"
-	sed -i \
-		-e "s:^\(CFLAGS =\).*:\1 ${CFLAGS}:" \
-		src/Makefile || die "src/makefile sed"
-	sed -i \
-		-e "s:^\(FILE_AREA_UNSHARE =\).*:\1 $(games_get_libdir)/${PN}:" \
-		Makefile || die "makefile sed"
-	sed -i \
-		-e "s:^\(\#define FILE_AREA_UNSHARE	\).*:\1\"$(games_get_libdir)/${PN}/\":" \
-		include/unixconf.h || die "unixconf.h sed"
-}
-
-src_compile() {
-	emake all || die "emake all"
-	cd "${S}"/util
-	emake recover || die "emake recover"
-}
-
-src_install() {
-	emake \
-		GAMEPERM=0750 \
-		SHELLDIR="${D}/${GAMES_BINDIR}" \
-		FILE_AREA_VAR="${D}/${HACKDIR}" \
-		FILE_AREA_SAVE="${D}/${HACKDIR}"/save \
-		FILE_AREA_SHARE="${D}/${GAMES_DATADIR}"/${PN} \
-		FILE_AREA_UNSHARE="${D}/$(games_get_libdir)"/${PN} \
-		FILE_AREA_DOC="${D}"/usr/share/doc/${PF} \
-		install || die "emake install failed"
-	dodoc doc/*.txt
-	dodoc dat/license
-	doman doc/slashem.6
-
-	# The final /usr/bin/slashem is a sh script.  This fixes the hard-coded
-	# HACKDIR directory so it doesn't point to ${D}/usr/share/slashemdir
-	dosed "s:^\(HACKDIR=\).*:\1${HACKDIR}:" "${GAMES_BINDIR}"/${PN}
-	dosed "s:^\(HACK=\).*:\1$(games_get_libdir)/${PN}/${PN}:" "${GAMES_BINDIR}"/${PN}
-
-	newgamesbin util/recover recover-slashem || die "recover install"
-
-	if use X ; then
-		# install slashem fonts
-		dodir "${GAMES_DATADIR}"/${PN}/fonts
-		cd "${S}"/win/X11
-		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
-		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto "${GAMES_DATADIR}"/${PN}/fonts
-		doins *.pcf
-		cd "${D}${GAMES_DATADIR}"/${PN}/fonts
-		mkfontdir || die "The action mkfontdir ${GAMES_DATADIR}/${PN}/fonts failed"
-
-		# copy slashem X application defaults
-		cd "${S}"/win/X11
-		sed -i \
-			-e 's/^\(SlashEM\*font:\).*/\1 				fixed/' \
-			-e 's/^\(SlashEM\*map\*font:\).*/\1 			fixed/' \
-			-e 's:^!\(SlashEM.tile_file.*\):\1:' \
-			SlashEM.ad || die "Patching SlashEM.ad for X failed"
-
-		insinto /etc/X11/app-defaults
-		newins SlashEM.ad SlashEM || die "app-defaults failed"
-	fi
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins "${FILESDIR}"/${SE_VER}/dot.slashemrc
-
-	local windowtypes="tty"
-	#use qt     && windowtypes="${windowtypes} qt"
-	use X      && windowtypes="${windowtypes} x11"
-	use sdl    && windowtypes="${windowtypes} sdl"
-	use opengl && windowtypes="${windowtypes} gl"
-	set -- ${windowtypes}
-	dosed "s:GENTOO_WINDOWTYPES:${windowtypes}:" "${GAMES_DATADIR}"/${PN}/dot.slashemrc
-	insinto /etc/skel
-	newins "${D}/${GAMES_DATADIR}"/${PN}/dot.slashemrc .slashemrc
-	insinto /etc/slashem
-	doins "${FILESDIR}"/${SE_VER}/proxy.slashemrc
-
-	keepdir "${HACKDIR}"/save
-	prepgamesdirs
-	fperms -R g+w "${HACKDIR}"
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "You may want to look at /etc/skel/.slashemrc for interesting options"
-}
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
index 040bf8f9b88d..337319403a22 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${PV}//freedroidRPG-${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls opengl sound"
 
 RDEPEND="media-libs/libsdl[opengl?,sound?,video]
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index 8407e27acd67..eaf9b5a64f9c 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,3 +1,2 @@
 DIST manaplus-1.5.11.21.tar.xz 9556540 SHA256 57b6e0d8a730f56060062aa0d6e6baafc100860aa2cc4ba5120d21772410aae6 SHA512 145479b9b6912064356f842910c2a5bbb16bacc7372b898d98f237514722bbac4c6f3fe49ee30942b6e38820cfe9d3508ba5ac64b858a6003e27569327729d7d WHIRLPOOL 628009c082219c63f42892881060dff3784ae419d3d6dab95357272774d0d0545a97cf0d7190157e3338ac38e7f821fe9e3a893f24ee10be71ec6ac83c097722
-DIST manaplus-1.5.12.19.tar.xz 9581180 SHA256 8b28cbb1f385124411f4d7c2dc7066b0c0226d9afa905401ebf79c90c4e5aa69 SHA512 afbf40c22f93a2ff7720cacebfeb90ea6669061ba5bab2f45a78bd11b890ca516606b6d260903eaa04b0cf0e3e49dce9301c030de50ffceeb70329d1284e0369 WHIRLPOOL 2fcf321101d6178942db6f51bbd38f88d6423f097ae8fd0d6415d5df2096dbd10e188e008166e57fb3f359edc9c1315dcfad78b546ba8804dabe9984cd00a066
 DIST manaplus-1.6.1.16.tar.xz 9610164 SHA256 393678d7de6d0253e53756bb689d2f778ed4c402215c8d72c576fdb6da963aef SHA512 2ba77b8d79e765cad7ecf3074eec49791a3f68d4fa66eed9bbf13adf23e94c35b55d8587850352e0855a7320c828dc886224fa4aa6260cd449a850ba469dd0be WHIRLPOOL f7dfdb3a0693f55d2202f488f0bfd036cb23f821c14962105c73ea16c5969f0c7bd53e2d5abd416f5d588be73de461bc1d58ff9269ed4c55cd4064644a759805
diff --git a/games-rpg/manaplus/manaplus-1.5.12.19.ebuild b/games-rpg/manaplus/manaplus-1.5.12.19.ebuild
deleted file mode 100644
index ec664dae1320..000000000000
--- a/games-rpg/manaplus/manaplus-1.5.12.19.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit games
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libsdl2[X,opengl?,video]
-	media-libs/sdl2-gfx
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net
-	media-libs/sdl2-ttf
-	net-misc/curl
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	x11-apps/xmessage
-	media-fonts/dejavu
-	media-fonts/wqy-microhei
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	CONFIG_SHELL=/bin/bash \
-	egamesconf \
-		--with-sdl2 \
-		--without-internalsdlgfx \
-		--localedir=/usr/share/locale \
-		--prefix="/usr" \
-		--bindir="${GAMES_BINDIR}" \
-		$(use_with opengl) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
-
-	prepgamesdirs
-}
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
new file mode 100644
index 000000000000..a34b27486951
--- /dev/null
+++ b/games-rpg/manaplus/manaplus-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools git-r3 games
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org"
+EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="mumble nls opengl pugixml test"
+
+RDEPEND="
+	>=dev-games/physfs-1.0.0
+	media-fonts/dejavu
+	media-fonts/wqy-microhei
+	media-fonts/liberation-fonts
+	media-fonts/mplus-outline-fonts
+	media-libs/libpng:0=
+	media-libs/libsdl2[X,opengl?,video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	net-misc/curl
+	sys-libs/zlib
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-misc/xdg-utils
+	mumble? ( media-sound/mumble )
+	nls? ( virtual/libintl )
+	opengl? ( virtual/opengl )
+	pugixml? ( dev-libs/pugixml )
+	!pugixml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash \
+	egamesconf \
+		--with-sdl2 \
+		--without-internalsdlgfx \
+		--localedir=/usr/share/locale \
+		--prefix="/usr" \
+		--bindir="${GAMES_BINDIR}" \
+		$(use_with mumble) \
+		$(use_enable nls) \
+		$(use_with opengl) \
+		--enable-libxml=$(usex pugixml pugixml libxml) \
+		$(use_enable test unittests)
+}
+
+src_install() {
+	default
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
+	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
+
+	prepgamesdirs
+}
diff --git a/games-rpg/manaplus/metadata.xml b/games-rpg/manaplus/metadata.xml
index 26079e608bed..b513812cb89e 100644
--- a/games-rpg/manaplus/metadata.xml
+++ b/games-rpg/manaplus/metadata.xml
@@ -5,4 +5,8 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="pugixml">Use <pkg>dev-libs/pugixml</pkg> for XML parsing isntead of <pkg>dev-libs/libxml2</pkg></flag>
+		<flag name="mumble">Enable support for voice chat</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-rpg/sacred-gold/Manifest b/games-rpg/sacred-gold/Manifest
deleted file mode 100644
index c7f363d7fab7..000000000000
--- a/games-rpg/sacred-gold/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sacred-1.0-1.0.01-x86.run 1515954 SHA256 6355482463095e2cde2beaa912b5eb36969589a279131951fef3ac0efd1f587d
diff --git a/games-rpg/sacred-gold/metadata.xml b/games-rpg/sacred-gold/metadata.xml
deleted file mode 100644
index 06e69cc12f05..000000000000
--- a/games-rpg/sacred-gold/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>calchan@gentoo.org</email>
-  <name>Denis Dupeyron</name>
-</maintainer>
-<maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild b/games-rpg/sacred-gold/sacred-gold-1.0.01.ebuild
deleted file mode 100644
index 41389e0bdf25..000000000000
--- a/games-rpg/sacred-gold/sacred-gold-1.0.01.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
-
-inherit versionator eutils cdrom unpacker games
-
-PV_MAJOR=$(get_version_component_range 1-2)
-MY_P=sacred-${PV_MAJOR}-${PV}
-
-DESCRIPTION="Action role-playing game"
-HOMEPAGE="http://linuxgamepublishing.com/info.php?id=sacred"
-SRC_URI="http://updatefiles.linuxgamepublishing.com/sacred/${MY_P}-x86.run"
-
-LICENSE="all-rights-reserved GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cdrom_get_cds .data/bin/Linux/x86/sacred
-	ln -sfn "${CDROM_ROOT}"/.data cd
-	unpack ./cd/data/data.tar.gz
-	rm -f cd
-	cp -f "${CDROM_ROOT}"/.data/bin/Linux/x86/sacred* . || die
-	cp -f "${CDROM_ROOT}"/README* . || die
-	cp -f "${CDROM_ROOT}"/manual.pdf . || die
-
-	mkdir -p "patch"
-	cd "patch"
-	unpack_makeself ${MY_P}-x86.run
-	bin/Linux/x86/loki_patch patch.dat "${S}" || die "loki_patch failed"
-	cd "${S}"
-	rm -rf "patch"
-
-	mv lib/lib{1,2}/* lib
-	rmdir lib/lib{1,2}
-}
-
-src_install() {
-	dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	mv * "${D}/${dir}" || die
-
-	games_make_wrapper ${PN} ./sacred "${dir}" "${dir}"/lib
-	newicon "${CDROM_ROOT}"/.data/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Sacred - Gold" ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-rpg/sacred-gold/sacred-gold-1.0.ebuild b/games-rpg/sacred-gold/sacred-gold-1.0.ebuild
deleted file mode 100644
index f4a154018cf6..000000000000
--- a/games-rpg/sacred-gold/sacred-gold-1.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
-
-inherit eutils cdrom games
-
-DESCRIPTION="Action role-playing game"
-HOMEPAGE="http://linuxgamepublishing.com/info.php?id=sacred"
-SRC_URI=""
-
-LICENSE="all-rights-reserved GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist strip"
-
-RDEPEND="
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cdrom_get_cds .data/bin/Linux/x86/sacred
-	ln -sfn "${CDROM_ROOT}"/.data cd
-	unpack ./cd/data/data.tar.gz
-	rm -f cd
-	mv lib/lib{1,2}/* lib
-	rmdir lib/lib{1,2}
-	cp -f "${CDROM_ROOT}"/.data/bin/Linux/x86/sacred* . || die
-	cp -f "${CDROM_ROOT}"/README* . || die
-	cp -f "${CDROM_ROOT}"/manual.pdf . || die
-}
-
-src_install() {
-	dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	mv * "${D}/${dir}" || die
-
-	games_make_wrapper ${PN} ./sacred "${dir}" "${dir}"/lib
-	newicon "${CDROM_ROOT}"/.data/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Sacred - Gold" ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 48b1633a4282..cc1eccf934bf 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1,2 @@
+DIST FlightGear-2016.1.1-data.tar.bz2 1266743984 SHA256 36016ac5ab83fc6ad44c5cebe0f4fa7a14cf55ff5b699016abdeacf5a04c4c18 SHA512 605d610d001f959e2434228b9c3741af0df5fd047af31e1d60ad5bdb1041cde3299cab622014735cff6534d2a8f0edbe44ab3528bae2072454aaf0b363e765b8 WHIRLPOOL 3c1c50d2a47a9c68839cea1c24439c1052fc8b4a8ff7ee4378913fe3aaa9c4f08feb3a2a8aca520087aa745a4bda0ef43d8ea4679072cd56ff1311acf27261e3
 DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512 791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9 WHIRLPOOL 0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild
new file mode 100644
index 000000000000..1a1745fa532f
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2016.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
new file mode 100644
index 000000000000..e261f2ed4675
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
+	git://mapserver.flightgear.org/fgdata"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 7988a9ffd062..cce1b8fad2cb 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1,2 @@
+DIST flightgear-2016.1.1.tar.bz2 7541607 SHA256 acdffb8a6a000cd44b23816f5d1467dbcf375d3cbd6233b2998467bd55dd60ac SHA512 bcebbf100e383a808154dbdf2b0f28ffcf0e3c0415a2db90e0daabb0073e83be69b3989dfc9e299c35fa6e39ddb5b9d4dfefd7f4c23ca8cd981768d8ab89e9c0 WHIRLPOOL d431c59c160a383c4f91f34f1e7ad322502704a4693c6c189cf258958703b0fe97290ab9db60a7de93f99511c79993c1a02de5ae559be0f0fab83b1bea371791
 DIST flightgear-3.4.0.tar.bz2 7522457 SHA256 b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512 10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e WHIRLPOOL 636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f
diff --git a/games-simulation/flightgear/flightgear-2016.1.1.ebuild b/games-simulation/flightgear/flightgear-2016.1.1.ebuild
new file mode 100644
index 000000000000..bbd90f602eb6
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2016.1.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=1
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}
+	media-libs/openal
+	media-libs/speex
+	media-sound/gsm
+	sys-libs/zlib
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/libpng:0
+		virtual/opengl
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DSIMGEAR_SHARED=ON
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install icons and menu entry
+	local s
+	for s in 16 22 24 32 48 64 128; do
+		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+	done
+	doicon -s scalable icons/scalable/${PN}.svg
+	use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+	newmenu package/${PN}.desktop ${PN}.desktop
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
new file mode 100644
index 000000000000..2d73c20cd971
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=1
+inherit cmake-utils bash-completion-r1 git-r3
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
+	git://mapserver.flightgear.org/${PN}"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}
+	media-libs/openal
+	media-libs/speex
+	media-sound/gsm
+	sys-libs/zlib
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/libpng:0
+		virtual/opengl
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DSIMGEAR_SHARED=ON
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install icons and menu entry
+	local s
+	for s in 16 22 24 32 48 64 128; do
+		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+	done
+	doicon -s scalable icons/scalable/${PN}.svg
+	use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+	newmenu package/${PN}.desktop ${PN}.desktop
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 9a12878a4492..b5c1cf772dad 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,2 +1 @@
-DIST openttd-1.5.0-source.tar.gz 10018865 SHA256 4c357205a63a475001a13e4ade59a73635e2f0c480ad097f4d7f03d2ae290ee0 SHA512 c2459165bd8f957d56d4171361237e6de42221f7b8c02f98503e2225a81fd496f10da9d9c60335edb981f86c4c4ce45fafc9edf43ea38a94b84f67136a17a165 WHIRLPOOL 88a15852d1ae01f7a03ea1bcc929bcdf450265a81462aa5316d2e16e86b79167d04503a83bc231eb411d159b70073c650db6e5604adbf07eccda43a193af3e20
 DIST openttd-1.5.3-source.tar.gz 10042384 SHA256 a5525de811ff83e89774d9a7344c7f63ec282b956c3f015af259fd79f54d18e5 SHA512 8185ea4b8e5ac9456c7067a5d662b4a2e1724e14fc0455705ec3b72943421cc5cb10cb67a4f483c47ff2fa6621a219cababd08e21086209a53241a74607b5466 WHIRLPOOL 839067c2c6f8f87ea74df376f3d3d5e2a126c5198f69efce1205603da67d97c1a1b0d5dc3b349aa92f916179ccc48581418b5aa1e9e7e250f636fae78bcbf7ac
diff --git a/games-simulation/openttd/files/openttd-1.5.0-cflags.patch b/games-simulation/openttd/files/openttd-1.5.0-cflags.patch
deleted file mode 100644
index bb7f768b3798..000000000000
--- a/games-simulation/openttd/files/openttd-1.5.0-cflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- openttd-1.4.4/config.lib
-+++ openttd-1.4.4/config.lib
-@@ -1450,12 +1450,6 @@
- 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
- 			LDFLAGS="$LDFLAGS -noixemul"
- 		fi
--
--		if [ "$enable_profiling" = "0" ]; then
--			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
--			CFLAGS="-fomit-frame-pointer $CFLAGS"
--		fi
--		CFLAGS="-O2 $CFLAGS"
- 	else
- 		OBJS_SUBDIR="debug"
- 
-@@ -1466,14 +1460,6 @@
- 				CFLAGS="$CFLAGS -G0"
- 			fi
- 		fi
--		if [ $enable_debug -ge 2 ]; then
--			CFLAGS="$CFLAGS -fno-inline"
--		fi
--		if [ $enable_debug -ge 3 ]; then
--			CFLAGS="$CFLAGS -O0"
--		else
--			CFLAGS="$CFLAGS -O2"
--		fi
- 	fi
- 
- 	if [ $enable_debug -le 2 ]; then
-@@ -1498,11 +1484,6 @@
- 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
- 	fi
- 
--	if [ "$enable_profiling" != "0" ]; then
--		CFLAGS="$CFLAGS -pg"
--		LDFLAGS="$LDFLAGS -pg"
--	fi
--
- 	if [ "$with_threads" = "0" ]; then
- 		CFLAGS="$CFLAGS -DNO_THREADS"
- 	fi
diff --git a/games-simulation/openttd/openttd-1.5.0.ebuild b/games-simulation/openttd/openttd-1.5.0.ebuild
deleted file mode 100644
index cb4fe056c13c..000000000000
--- a/games-simulation/openttd/openttd-1.5.0.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=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
-		media-libs/libsdl[sound,X,video]
-		icu? ( dev-libs/icu:= )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.7 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	sed -i \
-		-e '/Keywords/s/$/;/' \
-		media/openttd.desktop.in || die
-}
-
-src_configure() {
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts=" --without-allegro"
-
-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=" --without-libtimidity"
-
-	use debug && myopts+=" --enable-debug=3"
-
-	if use dedicated ; then
-		myopts+=" --enable-dedicated"
-	else
-		use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'"
-		myopts+="
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl"
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=" --with-zlib"
-	else
-		myopts+=" --without-zlib"
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX}" \
-		--binary-dir="${GAMES_BINDIR}" \
-		--data-dir="${GAMES_DATADIR}/${PN}" \
-		--install-dir="${D}" \
-		--icon-dir=/usr/share/pixmaps \
-		--menu-dir=/usr/share/applications \
-		--icon-theme-dir=/usr/share/icons/hicolor \
-		--man-dir=/usr/share/man/man6 \
-		--doc-dir=/usr/share/doc/${PF} \
-		--menu-group="Game;Simulation;" \
-		${myopts} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with cpu_flags_x86_sse sse) \
-		$(use_with lzo liblzo2) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	games_pkg_postinst
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-simulation/openttd/openttd-1.5.3.ebuild b/games-simulation/openttd/openttd-1.5.3.ebuild
index 88089b770af1..cb4fe056c13c 100644
--- a/games-simulation/openttd/openttd-1.5.3.ebuild
+++ b/games-simulation/openttd/openttd-1.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
 RESTRICT="test" # needs a graphics set in order to test
 
diff --git a/games-strategy/attal/Manifest b/games-strategy/attal/Manifest
deleted file mode 100644
index f516969c9cba..000000000000
--- a/games-strategy/attal/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST attal-src-0.10.1.tar.bz2 283704 SHA256 9dd692daa99dbf3ec14c178b5b3334a6a4085f790749aa58cf45ddf8c5e8649b SHA512 352b044aafd5e25ebdfa2c42af3c58c91a173db39461b2c845aaee964e418976cd58afa9f92fd99e3e498f7fad005c133d1482d212250477fc20b328e2e926db WHIRLPOOL 9a6865837f7fc8ec03e2441cfde8dba3e61cef3b12d231625e545ec0e01b4e2979311d6a5a7de19354edd07dd44db3ae8f0e5bbb05d561ff645d4c921316442a
-DIST themes-0.10.1.tar.bz2 30744206 SHA256 1f0e9c8b70ac8fd50cf7af492177b88383b230fe400f6ffa4b5641badac5a002 SHA512 cf3362f2ca5772135ab4e1760ac42ebc8195e6285c2cb96e8b89553851953c6fe15c5c06b30a4bd4e413c212b0f81d0386fedfddb089463824dfccefc3cc252a WHIRLPOOL ba0a3e1ba3805923a491fe64e4a175c27fe377fb2cbdca24f23b84c673fe010b044f3fef63ec864ef5ecda159035e3e1d8cca12ebf1ad01b3fd3b1af3b70d9ea
diff --git a/games-strategy/attal/attal-0.10.1.ebuild b/games-strategy/attal/attal-0.10.1.ebuild
deleted file mode 100644
index f3c320648fac..000000000000
--- a/games-strategy/attal/attal-0.10.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils qt4-r2 games
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="turn-based strategy game project"
-HOMEPAGE="http://www.attal-thegame.org/"
-SRC_URI="mirror://sourceforge/attal/${MY_P}.tar.bz2
-	mirror://sourceforge/attal/themes-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtsql:4
-	dev-qt/qt3support:4
-	media-libs/libsdl
-	media-libs/sdl-mixer[vorbis]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	mv ../themes .
-	ecvs_clean
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		libCommon/displayHelp.cpp \
-		libCommon/attalCommon.cpp \
-		server/duel.cpp \
-		|| die "sed failed"
-}
-
-src_configure() {
-	eqmake4 Makefile.pro
-}
-
-src_compile() {
-	local d
-
-	for d in Common Client Fight Server
-	do
-		emake sub-lib$d || die "emake failed"
-	done
-	emake || die "emake failed"
-}
-
-src_install() {
-	dogamesbin attal-* || die "dogamesbin failed"
-	dogameslib.so lib*.so* || die "dogameslib.so failed"
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r themes HOWTOPLAY.html || die "doins failed"
-	dodoc AUTHORS NEWS README TODO
-	prepgamesdirs
-}
diff --git a/games-strategy/attal/files/attal-0.10.1-gcc41.patch b/games-strategy/attal/files/attal-0.10.1-gcc41.patch
deleted file mode 100644
index 161aa3251d2e..000000000000
--- a/games-strategy/attal/files/attal-0.10.1-gcc41.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libClient/ressourceWin.h.old	2006-09-11 20:57:10.000000000 +0200
-+++ libClient/ressourceWin.h	2006-09-11 20:57:24.000000000 +0200
-@@ -54,7 +54,7 @@
-  
- public:
- 	/** Construtcor */
--	RessourceWin( QWidget * parent = 0, const char * name = 0, WinResType type );
-+	RessourceWin( QWidget * parent, const char * name, WinResType type );
- 
- 	/** Initialize player */
- 	void setPlayer( GenericPlayer * );
---- libCommon/creature.h.old	2006-05-25 00:50:11.000000000 -0400
-+++ libCommon/creature.h	2006-05-25 00:51:51.000000000 -0400
-@@ -38,6 +38,7 @@
- 
- class CreatureHandler;
- class GenericFightUnit;
-+int computeSequence( GenericFightUnit * unit );
- 
- /** Manage a creature */
- enum CreatureAnimationType {
-
---- server/serverInterface.h.old	2006-09-11 21:33:00.000000000 +0200
-+++ server/serverInterface.h	2006-09-11 21:33:16.000000000 +0200
-@@ -135,7 +135,7 @@
- 	void initStatusBar();
- 
- 	/** Add new action */
--	QAction * ServerInterface::addAction( const QString & label, MENU_ACTIONS id, QSignalMapper * sigmap );
-+	QAction *addAction( const QString & label, MENU_ACTIONS id, QSignalMapper * sigmap );
- 	
- 	void addAI(bool hide);
- 	
diff --git a/games-strategy/attal/files/attal-0.10.1-gentoo.patch b/games-strategy/attal/files/attal-0.10.1-gentoo.patch
deleted file mode 100644
index ab8d0c605105..000000000000
--- a/games-strategy/attal/files/attal-0.10.1-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libCommon/displayHelp.cpp.old	2006-09-11 22:41:38.000000000 +0200
-+++ libCommon/displayHelp.cpp	2006-09-11 22:42:20.000000000 +0200
-@@ -44,7 +44,7 @@
- 	_text->mimeSourceFactory()->setFilePath( QString(".") );
- 	_text->mimeSourceFactory()->setExtensionType( "html", "text/html;charset=iso8859-1" );
- 	_text->setTextFormat( Qt::RichText );
--	_text->setSource( "./HOWTOPLAY.html" );
-+	_text->setSource( "@GENTOO_DATADIR@/HOWTOPLAY.html" );
- 	
- 	QPushButton * pbOk = new QPushButton( this );
- 	pbOk->setText( QObject::tr( "Ok" ) );
---- libCommon/attalCommon.cpp.old	2006-09-11 22:45:23.000000000 +0200
-+++ libCommon/attalCommon.cpp	2006-09-11 22:47:28.000000000 +0200
-@@ -52,7 +52,7 @@
- {
-     QDir folder;
- 
--    folder.setPath( "./themes/" + THEME );
-+    folder.setPath( "@GENTOO_DATADIR@/themes/" + THEME );
- 
- #ifndef WIN32
-     if( ! folder.exists() ) {
---- server/duel.cpp.old	2006-09-11 22:48:30.000000000 +0200
-+++ server/duel.cpp	2006-09-11 22:48:57.000000000 +0200
-@@ -44,7 +44,7 @@
- {
- 	QDir folder;
- 		
--	folder.setPath( "./themes/" + THEME );
-+	folder.setPath( "@GENTOO_DATADIR@/themes/" + THEME );
- 	if( ! folder.exists() ) {
- 		folder.setPath( "/usr/local/share/games/attal/themes/" + THEME );
- 		if( ! folder.exists() ) {
diff --git a/games-strategy/attal/metadata.xml b/games-strategy/attal/metadata.xml
deleted file mode 100644
index ea58e232ebad..000000000000
--- a/games-strategy/attal/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 type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">attal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/coldwar-demo/Manifest b/games-strategy/coldwar-demo/Manifest
deleted file mode 100644
index f0a92cdf7b79..000000000000
--- a/games-strategy/coldwar-demo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST coldwar-demo.run 354684447 SHA256 769ca25da2f095e85e594ee09343ea20bf353e75f3bce362b937c2fae04c52aa SHA512 12fb0b482d7914c0f04256e5daefd287f1b172106de756c486e92341beb1d85332ba29941be0ba9711dabd2f2e7332c05034103c5a2a979743901b4eeb13b4a3 WHIRLPOOL 7df09173069969d2e7f7b50896058ae1553ef58eaa528db83c294adfad41c2b27ba4c7d1ff335a3901c66f1ea4bbb70f126f4f0cbcc369dab656d4ad93eacc9b
diff --git a/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild b/games-strategy/coldwar-demo/coldwar-demo-1-r2.ebuild
deleted file mode 100644
index 8c9d65451651..000000000000
--- a/games-strategy/coldwar-demo/coldwar-demo-1-r2.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 games
-
-MY_PN=${PN%-demo}
-
-DESCRIPTION="Third-person sneaker like Splinter Cell"
-HOMEPAGE="http://linuxgamepublishing.com/info.php?id=coldwar"
-SRC_URI="http://demofiles.linuxgamepublishing.com/coldwar/coldwar-demo.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3[abi_x86_32(-)]
-	>=media-libs/libogg-1.3.0[abi_x86_32(-)]
-	>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	>=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)]
-	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-QA_PREBUILT="${dir:1}/lib/*
-	${dir:1}/bin/meng"
-
-src_unpack() {
-	unpack_makeself
-	unpack ./data/data.tar.gz
-
-	mv bin/Linux/x86/${MY_PN}_demo .
-	mv bin/Linux/x86/bin/meng bin
-
-	rm -r bin/{Linux,*BSD} lgp_* setup.* data/data.tar.gz
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r *
-	rm "${D}/${dir}"/{${MY_PN}_demo,bin/{launcher,meng}}
-
-	exeinto "${dir}"
-	doexe ${MY_PN}_demo
-	exeinto "${dir}/bin"
-	doexe bin/{launcher,meng}
-
-	games_make_wrapper ${PN} ./${MY_PN}_demo "${dir}" "${dir}"
-	newicon icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Cold War (Demo)" ${PN}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "The instruction manual is available as:"
-	elog "   http://demofiles.linuxgamepublishing.com/coldwar/manual.pdf"
-	echo
-	einfo "To play the game, run: ${PN}"
-}
diff --git a/games-strategy/coldwar-demo/metadata.xml b/games-strategy/coldwar-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/coldwar-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/coldwar/Manifest b/games-strategy/coldwar/Manifest
deleted file mode 100644
index e5c8e219bc6e..000000000000
--- a/games-strategy/coldwar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST coldwar-1.0-1.0.1-x86.run 181769 SHA256 adffc27da6eff739a46193dd095d4b10048a251997b8c876befcae94423a1f32 SHA512 e7e2493e5b57d0ce254cb3e9baad722ed38b3c5813e81c17b39e382e590c629832397b2a810343673d61fae8b5da48335152c3c5c08e71abae6de24416ae7e75 WHIRLPOOL 3edc4958bd5c2863b26ae389fc49ea4562d0ed8f2191c66d0d2376879fffe15540bd3eb666a8a63e0422a48e087d26555526ab918deeb1a628acf5729b51b916
diff --git a/games-strategy/coldwar/coldwar-1.0.1-r1.ebuild b/games-strategy/coldwar/coldwar-1.0.1-r1.ebuild
deleted file mode 100644
index fb6deecfc11c..000000000000
--- a/games-strategy/coldwar/coldwar-1.0.1-r1.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 eutils unpacker cdrom versionator games
-
-PV_MAJOR=$(get_version_component_range 1-2)
-MY_P=${PN}-${PV_MAJOR}-${PV}
-
-DESCRIPTION="Third-person sneaker like Splinter Cell"
-HOMEPAGE="http://linuxgamepublishing.com/info.php?id=coldwar"
-SRC_URI="http://wolke.qcore.de/native/Spiele/Cold%20War/Patches/${MY_P}-x86.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="linguas_de linguas_fr linguas_ru"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3[abi_x86_32(-)]
-	>=media-libs/libogg-1.3.0[abi_x86_32(-)]
-	>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	>=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)]
-	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cdrom_get_cds bin/Linux/x86/${PN}
-	ln -sfn "${CDROM_ROOT}"/data cd
-	unpack "./cd/data.tar.gz"
-	use linguas_de && unpack "./cd/langpack_de.tar.gz"
-	use linguas_fr && unpack "./cd/langpack_fr.tar.gz"
-	use linguas_ru && unpack "./cd/langpack_ru.tar.gz"
-	rm -f cd
-
-	cp -rf "${CDROM_ROOT}"/bin/Linux/x86/* . || die
-	cp -f "${CDROM_ROOT}"/{READ*,icon*} . || die
-
-	mkdir -p patch_dir
-	cd patch_dir
-	unpack_makeself ${MY_P}-x86.run
-	bin/Linux/x86/loki_patch patch.dat "${S}" || die
-	cd "${S}"
-	rm -rf patch_dir
-}
-
-src_install() {
-	dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	doins -r *
-
-	exeinto "${dir}"
-	doexe ${PN}
-
-	exeinto "${dir}"/bin
-	doexe bin/{launch*,meng}
-
-	exeinto "${dir}"/lib
-	doexe lib/lib*
-
-	games_make_wrapper ${PN} ./${PN} "${dir}"
-	newicon "${CDROM_ROOT}"/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Cold War" ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-strategy/coldwar/metadata.xml b/games-strategy/coldwar/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/coldwar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index eb676f35b0f1..4bd4ca847c9e 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,2 @@
 DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8 WHIRLPOOL 1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55
-DIST freeciv-2.5.2.tar.bz2 40819394 SHA256 2b5665da849c8f95b9225857fc02935140de2d44cd1a112f9cf3086a84d0b5be SHA512 c2cd2123a3c3c86406afaa2607cd86b88b7cfeeb54cc1ab2db3bb79d8c56cea66baca53df32ebf7a697d0d31f1c7d08c3fafed759879633d38717c8d31ec5244 WHIRLPOOL d74c28d770c9fd5c499f2d66ab0485302ee53f2d10903095572529f59f464da6cc82b191d666b042093187805c00361399976a15c759cb61412ef77d06ae9b6d
 DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b WHIRLPOOL c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4
diff --git a/games-strategy/freeciv/freeciv-2.5.2.ebuild b/games-strategy/freeciv/freeciv-2.5.2.ebuild
deleted file mode 100644
index 4886b7979936..000000000000
--- a/games-strategy/freeciv/freeciv-2.5.2.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
-inherit eutils gnome2-utils games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-	)
-	readline? ( sys-libs/readline:0 )
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-	!dedicated? (
-		media-libs/libpng:0
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-gfx
-			media-libs/sdl-image[png]
-			media-libs/sdl-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)
-	system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-proto/xextproto
-		nls? ( sys-devel/gettext )
-	)"
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-	games_pkg_setup
-}
-
-src_prepare() {
-
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		tools/Makefile.in \
-		data/icons/Makefile.in || die
-	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-	local myclient myopts mydatabase
-
-	if use auth ; then
-		if use !mysql && use !sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase="${mydatabase} mysql"
-			use sqlite && mydatabase="${mydatabase} sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myopts="--enable-server"
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient+=" sdl"
-			use gtk && myclient+=" gtk2"
-			use qt5 && myclient+=" qt"
-		fi
-		myopts="$(use_enable server) --without-ggz-client"
-	fi
-
-	# disabling shared libs will break aimodules USE flag
-	egamesconf \
-		--docdir="/usr/share/doc/${P}" \
-		--localedir=/usr/share/locale \
-		$(use_enable ipv6) \
-		$(use_enable mapimg) \
-		--enable-aimodules="$(usex aimodules "yes" "no")" \
-		--enable-shared \
-		--enable-fcdb="${mydatabase}" \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable sound sdl-mixer) \
-		--enable-fcmp="$(usex modpack "gtk2" "no")" \
-		$(use_enable system-lua sys-lua) \
-		${myopts} \
-		--enable-client="${myclient}"
-}
-
-src_install() {
-	default
-
-	if use dedicated ; then
-		rm -rf "${D}/usr/share/pixmaps"
-		rm -f "${D}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
-	else
-		if use server ; then
-			# Create and install the html manual. It can't be done for dedicated
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-			# Note: to have it localized, it should be ran from _postinst, or
-			# something like that, but then it's a PITA to avoid orphan files...
-			./tools/freeciv-manual || die
-			dohtml manual*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${D}" -name "freeciv-manual*" -delete
-
-	rm -f "${D}$(games_get_libdir)"/*.a
-	prune_libtool_files
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index ac0c8741b53b..2ca3a17fcbb3 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,2 +1 @@
-DIST freecol-0.10.7-src.zip 46805547 SHA256 6909fc4e98dd765863b860d0fe16c5b75232d6fd4ef0ddea6e6de50cb06813fc SHA512 39bb8d9cc4566fb63c044552ef8bb698d06cb0a8baad85145288c5a435022efef5af822d6f779ebeb43d943916625320558dd118412e1bcaca0b2a0fa2b859d2 WHIRLPOOL 0fb908668807d3256ffb37e3c97d4ad0421c6f809e7e836f187f0d87af16c5953178165dabd799551fcf261d02f8671f4f360c4b851a6be77c47c556e86f67aa
 DIST freecol-0.11.5-src.zip 45280324 SHA256 99b31077fb3d7bfab44fcb900e0ea828a1dedf44fa814e05e166f240a68a5078 SHA512 1059c3b5c87c0f5ae07a99aaab1af2f73c7767a536aa2cff1b6c518b53d9ef6cb75713b4aeb601ab02bf946dcf451d01775b27cf82c457c0b9869e4cfeb55965 WHIRLPOOL 859c5097db4db88642fdfe0189bb731f47e7fe5118e943958698c351b21b6e0762a106b9541a8554633f770c7c2a0d4b57a8b7b26584e96be1277ec887721d67
diff --git a/games-strategy/freecol/files/freecol-0.10.7-gentoo.patch b/games-strategy/freecol/files/freecol-0.10.7-gentoo.patch
deleted file mode 100644
index 20f40695c26d..000000000000
--- a/games-strategy/freecol/files/freecol-0.10.7-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- build.xml.old	2012-03-03 20:28:27.470899027 +0100
-+++ build.xml	2012-03-03 20:29:27.702662193 +0100
-@@ -41,14 +41,11 @@
-         <!-- Woodstox XML processor -->
-         <pathelement location="${basedir}/${woodstox.jar}"/>
-         <!-- MigLayout manager -->
--        <pathelement location="${basedir}/${miglayout.jar}"/>
-+        <pathelement location="${miglayout.jar}"/>
-         <!-- Command line processor -->
--        <pathelement location="${basedir}/${cli.jar}"/>
-+        <pathelement location="${cli.jar}"/>
-         <!-- Cortado Video Applet -->
--        <pathelement location="${basedir}/${cortado.jar}"/>
--        <!-- JOgg/JOrbis libraries -->
--        <pathelement location="${basedir}/jars/jogg-0.0.7.jar"/>
--        <pathelement location="${basedir}/jars/jorbis-0.0.15.jar"/>
-+        <pathelement location="${cortado.jar}"/> 
-     </path>
-     <path id="junit.classpath">
-         <pathelement location="${basedir}/test/lib/junit.jar" />
-@@ -163,7 +160,7 @@
-       <manifest file="${basedir}/src/MANIFEST.MF">
-         <attribute name="Created-By" value="FreeCol Team"/>
-         <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
--        <attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/jogg-0.0.7.jar jars/jorbis-0.0.15.jar jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
-+        <attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
-         <attribute name="Product-Name" value="FreeCol"/>
-         <attribute name="Package-Title" value="FreeCol"/>
-         <attribute name="Package-Version" value="${svn.Revision}"/>
diff --git a/games-strategy/freecol/freecol-0.10.7.ebuild b/games-strategy/freecol/freecol-0.10.7.ebuild
deleted file mode 100644
index e9622e427cb8..000000000000
--- a/games-strategy/freecol/freecol-0.10.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit base eutils java-pkg-2 java-ant-2 games
-
-DESCRIPTION="An open source clone of the game Colonization"
-HOMEPAGE="http://www.freecol.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jsr173
-	dev-java/wstx:3.2
-	dev-java/commons-cli:1
-	dev-java/cortado
-	dev-java/miglayout"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-java_prepare() {
-	cd jars
-	rm jsr173_1.0_api.jar
-	rm wstx-lgpl-4.0pr1.jar
-	rm commons-cli-1.1.jar
-	rm miglayout-3.7.3.1-swing.jar
-	rm cortado-0.6.0.jar
-	rm jogg-0.0.7.jar
-	rm jorbis-0.0.15.jar
-}
-
-src_prepare() {
-	base_src_prepare
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	EANT_BUILD_TARGET=package
-	EANT_EXTRA_ARGS="
-		-Dstax.jar=$(java-pkg_getjars jsr173)
-		-Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
-		-Dcli.jar=$(java-pkg_getjars commons-cli-1)
-		-Dmiglayout.jar=$(java-pkg_getjars miglayout)
-		-Dcortado.jar=$(java-pkg_getjars cortado)
-	"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}/jars
-	java-pkg_dojar jars/vorbisspi1.0.3.jar
-	java-pkg_dojar jars/tritonus_share.jar
-	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
-	java-pkg_dojar FreeCol.jar
-	java-pkg_dolauncher ${PN} \
-		-into "${GAMES_PREFIX}" \
-		--pwd "${GAMES_DATADIR}"/${PN} \
-		--jar FreeCol.jar \
-		--java_args -Xmx512M
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data schema splash.jpg
-	doicon ${PN}.xpm
-	make_desktop_entry ${PN} FreeCol
-	dodoc README
-	prepgamesdirs
-}
-
-pkg_setup() {
-	games_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	java-pkg-2_pkg_preinst
-}
diff --git a/games-strategy/freecol/freecol-0.11.5.ebuild b/games-strategy/freecol/freecol-0.11.5.ebuild
index b1581cca3ca7..c61f8b6afd0b 100644
--- a/games-strategy/freecol/freecol-0.11.5.ebuild
+++ b/games-strategy/freecol/freecol-0.11.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index e5bdfbbf3a61..a9be3b21cdf6 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,3 +1,2 @@
-DIST lgeneral-1.3.0.tar.gz 1679182 SHA256 bd23962a8a98c1a3d3c176213c0b1845fd872ca68c141e2beff8d1a3792784ea SHA512 b958b4ee3fb6fa2b5e416cb30ddeca82cd17f0461a1afa6adc7d48d16f8e763e1610c3e05f561e442cc9460bdca64e2ac33cf616bd26f0ca8b2274c7e2b8bb41 WHIRLPOOL f00d2d0832727a1d90839bf6f1fd941a0c31e497a330dd991680146138f1dfb516e94e67a3ac8c20a1315e033313352a1d2f6a0e7f1153a7d365c2ef68581988
 DIST lgeneral-1.3.1.tar.gz 1678892 SHA256 6e95a84d7772f0bd2d64edac8c2aa45c6f750ae47bfb9dc203fe53a089e5562c SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5 WHIRLPOOL 9711bc8fc83a6806abc229c8de5ef669eb8335fb0aac59f5fbee9de7c3eb82865602569c83ba3246faa4be92ff5f2f8048b721bc605e299db5b76f88fe95e2d1
 DIST pg-data.tar.gz 410454 SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516 WHIRLPOOL 69f22f28cf4639dab0e6cf90036c26178129d7f67decf8b95ca175bb224bb3b985cf80382e06e45db06ef21d9ab9819fc1821b3d633a67bbb06ba56a8b450022
diff --git a/games-strategy/lgeneral/lgeneral-1.3.0.ebuild b/games-strategy/lgeneral/lgeneral-1.3.0.ebuild
deleted file mode 100644
index fa279849637d..000000000000
--- a/games-strategy/lgeneral/lgeneral-1.3.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils autotools gnome2-utils games
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/beta-}"
-DESCRIPTION="A Panzer General clone written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LGeneral"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mirror://sourceforge/${PN}/pg-data.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e '/desktop_DATA/d' \
-		-e '/icon_DATA/d' \
-		Makefile.am || die
-
-	cp /usr/share/gettext/config.rpath .
-	rm -f missing
-	mv configure.in configure.ac
-	eautoreconf
-
-	# Build a temporary lgc-pg that knows about ${WORKDIR}:
-	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		-e "s:@D@::" \
-		{lgc-pg,src}/misc.c || die
-
-	cd "${WORKDIR}"/tmp-build || die
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		-e "s:@D@:${D}:" \
-		{lgc-pg,src}/misc.c || die
-}
-
-src_configure() {
-	egamesconf \
-		$(use_enable nls)
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build || die
-	egamesconf \
-		--disable-nls \
-		--datadir="${D}/${GAMES_DATADIR}"
-}
-
-src_compile() {
-	emake
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build || die
-	emake
-}
-
-src_install() {
-	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
-
-	# Generate scenario data:
-	dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901
-	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg \
-		-s "${WORKDIR}"/pg-data \
-		-d "${D}/${GAMES_DATADIR}"/${PN} \
-		|| die
-
-	doicon -s 48 lgeneral.png
-	make_desktop_entry ${PN} LGeneral
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/lgeneral/lgeneral-1.3.1.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1.ebuild
index 45b8ee62f779..38eee967b4e4 100644
--- a/games-strategy/lgeneral/lgeneral-1.3.1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
new file mode 100644
index 000000000000..588a755e829c
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
@@ -0,0 +1,11 @@
+--- src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
++++ src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
+@@ -1349,7 +1349,7 @@
+ 			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
+ 			break;
+ 		default:
+-			snprintf(text, sizeof(text), _("Team victory!"));
++			snprintf(text, sizeof(text), "%s", _("Team victory!"));
+ 			break;
+ 	}
+ 	messenger.AddMessage("", 0, CD_SYSTEM, text, COLOR_ORANGE);
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
index bcde7131206c..15d30987c1a4 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug glfw"
 
 RDEPEND="app-arch/bzip2
@@ -32,6 +32,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-cmake.patch \
 		"${FILESDIR}"/${P}-soundconverter.patch \
 		"${FILESDIR}"/${P}-fpic.patch \
+		"${FILESDIR}"/${P}-format.patch \
 		"${FILESDIR}"/${P}-miniupnpc-api-14.patch
 }
 
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
deleted file mode 100644
index 202ecbc53324..000000000000
--- a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
-HOMEPAGE="http://www.siedler25.org/"
-# no upstream source tarball yet
-# https://bugs.launchpad.net/s25rttr/+bug/1069546
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug glfw"
-
-RDEPEND="app-arch/bzip2
-	media-libs/libsamplerate
-	media-libs/libsdl[X,sound,opengl,video]
-	media-libs/libsndfile
-	media-libs/sdl-mixer[vorbis]
-	net-libs/miniupnpc
-	virtual/libiconv
-	virtual/opengl
-	glfw? ( <media-libs/glfw-3 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-soundconverter.patch \
-		"${FILESDIR}"/${P}-fpic.patch
-}
-
-src_configure() {
-	local arch
-	case ${ARCH} in
-		amd64)
-			arch="x86_64" ;;
-		x86)
-			arch="i386" ;;
-		*) die "Architecture ${ARCH} not yet supported" ;;
-	esac
-
-	local mycmakeargs=(
-		-DCOMPILEFOR="linux"
-		-DCOMPILEARCH="${arch}"
-		-DCMAKE_SKIP_RPATH=YES
-		-DPREFIX="${GAMES_PREFIX}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DLIBDIR="$(games_get_libdir)/${PN}"
-		-DDRIVERDIR="$(games_get_libdir)/${PN}"
-		-DGAMEDIR="~/.${PN}/S2"
-		$(cmake-utils_use_build glfw GLFW_DRIVER)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# work around some relative paths (CMAKE_IN_SOURCE_BUILD not supported)
-	ln -s "${CMAKE_USE_DIR}"/RTTR "${CMAKE_BUILD_DIR}"/RTTR || die
-
-	cmake-utils_src_compile
-
-	mv "${CMAKE_USE_DIR}"/RTTR/{sound-convert,s-c_resample} "${T}"/ || die
-}
-
-src_install() {
-	cd "${CMAKE_BUILD_DIR}" || die
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe "${T}"/{sound-convert,s-c_resample}
-	exeinto "$(games_get_libdir)"/${PN}/video
-	doexe driver/video/SDL/src/libvideoSDL.so
-	use glfw && doexe driver/video/GLFW/src/libvideoGLFW.so
-	exeinto "$(games_get_libdir)"/${PN}/audio
-	doexe driver/audio/SDL/src/libaudioSDL.so
-
-	insinto "${GAMES_DATADIR}"
-	doins -r "${CMAKE_USE_DIR}"/RTTR
-	dosym ./LSTS/splash.bmp "${GAMES_DATADIR}"/RTTR/splash.bmp
-
-	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
-	dogamesbin src/s25client
-	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
-	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Copy your Settlers2 game files into ~/.${PN}/S2"
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index f9f349b341b7..76b742537fa0 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -5,3 +5,4 @@ DIST uqm-0.7.0-voice.uqm 115143439 SHA256 bcccf801b4ba37594ff6217b292744ea586ee2
 DIST uqm-remix-disc1.uqm 50188876 SHA256 b697694745d939311e8ebffdd5edf692e010c25d7966e1481074940a4d0487e8 SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b WHIRLPOOL fee79171e43fb203dcc2b8cbca7d3e2edfa4c6334a1f0996fa8951dc67ef94e67f06edbe250810e1385f5887834a7a0755e1e40a9aa3cdae0cdfb937e238fe46
 DIST uqm-remix-disc2.uqm 60282662 SHA256 7fbb4744102e31273e4459b01a156da052ec537c128fe91793643e348bc1bade SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e WHIRLPOOL e52f1eb1c8cd0007eb77d80719f8feeb044c61bb2d72c14fae92ba62ea8ad1225ffa427db39dadd864304818839c4df0e1e0fe9c0d8a2b265ceead14f70df56e
 DIST uqm-remix-disc3.uqm 39924875 SHA256 e6d89f8f66cf1df1cb278fca1e92261b1776ee670dff26132e33f14dbd31e91d SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951 WHIRLPOOL ba1ed49bb6761d9955fe9beced1987dd4458cd0203a9c8e712bb55034fd8d278f489c995969866cb7096bea75e88b330031f070b7aeb7e09f48fda0ece862e36
+DIST uqm-remix-disc4.uqm 86545760 SHA256 a4c8197712a5b72a81c7ef7a2a33ea7d3ac90ab063c929dd68e7328a559a86d0 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65 WHIRLPOOL 011859d9c7566c369c086925548fd4340e34d4f3657c6d4ff242451e7665acbac8c18ec2d6818856011e930a01406d947164ec0b8ed454b422424ec3fa78972c
diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
new file mode 100644
index 000000000000..41d994abfc07
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs games
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
+	mirror://sourceforge/sc2/${P}-content.uqm
+	music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+	voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+	remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="music opengl remix voice"
+
+RDEPEND="media-libs/libmikmod
+	media-libs/libogg
+	>=media-libs/libpng-1.4:0
+	media-libs/libsdl[X,sound,joystick,video]
+	media-libs/libvorbis
+	media-libs/sdl-image[png]
+	sys-libs/zlib
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	local myopengl
+
+	use opengl \
+		&& myopengl=opengl \
+		|| myopengl=pure
+
+	cat <<-EOF > config.state
+	CHOICE_debug_VALUE='nodebug'
+	CHOICE_graphics_VALUE='${myopengl}'
+	CHOICE_sound_VALUE='mixsdl'
+	CHOICE_accel_VALUE='plainc'
+	INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+	INPUT_install_bindir_VALUE='\$prefix/bin'
+	INPUT_install_libdir_VALUE='\$prefix/lib'
+	INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
+	EOF
+
+	# Take out the read so we can be non-interactive.
+	sed -i \
+		-e '/read CHOICE/d' build/unix/menu_functions || die
+
+	# respect CFLAGS
+	sed -i \
+		-e "s/-O3//" build/unix/build.config || die
+
+	sed -i \
+		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
+		build/unix/uqm-wrapper.in || die
+
+	# respect CC
+	sed -i \
+		-e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
+		build/unix/config_proginfo_build || die
+}
+
+src_compile() {
+	MAKE_VERBOSE=1 ./build.sh uqm || die
+}
+
+src_install() {
+	# Using the included install scripts seems quite painful.
+	# This manual install is totally fragile but maybe they'll
+	# use a sane build system for the next release.
+	newgamesbin uqm-wrapper uqm
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe uqm
+
+	insinto "${GAMES_DATADIR}"/${PN}/content/packages
+	doins "${DISTDIR}"/${P}-content.uqm
+	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
+
+	insinto "${GAMES_DATADIR}"/${PN}/content/addons
+	if use music; then
+		doins "${DISTDIR}"/${P}-3domusic.uqm
+	fi
+
+	if use voice; then
+		doins "${DISTDIR}"/${P}-voice.uqm
+	fi
+
+	if use remix; then
+		insinto "${GAMES_DATADIR}"/${PN}/content/addons
+		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
+	fi
+
+	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt
+	docinto devel
+	dodoc doc/devel/[!n]*
+	docinto devel/netplay
+	dodoc doc/devel/netplay/*
+	make_desktop_entry uqm "The Ur-Quan Masters"
+	prepgamesdirs
+}
diff --git a/games-strategy/warzone2100/warzone2100-3.1.3.ebuild b/games-strategy/warzone2100/warzone2100-3.1.3.ebuild
index f255dddd914b..5eba145c7e48 100644
--- a/games-strategy/warzone2100/warzone2100-3.1.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -42,7 +42,7 @@ RDEPEND=">=dev-games/physfs-2[zip]
 		dev-qt/qtgui:4
 		dev-qt/qtopengl:4
 	)
-	!qt4? ( media-libs/libsdl[opengl,video] )"
+	!qt4? ( media-libs/libsdl[opengl,video,X] )"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	virtual/pkgconfig
diff --git a/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
index e138e3f617b5..a144e6cadfae 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
 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 b693cf0b30e7..91e2398a11d5 100644
--- a/gnome-base/dconf/dconf-0.24.0.ebuild
+++ b/gnome-base/dconf/dconf-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 inherit gnome2 bash-completion-r1 virtualx
 
 DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="https://wiki.gnome.org/dconf"
+HOMEPAGE="https://wiki.gnome.org/action/show/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index 51ae704f412b..a1f1fe1872cf 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
diff --git a/gnome-base/gdm/gdm-3.18.2.ebuild b/gnome-base/gdm/gdm-3.18.2.ebuild
index 15a468f5d696..b52aa88557c2 100644
--- a/gnome-base/gdm/gdm-3.18.2.ebuild
+++ b/gnome-base/gdm/gdm-3.18.2.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 
 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
index 90221bc65fcb..515b9cf0e677 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+autoconf-archive"
 
 RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 )
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
index c708358183e0..714ffc27fd63 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 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.18.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
index 795f5cf5261e..ef4c5052b4ea 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.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.18.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
index 1b3585689367..dae9c7f9157b 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.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.18.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
index ada8058e5a1b..0151f31e0ce8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/12" # 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.18.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
index 5aea7dc35347..338685d4dd49 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.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.18.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
index 0d19a8828b11..8633663a55ec 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps 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.18.0.ebuild b/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
index 9b236c6f9f86..9a88dd6ca543 100644
--- a/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.18.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-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
index 9b90894c75fe..718d22641642 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="+introspection test"
 
diff --git a/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild b/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
index 2b0470d450f6..5c7bea4ce1a7 100644
--- a/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.18.1.2.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 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.18.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
index 6dcd65194674..429147429578 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.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.18.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
index b688230c52fd..f51bd3fc0324 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+bluetooth +networkmanager +nls -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/gnome-3.18.0.ebuild b/gnome-base/gnome/gnome-3.18.0.ebuild
index 16281a64ac21..929513a565ad 100644
--- a/gnome-base/gnome/gnome-3.18.0.ebuild
+++ b/gnome-base/gnome/gnome-3.18.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.18.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
index 5818884c13cf..ee9a32769b96 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.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/Manifest b/gnome-base/gvfs/Manifest
index 1f559a5a362e..fd397e88f8b7 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,2 +1,3 @@
 DIST gvfs-1.24.2.tar.xz 1627808 SHA256 0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228 SHA512 4e5a3150ec4a57ca1229653fd2ce91840e8f7c372de8eb3cd9196b83a687c4336b6fd6fec3f6f6dca740ff1033906cce8f42377c45014f4ce7fd9c33bdcedc59 WHIRLPOOL c65c2402a77cb5de3180f9988b6f0c29af3d979863e32943bca70a30dda89197a0747ed18ebfffe6d70a06d790be195a749c7b34afbfd780c80273aacad9844f
 DIST gvfs-1.26.2.tar.xz 1680404 SHA256 695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18 SHA512 0745b850d476311c5d1de357f902ff0c18f34be05fc2d047e1435b2ca3732ce6e2f95f9bd41ce100ed590939c45c6f7dcf8274799c7b552d80f56af7919df110 WHIRLPOOL 86116ac7878252e9078c1215198787a96c987e0ac0ef5e06bda24938ec142f7f073755bfa5409aee208ba516a6c36698798a4772d214c9897cbece0d50b6defb
+DIST gvfs-1.26.3.tar.xz 1682264 SHA256 a70f75fa60d66f3f478c0c8aec43d0e43455a8cc75a4dfa8029e51c816401b4a SHA512 ce75dbb42c07572b4829deeacee39a1875a894bc874eb6e542ca42c3908150d890b7dbb39fadb744fecdab635fb1fedd3df31fabf5bd7be0fa537714f874c94e WHIRLPOOL d048d411caa614d5aebcb1026af5870d589661f4db527b07f525c1c1a68199e0d6b8a428f6d9afa0291a7222d04c723d1442c08cc132fc1fc30973fc3946da3c
diff --git a/gnome-base/gvfs/gvfs-1.26.2.ebuild b/gnome-base/gvfs/gvfs-1.26.2.ebuild
deleted file mode 100644
index ed7f6f9cfda3..000000000000
--- a/gnome-base/gvfs/gvfs-1.26.2.ebuild
+++ /dev/null
@@ -1,128 +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 autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	google? ( gnome-online-accounts )
-	mtp? ( udev )
-	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"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
-	app-crypt/gcr:=
-	>=dev-libs/glib-2.45.7:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
-	google? (
-		>=dev-libs/libgdata-0.17.3:=[gnome]
-		>=net-libs/gnome-online-accounts-3.17.1 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.5:=
-		>=app-pda/libplist-1:= )
-	mtp? ( >=media-libs/libmtp-1.1.6 )
-	nfs? ( >=net-fs/libnfs-1.9.7 )
-	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
-	systemd? ( sys-apps/systemd:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		virtual/libgudev:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-
-		# Uncomment when eautoreconf stops being needed always
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--enable-bash-completion \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		--enable-gcr \
-		--disable-gdu \
-		--disable-hal \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--enable-documentation \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable fuse) \
-		$(use_enable gnome-keyring keyring) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable nfs) \
-		$(use_enable udev) \
-		$(use_enable udev gudev) \
-		$(use_enable http) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.26.3.ebuild b/gnome-base/gvfs/gvfs-1.26.3.ebuild
new file mode 100644
index 000000000000..2b0c0f11ea0e
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.26.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf"
+REQUIRED_USE="
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	mtp? ( udev )
+	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"
+
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND="
+	app-crypt/gcr:=
+	>=dev-libs/glib-2.45.7:2
+	sys-apps/dbus
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+	google? (
+		>=dev-libs/libgdata-0.17.3:=[crypt,gnome-online-accounts]
+		>=net-libs/gnome-online-accounts-3.17.1 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	http? ( >=net-libs/libsoup-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.5:=
+		>=app-pda/libplist-1:= )
+	mtp? ( >=media-libs/libmtp-1.1.6 )
+	nfs? ( >=net-fs/libnfs-1.9.7 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
+	systemd? ( sys-apps/systemd:0= )
+	udev? (
+		cdda? ( dev-libs/libcdio-paranoia )
+		virtual/libgudev:=
+		virtual/libudev:= )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	zeroconf? ( >=net-dns/avahi-0.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-core-12.3.0
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+
+		# Uncomment when eautoreconf stops being needed always
+		eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	# --disable-obexftp, upstream bug #729945
+	gnome2_src_configure \
+		--enable-bash-completion \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--enable-gcr \
+		--disable-gdu \
+		--disable-hal \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--enable-documentation \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable fuse) \
+		$(use_enable gnome-keyring keyring) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable google) \
+		$(use_enable gphoto2) \
+		$(use_enable gtk) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable nfs) \
+		$(use_enable udev) \
+		$(use_enable udev gudev) \
+		$(use_enable http) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udisks udisks2) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/gnome-base/libgtop/libgtop-2.32.0.ebuild b/gnome-base/libgtop/libgtop-2.32.0.ebuild
index c0e902392a00..1dcc15316387 100644
--- a/gnome-base/libgtop/libgtop-2.32.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.32.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2"
 SLOT="2/10" # libgtop soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.26:2"
diff --git a/gnome-base/librsvg/librsvg-2.40.13.ebuild b/gnome-base/librsvg/librsvg-2.40.13.ebuild
index d38ade171363..9615467ff2da 100644
--- a/gnome-base/librsvg/librsvg-2.40.13.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.13.ebuild
@@ -14,7 +14,7 @@ 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"
+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 )"
diff --git a/gnome-base/nautilus/nautilus-3.18.5.ebuild b/gnome-base/nautilus/nautilus-3.18.5.ebuild
index 04c8410e5cb3..82561ef9e588 100644
--- a/gnome-base/nautilus/nautilus-3.18.5.ebuild
+++ b/gnome-base/nautilus/nautilus-3.18.5.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 
 IUSE="exif gnome +introspection packagekit +previewer selinux 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/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
index 900100e4fbfd..53b4a9213af8 100644
--- a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
+++ b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/at-spi/at-spi-2.12.0.ebuild b/gnome-extra/at-spi/at-spi-2.12.0.ebuild
deleted file mode 100644
index 7158a34d0fb3..000000000000
--- a/gnome-extra/at-spi/at-spi-2.12.0.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="5"
-
-DESCRIPTION="The Gnome Accessibility Toolkit"
-HOMEPAGE="https://projects.gnome.org/accessibility/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="2"
-KEYWORDS="amd64 arm ~hppa x86"
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/at-spi2-atk-${PV}:2
-	>=app-accessibility/at-spi2-core-${PV}:2
-	>=dev-python/pyatspi-${PV}
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND=""
diff --git a/gnome-extra/at-spi/at-spi-2.14.0.ebuild b/gnome-extra/at-spi/at-spi-2.14.0.ebuild
deleted file mode 100644
index 5e4796d6e720..000000000000
--- a/gnome-extra/at-spi/at-spi-2.14.0.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"
-
-DESCRIPTION="The Gnome Accessibility Toolkit"
-HOMEPAGE="https://projects.gnome.org/accessibility/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="2"
-KEYWORDS="amd64 arm ~hppa x86"
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/at-spi2-atk-${PV}:2
-	>=app-accessibility/at-spi2-core-${PV}:2
-	>=dev-python/pyatspi-${PV}
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND=""
diff --git a/gnome-extra/at-spi/metadata.xml b/gnome-extra/at-spi/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/at-spi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
index e8fdca94b5a9..f1ff33df81aa 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
@@ -15,7 +15,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.8.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
index efc141241e08..9e6068aaee60 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.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.8.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
index 1da114d46786..e53cb629f89d 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.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.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
index fd41717b3b40..902bda93f792 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.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.8.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
index 13d43b64feef..f9d700a6bca9 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.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.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
index 4235b31db497..9caab862e317 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.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/cinnamon-translations-2.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
index 7cbeac18537d..8dd62f7be62a 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
index 62a193c98954..5452e342014f 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-atk:2
diff --git a/gnome-extra/cjs/cjs-2.8.0.ebuild b/gnome-extra/cjs/cjs-2.8.0.ebuild
index 7f766c8bd95c..902f86491dc1 100644
--- a/gnome-extra/cjs/cjs-2.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-2.8.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:24
diff --git a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
index 56058320c516..459be20bb30a 100644
--- a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="xattr"
 
 RDEPEND="
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 951983170364..a6779df3e277 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,3 @@
 DIST evolution-data-server-3.16.5.tar.xz 5364120 SHA256 e44ad4143402957cab8cab1a6b3d7057d8b111d268c6b9ad4e4008850f5b244c SHA512 7f4fd758175d3d48d249cebd855fe684b808574421f1d09ee90aad16c76da89980f17bb2fa9741187adb44327166ebcb78c5330f28f01b20f3810c36653f78d1 WHIRLPOOL 559b4e2f1de4f26bf5806c1f5cabc3afe6aea910fa0dcf657947d085ea2344250b8b149a7d6760d342abb1893872b937c7d7626648cff2fe12fe531fb52cd3c2
-DIST evolution-data-server-3.18.3.tar.xz 5411056 SHA256 9de9d6392822bb4b89318a88f5db1fd2f0f09899b793a0dd5525a656ed0e8163 SHA512 af17a550991a453de9e953c343e774c0ee1155a483a3c2d55e3da9b5ba9a99adbbc9de56c57d27176c8508dec8bba771480a1787d88fb09daaab57b9c1cdf712 WHIRLPOOL 01871974e33cf3510a181ea5a3e1ade4cc29675445b39b0de3e64ad93ab0de5b2330c778e8ef201e43d071c79b1825ab01731b71497b49e1f7b65bd02f3b3da9
 DIST evolution-data-server-3.18.4.tar.xz 5413312 SHA256 0b756f05feae538676832acc122407046a89d4dd32da725789229dc3c416433f SHA512 eb5a7d869f60ec104bdc778c6fc1d2e38aec5983e5996f3dff3fe582649074ba4e4a111d593729587ddbf36a43f76475370e7d70f21e95f9c63f1bbfe877adb3 WHIRLPOOL 479ec13c6ebd343361a2c531843434ef956712abcd1273da1a9d829220511ecef5ce7dbdbd65605db85353294aafb93aa12846855fc0d06ccf0d5150d0ee9e0a
+DIST evolution-data-server-3.18.5.tar.xz 5414416 SHA256 a897c789925e86df31a1c78212b431cca13dc4d5a3d87e1fb3d507df3994e8e1 SHA512 10b17b771dbb55ad8320b742d96f6d720f3245bed24fdc415027df6920b0847afa89eb839cd5d4613c0ec40972634c7c695e4ea0ce819973eab0de99987c253e WHIRLPOOL 3c95f43113882409bf85b8f97d49cea74e857ce4c562b625b0936bd014b0799ea16b6c7d2d9c0c0cdbd1f6ce7daf509c15d6413b26f275050da30030a5f0d2a3
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.18.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.18.3.ebuild
deleted file mode 100644
index 131b47c55075..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.18.3.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"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
-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/54" # 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.10: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.10: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
-}
-
-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.18.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
new file mode 100644
index 000000000000..091471e1cee2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 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,5} pypy )
+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/54" # subslot = libcamel-1.2 soname version
+
+IUSE="api-doc-extras +berkdb +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
+# berkdb needed only for migrating old calendar data, bug #519512
+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:=
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10: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.10: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
+	>=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
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && 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) \
+		$(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
+		$(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 \
+		--without-phonenumber \
+		--disable-examples \
+		--disable-uoa
+}
+
+src_test() {
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
+
+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
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! use berkdb; then
+		ewarn "You will need to enable berkdb USE for migrating old"
+		ewarn "(pre-3.12 evolution versions) addressbook data"
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 1269fc2db985..d9cbdeb71764 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,3 +1,3 @@
 DIST evolution-ews-3.16.5.tar.xz 684684 SHA256 d67e0cbf94800fb7035205bf8fd61ae1413ae7ba79265f8750fde1e7fb25eb58 SHA512 f046f3e0581cd21441b3737ff2fdd7cc3fa1333c3de8c3cf0be48f39239985cb68cbbd04089a84fa5f31ef84cc4100cf8a9ac0d1e6e261522f6e5305e505c0c7 WHIRLPOOL 960c84417c0b6a4374e5f063619c5495afc3b8eb0902b452021513c3a25fa1af148a71b3adbc19b915c857a4337f97de4eb0dac098db97a14e4ec362e36b0f28
-DIST evolution-ews-3.18.3.tar.xz 703116 SHA256 b42dd81dfa1db4cdccff5a14a8f233b2b85d26033b585bcad9122d7ccd2b3b13 SHA512 daa77c2b4f3bcc8c1f56d5e1904b7d4b826ef61298ecce9d6b69e389523071b4da54ee04d73af196d8fed0ccf93a26b8fd32e2f85e2d9f3392da7689b62d7291 WHIRLPOOL a2bb480aa6c56bf8735238653b5645eedd1bd56657027d08b35b2bd76820e8e7190c1b799c1b004656c5c783f015d9ff861519bd092d8957053b6125285a5da9
 DIST evolution-ews-3.18.4.tar.xz 702952 SHA256 9285d4f1f1c32e25a4ac75f38a872c2b88f463196a796d7974ada4e89a01c707 SHA512 a39fc2d919c3a388331db0643009f8dabf229637ca79be92aa88bf80e67452bdfc8b95bbaed3a774cbc27a2b365162af1a15589fe577ee90d6e7af85e2dae9e3 WHIRLPOOL 509c00635a0458571717bcc0d656bc635c8ade15ef62b5da17c7ed3b365a0aabf70df7ffa6c464d5b9f1d7d01fcd0300d98c272f82f9a20abbcf5dcd32472734
+DIST evolution-ews-3.18.5.tar.xz 702984 SHA256 7e1ed3b18161a620ba358ebf23e4c7aea85c0c5070be3c20a8a2ef012fbcfc55 SHA512 a1359803a9929391ac8b2945e411058cef6038c607706a08c1ab270c40d2b0840537e5c29416bf74bc9d5b3b6a073257f21f0c16951e6e1aa49ee8f983725c27 WHIRLPOOL 0d742407b3d293d4f70656e40dce3f1503f0e5f2ac599d2681a8cb49a34e5647aa4a8b3a85aeebd025e543fc54bc4f282c103bdb09d50d0be633c8e52fb2d4fb
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.18.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.18.3.ebuild
deleted file mode 100644
index f511fc91a43c..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.18.3.ebuild
+++ /dev/null
@@ -1,41 +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 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/evolution-ews/evolution-ews-3.18.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild
new file mode 100644
index 000000000000..f8320ee5200d
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.18.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/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
deleted file mode 100644
index 3002c10b6264..000000000000
--- a/gnome-extra/gdesklets-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gdesklets-0.36.3.tar.bz2 3745626 SHA256 805b0343635e5dcfd24d23ab10f0153ab5135dc971ba1712fbf4bddbeee26af5 SHA512 c54a759023fe31e97271fe1a400afda0c61163f3b6c5fa3f9e0ea8d4c048f7edad62273aab1fb2160a48a0289ead43c35eef920d83dfd3f653c79c53e367fc4c WHIRLPOOL b1000971867ca36dba1e805ae3d3430d3c5cdf5a6023a71754f59d8245e11217b5d883bd6031bb7a3f384ce819e1eb06cc246cf1f12cfb8448ff5c6d356a3271
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
deleted file mode 100644
index b9af404a3b63..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-control-getid
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python2
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# 
-# A simple script to get the name and id from a Control.
-# Pretty much copied from test-control.py
-
-from plugin.Interface import Interface
-
-import sys
-import os
-import __builtin__
-
-if "." not in sys.path: sys.path.append(".")
-
-try:
-    path = os.path.abspath(sys.argv[1])
-    folder, base = os.path.split(path)
-except:
-    sys.exit("ERROR IN CONTROL INSTALLATION")
-
-
-os.chdir(folder)
-try:
-    module = __import__(base)
-    clss = module.get_class()
-
-except IOError:
-    sys.exit("Could not load control in %s!" % (folder))
-
-# Get the string in the form of "IMyControl:hash" and translate it to
-# "MyControl_hash"
-# gDesklets needs it in the form of a valid python module name
-print (Interface.get_id(Interface.get_interfaces(clss)[0]).replace(":", "_"))[1:]
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch
deleted file mode 100644
index 8d9b3dc10c98..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'config/Makefile.am'
---- config/Makefile.am	2008-12-29 15:33:52 +0000
-+++ config/Makefile.am	2010-05-01 17:24:06 +0000
-@@ -21,7 +21,6 @@
- 	ConfigUnit.py     \
- 	ConfigURI.py      \
- 	ConfigDialog.py   \
--	ConfigWidget.py   \
- 	ConfigManager.py  \
- 	ConfigWidget.py   \
- 	DaemonConfigger.py  \
-
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
deleted file mode 100644
index fc8753e46c85..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am	2010-12-14 10:24:59 +0000
-+++ Makefile.am	2011-01-31 01:20:58 +0000
-@@ -11,8 +11,12 @@
- autostartdir = $(sysconfdir)/xdg/autostart
- sharedmimepackagedir = $(datadir)/mime/packages
- mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
-+pixmapdir = $(datadir)/pixmaps
- basicdeskletsdir = ${installdir}
- 
-+# initialize this so we can add to it later
-+nobase_dist_install_DATA =
-+
- include Makefile_gdesklets.am
- include Makefile_python.am
- 
-
-=== modified file 'Makefile_gdesklets.am'
---- Makefile_gdesklets.am	2011-01-06 11:01:06 +0000
-+++ Makefile_gdesklets.am	2011-01-31 01:20:58 +0000
-@@ -1,12 +1,14 @@
- # Set the LDFLAGS for this section
- AM_LDFLAGS = -module -avoid-version -as-needed
- 
-+# Libraries that get installed in these exact subdirectories
- nobase_install_LTLIBRARIES = \
-   libdesklets/system/gtop.la \
-   utils/svg.la               \
-   utils/tiling.la            \
-   utils/x11.la
- 
-+# Scripts that get distributed and installed
- dist_install_SCRIPTS =             \
-   ctrlinfo                         \
-   gdesklets                        \
-@@ -16,38 +18,62 @@
-   gdesklets-shell                  \
-   test-control.py
- 
-+# "System" scripts that get distributed but not installed
- dist_noinst_SCRIPTS = autogen.sh
- 
-+# Man page
- dist_man_MANS = doc/man/gdesklets.1
- 
--EXTRA_DIST =             \
--  AUTHORS                \
--  COPYING                \
--  README                 \
--  TODO                   \
--  NEWS                   \
--  contrib/bash/gdesklets
--
-+# The .desktop file
-+desktop_in_files = data/gdesklets.desktop.in
-+# The shared mime XML file
-+sharedmimepackage_in_files = data/gdesklets.xml.in
-+
-+# Other odds and ends that get distributed, but not installed
-+# It's up to distro package maintainers to install these
-+EXTRA_DIST =                                          \
-+  AUTHORS                                             \
-+  COPYING                                             \
-+  README                                              \
-+  TODO                                                \
-+  NEWS                                                \
-+  contrib/bash/gdesklets                              \
-+  $(desktop_in_files)                                 \
-+  $(sharedmimepackage_in_files)
-+
-+# Docs and images that get distributed and installed to these specific
-+# directories
-+nobase_dist_install_DATA +=                 \
-+  doc/basic/gdesklets-doc.xml               \
-+  doc/basic/Images/desklet-context-menu.png \
-+  doc/basic/Images/desklet-start-shell.png  \
-+  doc/basic/Images/gdesklets.png            \
-+  doc/basic/Images/open-command.png         \
-+  doc/basic/Images/preferences.png          \
-+  doc/basic/Images/profile.png              \
-+  doc/basic/Images/remote.png               \
-+  doc/basic/Images/shell.png                \
-+  data/about.png                            \
-+  data/gdesklets.png
-+
-+# Additional files that get cleaned by distclean
- # See http://www.gnu.org/software/hello/manual/automake/Clean.html
- CLEANFILES =   \
-   po/.intltool-merge-cache
- 
- # The .desktop file
--desktop_in_files = data/gdesklets.desktop.in
--dist_desktop_DATA= $(desktop_in_files)
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
- 
- # The shared mime XML file
--sharedmimepackage_in_files = data/gdesklets.xml.in
--dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
- sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
- @INTLTOOL_XML_RULE@
- 
- # And the mime icon
--mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
-+dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
- 
-+# Note, this gets installed in both $(pixmapdir) and $(installdir)
- pixmap_DATA = data/gdesklets.png
- 
- libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \
-
-=== modified file 'Makefile_python.am'
---- Makefile_python.am	2010-12-14 10:24:59 +0000
-+++ Makefile_python.am	2011-01-31 01:20:58 +0000
-@@ -1,4 +1,4 @@
--nobase_dist_install_DATA =              \
-+nobase_dist_install_DATA +=             \
- 	Controls/__init__.py	\
- 	Controls/ArrayBuffer/__init__.py \
- 	Controls/ArrayBuffer/IArrayBuffer.py \
-@@ -48,21 +48,6 @@
- 	config/DisplayConfigger.py \
- 	config/StateSaver.py     \
- 	config/settings.py \
--	data/about.png                               \
--	data/calendar.png                            \
--	data/gdesklets.desktop                       \
--	data/gdesklets.png                           \
--	data/gdesklets.xml                           \
--	data/gnome-mime-application-x-gdesklets-display.png \
--	doc/basic/gdesklets-doc.xml \
--	doc/basic/Images/desklet-context-menu.png	\
--	doc/basic/Images/desklet-start-shell.png		\
--	doc/basic/Images/gdesklets.png	        	\
--	doc/basic/Images/open-command.png		\
--	doc/basic/Images/preferences.png			\
--	doc/basic/Images/profile.png			\
--	doc/basic/Images/remote.png			\
--	doc/basic/Images/shell.png \
- 	display/__init__.py            \
- 	display/ContainerTarget.py     \
- 	display/DataTarget.py          \
-@@ -212,4 +197,3 @@
- 	utils/typeconverter.py    \
- 	utils/vfs.py              \
- 	utils/xdr.py
--
-
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch
deleted file mode 100644
index 3abfb08b8ec0..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-=== modified file 'configure.ac'
---- configure.ac	2011-02-15 10:13:11 +0000
-+++ configure.ac	2011-04-08 01:27:57 +0000
-@@ -9,6 +9,7 @@
- AC_CONFIG_MACRO_DIR([macros])
- AC_CONFIG_FILES([Makefile])
- AM_MAINTAINER_MODE
-+: ${CFLAGS="-Os -g"}
- 
- dnl Required programs
- AC_PROG_CC
-@@ -21,14 +22,12 @@
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- 
--CFLAGS="-Os -g"
--
- AC_ARG_ENABLE(debug,AS_HELP_STRING([--enable-debug],[Maximum debugging]),
-               set_debug="$enableval",[set_debug=no])
- AC_MSG_CHECKING(for more debugging including macro expansion)
- if test "$GCC" = "yes" -a "$set_debug" != "no"; then
-   AC_MSG_RESULT(yes)
--  CFLAGS="-O0 -g3"
-+  CFLAGS="$CFLAGS -O0 -g3"
- else
-   AC_MSG_RESULT(no)
- fi
-@@ -39,7 +38,7 @@
- AC_MSG_CHECKING(for more warnings, including -Werror)
- if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-     AC_MSG_RESULT(yes)
--    CFLAGS="\
-+    CFLAGS="$CFLAGS \
-     -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-     -Wmissing-declarations -Wredundant-decls -Wunreachable-code \
-     -Wpointer-arith -Wcast-align -Wsign-compare -ansi \
-
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
deleted file mode 100644
index ae458a3bb2b1..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- main/__init__.py  2009-09-20 20:02:48 +0000
-+++ main/__init__.py  2010-05-08 15:41:26 +0000
-@@ -16,8 +16,11 @@
-     # case the DISPLAY variable doesn't contain the screen number)
-     DISPLAY = vfs.escape_path(gtk.gdk.Display(os.environ["DISPLAY"]).get_name()).replace("/", "_")
- except:
--    print "Error: could not open display", os.environ["DISPLAY"]
--    sys.exit(1)
-+    try:
-+        print >> sys.stderr, "Error: could not open display", os.environ["DISPLAY"]
-+    except:
-+        print >> sys.stderr, "(could not get DISPLAY environment variable)"
-+    DISPLAY = "0"
-
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r4.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r4.ebuild
deleted file mode 100644
index 480ec6ecc88d..000000000000
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r4.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
-GCONF_DEBUG=no
-GNOME2_LA_PUNT="yes"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1 multilib bash-completion-r1
-
-MY_PN=${PN/-core}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
-SRC_URI="http://gdesklets.de/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://gdesklets.de"
-LICENSE="GPL-2"
-
-IUSE="dbus"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-# is libgsf needed for runtime or just compiling?
-# only need expat for python-2.4, I think
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2:2
-	>=gnome-base/librsvg-2.8
-	>=gnome-base/libgtop-2.8.2
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	>=dev-python/libbonobo-python-2.6[${PYTHON_USEDEP}]
-	>=dev-python/gconf-python-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.6:2[${PYTHON_USEDEP}]
-	>=dev-python/pyorbit-2.0.1[${PYTHON_USEDEP}]
-	|| ( >=dev-python/gnome-vfs-python-2.6[${PYTHON_USEDEP}] >=dev-python/libgnome-python-2.6[${PYTHON_USEDEP}] )
-	>=dev-libs/expat-1.95.8
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-.in-files.patch \
-		"${FILESDIR}"/${P}-CFLAGS.patch
-
-	python_fix_shebang .
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install bash completion script
-	dobashcomp contrib/bash/gdesklets
-
-	# Install the gdesklets-control-getid script
-	insinto /usr/$(get_libdir)/gdesklets
-	insopts -m0555
-	doins "${FILESDIR}"/gdesklets-control-getid
-}
diff --git a/gnome-extra/gdesklets-core/metadata.xml b/gnome-extra/gdesklets-core/metadata.xml
deleted file mode 100644
index e8e04b67a5f0..000000000000
--- a/gnome-extra/gdesklets-core/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<upstream>
-		<bugs-to>https://bugs.launchpad.net/gdesklets</bugs-to>
-	</upstream>
-	<use>
-		<flag name="dbus">Enable gDesklets Controls to use DBus</flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild
index 0531741771b7..f9966ed2f9c6 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.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.18.1.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
index 1187727508e3..8c3413245036 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
@@ -15,7 +15,7 @@ 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 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection python vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
index d51544b7c61c..e3e9533c6ae3 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.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.18.2.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
index 6161be99d601..60a80692daa0 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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.18.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
index 140be511b43d..6a297851cea2 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
index f12b4948a1ab..b5fcfd15a44f 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 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.18.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
index f9514061e078..6369b2b5384e 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha 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.18.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
index 4267a3b98035..50d80ec7c195 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.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-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
index 778d57884ec9..b73c27920529 100644
--- a/gnome-extra/gnome-directory-thumbnailer/Manifest
+++ b/gnome-extra/gnome-directory-thumbnailer/Manifest
@@ -1 +1,2 @@
 DIST gnome-directory-thumbnailer-0.1.6.tar.xz 260656 SHA256 35e6c8b4d11553b24eadb21dc2367072eedbd284cec4c23d06492ab2f26d0e04 SHA512 772c1e451d896d3704c25b5ab17ba74a52c14fb1103fb4ab18c67c6b2b5714b7ff5ac020252630b729aa081c8e1836a437487691590c3be1e63a0cc654f32dcf WHIRLPOOL 486277c694b0467c879cadace0f858e9a0e8346f024d4f1c54c958f1ac8a900012d901f11253f61e53e203535af56351f105977907ec2fe11d7db49faa3e22d5
+DIST gnome-directory-thumbnailer-0.1.7.tar.xz 272984 SHA256 977ebb515824bc9de37663700174ab39b9604709e989457cce3395a791172298 SHA512 62d429f9a8420e45831cbfb94ef4d050ffd89975a2bd5ad61861435d8af559fd6bf3949683711f2240b7573c6222d0a436ec9876f7f63106e12adff3006126db WHIRLPOOL 2b3ef85a9924e1749db734897c2c2f33b6ff7ac456697dab6f296927f27b5d4a0f53d41a130b408f32d0c91a17d35bd284e3918b3d603181fb77aec527215c9e
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.7.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.7.ebuild
new file mode 100644
index 000000000000..d1acf5afd301
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.7.ebuild
@@ -0,0 +1,27 @@
+# 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="Thumbnail generator for directories"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64"
+
+RDEPEND="
+	>=dev-libs/glib-2.35:2
+	>=x11-libs/gdk-pixbuf-2.6:2
+	>=gnome-base/gnome-desktop-2.2:3=
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
index 346be520ba99..8521ad266d68 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.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-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
index a1fbc15a03ec..6bec04c6d01b 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="nls totem vala"
 
 RDEPEND=">=dev-libs/glib-2.32.0:2
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
index dd1f78fee3cc..91424da1359b 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.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.18.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
index d2907a8777f5..03c180487939 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
index 63af3285f574..c288e7f49be6 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.45.8:2
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
index 727cb89b16d1..e8cc601bce16 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.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/gnome-shell-frippery-3.18.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
index de287b081e1e..75f42adead3e 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
index dd1c892fc82d..80e7fe9dace4 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.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.18.1-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
index 8557cf79534c..58ad6438717e 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.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.18.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
index 34dc73c7b5b3..949c77c6e549 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.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-user-share/gnome-user-share-3.18.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
index 530f69e65e35..f038e821ffde 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
index 5974a8fa8e32..1d3d892c31fe 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.18.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="
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index f5939c663b55..4a97faf8d573 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.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=""
 
 # orbit is referenced in configure, but is not used anywhere else
diff --git a/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
index a9efc98ef1ef..87bc0a1b28de 100644
--- a/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/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-r1.ebuild b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
index 221aa1c66d69..082ba4575c48 100644
--- a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
@@ -27,7 +27,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/Manifest b/gnome-extra/libgsf/Manifest
index 14f6e4b45fd7..d65501e5f339 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,2 +1,2 @@
-DIST libgsf-1.14.33.tar.xz 608364 SHA256 82dd38e0c1f497704bf3b43682fca2768886058f004b14e9b5d103596f8c6e6b SHA512 9dbda65a610f3e6efaf40bb51ed9ebabe485e0c2c9c8d0ff155ae39fa1aa3074df8094f51d9b0f27eb251b1aed4b4faa77ffce4d6dc16ef7c99c5b697528be5f WHIRLPOOL e2c4bdaf9ee9ecb0255ac8af8d413cc73c6dc78295eaf9191e71841218187bf4e280500525dc7b6b8048e15e282d15f7f46b226a12361f112b63494e6d07f1bf
 DIST libgsf-1.14.34.tar.xz 609880 SHA256 f0fea447e0374a73df45b498fd1701393f8e6acb39746119f8a292fb4a0cb528 SHA512 9a9fbb178147ed80572a8e727b1d3ba1f305c12c6a3b151016daf7eb51b7bf75b30d3397070ce98d6e83acf9617b15eb281fa976df291ab894119d2647826532 WHIRLPOOL c998d25adf0898b65219a9fe78075f8123a448e079fb167acc61b3cbe9093dcb2d9867a48d9d544b3a7b838a41559a3eac1b88e204294d56e49191f3d16f8e48
+DIST libgsf-1.14.36.tar.xz 609764 SHA256 71b7507f86c0f7c341bb362bdc7925a2ae286729be0bf5b8fd9581ffbbd62940 SHA512 ca0345fa4190df4d392e7cf71187d2f3b0c4bbe2312f18c076f1a9fa90e7803a754cec9a7df3da9cd00ded800eb4ad78e7acb099350dcf44c35181cddade7a85 WHIRLPOOL e99ea9a087aad127c469d353c3632d75e98a12045c8e198bb02280991ad6970b0198654ab525dd067e038caba75e710a2203868463900aa409bae332c797b8d2
diff --git a/gnome-extra/libgsf/libgsf-1.14.33.ebuild b/gnome-extra/libgsf/libgsf-1.14.33.ebuild
deleted file mode 100644
index 63692f185d2d..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.33.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"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-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"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? ( x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35.0
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.36.ebuild b/gnome-extra/libgsf/libgsf-1.14.36.ebuild
new file mode 100644
index 000000000000..38c8e3383d1f
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.36.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"
+
+inherit gnome2
+
+DESCRIPTION="The GNOME Structured File Library"
+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"
+IUSE="bzip2 gtk +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libxml2-2.4.16:2
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+		)
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35.0
+	dev-libs/gobject-introspection-common
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_with bzip2 bz2) \
+		$(use_enable introspection) \
+		$(use_with gtk gdk-pixbuf)
+}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
index 6f57138e22ac..c8eb8043ccf4 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
index 5bd4bccae48f..9f96299b4dc1 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.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/nemo-2.8.6.ebuild b/gnome-extra/nemo/nemo-2.8.6.ebuild
index 9e1d1ade57c4..383e1b776699 100644
--- a/gnome-extra/nemo/nemo-2.8.6.ebuild
+++ b/gnome-extra/nemo/nemo-2.8.6.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 IUSE="exif +introspection +nls packagekit tracker xmp"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
index 4a4a8759eef4..1eb3f3c92fbb 100644
--- a/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	app-crypt/libsecret
diff --git a/gnome-extra/sushi/sushi-3.18.0.ebuild b/gnome-extra/sushi/sushi-3.18.0.ebuild
index 327047e709d8..6c483facc76f 100644
--- a/gnome-extra/sushi/sushi-3.18.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.18.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.18.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
index a139346f53b7..5b77b6ea154b 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 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.18.1-r1.ebuild b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
index fdf3179b8da2..3f8f65b6be80 100644
--- a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
+++ b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
@@ -14,7 +14,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/zeitgeist-extensions/Manifest b/gnome-extra/zeitgeist-extensions/Manifest
deleted file mode 100644
index 31a4c542419f..000000000000
--- a/gnome-extra/zeitgeist-extensions/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zeitgeist-extensions-0.0.13.tar.gz 30700 SHA256 c8a93b419c7f81fad2dcda2aa40ae4a610432b971d7deca20bcd1451bd841d65 SHA512 3ff54cca7d98b0805df038a4d04616e1eb2dd2bc3895f8e9ffaf16147f6efd3410e8ca19abe04d0ef94793427374db94fbe18db8d196e2d2d4cd304bd34bd3cd WHIRLPOOL d8dff29e46fd83fc19fa101ad4d14403395a0ea044852e4e1ee1c72a1f1518cb0502c35cd6526ffc89f529a5c4f8ed0623f2a60d00fbb815306e06cf163c7d5b
diff --git a/gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-gobject.patch b/gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-gobject.patch
deleted file mode 100644
index 00d03f2656ce..000000000000
--- a/gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-gobject.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nur a/extensions/tracker/tracker.py b/extensions/tracker/tracker.py
---- a/extensions/tracker/tracker.py	2011-12-18 16:42:33.000000000 +0100
-+++ b/extensions/tracker/tracker.py	2011-12-18 16:55:08.000000000 +0100
-@@ -26,9 +26,7 @@
- import logging
- 
- import gi
--from gi.repository import Tracker
--
--import gobject
-+from gi.repository import Tracker, GObject
- 
- from _zeitgeist.engine.extension import Extension
- from _zeitgeist.engine import constants
-@@ -52,7 +50,7 @@
-         self._engine = engine
-         self.cursor = get_default_cursor()
-         if not (os.path.exists(INDEX_FILE)):
--            gobject.idle_add (self._reindex)
-+            GObject.idle_add (self._reindex)
- 
-     def _reindex(self):
-         log.info("Empty index detected. Doing full rebuild")
-diff -Nur a/extensions/fts/fts.py b/extensions/fts/fts.py
---- a/extensions/fts/fts.py	2011-12-18 17:21:37.000000000 +0100
-+++ b/extensions/fts/fts.py	2011-12-18 17:22:09.000000000 +0100
-@@ -49,7 +49,7 @@
- from Queue import Queue, Empty
- import threading
- from urllib import quote as url_escape, unquote as url_unescape
--import gobject, gio
-+from gi.repository import GObject
- from cStringIO import StringIO
- 
- from zeitgeist.datamodel import Symbol, StorageState, ResultType, TimeRange, NULL_EVENT, NEGATION_OPERATOR
-@@ -294,7 +294,7 @@
- 		# Cache of parsed DesktopEntrys
- 		self._desktops = {}
- 		
--		gobject.threads_init()
-+		GObject.threads_init()
- 		self._may_run = True
- 		self._queue = Queue(0)
- 		self._worker = threading.Thread(target=self._worker_thread,
-@@ -304,7 +304,7 @@
- 		# We need to defer the index checking until after ZG has completed
- 		# full setup. Hence the idle handler.
- 		# We also don't start the worker until after we've checked the index
--		gobject.idle_add (self._check_index_and_start_worker)
-+		GObject.idle_add (self._check_index_and_start_worker)
- 	
- 	@synchronized (INDEX_LOCK)
- 	def _check_index_and_start_worker (self):
diff --git a/gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-python.patch b/gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-python.patch
deleted file mode 100644
index 3875dc682e05..000000000000
--- a/gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-python.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- memory-profile/profile_memory.py |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/memory-profile/profile_memory.py b/memory-profile/profile_memory.py
-index b1e8c06..da37c90 100644
---- a/memory-profile/profile_memory.py
-+++ b/memory-profile/profile_memory.py
-@@ -28,8 +28,7 @@ from _zeitgeist.engine.extension import Extension
- from _zeitgeist.engine import constants
- from _zeitgeist.singleton import SingletonApplication
- 
--from pympler.tracker import ClassTracker
--from pympler.tracker.stats import ConsoleStats
-+from pympler.classtracker import ClassTracker, ConsoleStats
- 
- DBUS_OBJECT_PATH = "/org/gnome/zeitgeist/memory_profiler"
- 
diff --git a/gnome-extra/zeitgeist-extensions/metadata.xml b/gnome-extra/zeitgeist-extensions/metadata.xml
deleted file mode 100644
index 789b16c98ea0..000000000000
--- a/gnome-extra/zeitgeist-extensions/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <longdescription>
-The Extensions allow manipulating events before/after insertion as well as 
-before fetching from the engine. They run in the Zeitgeist process. Default 
-Extension are Blacklists and Datasource Registery.
-</longdescription>
-  <use>
-    <flag name="fts">Enable the full text search</flag>
-    <flag name="geolocation">Add the physical location of the computer at the moment when events are inserted</flag>
-    <flag name="memprofile">Memory profiling extension</flag>
-    <flag name="sqldebug">debug zeitgeists sql statements</flag>
-    <flag name="tracker">Notify Tracker on events</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">zeitgeist-extensions</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild b/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild
deleted file mode 100644
index b75b09039989..000000000000
--- a/gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild
+++ /dev/null
@@ -1,71 +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="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Allow manipulating events before/after insertion as well as before fetching"
-HOMEPAGE="https://launchpad.net/zeitgeist-extensions/"
-SRC_URI="https://launchpad.net/${PN}/trunk/fts-${PV}/+download/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE="fts geolocation memprofile sqldebug tracker"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	fts? (
-		!gnome-extra/zeitgeist[fts]
-		dev-libs/xapian-bindings[python]
-		dev-python/dbus-python
-		dev-python/pygobject
-		dev-python/pyxdg
-	)
-	geolocation? (
-		dev-python/dbus-python
-		dev-python/python-geoclue
-	)
-	memprofile? (
-		dev-python/dbus-python
-		dev-python/pympler
-	)
-	sqldebug? ( dev-python/python-sqlparse )
-	tracker? (
-		app-misc/tracker
-		dev-python/pygobject
-		dev-python/dbus-python
-	)"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-python.patch \
-		"${FILESDIR}"/${P}-gobject.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	python_moduleinto /usr/share/zeitgeist/_zeitgeist/engine/extensions
-	use fts && python_domodule ./fts/fts.py
-	if use geolocation; then
-		dodoc ./geolocation/example.py
-		python_domodule ./geolocation/geolocation.py
-	fi
-	if use memprofile; then
-		python_domodule ./memory-profile/profile_memory.py
-		newdoc ./memory-profile/README README-memprofile
-	fi
-	use sqldebug && python_domodule ./debug_sql/debug_sql.py
-	use tracker && python_domodule ./tracker/tracker.py
-
-	python_optimize "${ED}"/usr/share/zeitgeist/_zeitgeist/engine/extensions
-}
diff --git a/gnome-extra/zenity/zenity-3.18.1.1.ebuild b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
index ba1029b1e8b4..4936d5956989 100644
--- a/gnome-extra/zenity/zenity-3.18.1.1.ebuild
+++ b/gnome-extra/zenity/zenity-3.18.1.1.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-apps/price/Manifest b/gnustep-apps/price/Manifest
index f4ac2e637c38..b31fc080d4d9 100644
--- a/gnustep-apps/price/Manifest
+++ b/gnustep-apps/price/Manifest
@@ -1,2 +1,2 @@
-DIST PRICE-1.1.0.tar.gz 253467 SHA256 01df4bfaa686bbaa01d8b5b23a14e9a53709a19fa2df448122850fd076111c9e SHA512 2c8fd9a897cdc0d4868df28c84a4150ab9f5ccca5bf51fad7d97c6e276022402a9d86c50457e99c1df5042ed1aeec1dfcc2e84a1f463752a9df8f11623e8892e WHIRLPOOL 7e0856e75a874d504394cd227c92fb80875e70b7aa91259c9e522f4598b05648500607632c5aea8a14ea4f2654716e083bfa23de37fba19548ea8dcb718aa488
 DIST PRICE-1.2.0.tar.gz 265584 SHA256 715dea82f69f2f7fa6ca46702b1c39646f1470c5f4aeaf0f88458816b8825fa2 SHA512 a8eca27c38afebd382d85ecb18003ad15ede16f7df057c3180cf0529473e884b0ddbfd143554407d07d10001d9a66621775be8d8db4a05febdfe430aa39f06b8 WHIRLPOOL c5745a850ab903e2d19da83266e69a89c60a6e90404d4249fee0f699a5cdf4c408196004511d3cc63a3f9ea1ef3d6a3a02f142695755fc4c3ace479c0f387dee
+DIST PRICE-1.3.0.tar.gz 275904 SHA256 464bca113731023b43949992456cfa054f2d0fa3e1c5e7b5ca399f3f6f0af49b SHA512 dd9530d4c953922a218847420052859cddf23db5513ed8e0e8215c06a5e8f877560bdd039e56e7f47c646d8d8456f335a336a696467b290b7e8376f6ffffd542 WHIRLPOOL 4c37ce3f80a5aa84ba1a40ad6dfb5d922b3fe5ef799c64d02f5978999cc7b8467e56cca05a7258b0204cb4a3b685521af1dabf1a76d5b4214c7de45888fc099b
diff --git a/gnustep-apps/price/price-1.1.0.ebuild b/gnustep-apps/price/price-1.1.0.ebuild
deleted file mode 100644
index f461617d3bbc..000000000000
--- a/gnustep-apps/price/price-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit gnustep-2
-
-MY_P=PRICE-${PV}
-DESCRIPTION="Precision Raster Image Convolution Engine"
-HOMEPAGE="http://price.sourceforge.net/"
-SRC_URI="mirror://sourceforge/price/${MY_P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/price/price-1.3.0.ebuild b/gnustep-apps/price/price-1.3.0.ebuild
new file mode 100644
index 000000000000..f7558df79a94
--- /dev/null
+++ b/gnustep-apps/price/price-1.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnustep-2
+
+MY_P=PRICE-${PV}
+DESCRIPTION="Precision Raster Image Convolution Engine"
+HOMEPAGE="http://price.sourceforge.net/"
+SRC_URI="mirror://sourceforge/price/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index a288fdb12e5e..a08ee61ad9f2 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1 +1,2 @@
 DIST sogo-2.3.2.tar.gz 11440737 SHA256 236812a74afdd388a10edd9b2db27f4bf8e05818d5ddd65fea9b1b43e6c7a223 SHA512 a91a710af1c36e3becf250c60e1430a012b98e9026957c9faf6c7cddc526273296f00d9df2e7c8c830887a96dfa2576ffd2dd0dfb1ed3e6fc6bfa1b9f100b792 WHIRLPOOL 66fcd37f012923f4f500f6b961dface5dab47b99e89788660728274fc752ad229b5728408e5846450e40e8bf17a54c73372ee0a9ab6666e3b100c05cd7f24cad
+DIST sogo-3.0.1.tar.gz 25058324 SHA256 6c95c2f401b14be47d5fbd14a6aed9b4439346b1b337526a0744c98743d5cb5e SHA512 bec2c65dc1b8a8d00a8456294325351068ec79808029557b87620172c001936ec76bce244a4d23eba66a83e28dc8d6fdd70f5448bba0567e9f434bf3626a777c WHIRLPOOL b2ccec462d6c02bf7ccd4438a5bfa147ca0ad391257c29354a51576d9602532830fde747d0e049a340eac0efc125d5d02fed93b40139cb8ff40059a639d8ef82
diff --git a/gnustep-apps/sogo/sogo-3.0.1.ebuild b/gnustep-apps/sogo/sogo-3.0.1.ebuild
new file mode 100644
index 000000000000..9f4d19144af0
--- /dev/null
+++ b/gnustep-apps/sogo/sogo-3.0.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gnustep-2 user vcs-snapshot
+
+DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
+HOMEPAGE="http://www.sogo.nu"
+SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls libressl +ssl"
+
+RDEPEND="
+	dev-libs/libmemcached
+	net-misc/curl
+	net-misc/memcached
+	>=gnustep-libs/sope-${PV}[ldap]
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.2"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+pkg_setup() {
+	enewuser sogo -1 /bin/bash /var/lib/sogo
+}
+
+src_prepare() {
+	gnustep-base_src_prepare
+	sed -e "s/validateArgs$//" -i configure \
+		|| die "GNUstep.conf sed failed"
+
+	default
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	./configure \
+		--disable-strip \
+		--prefix=/usr \
+		--with-ssl="${ssl_provider}" \
+		$(use_enable debug) \
+		|| die "configure failed"
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	newconfd "${FILESDIR}"/sogod.confd sogod
+	newinitd "${FILESDIR}"/sogod.initd sogod
+
+	insinto /etc/logrotate.d
+	newins Scripts/logrotate sogo
+	newdoc Apache/SOGo.conf SOGo-Apache.conf
+
+	insinto /etc/sogo
+	doins Scripts/sogo.conf
+
+	insinto /etc/cron.d
+	newins Scripts/sogo.cron sogo
+	keepdir /var/log/sogo
+
+	fowners sogo:sogo /var/log/sogo
+	fowners -R root:sogo /etc/sogo
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+	elog "SOGo documentation is available online at:"
+	elog "http://www.sogo.nu/downloads/documentation.html"
+	elog
+	elog "Apache sample configuration file is available in:"
+	elog "/usr/share/doc/${PF}"
+}
diff --git a/gnustep-libs/performance/Manifest b/gnustep-libs/performance/Manifest
index 31761711e417..0aeec1608ad9 100644
--- a/gnustep-libs/performance/Manifest
+++ b/gnustep-libs/performance/Manifest
@@ -1 +1,2 @@
 DIST Performance-0.4.0.tar.gz 48527 SHA256 e55c1a8d9e6f1e3ba146490d1b0cf7b84e124410a50070ab3b27ecfc4aab6a1c SHA512 0c590508f2c58501969e8a1233663521274833d0915a671b1f81daf283770b0e98892e5ec447a07e0ede767b1c4f2bf2f2ac52bc6c48b413ff02085ced34a22c WHIRLPOOL 9b353d649fb7c280c370ed76d467b7dea1d70c6ed5dd265c56987744c0029a89cba1aebd17802e595cbd9338f6a36de62f97013df9eed211f4ebcfad18e06c9d
+DIST Performance-0.5.0.tar.gz 50569 SHA256 305fe21705a9774becb58f076542919da38c36867d946b69f735fecfa5bc8459 SHA512 ac83d046c801e1c2b69c708fa806cccf40fca4d5dabe5d461524c3c3eea989c939a11e58d8bff177f45e55a3e1be73bd03b0bb80b611c8390560740cd5cf9fd5 WHIRLPOOL 77168c9c987038f932e825cd4f976c2e8fe1981574bba6aaff7a38a234dfad2a8f1618412f7b48dd660867450e6c7e67804aef09274b1defafc31c89d6c3170e
diff --git a/gnustep-libs/performance/performance-0.5.0.ebuild b/gnustep-libs/performance/performance-0.5.0.ebuild
new file mode 100644
index 000000000000..ef551c22396f
--- /dev/null
+++ b/gnustep-libs/performance/performance-0.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnustep-2
+
+MY_P=${P/p/P}
+DESCRIPTION="Help improve the performance of GNUstep applications"
+HOMEPAGE="http://wiki.gnustep.org/index.php/Performance"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="LGPL-3"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if ! use doc; then
+		# Remove doc target
+		sed -i -e '/documentation\.make/d' GNUmakefile \
+			|| die "doc sed failed"
+	fi
+
+	default
+}
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index c2ec7f4d9b15..3bb267e8a59b 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -1 +1,2 @@
 DIST sope-2.3.2.tar.gz 2184555 SHA256 f37877eb5915d5a6a3bc831a4d38ef2bd60e7fdaa40354056b10c4cfbc0ecdc1 SHA512 17d0ee6474410692c6b81bf32b730f4352e7d9c367f18c4a53d7aebbbe65aa2ca2f6eeaea8c722c8367835973b96395b932c9fdb81f08fdf79f299a926e14c9d WHIRLPOOL 17ca7912056d6d6a33c70af56c44819eaff8f640a87de76aa8858f2cd85114026ce108d6d424d50b6fa4085649c1873aee1854482379708785a9162fdc94daf1
+DIST sope-3.0.1.tar.gz 2190373 SHA256 83dd4568ecc1ce25e31eab90d672b43051c35713b36dcfd3d06282ca4288f98e SHA512 d94c40a425a16e04d1b841b0845e8cd3f4a960978464affaa846a8ef5c2540234ced655069b25a31221af31b3febc9b8c887a89ef43b3129e2a886c1b8fc2f50 WHIRLPOOL 1346684d22a644e95b0fccf59649ad79dc0f9f15eeb37903b056354d561278f2aacae996805f653bd17485c34a13aa447f9b2d67a50f9a65e8d63dcdee772922
diff --git a/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch b/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch
new file mode 100644
index 000000000000..86bcc7ac351d
--- /dev/null
+++ b/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch
@@ -0,0 +1,35 @@
+--- a/sope-gdl1/MySQL/GNUmakefile.preamble	2015-09-07 17:52:21.244429620 +0100
++++ b/sope-gdl1/MySQL/GNUmakefile.preamble	2015-09-07 17:54:16.586770809 +0100
+@@ -33,12 +33,12 @@
+ 
+ MySQL_BUNDLE_LIBS += \
+ 	-lGDLAccess	\
+-	`mysql_config --libs`
++	$(shell mysql_config --libs)
+ 
+ MySQLD_BUNDLE_LIBS += \
+ 	-lGDLAccess	\
+ 	-lEOControl	\
+-	`mysql_config --libs`
++	$(shell mysql_config --libs)
+ 
+ gdltest_TOOL_LIBS += \
+ 	-lGDLAccess	\
+@@ -46,14 +46,15 @@
+ 
+ # set compile flags and go
+ 
+-ADDITIONAL_CFLAGS += `mysql_config --cflags`
++ADDITIONAL_CFLAGS += $(shell mysql_config --cflags)
+ 
+ ADDITIONAL_INCLUDE_DIRS += \
+ 	-I../GDLAccess -I.. -I$(SOPE_ROOT)
+ 
+ ADDITIONAL_INCLUDE_DIRS += \
+ 	-I$(SOPE_ROOT)/sope-core/		\
+-	-I$(SOPE_ROOT)/sope-core/NGExtensions
++	-I$(SOPE_ROOT)/sope-core/NGExtensions   \
++	$(shell mysql_config --cflags)
+ 
+ 
+ # dependencies
diff --git a/gnustep-libs/sope/sope-2.3.2.ebuild b/gnustep-libs/sope/sope-2.3.2.ebuild
index b06ce6194efc..f042ec925ea2 100644
--- a/gnustep-libs/sope/sope-2.3.2.ebuild
+++ b/gnustep-libs/sope/sope-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit eutils gnustep-2 vcs-snapshot
 
-DESCRIPTION="An extensive set of frameworks which form a complete Web application server environment"
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
 HOMEPAGE="http://www.sogo.nu/"
 SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -39,6 +39,7 @@ pkg_pretend() {
 src_prepare() {
 	# https://github.com/inverse-inc/sope/pull/33
 	epatch "${FILESDIR}"/${P}-optional-deps.patch
+	epatch "${FILESDIR}"/${P}-mysql-preamble.patch
 	gnustep-base_src_prepare
 }
 
diff --git a/gnustep-libs/sope/sope-3.0.1.ebuild b/gnustep-libs/sope/sope-3.0.1.ebuild
new file mode 100644
index 000000000000..f7140008044c
--- /dev/null
+++ b/gnustep-libs/sope/sope-3.0.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils gnustep-2 vcs-snapshot
+
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( virtual/libmysqlclient:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.2-mysql-preamble.patch
+)
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/gnustep-libs/sqlclient/Manifest b/gnustep-libs/sqlclient/Manifest
index 05a3d189a333..ca72fefca77d 100644
--- a/gnustep-libs/sqlclient/Manifest
+++ b/gnustep-libs/sqlclient/Manifest
@@ -1 +1,2 @@
 DIST SQLClient-1.7.0.tar.gz 164218 SHA256 8f9c9491f774fce3bf369e407c8f22091c597baddc1a4b0bfe8ccb251bb79462 SHA512 cf4c9ec3bb60b57f4cc2673353029c77a0994c6912e9b5ee9bdab593b68663bde4a465cae6f39482c34fc0a5acff66ac2059be3644eb8db30a399c754e238809 WHIRLPOOL 153dd519969f437579ae3e24732c20c90fec5e141eddf746e4c55b35e7dadb388e4d0ae07b134ca0549e32f4cf6649d7ed1aa798e43498d57701dec664ae0cd0
+DIST SQLClient-1.8.1.tar.gz 148622 SHA256 c6cb9d0033b496b52b698f1f80007b6acd215441683cf1a1c22f67a96198074f SHA512 f0339063bf1f0a9050826440f9d4c116fddf61e62f4a8fd4c694afd079d82b54b306dcdadcd29951bbb3502129de211d166e2958de4d31cd6e78563498f2b50f WHIRLPOOL 2dff10803b231a3d4634a8efb22be7e077c2afc6a679d56ea919c0ff98a4f9aa23c6812406df7e5b2fc811a95cfeb8944845313d69869d73da5db39c9ebb429c
diff --git a/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild b/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild
new file mode 100644
index 000000000000..0a4e91d0d7af
--- /dev/null
+++ b/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit java-pkg-opt-2 gnustep-2
+
+MY_P=${P/sqlc/SQLC}
+DESCRIPTION="GNUstep lightweight database abstraction layer"
+HOMEPAGE="http://wiki.gnustep.org/index.php/SQLClient"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="LGPL-3"
+SLOT="0"
+
+IUSE="java mysql postgres +sqlite"
+
+RDEPEND=">=gnustep-libs/performance-0.3.2
+	mysql? ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( >=dev-db/sqlite-3 )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( java mysql postgres sqlite )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if ! use doc; then
+		# Remove doc target
+		sed -i -e '/documentation\.make/d' GNUmakefile \
+			|| die "doc sed failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=""
+	use java || myconf="${myconf} --disable-jdbc-bundle"
+	use mysql || myconf="${myconf} --disable-mysql-bundle"
+	use postgres || myconf="${myconf} --disable-postgres-bundle"
+	use sqlite || myconf="${myconf} --disable-sqllite-bundle"
+
+	egnustep_env
+	econf ${myconf}
+}
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
index f1b585164ec0..ba85c58a9fed 100644
--- 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
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild
index e5e20117cb12..4e69d6c0b27a 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.3-r1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.3-r1.ebuild
new file mode 100644
index 000000000000..6bd451d28afd
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="
+	https://www.kde.org/applications/multimedia/
+	https://multimedia.kde.org/
+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+ffmpeg"
+
+# Add back whenever it is ported - no change since 4.10
+# 	mplayer? ( $(add_kdeapps_dep mplayerthumbs) )
+RDEPEND="
+	$(add_kdeapps_dep audiocd-kio)
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep kdenlive)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kscd)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
+"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.3.ebuild
deleted file mode 100644
index 45e8bf1a3efa..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.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
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="
-	https://www.kde.org/applications/multimedia/
-	https://multimedia.kde.org/
-"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+ffmpeg mplayer"
-
-RDEPEND="
-	$(add_kdeapps_dep audiocd-kio)
-	$(add_kdeapps_dep dragon)
-	$(add_kdeapps_dep juk)
-	$(add_kdeapps_dep kdenlive)
-	$(add_kdeapps_dep kmix)
-	$(add_kdeapps_dep kscd)
-	$(add_kdeapps_dep libkcddb)
-	$(add_kdeapps_dep libkcompactdisc)
-	mplayer? ( $(add_kdeapps_dep mplayerthumbs) )
-	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.1-r1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.1-r1.ebuild
new file mode 100644
index 000000000000..6bd451d28afd
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="
+	https://www.kde.org/applications/multimedia/
+	https://multimedia.kde.org/
+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+ffmpeg"
+
+# Add back whenever it is ported - no change since 4.10
+# 	mplayer? ( $(add_kdeapps_dep mplayerthumbs) )
+RDEPEND="
+	$(add_kdeapps_dep audiocd-kio)
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep kdenlive)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kscd)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
+"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.1.ebuild
deleted file mode 100644
index 4316135efc5c..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="
-	https://www.kde.org/applications/multimedia/
-	https://multimedia.kde.org/
-"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+ffmpeg mplayer"
-
-RDEPEND="
-	$(add_kdeapps_dep audiocd-kio)
-	$(add_kdeapps_dep dragon)
-	$(add_kdeapps_dep juk)
-	$(add_kdeapps_dep kdenlive)
-	$(add_kdeapps_dep kmix)
-	$(add_kdeapps_dep kscd)
-	$(add_kdeapps_dep libkcddb)
-	$(add_kdeapps_dep libkcompactdisc)
-	mplayer? ( $(add_kdeapps_dep mplayerthumbs) )
-	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-"
diff --git a/kde-base/kactivities/kactivities-4.13.3-r1.ebuild b/kde-base/kactivities/kactivities-4.13.3-r1.ebuild
deleted file mode 100644
index 5fa7b7b51709..000000000000
--- a/kde-base/kactivities/kactivities-4.13.3-r1.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
-
-DECLARATIVE_REQUIRED="always"
-EGIT_BRANCH="KDE/4.13"
-inherit kde4-base
-
-DESCRIPTION="KDE Activity Manager"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	|| ( $(add_kdebase_dep kactivitymanagerd) kde-frameworks/kactivities:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKACTIVITIES_LIBRARY_ONLY=ON
-		-DWITH_NepomukCore=OFF
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-base/kactivities/kactivities-4.13.3-r2.ebuild b/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
new file mode 100644
index 000000000000..fe70ee206343
--- /dev/null
+++ b/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+EGIT_BRANCH="KDE/4.13"
+inherit kde4-base
+
+DESCRIPTION="KDE Activity Manager"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	|| ( $(add_kdebase_dep kactivitymanagerd) <kde-frameworks/kactivities-5.20.0:5 kde-plasma/kactivitymanagerd:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKACTIVITIES_LIBRARY_ONLY=ON
+		-DWITH_NepomukCore=OFF
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/legacy-icons/Manifest b/kde-base/legacy-icons/Manifest
new file mode 100644
index 000000000000..db5163f83985
--- /dev/null
+++ b/kde-base/legacy-icons/Manifest
@@ -0,0 +1 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/legacy-icons/legacy-icons-4.11.22.ebuild b/kde-base/legacy-icons/legacy-icons-4.11.22.ebuild
new file mode 100644
index 000000000000..947f30a17509
--- /dev/null
+++ b/kde-base/legacy-icons/legacy-icons-4.11.22.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="KDE legacy icons"
+SRC_URI="mirror://kde/stable/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	!<kde-base/systemsettings-4.11.22-r1:4
+	!>=kde-frameworks/oxygen-icons-5.19.0:5
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+
+	cat <<-EOF > CMakeLists.txt || die
+project(legacy-icons)
+cmake_minimum_required(VERSION 2.8.12)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+add_subdirectory(systemsettings)
+EOF
+
+	# bug 574778 (kde-frameworks/oxygen-icons-5.19.0)
+	mv kde-workspace-4.11.22/kcontrol/kfontinst/kio systemsettings || die
+	echo "kde4_install_icons(\${ICON_INSTALL_DIR})" > \
+		systemsettings/CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}
diff --git a/kde-base/legacy-icons/metadata.xml b/kde-base/legacy-icons/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-base/legacy-icons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-base/systemsettings/systemsettings-4.11.22-r1.ebuild b/kde-base/systemsettings/systemsettings-4.11.22-r1.ebuild
new file mode 100644
index 000000000000..b322ed00f54f
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.11.22-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+HOMEPAGE+=" https://userbase.kde.org/System_Settings"
+IUSE="debug gtk +kscreen +usb"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+	app-misc/strigi
+	dev-libs/glib:2
+	$(add_kdebase_dep kwin)
+	$(add_kdebase_dep libkworkspace)
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+"
+RDEPEND="${COMMONDEPEND}
+	sys-libs/timezone-data
+	x11-apps/setxkbmap
+	x11-misc/xkeyboard-config
+	gtk? ( kde-misc/kde-gtk-config )
+	kscreen? ( kde-misc/kscreen:4 )
+	|| ( $(add_kdebase_dep legacy-icons) >=kde-frameworks/oxygen-icons-5.19.0:5 )
+"
+
+KMEXTRA="
+	kcontrol/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.kde.krunner.App.xml
+	krunner/dbus/org.kde.screensaver.xml
+	ksmserver/screenlocker/dbus/org.kde.screensaver.xml
+	kwin/
+	libs/
+	plasma/
+"
+# fails to connect to a kded instance
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-kcm-randr.patch" )
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kcontrol
+			doc/kfontview
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
+		systemsettings/CMakeLists.txt \
+		|| die "Failed to fix systemsettingsrc install location"
+
+	sed -i -e '/kde4_install_icons/ s/^/#/' kcontrol/kfontinst/kio/CMakeLists.txt \
+		|| die "Failed to disable icons"
+
+	kde4-meta_src_prepare
+}
+
+# FIXME: is have_openglxvisual found without screensaver
+src_configure() {
+	# Old keyboard-detection code is unmaintained,
+	# so we force the new stuff, using libxklavier.
+	local mycmakeargs=(
+		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
+		-DWITH_GLIB2=ON -DWITH_GObject=ON
+		-DBUILD_KCM_RANDR=$(usex !kscreen)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with usb)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/systemsettings/systemsettings-4.11.22.ebuild b/kde-base/systemsettings/systemsettings-4.11.22.ebuild
deleted file mode 100644
index 23e074fee603..000000000000
--- a/kde-base/systemsettings/systemsettings-4.11.22.ebuild
+++ /dev/null
@@ -1,99 +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-workspace"
-OPENGL_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-HOMEPAGE+=" https://userbase.kde.org/System_Settings"
-IUSE="debug gtk +kscreen +usb"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	app-misc/strigi
-	dev-libs/glib:2
-	$(add_kdebase_dep kwin)
-	$(add_kdebase_dep libkworkspace)
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=x11-libs/libxklavier-3.2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	usb? ( virtual/libusb:0 )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-"
-RDEPEND="${COMMONDEPEND}
-	sys-libs/timezone-data
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-config
-	gtk? ( kde-misc/kde-gtk-config )
-	kscreen? ( kde-misc/kscreen:4 )
-"
-
-KMEXTRA="
-	kcontrol/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.kde.krunner.App.xml
-	krunner/dbus/org.kde.screensaver.xml
-	ksmserver/screenlocker/dbus/org.kde.screensaver.xml
-	kwin/
-	libs/
-	plasma/
-"
-# fails to connect to a kded instance
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-kcm-randr.patch" )
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kcontrol
-			doc/kfontview
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
-		systemsettings/CMakeLists.txt \
-		|| die "Failed to fix systemsettingsrc install location"
-
-	kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
-	# Old keyboard-detection code is unmaintained,
-	# so we force the new stuff, using libxklavier.
-	local mycmakeargs=(
-		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
-		-DWITH_GLIB2=ON -DWITH_GObject=ON
-		-DBUILD_KCM_RANDR=$(usex !kscreen)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with usb)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index ae9301a4489e..73873dd6cf00 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,2 +1,3 @@
 DIST attica-5.17.0.tar.xz 60436 SHA256 ce1a004bb2814931acbc435778fa65524da5a029d6a212f450af8043ca41ae58 SHA512 685373bc10256c707498659604df149d678e9415443867cfd677f131d0d1ef916e5d6c8c203f4de5769dece41a32a7d774701dd18a019b24a5c3b36e0fb958fe WHIRLPOOL a359b029233f778442a21a51c85567193ad1f00f1f83de62be093570e9695be28ea482da9ff6ce3b0b6f2e627c0e74491d101850e7a6278faf9a952b0abc2570
 DIST attica-5.18.0.tar.xz 60464 SHA256 bc97eb3fde1b77f14e7b3169aeefab674f5caa43998705a2b7c7f534959ad7d8 SHA512 7fb2014dede5491511db058e39793544c536991381865bb6d2b67509094fd69ceec56ec832fa7b632862559b3279481d502ac3ef2c2f74864c015090605e1e69 WHIRLPOOL c5a7b2198a031d7977bb37580faa35867255247d3146078ea06e97f26e753b46c0917b8da25ec733cc815741d220164496a25666d589024e2108d9976f78ea61
+DIST attica-5.19.0.tar.xz 59800 SHA256 9b06375988eadf67da3c22c9c434adcaddfcadadff161fafee1a3327b6957b31 SHA512 1dcdda6927c9a0e5eaff96f7bd32de30565758f037745baaa06206e5af52b819fa89d94623a9dbac5d40127012a4072e21bd66a338d37bc39eda0b7a58f3aa37 WHIRLPOOL b16a812dd40d7da2100329d9e3275a65974dcf4ffe0d646fd3474f4a2f17c8d87af2f30c126d4bc26f95e17cabc979dfef0bb9b06cd360406b8062260609a910
diff --git a/kde-frameworks/attica/attica-5.19.0.ebuild b/kde-frameworks/attica/attica-5.19.0.ebuild
new file mode 100644
index 000000000000..f97613dadfed
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.19.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 58d51a4d5c4d..98d6d9d95119 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,2 +1,3 @@
 DIST baloo-5.17.0.tar.xz 180460 SHA256 608a687d16daad7cbfac3f344a3bb11ba4c25cdb81e3cb7596f70e1393b1f305 SHA512 e7965a56f2dd817860bab451a93fba12fc253c47fdc1c93fde0b29c92d2430b9b0c9ec41f7ae4913a26ad664071bae5ca1d64e21edfbc8b1515d3712b7c53109 WHIRLPOOL b6fc6a40b50713dbfa7176f7ce657a53b3f21b1c6e730b6edcd8d781bfbf69a022329946cd710a405b5186e1ef60bd4affc09b08566daf2750c075f22ce4797d
 DIST baloo-5.18.0.tar.xz 180692 SHA256 88a2e89a102674e8fab19103e979550ebe2c4b31c05b29f6c18fe500b669b669 SHA512 90d788d40003f64b7a7fcd19a4a1800606cd35cca879d0855e48351b41859f1bf02d21972ca54b7aed1c3143bc250b926a3525011c5e69c8f3b8e4c117d6df3d WHIRLPOOL e66d375ac502d5d826b434de6b98bd58fad3b0f40f62f85c49e8ad00ea6a9c0be07067530bc125f8f093c86dff97fb80515014082ce483532994a52ce07214d6
+DIST baloo-5.19.0.tar.xz 183060 SHA256 6f6b94d464fb5da0a2256565d362aca979e3d220f11fa4c8a99d17380207de0b SHA512 966e061a87b122e0f75d5c4f4af6489c5eb859578313843bcb169bb16c61c795d023922055ab187e15ecfa288acdc59d5ef1d99cedefecb1b5464852d73afeb2 WHIRLPOOL f7da7ef8c15e7e347e3e891c3813077dc9fa9cf0281a56c284aec2c8870a2fc4bb4400e3b7fc71c022d73e9d52b1e61a3678991b42a1db17d7cfb7961c5d1d96
diff --git a/kde-frameworks/baloo/baloo-5.19.0.ebuild b/kde-frameworks/baloo/baloo-5.19.0.ebuild
new file mode 100644
index 000000000000..a92478ed4f0d
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.19.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	>=dev-db/lmdb-0.9.17
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-base/baloo:4[-minimal(-)]
+"
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 010bd1b56292..57a39905d2db 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,2 +1,3 @@
 DIST bluez-qt-5.17.0.tar.xz 73300 SHA256 65ea5fd876abd4fcebe3a94840723ae139895fa603d2044c0f8f632af40306ca SHA512 f4d6ab97dc1fcc1c12ffa004bde94bea3c16315e61ac09b5b68d85802e14b295a54cfacb98e193bd2407beb1db3b10b772434f42dea87bdfedd77daa7d4fb207 WHIRLPOOL 2eac99f4c9a86e293854409b14ef1c5cbddea96bef4920db60fb1702dca587ef2e7664e3e30b84a7626908f26ac2583864eed5accfdf262d5b0df1a39572040e
 DIST bluez-qt-5.18.0.tar.xz 73396 SHA256 79e5c663c2c2287530f9351f108045dad52de0c5576892863fb17147f8397d9f SHA512 6fe887d9001ea348c80c84d79af4a037d4b3a822f84abafcdb38f485a8b0f49627aa227d0ac420088f3406eb6aa31b6ec9f6f2d7cec193dafb026df3689d8034 WHIRLPOOL 7c4443a4ee825144c05be79404b8f87d9621c1242551a4c4c1c98785c5daf6bb043db53bbce28fdb7ea0d84331d7fc1e3ba33958c625856b8172d556ae868b9e
+DIST bluez-qt-5.19.0.tar.xz 73392 SHA256 db5b1d29f507b1af8ed7854341278ad210e3cde54c738b1db9d65af8f3890918 SHA512 06a03fa37d8a76251957484c4f99841fa1b51d69ad6d87c4fdb709e4bfa3fa000579458e2cbb3c1cbeab8de22b9509801392996a6292722f89536779fba186b8 WHIRLPOOL bb054e4021bffc8cb09a168513e7b3ac32b3acc58e15b9b3dc86af4a64730471e355d950f33a7331d4194aec3dfefa40eca3f3f6416c987b1d5cb26f1bfb1e54
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.19.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.19.0.ebuild
new file mode 100644
index 000000000000..33abb8aec67b
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.19.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/bluez-qt
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index fa6059e46ccd..5281e61c374b 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,3 +1,4 @@
 DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39
 DIST breeze-icons-5.17.0.tar.xz 1401160 SHA256 04e124a0371b9c67cec49e8a848f9af86c5999db9ce5bf0923fe217d6b091d88 SHA512 5ae21497c85cd24c9ba750fecf68ff5578fe715e976a31304489e32f1c5f1d37096fb6e9cee532d786777f7b7ef45bc72eafa1cc8e2d828b7a53cefdeaede2e0 WHIRLPOOL 7a6e8f323f48462b4d82a32fc84be290e44bfc8e9a10a95c25de32ef746897466fa44cdb2d7132dd1f4cfe95a4d54390c5166c40d5c19ad5002f1c7b6c7d7b8e
 DIST breeze-icons-5.18.0.tar.xz 1415276 SHA256 9f7007cdc805083812583d575b3ce2880f41f32f5337582c55a6acfc4bc69128 SHA512 38ed12602fc1967dc11481638ccc5407362b510e8f6ef6eba1c7153d1a451ae6a0ddcf73ffd6cf1bd9850574e07ed131692d3cd38d6bff573815803ea964d535 WHIRLPOOL ef24f992b36ddff4bd2a05e5b941e318607e73b3e8ecc7b6f30de178d5f6056ac11f0d82bc9bc77bd5223a57c2ee03760466f8d98cb3b59e19e5996fa047c511
+DIST breeze-icons-5.19.0.tar.xz 1525492 SHA256 40eef069527d735d0380e6ef121ee96ec7d46e6ec93e7f96c34cb74025e8912f SHA512 f3a25e3171788560bf2f3e317cd695e56fc8f8395a32c68a3d2ca33471b9909a603519a08e84eb28e1b01ef09d04022bae92a4471b7b356514347042033b24e0 WHIRLPOOL b295665b62cbe01d3ebc68146a834ea05c6ac366eef19440c37ce0edc2bc84a7a52e508b36971f5d198b8a1d5a3acfedd56809c1301ee96c8107c107d7789295
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.19.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.19.0.ebuild
new file mode 100644
index 000000000000..3e766e019485
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.19.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="!<kde-plasma/breeze-5.4.3:5"
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index fd81fb135b35..075185c6257b 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,3 @@
 DIST extra-cmake-modules-5.17.0.tar.xz 139764 SHA256 1a57fe0e07cca59e68bcbb4e06e07e62e335473173ce1e447bda399e47537405 SHA512 32ccac43dab86e3a4b9489db93d3ec2f5c4dcc27076de4b1c4c91c2848d610a40deffd66d7b977a7e893d38e7a4fe279b65b64b1cfd9b7fc6425cc500af0fa8b WHIRLPOOL 9962cac79045fce2090066834d453c963de1ece300cf8dd5c2228a190b4e47444ebb25e6eee698a14a626baae9d91d2632e61cd9f85c2ed79993b7ef7f5e0213
 DIST extra-cmake-modules-5.18.0.tar.xz 284172 SHA256 7ea049840eef3a0ff5253dbbcac72e6368c40798d83fedc35d8c94a0b4bfe0ce SHA512 d07409af086a840c72fd743392fca6c5a180b75a28419b600f35db5677e3a13e27a1fb9babbc673a188338720f524a9343b39d7c8f46e92199d5c36fa55394fa WHIRLPOOL 88d432c8f02c6fb4fa8be25790d2973d162acbdfb2915fac92073a93ee579af2db83c024e6bd99b591f93e5f2766474b6e4ade4e726bdd0fc180d54692db2cdb
+DIST extra-cmake-modules-5.19.0.tar.xz 285124 SHA256 c3d02fbeaa3af9bc1165365be00a97746475c26d85695e16d7f1a8ac168483b6 SHA512 35797569ee44ac288430710afabda6aff3288c2270b0ef7bfd0ace166f8392799294020be3b0dbf8fae25218ef7296979a26f07c9a99ece6986946f243d4a7f5 WHIRLPOOL 46dcbf6054389917a9c5799592b45a6e051cee740581b225e295cc7bbc71df03b79e285770e60c4726db166e138be5ce86db1acbf8cc41fb1278edb326d76d97
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.19.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.19.0.ebuild
new file mode 100644
index 000000000000..564b668d44f4
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.19.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-util/cmake-2.8.12
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+"
+RDEPEND="
+	$(add_qt_dep qtcore)
+"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HTML_DOCS="$(usex doc)"
+		-DBUILD_MAN_DOCS="$(usex doc)"
+		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 5d2e4cedf463..7b55bc291faf 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,2 +1,3 @@
 DIST frameworkintegration-5.17.0.tar.xz 1782980 SHA256 743f94f359984b85f608b2f4f059b2daaa1f8dc90210431526677dcd0da60cb9 SHA512 869394a4ddbc2d842d5ea724c1fcd30ad63667f9f197a5cdc7aea5ca9901b2e11ebb3942e73cab9f6a66bc45bcd0186276e36e9d0662a7b2c0866a8946593cc1 WHIRLPOOL f3f8c116538e095d6e5aa9821b3e19860613914727a9036340f7b2a36af3b0fbbe6c645d05062c9cc473876670fc0dc3c8be381b9247e26d801b63fabe46f6d7
 DIST frameworkintegration-5.18.0.tar.xz 1782972 SHA256 3b072fac7d4fc4a1c5981000799b5da2bb703d1c1f3747c7092282590b421c1a SHA512 40a90aa5e779d33af35e446bbfcff6ca475b9430cd3c6146411ca542a972ba72c9a92342e6c55d5d60934df7d660a775aabf297b01e5252334e4a5f8a0bfe1e7 WHIRLPOOL 1f0861753049e15803d83227bd8110dd4f7c0541392ceb60a11cd860567d85b3cf9d5dbf63db62c0977499c6bb1da1bf4be360e750bfdc09ca4b359328a1ed98
+DIST frameworkintegration-5.19.0.tar.xz 1784504 SHA256 c3cb58b4758b28df9121c44aaadac74fb4546b968ec071a2ef177bc6cf3d8a02 SHA512 f9bdda8f819843100ca47ffb807ef1633a1ed08e894cd4df2f679f2ffda6c595eec18bd3396a01bdff74e1acb2280a8c8f616be4f32da1f01237d509f89c5e1a WHIRLPOOL e7bb00dbd70d18c35aa6fff54d36567b76190dcc1a178d13f69f394cfa3b51624af76097cc3cbe897c7a4de087c668bae34a53cafde9309ae068cc8e5b3ec239
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.19.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.19.0.ebuild
new file mode 100644
index 000000000000..9e2f36963e16
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.19.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT_MINIMAL="5.5.1"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_plasma_dep oxygen-fonts)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtwidgets)
+	media-fonts/noto
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index a95f6c0022d6..a14f8826a86f 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,2 +1,3 @@
 DIST kactivities-5.17.0.tar.xz 185028 SHA256 5a7580770349f005972ab5cf27f2f67ce643c1b3cfffdf56c03729fbd61cdd52 SHA512 08b407d544ab9ea1cd115d132603538dc948bfd6367160126944d981b2510bfb5e562bb91f35de22b179ac2a374aa8f74f9f61cb4dcf22ca482e41f92f883156 WHIRLPOOL 328bf46d92853728954927f6656f3557d69526f029977bca40d2c7cfea7a40fbab32d5d49611049029bb2adf41a18ffe9e766b33da56f8204b840701652778f6
 DIST kactivities-5.18.0.tar.xz 181888 SHA256 b95e76570963a9f8797f103e32ddf58382c104e935fc27de3f48eea3db300a5b SHA512 f21a162234f068083d3aae0b184ba6fd7253c0dd40c989300c9553eb1a04ec2136476e212e0b19b52f2aa68c08079a882bca1c624a1532d5cc4860b0e13468d1 WHIRLPOOL cde7404bea3eb6c289e328f9d0590dc27f6f95d7cb2c9c3afb199122f7699fef7516e64bc944807a9bf9676cd6358a96fc49e93fa54e8bdbf5393a4fd10ba90b
+DIST kactivities-5.19.0.tar.xz 151552 SHA256 43cff33c5c4a232206bf6ffdaa1ea3f50e40339e4568a7376992fc61970eb47a SHA512 8354979888fc23108237482a37686c302527d79c7d16f3c858a7627c8a018d425fee0f2b810e62fd9552552d90c4fbc0235b4066082f3fc011ccfa91c8db2514 WHIRLPOOL aca6d791c3288c9957a4a7c8d9c5fdec0dc9a9edb1090627d63cd0c62a75f8686d3c90e8caade0c26be7c33ad40625b534dc8ca32e60cd2499c4872119969907
diff --git a/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch b/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch
new file mode 100644
index 000000000000..001fbb26ea4c
--- /dev/null
+++ b/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch
@@ -0,0 +1,89 @@
+From b3c8ad1ad48d65ea77724f94073909dc8ab97596 Mon Sep 17 00:00:00 2001
+From: David Edmundson <david@davidedmundson.co.uk>
+Date: Sat, 6 Feb 2016 18:02:53 +0000
+Subject: [PATCH] Fix crash in activities context menu
+
+Currently we call deleteLater() from inside ::run which is running in a
+different thread than the receiving object.
+(QThread objects live in the thread that created them, not in the thread
+they create)
+
+This patch causes deleteLater to be run in the right thread.
+
+QCoreApplication::postEvent is thread safe but it needs to be in the
+right thread to work out the correct event loop level for deferred
+delete events.
+
+BUG: 351485
+REVIEW: 126955
+---
+ src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp           | 2 +-
+ .../fileitemplugin/FileItemLinkingPluginActionLoader.cpp         | 9 +++++++--
+ src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h | 4 ++--
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp
+index a887132..f3f6dde 100644
+--- a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp
++++ b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp
+@@ -124,7 +124,7 @@ void FileItemLinkingPlugin::Private::loadAllActions()
+         setActions({ action });
+ 
+     } else if (!loaded) {
+-        auto loader = new FileItemLinkingPluginActionLoader(items);
++        auto loader = FileItemLinkingPluginActionLoader::create(items);
+ 
+         static FileItemLinkingPluginActionStaticInit init;
+ 
+diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
+index 3343eb4..b35713d 100644
+--- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
++++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
+@@ -40,6 +40,13 @@
+ 
+ #include "common/dbus/common.h"
+ 
++FileItemLinkingPluginActionLoader* FileItemLinkingPluginActionLoader::create(const KFileItemListProperties &items)
++{
++    auto l = new FileItemLinkingPluginActionLoader(items);
++    connect(l, &QThread::finished, l, &QObject::deleteLater);
++    return l;
++}
++
+ FileItemLinkingPluginActionLoader::FileItemLinkingPluginActionLoader(
+     const KFileItemListProperties &items)
+     : items(items)
+@@ -150,8 +157,6 @@ void FileItemLinkingPluginActionLoader::run()
+     }
+ 
+     emit result(actions);
+-
+-    deleteLater();
+ }
+ 
+ Action
+diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h
+index 50dccc5..5264a45 100644
+--- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h
++++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h
+@@ -33,8 +33,7 @@ class FileItemLinkingPluginActionLoader: public QThread {
+     Q_OBJECT
+ 
+ public:
+-    FileItemLinkingPluginActionLoader(const KFileItemListProperties &items);
+-
++    static FileItemLinkingPluginActionLoader* create(const KFileItemListProperties &items);
+     void run() Q_DECL_OVERRIDE;
+ 
+     Action createAction(const QString &activity, bool link,
+@@ -46,6 +45,7 @@ Q_SIGNALS:
+     void result(const ActionList &actions);
+ 
+ private:
++    FileItemLinkingPluginActionLoader(const KFileItemListProperties &items);
+     KFileItemListProperties items;
+     KActivities::Consumer activities;
+ };
+-- 
+2.4.10
+
diff --git a/kde-frameworks/kactivities/kactivities-5.17.0-r1.ebuild b/kde-frameworks/kactivities/kactivities-5.17.0-r1.ebuild
new file mode 100644
index 000000000000..200450a98f0e
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.17.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.0-crash.patch" )
diff --git a/kde-frameworks/kactivities/kactivities-5.18.0-r1.ebuild b/kde-frameworks/kactivities/kactivities-5.18.0-r1.ebuild
new file mode 100644
index 000000000000..62d37eb3f006
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.18.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.0-crash.patch" )
diff --git a/kde-frameworks/kactivities/kactivities-5.19.0.ebuild b/kde-frameworks/kactivities/kactivities-5.19.0.ebuild
new file mode 100644
index 000000000000..d9e765cb4b1f
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.19.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative widgets)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
+
+PATCHES=( "${FILESDIR}/${P}-crash.patch" )
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index e2efdbdb229a..fae32b25fc6e 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,2 +1,3 @@
 DIST kapidox-5.17.0.tar.xz 132796 SHA256 618ea6a45bf90546cc0b5891a316d997a6459d04a506f3ec7b0e226e8615a3b1 SHA512 e266402933b6d18d178a98744b64bc5fda950e8b205d88a43ba7791125ab759321149d099944d17980ca1c66aa52df5fae04da4aa15fcce8ed96cdf7018afcfa WHIRLPOOL 82d11717eb4afd2da4e0cd968013ec7d73ab235bfa89a683346abf3e8cc29ccf2b17f0cd6751dc7366532499bc4ad9ef50ad0baf3d8915d4b5502064e11ee689
 DIST kapidox-5.18.0.tar.xz 132828 SHA256 1a9cfbe26b301601c8918cc98783885602e69365dc6e96ecc558c67ead9c4cc1 SHA512 9f77d53273c1d7b1b4da2a40be984640901a219637b78a557e4ff1b66cc5baa4d07ee9a744e2987d281e805e057951254f73f3acfc7ed24701fda35b45320ad1 WHIRLPOOL d5dbc13cd7ddff989ad9710a31776887b16b0129f1a25e514a073c82ad607a6d082142c13bc9ff2dc8d7efbb56a4cdaa933b2350f39324bfad43333aa1916bff
+DIST kapidox-5.19.0.tar.xz 132800 SHA256 df8749d2181a1fdbde6d17d17e9a6bbd5bf74ccf22157120b6d5b4997b182729 SHA512 09ba83d384b0676c6fa33191c2729c529399d2c621adcaba4c9df3120f3d4e91d6a01dd9c78dd5cbab8bd7e014735ad085e9b201d6a801332089f6083b4c043b WHIRLPOOL 6b52519f49e667f04252405107ed96e171527491574f3ab1e5554a29859d2cceb69c026128f127e4f3128ff0a52a13eaa651d556d2cd06e9e9fe70320c52e0e6
diff --git a/kde-frameworks/kapidox/kapidox-5.19.0.ebuild b/kde-frameworks/kapidox/kapidox-5.19.0.ebuild
new file mode 100644
index 000000000000..84e9e7a4ad42
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.19.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="false"
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index f9d1af796903..88ebd8646b53 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,2 +1,3 @@
 DIST karchive-5.17.0.tar.xz 109140 SHA256 a1d12ae9c12ec62c42d814bbe89d323ed804a2a4211db402bfe9dac01edfc7e7 SHA512 246b8a08ab215f062c4cadf7da8e158e47a3800ef2e925745e756bf9e259cfff8b4bd110e10a2021d03d19782c74369f9d0746475cc5e599fec06f0bd37dc001 WHIRLPOOL cd1c070ae1986b918dc83cf5466e7d1a66737889b4cca0ad3cb8a95c527d88016efdcc9d99636b2a7eac00fcb47ff362251cb2f2737266411c1cdf7d2caf36b1
 DIST karchive-5.18.0.tar.xz 109176 SHA256 059e81e707b09ac2cba69264cfa4ac17bcc93f9838b02495fd6325e2114f055e SHA512 56767d28ffacec0987dc932a3720870caa45fbdc162ff5c5b3f6f6f3b3f4bacf1091d00d00c627698c2bb8ea64524131e9b412d6b52a4289efd06fe3eb2ee50c WHIRLPOOL 1315a15266cfaeaa8970861ba424b2fa9a90b768947263ff545ebc31a3ccae0316de5261ac4bd1b32bdb037dad67983067bdcbd5f1e4fe91f36c3d6c3f1e53ea
+DIST karchive-5.19.0.tar.xz 109292 SHA256 bb7a52fc3e0a6cffd0db144a3c4582e6461de1fa6ff1d1905ca1097d62bd7a10 SHA512 d578c515d7f8a59270673b15d8329ca86d8f9719e3d51f55feaf683b7505ee436b4dfd88c369c6a9d788b0f9186e3690d4685c1dc9153f7fa1b1058657f4eeea WHIRLPOOL 07a50ff0afb2890bc49767bde82f45df4a0ea64d39a09da21ff0574bc03de9315d0ab728f87579ec718ef42c1163fca68b9e2784b5e5e1d23ac75ef6c96355c8
diff --git a/kde-frameworks/karchive/karchive-5.19.0.ebuild b/kde-frameworks/karchive/karchive-5.19.0.ebuild
new file mode 100644
index 000000000000..9c165c72e72e
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.19.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index db67e0157142..0d2bfcfa1d0b 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,2 +1,3 @@
 DIST kauth-5.17.0.tar.xz 82352 SHA256 c3e3a370a6b847cebf73ca8262b79142fc1e821d9dcb81c08063ba0a097cfb6c SHA512 3daaa35f5bd1a0de19cf6df74025fd9cea43ec0ee21eb25fe27d9111abe61c342eef989ec9fb849b8b0525e88fe3dc3c6b82eff86421cdedfd720efbd7b532b6 WHIRLPOOL dbf07982a4d0dccd4fb7cba7fe3d2c7a47ec44774ad2ca595d1f6ce1cf0d547ccc950709d870c3c2dd74246f006522064f0110d94ede574e5afe27bc23b84fdc
 DIST kauth-5.18.0.tar.xz 82372 SHA256 96803c911621798ea1dc4df17c93691c762e4abc8d2ae010613a0cbed8f17b92 SHA512 694557ff533e90c031a89e15ce1205569b239f8286fc069a8ff2db7e09bcb9ea11b31c139fd424c887a9e2a5f4e55b0ed569a7ce055cced693011fb65db27166 WHIRLPOOL 8ade1b0efb28dd9aecbc76944dd5ba2b9529a9ea541709ec6c2b4f2b42801ad0cfd24a6c1f917ba27400478d17c42415252154d3f3fb22f696c75b21ae531f99
+DIST kauth-5.19.0.tar.xz 82444 SHA256 5a7777cc81a5c96876ae670ab56fc5c2ae92c347dca3e468bd59c009058ca93a SHA512 1a83dd6f5cf3d1714f9560bf0f37c79a82789d00f749cd4e4141b7083858e23bc95d0e7153a48235475f9dc79e9c211ae6e7bfeac943b5f0c0a3c4e80873b6f5 WHIRLPOOL f1663e7ad18616caeb54464c4ee9d8d04b82a75c085434bb7a7d6f5d0042b6770f86a8c74fe79feb14a0e42a7f1cd0ad633187c37738e182e039ab89b37bbfed
diff --git a/kde-frameworks/kauth/kauth-5.19.0.ebuild b/kde-frameworks/kauth/kauth-5.19.0.ebuild
new file mode 100644
index 000000000000..4450160d9922
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.19.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls +policykit"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	policykit? ( || ( $(add_frameworks_dep polkit-qt) sys-auth/polkit-qt[qt5] ) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package policykit PolkitQt5-1)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 2bbc7ebf78ba..9317d06e7e24 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,2 +1,3 @@
 DIST kbookmarks-5.17.0.tar.xz 115024 SHA256 cab3d5b6953843080030cf1ce0c516d1d17330cda935c269aafed2209e026766 SHA512 976241eedac9ccfd5755d445a5e4827f8d56147bd62eb8c56cd905438358633f07c2ed032441999a9d534aea04401dcafc5bcaf131d5382ac5b0212923a1a7c4 WHIRLPOOL 2854e2a1cde4c063789e5d6502a0c74cf3a46266d74720053ae0021067f68b5cb143ff8ab30bfcf558a6d74fd97f4b15f56aa57a50c381f22518e8b2a9e47e29
 DIST kbookmarks-5.18.0.tar.xz 115068 SHA256 363c56b19b25d19eaa3b8988fcb6000823cca0637ac5460bc4a61c2d82712262 SHA512 acf2f6ec6a1f5fd4a519d404ff69414dc1320941c356f58aea0f435916b3e75a9994ff7782c55a4e5985e0e8b85a032b201647668c330af411a25c40d336b3d7 WHIRLPOOL 35d87cb34a16285307c641de91f8077fbc43574980b7bc64b282f7afdd4851c6dc216f1cbd760fce1c8aac50f6de371b78fd88953ae1b7a1e27660c1ec66ea23
+DIST kbookmarks-5.19.0.tar.xz 115472 SHA256 4d273e41c0d5517a434cc8a6d86ea31a3da266ef556fd51eb6880cd6ae448160 SHA512 7377a561e1c6165060a5ee5f8374bb7b827dddaf4bd29616e24f62cb7040181a08a8f68ea8d75561635486613f3fc77238d9c0ca0375c8fe5ae39d1c9dd9214b WHIRLPOOL 8d151f77382a97f22034917b037b8ae8699a96452321c6d9379d3bf2b79855bd7612ba80ba8149d9d57f50fc47da4b03790c1052d622fd05083a2e8ae011a65d
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.19.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.19.0.ebuild
new file mode 100644
index 000000000000..012a34033935
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.19.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kconfigwidgets)
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 466fd3ea95ea..0be3523165b1 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,2 +1,3 @@
 DIST kcmutils-5.17.0.tar.xz 234808 SHA256 f0233c2afb6e644756402ddbc7d5595f7dacab1ff1e38f6e60378244a242cb9c SHA512 ac999d4ceaedd6fdb1db32e635825e68e85741b3eeca3e007ef772f61926c5cf2eeb2b2908eea2399810caebdc0e3579633d2355cb5bbb2ac32a7eec6afdedf8 WHIRLPOOL e2bdc5a8371bb66261777c5182e94524122f42202a0b0edc158b5b63b7b7ba0bcd8e4ae04415692f8cff46939e295f391c243b15f4d31c112bfbffc46efca45e
 DIST kcmutils-5.18.0.tar.xz 234900 SHA256 d7e141b1adee96079c749547070ad5cd14fa3ca49d39750e0a3d60161118a3d4 SHA512 b9ece5ca849ad8cdf31001319cf82d5ec62690f77dd2e3cbc20b6941a3b1724c59f3213eedd4d03cc54b78e8c24d5abf7ffd842de663eb48d7a3da6bbbddff8c WHIRLPOOL 3b7a612a27a283ef75ed4a423b675f43ea2a14b9c32573b75b8a83f5d3e761fc5fc3e41f323114e43355c7b45aa47b7b2f764c799d3235b1d47fbc414d52f3aa
+DIST kcmutils-5.19.0.tar.xz 234700 SHA256 a87d450d277aad703c82e8eb5924bdfec6471df95494f51cf309e3fdc7920d62 SHA512 2e809c8e073ee110da2863af7b41b938b4543683a131b6ce233982ac2fc2edbe2b02eb359ff7df00aa9642e4abbe6b0e48857113e4172c7fd3f49675843304a8 WHIRLPOOL 162663e3f9a9d93b239ee879d360ea1bedabc277f93dc4daf03f85b429948b886b4db63cd2d1d846168829eaa066a255cfe8b9a2b670269910643a2911b1b0c5
diff --git a/kde-frameworks/kcmutils/kcmutils-5.19.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.19.0.ebuild
new file mode 100644
index 000000000000..fb408172332d
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.19.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORK_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index c1487d0d012b..72ac03b0a268 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,2 +1,3 @@
 DIST kcodecs-5.17.0.tar.xz 217016 SHA256 43ee8f25170497cfa648e8be790ac6f12567797471701893dc3f99ae4f61d18a SHA512 576e454cee4ae4324b1b3d1dc2815cf597cc9e904d06f5b5dcd0e2050dd4fbaf37bcc5c64c555290e92473068083af340fd379f62a56ef53bf94dec321a68c26 WHIRLPOOL 8262950dba9a0940348ffabbb5a9b371e4a10f92d8643cd8cea4b1e322e886404b4d6950c1a77f070770eed5055c6cab50d53242fe1cc9288d4ee38ce0487dc3
 DIST kcodecs-5.18.0.tar.xz 217008 SHA256 9098cec9ed88287cf000580c2381a60faad45e1f7b70a1a391c2b579fe6dd2c6 SHA512 e1734f9fe9823f48b209acae2bdfb7c7cbecf3c5a4414370b31486e7f4cf68dc54d38dd727ce2bc979f4b79620bed2c5c33d71b0be5c3b6c67b6155f844ffd1f WHIRLPOOL dd365f84d0d999f36b693628f007324510842179941d00c835dc975b51cc51f0327e161e212b23c263cf4e423d3e36191211e861531c52191f9b801b450c774f
+DIST kcodecs-5.19.0.tar.xz 217428 SHA256 c6bce99acc1e024e7ade4a9ade5ebd5f2be9100b1bda239109c5a6ed4818f7e7 SHA512 0765c64f456ce73e3abc0e34744d27fa98ead88afa783632bde9dc2851fe64ba0e393c8c0fec1ad8ce3e069bc971b3ffe591bdc4f9c236114e8f2af7a8785ab8 WHIRLPOOL 1a1cd46d1efe5d68e8adff385b67cbfaf5ecc954b372f46256141a1567fe21031c924b7b18c4889f2909f544af61299ba1617e76d11020c617201deddf5ca9fd
diff --git a/kde-frameworks/kcodecs/kcodecs-5.19.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.19.0.ebuild
new file mode 100644
index 000000000000..bc04b15cb37f
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.19.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index f61d52284971..96ed14e49b99 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,2 +1,3 @@
 DIST kcompletion-5.17.0.tar.xz 115864 SHA256 4f2822e515b905c75b37c47af5d9502ef1fce9aff5220ba60b972691e7e81535 SHA512 1074358f1b9ce1ad2a0173e960ed7b7d5797539f7f7f581779765df1c283c4e79dc47af27099cae69286e10e5484d45e15d7797e4ddbc4281ff4249478f5af9c WHIRLPOOL 8d1296aa6107fac0635d6081cae65ed21aeebe2d11b47414b311bf60810f5d9a934be54340e93d22894cc598fe1c63595f3dbdd34dcaa887edb780a8f41c7e35
 DIST kcompletion-5.18.0.tar.xz 115836 SHA256 cb9cd9e2c156df65f6de8057ad855808922b072cf042882de91c9f4aef23723e SHA512 a2215038e5a8738650f3abf99becdc4a0fa13420506827cb284818ff4cc56b5aa0ff960db940791ca37718b63d579b523c7f9a5e0c8906ee3018f3ce18c7325a WHIRLPOOL e5b50da4ea7530dcc9abc3dcfcc65a0264adb35cb7e671ff493a911c1437951cc2ed662f633acc3476e2e866eb95f7ae4c143c3ec21020dbeafbf19a77fa8413
+DIST kcompletion-5.19.0.tar.xz 115900 SHA256 8d3fe5f6c3438c20ea552fffde479a616f9559d1124c631f278cade166f1c016 SHA512 375e3951f223205ef5d63f8013055bd390fc6cd7a9c46cec3882cc43e51788186028a5e5a0cf78f928fb658d73e108ce9ac83b36e1eae4e485c9eba1a808023d WHIRLPOOL 3a4a9062573412c694f9d8dcf33fa21f2b0e31ab7fc593fe44c45a92b42e60f70bae237182343d018768c884c93a8772c4d01946ec3e8db6cdad9499447d299a
diff --git a/kde-frameworks/kcompletion/kcompletion-5.19.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.19.0.ebuild
new file mode 100644
index 000000000000..db8454dd3ebc
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 9fb2a24f0830..4de2366c69f1 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,2 +1,3 @@
 DIST kconfig-5.17.0.tar.xz 224904 SHA256 325bb286987081af061f9a146289849b11c0a605f91c1c8d7416ebc80d7faacd SHA512 52d39913b043d3e5dc64651970f9547373aa7a8d9185d9026b83756db2e936b9ee0d09882169477debefd06eafa9b5b8cace90f6b5de9f46e9845787288b5a33 WHIRLPOOL 15e8f8e7d99fcf5d6eb3d1890610633cf58551567e88ee7d94560eb0a30c673cc504758096cae91431e78722fed1731cf01de5d65cd54471d0e72d89122a17af
 DIST kconfig-5.18.0.tar.xz 224884 SHA256 36a4c887080bff674bccd302985ff9a401d8e1a8a0649616ff686f4d1ddceee8 SHA512 0ce1554c4097902b2c044bdb245c97c6c5b975e0d496a486117db0ca1e10fb8a7757871bb741829cfea0fc9457737d68f6341ea13d74a0dc4f52081df6fc9f32 WHIRLPOOL e7d7d0fdcf9d582efd86a12285a1c70f059396af0e4666c153f9669448cfdc99400f4235ae0a64331ba0e14036b4dc24940e9a01aa17d1e969ab9ebb3db19bc7
+DIST kconfig-5.19.0.tar.xz 224788 SHA256 b536a75a82fd00915204bbefb5f33dce1ada0a600cc47e947a13408fa883655a SHA512 9a5a16246cf8546cd923d4e98f1b73fc7f3e745abb48b2fe24551d65d227d96d3f912a29d760b051310eabb1de9063db31a40431916106b53b7d172077c129f3 WHIRLPOOL 9b0128afbe8d72dbfb662f803ea8e9d5246439fd9dadaac4b9c50985373476c3d4d01441455a369765f07094b45875776aef366170fbd7f1051811ebb610cc7c
diff --git a/kde-frameworks/kconfig/kconfig-5.19.0.ebuild b/kde-frameworks/kconfig/kconfig-5.19.0.ebuild
new file mode 100644
index 000000000000..84e457342a3d
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.19.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# bug 560086
+RESTRICT="test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index b514705148e9..dbb4e8def734 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,2 +1,3 @@
 DIST kconfigwidgets-5.17.0.tar.xz 358856 SHA256 c23382e70182a84b4a164afa313612308d3dcf1f5ec34bad882853725599793b SHA512 bb32b0f79acec46ca06b2be1db511791583416feaace47f7b567febd15e18838bb66d24c2f3bbfd46ec22f8ef42f1818c4b4ac7f76afdffe4bf85aa1f0938935 WHIRLPOOL f807e7343fa2f8d9f17deb2da7d980be3c37f39abeb580a94a81c2167c0225642eabe6d4453390c22e0b86333f10458e70cdee9e60ded8a4ec9c701ea671d00c
 DIST kconfigwidgets-5.18.0.tar.xz 358820 SHA256 35a25df3d79ec4ae50f80e496218b8898564011f6eadbe7cb742e70b08102122 SHA512 883dc52b8ea39e59e867f1aefe7cc73caf7d8d6cf75b0c4169d69f820157477d5213da25731dc8caee0c6673c8923f172d0a11bdf84af2dad85af53e10437f73 WHIRLPOOL 93872e7828e23342821054c3492ce5239a9f3ef3cde5db75259a3a09c8d220b655a0ad69e3c588d97b56bbf40486cd50029bab96e8cc0780e58871565e164362
+DIST kconfigwidgets-5.19.0.tar.xz 359100 SHA256 fb7a748eb1ceee2a33027581707d1942b1eae239526873367f924b06d9118dda SHA512 42c5390a987f183332b8b6bc3f23736cc67a43c1bd7c614ca85cb7fb286c82ebb7056655c74eec1cc5e8eb30a3d8c3af0519dd5bb4ddbd397f01b68adda50a9d WHIRLPOOL b61e4a8f2c6a4d09fe5ebf9d3865b0e7629bbe7c082c41f94705da8ab314c4cd5e3738e508ad48469da57451c06e366828d024609f9a42cf48cc0933b141f278
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.19.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.19.0.ebuild
new file mode 100644
index 000000000000..08368d3ac0d7
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.19.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	!<kde-frameworks/kdelibs4support-5.3.0:5
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 3dd777619473..44d283580986 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kcoreaddons-5.17.0.tar.xz 310928 SHA256 f6200396dece6469438d57d02b7d8c231bcf6986190cbb3669923dc562d4a65d SHA512 2e0a779cb7b6a9b1fadec57e359a92fb8854e98cc80f3235598e3e0793f9600ea730ef81dc50e9a71c78a3fc1b6ac45922159e6fb7221ee232a71b0160788398 WHIRLPOOL a0269302fb68c8cdbb9163b13de174295c9523629dda8f297b75595b145706cff7fe470c69a5152bd2567d9aeb1e82f7cb8f27aeea408ed2559b826b141333e5
 DIST kcoreaddons-5.18.0.tar.xz 312104 SHA256 ee7785642f3bcbb513c6a236f8f13a14809ee58b69a7a885c4c63688acbac817 SHA512 1a1fcd2ac01b54c2d95eaa62119642d392aaeaa79aab4f36fb926e22342e30a4e6dd73cf5ea386eb7c04fc0f3aba54818a213c47b88f91a5a2ae31bcbc679bcd WHIRLPOOL c321ca4655ceba8d907e6762258618d6346305bffe9b0da764c8aa2645c459b78ebfb485655be507b6cdb4034c65583b02d2e6dae29d90749001970b3d5d0a5d
+DIST kcoreaddons-5.19.0.tar.xz 312568 SHA256 9c35aa5df72874cf74266d10bd60b077f6d1f4b77e3a01c645a237b7e303551f SHA512 040caed5ad45f0a538d8348c46b3abd8aafdae676a1575e75d8fab0a56081d76896ab68fcbe97b1eaf6120e2ad13edcfced2a76be14cc66318977dfdbfa7c742 WHIRLPOOL 74793f2b2d6787e1ef0210f3eb316e8053708465e707aa19a69eb651d2dc1d30bb500f6711fe21179174fc40fa3bfefd6260bf2f71c157d99bfb1f90ef0f0f8e
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.19.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.19.0.ebuild
new file mode 100644
index 000000000000..037dde3f7feb
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.19.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="fam nls"
+
+RDEPEND="
+	$(add_qt_dep qtcore 'icu')
+	fam? ( virtual/fam )
+	!<kde-frameworks/kservice-5.2.0:5
+"
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		$(cmake-utils_use_find_package fam FAM)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 5365c15f721d..481bf4601ecc 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,2 +1,3 @@
 DIST kcrash-5.17.0.tar.xz 20124 SHA256 edd4906a2cf62dbee0e502e375cba4718361a9033ce278cf738371edf4243b6c SHA512 d34962c44379a348162a72985fb90bfed1b7498e3b80165ef3cc425bded327ef9c82e5cc0761185e2553855817211abcaf6e19cb2c875699c46c0b7512b56f77 WHIRLPOOL 7afd6cefd288bf8dd587c6abfbedebba79aa8611c20dc7d04fee8d0a87535ce4c6053a29745432eaa0dbb9a89636d4f62eeac2755e2abd0010a826f28ac2e7ec
 DIST kcrash-5.18.0.tar.xz 20124 SHA256 bcf4f57ecf3393e73ea3754c4930887fab34422f27e85059a492ac0af23f6266 SHA512 a668e57206e9dde4184af5614b8a00d7d1ffb460267cb90f664da6608c83c519ff905feaf2910271bb4e6d3a42fb2bf25a9fc9007b9fcdcc01e8c27c712de4f4 WHIRLPOOL badf1acfa6a82c1572dff77de58be7b4b1fb93bb5d71cac5ce55ae4882e9c3d3956916ca19909c8bc947d92281d672dd7b75cbeb4de7e67d6e69f9c4df3bb818
+DIST kcrash-5.19.0.tar.xz 20104 SHA256 d4bfd6e52d65e2385c643cdc23838ae05ff4f7ba0d28f781e526491dee1bc0b7 SHA512 379a67c1f9532324f818e12001c6b3eb26bd0fd1091a90153d559140b3aeff6bb7ff4dc052a400bf39a9c11daef0dcafc4ad3ea44b7a837ca8bfb209f30a91b3 WHIRLPOOL 9725179149742c064e54b52e7e57ae8c5e7f5f4a748081357975256239b2880d112abbf88f82c9a94670a8279b88be10843b3bd541f9715cfc1d2be43a7607d7
diff --git a/kde-frameworks/kcrash/kcrash-5.19.0.ebuild b/kde-frameworks/kcrash/kcrash-5.19.0.ebuild
new file mode 100644
index 000000000000..7979d02c5b7a
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.19.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls X"
+
+# requires running kde environment
+RESTRICT="test"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtwidgets) )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 5e7b65cc8969..696f9c741b77 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kdbusaddons-5.17.0.tar.xz 33800 SHA256 b599a448be04bfeee0be7bf0aaf6272964bb82871b5dd1f26cf06c03c44993d8 SHA512 dd15bb3d839e4b4990681dd24f4d5d0133badfdc8be4689439afe7601a8c61402fecb2239c3a72d17f7c4228cb8947c662f0bc2fd7bfaa77c2b18410bb95c80d WHIRLPOOL d7e56329abc4aed91ab3360a0ab4d18897a3fad8b47e83dbdca760c068c3043ce536c635ed780297fc96eec36b7570632b6d9cabb30e26f2242c0a7fd5c75c8c
 DIST kdbusaddons-5.18.0.tar.xz 33848 SHA256 487d4859bf3e87e10ba76907f3417ec0b21624fda6d6aed25ca687affee03c51 SHA512 aca4438c62f6d72850a4b0eed5a6c470d1021c3bddaae0a28fdf4c718d6819175f5bcd10d92e88d804523ae4cbc2fafd3178933a86d03328360f4af439364024 WHIRLPOOL c75857a3632692e8a33c038be6376e7edf0173273c82c112a94b3adc646571aba398fd01df0ccc64414eb12f39e0f7e5e6b0229c70bf244f0d6f07309a587312
+DIST kdbusaddons-5.19.0.tar.xz 33812 SHA256 485cc76762c44ce2417e7d04e4e6d33ea29abb74b9a534ca5273d009665465ad SHA512 6f801967af8518979cdf8d5ae13fc16b0c7d45a47b194b49d48cc598216a49918ef84b0219c0f825e1107a6532a5db37f40dd10d34a3dc6047bca58980786d64 WHIRLPOOL c1675e609f28c2df0131540b89a76c653776500d6ba68b22159bcaed601b9496f70b00d69bbe954abb3611187c323f98a182629f6f1d6bbd62ff9819651685c1
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.19.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.19.0.ebuild
new file mode 100644
index 000000000000..73214f6091ae
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.19.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index ab6506fca6eb..aa101d755ab3 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,2 +1,3 @@
 DIST kdeclarative-5.17.0.tar.xz 167516 SHA256 93a02714e8aafeb1d33a416e609e0af20d757be987ab70e62b4d0ccedb6ce58a SHA512 12537cf78fc58877d4193d6da52aa91353705c50382698451c1e0ee81a15022edcd6346eb194a7831146b1c1aa4319c8cf026d7a706b2b01f8d8c8abd125ac0c WHIRLPOOL f29f916c614747fa301815ac7a1300f3c8bca7990419f2860822e81a97e8e6b8156872cd47d068c1f6b942c570d06b4d655dfa947dcf5fa41cecd441775445ed
 DIST kdeclarative-5.18.0.tar.xz 167512 SHA256 46a5cead4e8df189de16fdeedba52088ce2c06b73be4f013d3e3e96a84e5fb56 SHA512 f43949945e1c51cb19982abcd73b737d8d85d21bf1d286502cb898efea92dd70c21c09abf20984d3bcae227bd2ba24303c2758b463755471f57699a62c0559c0 WHIRLPOOL 6361e24cd055c5a12f6ae3dce9e2ca1b5f03fb775220975cbcda474c49b1dd347d2efca816bac4c1874e40264601f0e97f18e92c9f40d872f9a4807e28d0827b
+DIST kdeclarative-5.19.0.tar.xz 167340 SHA256 4f146f455fac81a5d968e189419c4ed2cb7315fa62f4fef1bef54b7efc17e00d SHA512 8fca2dfc2c63155f2901d45ba5b5f41cb6384d7b0beb8d125d3fd32a019fe30105b642880b087801621cddc3d418445069f71b7ded50541ad0b6a2604399c53d WHIRLPOOL d00891ea4dec4d3ae66877ce5d0b688a2ce6bd75b39507547141d814ee10f7d602628be1fa06f02a673391eea68736d3788ade872bf605ccca01e30425a34d14
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.19.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.19.0.ebuild
new file mode 100644
index 000000000000..614ce800dc0c
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.19.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 6af3f4a7947d..f1f942795181 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,3 @@
 DIST kded-5.17.0.tar.xz 36000 SHA256 134e108fd99e196e4c539848fe5de9a2a39325d77d845b084809831d774b9eea SHA512 3ac7d498996d38566625663f74d4e2b9085a23e0db8edfb6f286eead03e47f7dfb4a9f76268ed70010f2b48f25f08f2dbae8358e43d49405ad65cc888f24f377 WHIRLPOOL 5f4057363626b70dac669633c0f18c05ec287c82a3191a391170802180a4aeb35f3b89b685ac551945484d24ac0c22744816a39fed66bc2dda314ed2707bebcf
 DIST kded-5.18.0.tar.xz 36112 SHA256 457d912d2f0ee3c5043776f045889b5b504a13199048f11967d453d5fdb1ba78 SHA512 acc7f1c8812839f479efd7905cda973d516caffcbca289397cff5efc39009a27f13faf68471d806c34c1a4fc1194bf73beaaf6c320531b4052ce982c111a3f73 WHIRLPOOL aed61f0f110a1b721a9c357926f11844d478d05d69d7e961f91b5ad73b234f53fbc873757a0f3ef0278002b3c907b61d54070d2298689bc4b3fcdc991aa75444
+DIST kded-5.19.0.tar.xz 36068 SHA256 1fa66b42312bc7c1ba23fe02dca04d9bd52c98e7a6a9754ac6c763252078db5b SHA512 9ee81b89cc29e2fd50f27a364bd52267e3d878df7ad9ec3cd2cfe9c2c71e84e06b37856c067df3ffc5500f7303ba5635a42334e7a2af0935e8ec7ad4573a97aa WHIRLPOOL f63c8a8faa0d073d9b36546b074a02a088c808e1878e430be3acc01a9846d17b4138418b0625a23b89ecf2f900a954ecad05775b0f5386ae5a88086029825e82
diff --git a/kde-frameworks/kded/kded-5.19.0.ebuild b/kde-frameworks/kded/kded-5.19.0.ebuild
new file mode 100644
index 000000000000..4548df12de2d
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.19.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 86af3bad6ce7..00487a59c805 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1,3 @@
 DIST kdelibs4support-5.17.0.tar.xz 3219596 SHA256 3d9f2e9223c01caebd2bc2be1590b00ea9413a6874020caa622034f981c9270e SHA512 71e6196b76b59f484bb268eace5a30a1427388e037900fae9f222aa4bd6f2a6f93c7325370c36c08dd2efadaa1f7cc28d04c93ab9b302813ce9e4fa312990b5d WHIRLPOOL 6ea12057aa171ab1766ddc2ffe43f751206d19dbb3387e1a6704ffff963a8976d96c7893b440cb35c91df072154506f10bfafaafb77ebcf27d33a6dfcf044b9b
 DIST kdelibs4support-5.18.0.tar.xz 3222800 SHA256 a821dafa24ea74bc3bc59f4edad331005fca0b99fd219c0c32908b6aad84903a SHA512 a0718c23f05ffba75bdf3e28b5328d9193d22542c03e0142cdd46e21ec2ea45490a77847da5fd458774005a69ff0467a8c445ff14f1936c4be06ea2770776d8f WHIRLPOOL 05bcac10abe34ba3d7b67fb3ccf88e40b7e3f015bd409729ff71d7973b2594dc6ce630989a75d614f1795823949846fd70ba01df0294d1a213115302a02866b5
+DIST kdelibs4support-5.19.0.tar.xz 3225356 SHA256 f60a9b9a950191f5ecbd1fa8a8ccb4ad4327e92e66f3ac0c00c8bb67a4581647 SHA512 60f5b4bd1eb84d51443b3266a5d970b9a66eafc1394b6268cce429ea8bd60137475ef2667c5e8f742ecbe1e2339bd08b92008d207e7e6c8d390f0e4bd3240816 WHIRLPOOL c13b1ce43e14f4de33697ee20d23d07bf974f90a37ad690be2b02d9d8d10363fb0a81212ae4e6ce7a7b8e2145155306c20a5d10116973dc4d90d5f06409c1182
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.19.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.19.0.ebuild
new file mode 100644
index 000000000000..3165ae10d236
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.19.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesignerplugin)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/openssl:0
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	virtual/libintl
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kitemmodels)
+	$(add_qt_dep qtxml)
+	!<kde-apps/kcontrol-15.08.0[handbook]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-lang/perl
+	dev-perl/URI
+	$(add_qt_dep designer)
+	test? ( $(add_qt_dep qtconcurrent) )
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index e7f8affc6fa9..b3a8b0a0002e 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,2 +1,3 @@
 DIST kdesignerplugin-5.17.0.tar.xz 87048 SHA256 3f4c1762f5793f5a33a6f72f658e725f7f2edc73fbc9e2d44b4ebf4054d4876c SHA512 745c102ec573f48c8bc7fd39e08fa3d0cc6c6f7cce4d0e634780311abe2338652db425dc8f86eaadef72d81637801084ead606cb5c3d3efd7d3e44c19ee12648 WHIRLPOOL 5c3ff6a5e07ed1fba4ef2b04e6c7cb84af1d7eeaad6c4910b252181f2aaec592dba7f3f80342cfed7763de6937500b8ae8cf52f47a2866674b576370f32e74bf
 DIST kdesignerplugin-5.18.0.tar.xz 87072 SHA256 76849708e7e95eb051d4d2ebcddd0424f99d2ac9658204eceab0f5be51777498 SHA512 f024dcd832bfeef10b3a8a65b6d6f54c9da67a93ad8cf9d84d78b17ab4e479bc2d231f0146f7b0cc94439b2b963340e211688f43daa4e8905191c799136c291a WHIRLPOOL 4103c834d286d3ea4fbd3c5d43da4bc0f84e6ea30b2dffac4794545906ecd644999f2064b81569ae46467c1ee3b6ec0620c62619603f11390239b7824b5ec68b
+DIST kdesignerplugin-5.19.0.tar.xz 87088 SHA256 4573434c533a6ee601383b7f8c97611b77db82535610447a36e9e4a8fcae3686 SHA512 5deeb8b1d0fa119b1dcd72c8cb0b71ecf1edec91e3574678e8b3ba729cdbd6f9ce54f86264c03ebd9c9b938eb54004af875151f72961d7d5eeb985885a018490 WHIRLPOOL 28eae63eba78e1649c586746d6bb89d12a025afe4b572c1c453590ec66794d3904ccc3a01b7c4677c681acffdbed63a4a1ac97808cd1689ec0f7b6ffe03bbd3c
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.19.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.19.0.ebuild
new file mode 100644
index 000000000000..5a9cecb1793a
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.19.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	designer? (
+		$(add_qt_dep designer)
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kplotting)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+		$(add_frameworks_dep sonnet)
+	)
+	webkit? (
+		$(add_qt_dep designer)
+		$(add_qt_dep qtgui)
+		$(add_frameworks_dep kdewebkit)
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer KF5IconThemes)
+		$(cmake-utils_use_find_package designer KF5ItemViews)
+		$(cmake-utils_use_find_package designer KF5KIO)
+		$(cmake-utils_use_find_package designer KF5Plotting)
+		$(cmake-utils_use_find_package designer KF5TextWidgets)
+		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
+		$(cmake-utils_use_find_package webkit KF5WebKit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 06308a14d1cc..6ce6f330df37 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,2 +1,3 @@
 DIST kdesu-5.17.0.tar.xz 44008 SHA256 0884aed186fd5169ef055d2f8b33d4bf31ad6e61c4373c1c2249874f3a1913a1 SHA512 89c09b450401abcb1597ca9a7424385251f841872be850e7b745a35b24859999c5c5f9711a5bb0ec85e7797f4276e98acc3342e8bb0aa850c4ed6e2d22136ee0 WHIRLPOOL 1add61f70ecbfef82455504a8a602f18cd793516276b136c4a0977ba1e135bd59ad8d41499ea5588c8b150defbf7b89fd49833fbbc7558abcb23ea544d1ff4f2
 DIST kdesu-5.18.0.tar.xz 44120 SHA256 03e5c3db3ea8ebe0b24ddb91d2c6f33b32772ce178f8c485b1e40242e2ae1237 SHA512 3714f367ddd4040cc396bcd98f3ab39e0c7a955ff60b49e960c6f4fe4782ba5cdaa1682beb2496c14d4105dd4cc642cce2b5fe8a384afa7d73da18556065d1a2 WHIRLPOOL cb613f86a70f5eba2a3df82c04a1891a82541bca5d4c8f761285e494d3da0856bdc1f0d0180f0544873364875064b34f3b289460f44f2cc19f069452cafd8b33
+DIST kdesu-5.19.0.tar.xz 44116 SHA256 ff4129bdbda956519f9e14994291493428ce7ea47c7e8acc68770513e5a988a7 SHA512 8c3ea2c5711987e832b633ce93d1be2ab9cd76a2e854c8301289aa8b65aea8d727481d121d83f7dbdab037623ff76130cfe983f26a7fd4040175920f6358428b WHIRLPOOL 11861ec7875384e462d6ce60be78961985aa3fae15c98ad778b5b07b67fe75c349224baf27570ac4e1fae0dea315f833cef89d6c7178d8c4c4b34395325abf4c
diff --git a/kde-frameworks/kdesu/kdesu-5.19.0.ebuild b/kde-frameworks/kdesu/kdesu-5.19.0.ebuild
new file mode 100644
index 000000000000..cda2b212c32e
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.19.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index ce82277f113c..0ee7f8844042 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,2 +1,3 @@
 DIST kdewebkit-5.17.0.tar.xz 29348 SHA256 acc7568696d7a4af021aed4277fbf5c7499719f672bb976ebf308118ae5576dc SHA512 b580a57181086b160b71d8fae51d8ddab8fb4200b96f5d2ad7de410b87b8539efbd4bb32dc461afbfd1e2328b37f8359d41b0aee6b6ff5953977fcb788f09495 WHIRLPOOL 2497782cbff47563626baa75feb97d6dcf97e47de80bcaaa2b3bb10ee23ded44b4b984f65d76538e718db2290dcdbc6f57028d05f2d427493c6c1674070b8ef6
 DIST kdewebkit-5.18.0.tar.xz 29348 SHA256 d45205621f3277a009bb9334b137c8f6aee31e01bd2b71d39a0581e9ba3019aa SHA512 6b9aace101cca1e6a7fb738b1c140d25affcbd829848bbca2e7970c8edca2ecaecd32a5514fdebec732bbe41ae31acc3eb95c14b23e911396ffe39f98d7d5b50 WHIRLPOOL b24a1d309b78a78af899e2969bd41fc5a98222da2663dde728bca0c7cb14f318f8e0b24dcfbb92edbffcb25e5f356d8191bcac5e509c817964faa5a2e1236ebb
+DIST kdewebkit-5.19.0.tar.xz 29356 SHA256 1282e3f7fb7f5697b26ab6c35e0f9e444e14fdd5148958b775eebd0eadc26511 SHA512 997a023a69e9f3aedb6f2fc0def13174bbd31ea97b3d6e303ed7f5603e8fa1e1e9c4c99ab594f23d04e9017bca48a42a5db8f8ca027e030361326fb4c904d04d WHIRLPOOL 980089d1f5262c36a408fb96063febe8aa848b25e7e7fe0e9677c3589f4b4dd6bd545d379242bc946b5faa0fe4f7daae82e12e2aaf1d8a1d5163b951976875da
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.19.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.19.0.ebuild
new file mode 100644
index 000000000000..ba5e074cdc29
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.19.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtnetwork)
+"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index fd3aeda705ca..784932ce1271 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,2 +1,3 @@
 DIST kdnssd-5.17.0.tar.xz 56400 SHA256 e10a1b2f3b64039c964128d47edce7b19a7d90975dd17084210c895b6f83d216 SHA512 ae88175e37427e0d6beae07cb2590e905dc8799c4dac8a2c531e108d6f2ab891c78906a26ea47d26ae0fac67aeab45ee9fe27721c16f11bcc7b759e3cc21da12 WHIRLPOOL 148f1f3ea603dc0109b1d1092bafa956f93a5273615634237499d40e0bf86b65debe121e183d2aa695086947f661b51f3934a9a47fbf6fdbe0da2b2c985442f5
 DIST kdnssd-5.18.0.tar.xz 56372 SHA256 34ec8043f4bf0a226f6e615952360de501ce1b24b1ac9a5fd0f30fa61da6778b SHA512 2fe640346d02dd3230d510c107af711df0fd83cff2804619305ab270119e7ab3c381d58c1f29cb3be9c18a333c15afc8a8a7a4e47141fb84a923f0246894fa3b WHIRLPOOL 97fa2feb74245a310f9bb7faf2e3ba50bbbb66f6ad795fc0bcc8ffb3d02ab27168cea87882bfeed0667ba02f9ad261ac50b1c70ac266e53aa5c7d84ee15aa9d4
+DIST kdnssd-5.19.0.tar.xz 56404 SHA256 240c6cd1a480b4b9e8b8ae71bb948c853006721d2278c39b822bd724a2e04895 SHA512 57c93237de2e1772dd5e1c1de514312a420bd66219e1f365d6b88f601b3daa01037a8f3aa5004e7ab3da606d442472972590928a31ef1dc8664813acd7a814f7 WHIRLPOOL 7ab27ec996fcdb209328441a57bdc26d25a0390d4b1aa25bef28b31f8c9db96a2e07c5dcab8fbf8eb70b33ebdf6ca82b2e92ddebbc0f3a7912bc6d5ce20c1081
diff --git a/kde-frameworks/kdnssd/kdnssd-5.19.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.19.0.ebuild
new file mode 100644
index 000000000000..ab0fc0bf5f9f
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.19.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls zeroconf"
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+	zeroconf? (
+		$(add_qt_dep qtdbus)
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake-utils_use_find_package zeroconf Avahi)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index dbec71ec2a57..65974e26a6a4 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,3 @@
 DIST kdoctools-5.17.0.tar.xz 407996 SHA256 2857094d27cbcc1e89790ad5d760cbeb699f2a5636c3a5ec603d3d9791917f61 SHA512 40ce467c0fe005e6acf33d6fcdf592f2845729b756fc8d302c7d88a699425f963ade89b57fe72cad02e6684d0f410bcbbd2feadc683e03fc879f34a3765a3d3d WHIRLPOOL c0b247675c5b97ec9ff7c79b2e1bdc8ac55730f3204d48899a7e5f4710b7f4005fc4b5db6d133ce91cb31d949a7ddea0f7f661f56166103cc95dd974c03d749a
 DIST kdoctools-5.18.0.tar.xz 407976 SHA256 ed702ac3da6561404b24908049947bf7903feff4c0748460d0eea44216250782 SHA512 dfc4c33496ea579b097ad35ff4578b7e68cf78c51905972253c59d2aec635b8ce503b9505030fd1cd2158b2678665afe34305e2055a0140ae694f83ae9dd521a WHIRLPOOL 34150cdab0d25212e9f9a2caa26013265a832d0ab8fdef2514cec047c29d7de874e49eb48b2f213ac7a02bf6f75a46d57272f486dc82f88245204bea6f46f124
+DIST kdoctools-5.19.0.tar.xz 408008 SHA256 f65a660eeb018c3c8b55c63e375a9d552c772f49e7cfc0a6263bdece933de719 SHA512 9af22acd1a0979c50668c225ca41bf7641ab4bbb2c98219503a3beefb0df1b00ccd4b4bc865824af5919bc59e5e1f7d4f200a65b6c20ff02cb7573d784ac2a0c WHIRLPOOL 79559ebc77356655589411917dfbe5af44123fe0a5edf22bb240231fbf6201fb34d18b69569dc1a5a94be487b23132b4ae5b40bfc13f08d2711e74166ee84259
diff --git a/kde-frameworks/kdoctools/kdoctools-5.19.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.19.0.ebuild
new file mode 100644
index 000000000000..29814f34391f
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.19.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/URI
+"
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 857d6fc4c048..018df87001d0 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,2 +1,3 @@
 DIST kemoticons-5.17.0.tar.xz 94356 SHA256 23ecdffb3110329cab7d8c3e614b6096ac2cc457fe69e60db503de40b593bf33 SHA512 03548beabec53e56ea476f82efa692ccd48f83dd9536b8f65814be2cdd9d29f2f72e9b1f13f76521f6d1f4231a532a9a320ba6a2165500db5d08f6b6186bbda9 WHIRLPOOL 45cf50211209c90505a89e314aa7518d964b3a03094075829d88218aee09e996a741940a762dfdcd37c1bd56af6e2836b21c3a20194fe4b7a25f27c180596c9c
 DIST kemoticons-5.18.0.tar.xz 94464 SHA256 1a4e98b81e4d203681f4d70faf2a4acf60b9fafc896f8067b340c8587f366a51 SHA512 9678666d6ea27ba15483d7ddb785a8f383e6356352a1554b1acd9f86d54cec92b527a8a3f4ac3119047d5ef424d1a8c90a95da3999d18c7868058eb9a586120f WHIRLPOOL 8111433ef525c8f6fa277c3fc9de00406f2230e847ab23004aeca62f1aa22483ba7ce9ac44e533cbadafca955ee8fa200f9b9ce82f841b980f351f02b84f0de2
+DIST kemoticons-5.19.0.tar.xz 94468 SHA256 e59913e04bdad055f8215e80b7efd9eb9dfa57c80d72d46fae3b73e1b4e8313a SHA512 2b1f40df21c3afbced68c6f8403db4cf7f3b188bddea44b6b7db4924d956e499578773dfab847195757c2e6730050827cf9bb9e3b6b06aa0ebac69802483f607 WHIRLPOOL c1b7bb0c1c54aa4e93a56aa1930846d4a9fe8a835a8c32cff8bba48866dcbe6623170b252a5843ea4ad8c6d75991d4a3c943c2e1e6ad420d100fd1de376b74e0
diff --git a/kde-frameworks/kemoticons/kemoticons-5.19.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.19.0.ebuild
new file mode 100644
index 000000000000..79a59fd2d074
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.19.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 19b15d1b923e..f33f086b75b0 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,2 +1,3 @@
 DIST kfilemetadata-5.17.0.tar.xz 123944 SHA256 f0d7e4c5bb74d1eeb5a1f5fa93c14567154ec3fd12c261148a617c167631c8a8 SHA512 9140401346e2972326b84b12499ac63b60c05e323f47eb660189ff121678e27b852bf4bbc9b82e79f891139d01231de10d0fd4b928d41cac6fdf00086c0fdb1e WHIRLPOOL fa55f3ebd33a96e453280e4e55e1d7b9597babdd86206b8a959179f40644beadefc80a252ad582914e6d2bfef238e196b7d1e1763426814d1719e4b3006ed4df
 DIST kfilemetadata-5.18.0.tar.xz 123968 SHA256 a4ea5c0a7f460f4850c39a2d447948b395b8c5b11441a74c281c30d40bb468a5 SHA512 00f078b9bfd4b5030bcd173d374b0306b0c5bf281e32df3333f361d0991cd784e4cadea261b5c10f48061c31f081a8a50bc803c77136e0d391c0338efe5f20a5 WHIRLPOOL 61df8cd55be51923e6b73140e478301257385d90f830ec1fb323185ac604158d851a4fb51c16d6f0c7d9f818ec9b6f8a076fdafa5e0a3b332dcb99603fdb3bc5
+DIST kfilemetadata-5.19.0.tar.xz 124788 SHA256 190f7c37d9fd1e31e284c5fd112d209d2348c9ead654be22ef7d5cd8878b4886 SHA512 fe6231584ae0fc4583c51eb66040109ede3a3822ab144f9de85f8c5b2ca28d62b57c0c335edce1c55cee47e2130beb9369d9e2e26638886f85ae71c070e9884f WHIRLPOOL 735d930e359db9686817ba36b8989c5c861699965772b0f40813c83670dfb893bc561473cf848728b91501c52349cb8994cd9bc7a8ff16bfa014d30ba463fe6b
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.19.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.19.0.ebuild
new file mode 100644
index 000000000000..5b1323c23f98
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.19.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="epub exif ffmpeg libav pdf taglib"
+
+# TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not integrated upstream
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtxml)
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_find_package pdf PopplerQt5)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index e6742933e69c..067f925d1886 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,2 +1,3 @@
 DIST kglobalaccel-5.17.0.tar.xz 81724 SHA256 1f12b02db246c7ef379976081ee3d85639e018acfb35cc1a4a5ef58725eda836 SHA512 71d96757c993c0c4cc05fd95ad044fc122540959489ac3691ff1803b5c02a3eafe56ed16bb893f1ed9f306b0594f288fb71649783a125aeab37de5dcfc37ca17 WHIRLPOOL a72c292e358d26344d874c1996941359ca02c27e2be6fddd6c5ba369ecc13e630702c46c61354f3868bbab194d4e64869340b6a06a7c256204b3d0e02eb06952
 DIST kglobalaccel-5.18.0.tar.xz 81720 SHA256 81150bba3cc516ce6e0aa2cc647d7249700c06e98fbcc786a17f80c010cc42ec SHA512 0981f2aad7a4882b683a9262f4a4a418b439fc5f28bf84507a02874e31d9af2e3d384cc3a9ef94aabfc826f5ef40154ac720378cada717c4a882b247d14e4b07 WHIRLPOOL cebf5f78a0c4e0de82765092543e3adba818c79d310d7430a8eb6a4a5db02504c14ec01856e54130ecd8e9e6d9da1f509bcc9cd9be3b936fda8b45c3b2a99021
+DIST kglobalaccel-5.19.0.tar.xz 81816 SHA256 ad803a2d78e1668ed85231358d559b3a2afa297855dd8ed540f504711c4a3208 SHA512 1612460ae7b0e84fecdd96324fae92fe0af323da22f6e8b89582f441bd4a00ef796c76536a7031ab14ffbc9e8bf0bfe9bdcb10d19ff9fdcca8e15f055b94b4b7 WHIRLPOOL ff0662a113b08e51f8196d359852b85ba110f622b0a38feb3916e383f47f49f5c88b96301151d440654026d41569928e62da2082a1dbfcdcb4629ab5b770bf3d
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.19.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.19.0.ebuild
new file mode 100644
index 000000000000..33670783aeb9
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.19.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	!<kde-plasma/plasma-workspace-5.2.0-r2
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 8b64159b4b08..cad61de6895f 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kguiaddons-5.17.0.tar.xz 39340 SHA256 e434d05fb78d3d897e75e09bf0ad8781b87a73ff1185982e3af71fc108a525e4 SHA512 12a92acbe69f50894986ef91db6ce8327ca64e0620f66307cade8cfe5c281b3ee8c751bc37d6954d76ce4abbdde1e6626be9329706b1d1dccdcea404b169387a WHIRLPOOL ce8ecd2011cf64d48796e3499b1452c029fd810afb6fb47430116e1ad0b65fd518ce7fc05f6fe826f3f044a90a03f4f29736df7cf8a2e58063d921a79766188e
 DIST kguiaddons-5.18.0.tar.xz 39324 SHA256 bf4b419964849f87e599313da8d2d0fe15cbfc1d12495d052be692c7e3927594 SHA512 2c0852ab549b38c6bccc0748764db71b7b24d38e32db32cd1b2782ef1ce18e2c99592206a521512f703fcd5fa24272d213a3fa8eb9c0d1d93a7acdb92bec56e8 WHIRLPOOL 13b3e63aafe9368c221e4717a1b3975a869873c8ff97ed86560bef70b92426dff9ff5ad7c536a3535c40c7f24f7322275254066636664426fe958ab23dbb72f4
+DIST kguiaddons-5.19.0.tar.xz 39364 SHA256 1e4a035ec208e36aa09d585fafda837981b2444b91aec811672ebebb8f533d05 SHA512 b7efb3113b9a6e2d5346e8f7e3635fa1608c5462efcc7fdab9f6fc2792141d6a874b1e7690eed581be9197faeaadc92aeb8d7c474f6892af9ea5e837824e5041 WHIRLPOOL cf97385ad5e6c1550ba4ffaffcb7091c1ba7033c9cce42d59e533b393c44112e97e43a1f17ec17c1c790ef837f6fdc269c5f1d7ae36676cea9fa836c4746a052
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.19.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.19.0.ebuild
new file mode 100644
index 000000000000..af10265ba0e2
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.19.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-libs/libxcb
+	x11-proto/xproto
+"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index a4c1a4acc2fa..afe7f5d57f9b 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1,3 @@
 DIST khtml-5.17.0.tar.xz 2076468 SHA256 249e978e3fcc5956f2a2845afbe245ef7b0a596556f8ad048cdd0a58cfaae557 SHA512 dad41fa8b4fbb20380a14db9354865105a3637b4fe11fdcd63b54762df869f581e9e5dae1e4089a4a59c692de242dae9df0fef1abcf47cf68c7f03a449530ca8 WHIRLPOOL e203597980cad1fd97f0ebc756b81db914376427203cc9dbdbf02df3e985382399e7ef622cd5d299e083e51956de34f5527adfadf3f99b6af0b6db461f0706fa
 DIST khtml-5.18.0.tar.xz 2076252 SHA256 45cd9211ae6eb3e1e76a731a353a2a62fc2e310a6386a7af9f25f50557b0f14d SHA512 ad109cb6a45255134d5fcb967cc6fc2027c0b7866b928a60af7b08ac92b4d4919581d0da6ff56cba9b59b061152cd8e5bdd0f0b6ba607c2fdefe7677447f38e5 WHIRLPOOL 735092fccd793e0fc350d4853cee59072e230d58938c30f3be31e17cd998af8a9d8fb550d0fce3f005efb6182000d97a66687e893fa25b52c7f674064d07fb74
+DIST khtml-5.19.0.tar.xz 2076444 SHA256 8504fbc3a52aac430637f049b2d25f71b49e9017c53de43729c9779b14290a43 SHA512 fe8c34941bcbd86df0238a4498caf27da7ba99e88a6905f0a8986ef0b3f1d683bd6d27d482e636101fba1b57d668bfc05bc397d09f56f501a48aa2ef64d1f21e WHIRLPOOL 119ad8689e7020452ce7dd3442d1f027f66a5752bb0ef4a3c5cc36bd71ea7d4d68f900d54f1a8c8d2d9f7e57aedb67a52b4417f5a6097a679df7a25ba1f5daf1
diff --git a/kde-frameworks/khtml/khtml-5.19.0.ebuild b/kde-frameworks/khtml/khtml-5.19.0.ebuild
new file mode 100644
index 000000000000..21a5cf0889d1
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.19.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	media-libs/phonon[qt5]
+	sys-libs/zlib
+	virtual/jpeg:0
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-libs/openssl:0
+	test? ( $(add_qt_dep qtx11extras) )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 9d65bb0271e8..b4a6ddcc0acb 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,2 +1,3 @@
 DIST ki18n-5.17.0.tar.xz 596172 SHA256 e35450c1e40427f676ed88a25380e306ace259cdb1768e0da5e9942eb2f6901d SHA512 6de674247ee5e5d2b1992a9eb0aff6b63e71a6c3a24c97ef42ed1e72ee50871d8ce21874ed786b3cc2c7fbd901dcd03508d94e24e0faabdd7809c35aac72741e WHIRLPOOL 36428f9049e82634980538be4fb8eeeafe04ce253e78ff4c31920e038e806e32b63d6c4d19e5e56a2197a341e73df428d35a82322c529c7f6e5208065bb27429
 DIST ki18n-5.18.0.tar.xz 600436 SHA256 0926ef9fd9a1f7fe74c251c4fc155855fad2347eb37fb1e4dde12ea012c17493 SHA512 75673cdc35864407f17de5ccd2e249941be85065b8502216d2de25e501c05963d6636ebed71b459e57742c22eea103413cea450e5a0355f94be52f85a4bbabde WHIRLPOOL 7e19a98b81930d183741212d48faa9ee5d0d0fec4be4a2ba9386eb76fe383519a79e1eeaf9de8f5bbe54882908395d2c3a502fdd28f27cb25ad06cf75c0900cb
+DIST ki18n-5.19.0.tar.xz 599812 SHA256 05f8e37a35bc108363df3d6026ccb3e375d1a60e3fbb9faa53a8150f04cb6a6c SHA512 4c54e3cd77e6bcd78dfd7ff8e91e735edef2a489eda549cd0ce14cfeb4ebb104845ccbe0897ec1e35067623f4affb65f0d7025daa239ac001787169b65d9ed2f WHIRLPOOL 50ee2307611fc87a0a60e6675eda56b55b8b7c6edda7a91a371f1276b938dd52f3ac06414dc0c87f5ba04fffd811e3d1fc26df03b0a5942a3ecbc9b09c4c37aa
diff --git a/kde-frameworks/ki18n/ki18n-5.19.0.ebuild b/kde-frameworks/ki18n/ki18n-5.19.0.ebuild
new file mode 100644
index 000000000000..b319c6e5cee0
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.19.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtscript)
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_qt_dep qtconcurrent) )
+"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index c3ed05052551..6117f9dbb6e5 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1,3 @@
 DIST kiconthemes-5.17.0.tar.xz 196508 SHA256 638216de3c9fba6249c0e2e3ce0c779b89c4b20683f1a3c1d8ea82952b7ffcb9 SHA512 73ccc60686808d06f5b9aa4d75f628a3e0e89ea0d5b0b4e4b9e785140e93dc859ea8bae3ac615da264fc087859cbb0946e1051bf688855965379b622991130a8 WHIRLPOOL 611d045ce623712802eaddd6bf9a35c0db252679de03878b199d3106a1ba856a98f8fcb06d73a9caade17aa96acdbff524b2a28b3d4e77748ce7b3a2f07a7a29
 DIST kiconthemes-5.18.0.tar.xz 196492 SHA256 2df21aa7a72c218903060976cf2ac63024bfd30e4188d78d78f6148f0416f282 SHA512 fa51699cfa80f4cd8d56d60fd09e5e85a9d4a2fb4b35930d883a203fca92c5107dfda4272d8c3359cfd1432bd7ff495fa1c556ec914d744b371b55dd1dce7b9b WHIRLPOOL 100d899e144b2fa0d14e781e8e957064726d87a2ab900d6d669ac1c7067e60ff6594ec2a1d12a96dcabc605a67ec02874d91a140acc864e990a23e9773ff95d6
+DIST kiconthemes-5.19.0.tar.xz 196528 SHA256 76bc712fe9c23e7403febe438e09f024e79e30154aff06c6127ca8f672643166 SHA512 0b2789e198ec308b85d8b5dab2c69f577642d615cd3cb20145395cdf7c29ef312733ce919311d79d53d153208ee03b0def5e80999c2620ac4ee6dc57fee70900 WHIRLPOOL 469e0f53aebc15628956ef9a4147969097680d1675cceb14ed01adbfabfd6780303a24c43d4a8048aaffded1f639132aef83008a9de20cb75543e354c683091e
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.19.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.19.0.ebuild
new file mode 100644
index 000000000000..437d0e77458b
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.19.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 9fbf807b0b1c..d0e61f87efa7 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1,3 @@
 DIST kidletime-5.17.0.tar.xz 26332 SHA256 25d9d3a4717a9bcc353e5475a3b9873ae7c7b6d785dec0016e33cca1181f2f1a SHA512 155466bdfd2a5415f0ab2ac8f972fe27774b654a3c86f507944740bfc8d5ce998b4fd019e1be4ccfbd53fce309b97742dba334f82b2fd69fd23d58985ce0fa52 WHIRLPOOL 8d16992187a67a7e85a95cc3dc8a18afea4d9c95238241a7417c531a442a833b495d0a2bd57b4de1aa8b77a6be146e7204116790d49af6f878f4aac7f03d8f0a
 DIST kidletime-5.18.0.tar.xz 26348 SHA256 71256b1c1380fb2f7002db59b3f34ba492605193a48ceb7697ff66040ab6461c SHA512 caebb7585c9ac9fbca79246b618766eb7cbbba24e25a7404ca978cdd810343764ad435ba8bea741d7f2351189920cdb84617ee7793bb67fee96ad2f9f94a98a0 WHIRLPOOL 95a0fd0d4f7283e1f7a31635074f4014d59afadb8c593a608d3f6a71a687d0ff40732a9b445073908884439f4d7d60a76462400d9a667175043d26556d878744
+DIST kidletime-5.19.0.tar.xz 26368 SHA256 86712f379913e12eb6674155957e3843230c3be06fce8e2674b0353336fe8b4a SHA512 ddf0719068f21970bbe9e6e654a549225ab67a8376e76f8225a3ff7f2c76c05af8cf0ad85aef0b891f4e6c4b8a00fff3b15c947fafcf45920c2acd2e399eb390 WHIRLPOOL 4431e3d8a846f9085d228df79ef30b8fa06cbf045877268145ad6a143b06f801838bd5792a27db9c6818a30092ea4959cfbd8e240a01d3f69d8d718c42463dff
diff --git a/kde-frameworks/kidletime/kidletime-5.19.0.ebuild b/kde-frameworks/kidletime/kidletime-5.19.0.ebuild
new file mode 100644
index 000000000000..97d3a5dcf4b2
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.19.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libxcb
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 2d90fc52700c..aa0c7f65e85d 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,2 +1,3 @@
 DIST kimageformats-5.17.0.tar.xz 85184 SHA256 7a7d58e573b82ff4fcb9a8d9313e7b9c77e487ee186d1dea7dd081c2f8018037 SHA512 b9b090237b3dfeda5ea628ebd163ad3951c45d562c4e4e14414bc44f503f8c665ee80df07c034fa1b295939f3a1d75543715c1b5ecb89dada90863775244772d WHIRLPOOL 8eff5b4e7d03306b25b6f76a12778a85ec3703449edd49263e7902bf0d1b6d2db973cd063cb9b3df30d3893dfec3bf007ba9c09a92bd91c582d4bbe6b8c7f470
 DIST kimageformats-5.18.0.tar.xz 85192 SHA256 cc5e4977fe26278374f1b18cc1225a7e921b5401cea2bc95f35893ae0960dff8 SHA512 7c0b2f7b2c2b4bcb0b8fbc9b32a6d7cfe2801ae2740d3c66b5711a4ac913a9e172884be2125a76f098d8ebc675b1149464843d11d39e8a792971794597a3fd04 WHIRLPOOL b0c8161469106179a77f4a94cfc2896f58f26975fb7c024d51079c17d4dffb53000e54136fcdb5523a255665bd02c3ab8ca7bde2c056dd40057a7f420237c722
+DIST kimageformats-5.19.0.tar.xz 204108 SHA256 656fffdc4fc60535afdbd17f7e031a9d399f88f0080a33bf6a9659b00cfbb1f9 SHA512 d2e68898747690b4214c6c2778f07e0e157f464a3a2117679de9246e68c5ba0b8c53d74e1b0af04b8a05cb484afebf24bb6211178d723e419966a540dd956b2b WHIRLPOOL f3ecb114c79410e56c9f0db36fd3ef961175e26faedabd96ae9df7ac9c8240a1b3f2d8585c8698ce144b7cb80160e6d81b0f92b5c22bfbbc6b8a6c5ec1a768bf
diff --git a/kde-frameworks/kimageformats/kimageformats-5.19.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.19.0.ebuild
new file mode 100644
index 000000000000..a452f186cf27
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.19.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+	eps? ( $(add_qt_dep qtprintsupport) )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eps Qt5PrintSupport)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 696dcbbacadd..91130d461b37 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,2 +1,3 @@
 DIST kinit-5.17.0.tar.xz 117568 SHA256 b1d8fc2727cb15875e3e2aeac645f9bbd482420297407ed2d41b3cf40b634fa1 SHA512 7c672cdd6d8b931b660e7870e777237d3d95bf204f9aef5bff8cfce5d733d5fed112d30385476309a12da157a9965562992a416decd4702842d65f57e59a029e WHIRLPOOL 92b3036ae75c9427fffc83d54d2beb1dd9fcc13f33f9adbc10c18f7c8210068b6778c751af55e79e3a2cc2d8e835cdac85d17e5ae7f9a35e234492baf0d24235
 DIST kinit-5.18.0.tar.xz 117640 SHA256 08bc4f46cb90c164cd3e087e14c42859bf1e26057a0132c2395c6bfafca95d90 SHA512 2840ede1f8a7481073476d3db88b1e737658b3096ffdb931a185f8e4ba5225e535be05fc598b74b69b1e0829501aa4f0e84f94c27c60b05b5847d36673a8dc1e WHIRLPOOL 8bd740c69e1d34a5de324526186965d8537f8901516e96449251ff509950b86bec76938ee6e3946489e94f3d7cf89bdf6be2916394a55346d3c6deea29d8e22a
+DIST kinit-5.19.0.tar.xz 117768 SHA256 f53bf6997ff5cf0b0bcb86bee755a3da20d5cf1de7a6efcd73dada8665bc870e SHA512 982f636887ee40701609c9f3cb3b9546bd873d49b61afd346506110f789db59dc5beafa41be4602b0c5815ecde783f31664b3cc496d525908191e1a1091cebd5 WHIRLPOOL a258283ba1674906276d2b85b721e74221b72daa9c478a5c0ed1d50cd01d6958c3cca0cfc46f30220bbd3a6d15d8904312b4d94f0a90b5668e26059dd27fc0ea
diff --git a/kde-frameworks/kinit/kinit-5.19.0.ebuild b/kde-frameworks/kinit/kinit-5.19.0.ebuild
new file mode 100644
index 000000000000..a89b59c1f762
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.19.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+caps +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	x11-libs/libX11
+	x11-libs/libxcb
+	caps? ( sys-libs/libcap )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	x11-proto/xproto
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 0a73a4de83f9..577f4043721b 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,3 @@
 DIST kio-5.17.0.tar.xz 2868916 SHA256 1491a8dfe12bef2b5e889a1fa61eab9c4247608db2934bd22a7b0270d714d0b5 SHA512 03d3c68aebb70357cb251bca937f16fa0e1addb4fbf3fa24420aefe4c5b33317ac618685ef92393e45da415338cf0ed43170075c5fc6b42a4d67619ff262bd63 WHIRLPOOL 57a0dcca686d497e2ef9641272ea34676066702ff03bf88c85f3a1ad1d7beffa5d4ac6188fe3c22a9402de21e2624341d49b32b4b6b73a00b3975ea99c66dfb8
 DIST kio-5.18.0.tar.xz 2877312 SHA256 da526bb9b7f02b9670cf6bea54645a89a5b32d008204a4f2253bdd5e74df0f08 SHA512 35a1fbf27b4d0ffdf3297659e2c1a8b9add92d20f1cf6a3adbb79eed36164abc21caa543931ad3be39695f001d250638c091ed398e1776cc6e1fda8c3556d3a0 WHIRLPOOL ad812a7f12b78b00de95d5d41186927c14a37ef431c3adc5a611a5f0d89340c1f63e1bdffe16216a831229b3a995de312744e55245893953b6408ebcaae60883
+DIST kio-5.19.0.tar.xz 2889500 SHA256 db26d787efd4b9f7da1970fb9814bca130f6d3adc578a847e93b4ac5ceadfa30 SHA512 5ebcfa03170e15b7fd1a686a8897945724c3fe14407ac64af502139ebb427edc7b3b63ab5ed009160dae8245fba01df8be59faa5bb25aff4b57b9850ee1b913d WHIRLPOOL 5a8985b3d2c55e07bf5b84bd22e280cfaebbc5a226b17092c28ae3fc07f51ec4afb3d78461181a7500e4d924d5c664958be1cfc860da147db32ff8feaadf574f
diff --git a/kde-frameworks/kio/kio-5.19.0.ebuild b/kde-frameworks/kio/kio-5.19.0.ebuild
new file mode 100644
index 000000000000..29b28be7d25b
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.19.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	test? ( sys-libs/zlib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-proto/xproto
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# tests hang
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl ACL)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index adac320a7701..5a8598506049 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,2 +1,3 @@
 DIST kitemmodels-5.17.0.tar.xz 383876 SHA256 dea6218ca68a2ac8728ae85d045b06fd28ad1ddd3029d2edf8f4bbea4f0bf8a7 SHA512 6689817970a6866454d4b4ecc7f2868fd6d848cb96c820dcea5f15f93c7e94904fc5f948f89a7d151ef98541c8dcaf3c03c69c2406b4d8aa154796e325b8b6bb WHIRLPOOL b6c0e096d99d91e13444f24f44239c67920e87563c2ce47b5849dc91ef057112f4cf88406858c8cc8617e29176c5b1f3c9adafed9f14e103a865b74b3995bb83
 DIST kitemmodels-5.18.0.tar.xz 383884 SHA256 84e3b054746921f44c66be76e8ae791a9e71e4c3648af497a114731a543cb964 SHA512 0b1e76479c9ea4371b7fdce8c76e32f23b71285c39421d05feb5706dfc0c38df9c04ed75f1cf7c25e67312bfdc6ecf072a5cae26b1775264f18949f64d78dbef WHIRLPOOL 0619dfc6669460d07cb2f9c0e57fa92a633427f81dc74a287ad5c91acb118836e1affa539190d9845aecdb841054b786fb48bdb464ef736fb36aeef78486cfde
+DIST kitemmodels-5.19.0.tar.xz 383912 SHA256 c7d255461b62ea1c277b4d384580958164172e0f7513d4fe62d66283528d756a SHA512 b989f9f48700756920da64053e279184eeca872f012cca15ad722c67240309302e5d34433e4180a6dd46409ef1db359e6ec25a981b98ee3feb5760100ca7754c WHIRLPOOL ae1b5e27513208c7500ce67ceebaca10df87fc177290decd2057fc22599daeedf30b65f08d3a5f3ebe36ebc3456fcabc93a17e29121d3cfeb8c500879d7bf06c
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.19.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.19.0.ebuild
new file mode 100644
index 000000000000..17eea8f3449f
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.19.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 78c274c8f25e..980e14d7efc5 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,2 +1,3 @@
 DIST kitemviews-5.17.0.tar.xz 74048 SHA256 e3223f307e367223124ad140d9e8d52a3bb11a3de64c357ca1d220ae870c6ecc SHA512 d6f03c91883043756c9c3afb8bfc6823b1178ffc48e425c2cb80a174b51399a885abd9c7dc252f3168e06ae48d5e99c3ec6d9fba918876d47a142dad8612d5a5 WHIRLPOOL 58652eca09081c59c7ee8871c960fef68ba25d0c572903b4128791304919db4c5a60a6bf1b36cbafb7f5f57948f54e6c4ada8eb048fe935238f0bc1fd50de4af
 DIST kitemviews-5.18.0.tar.xz 73960 SHA256 6b785b151c5e02e652d25371a133193ca60b9209a8cba6968c00e67f1d80eb82 SHA512 634b73f17fe45ab6f98fda419f65a4883a7fdbf77b379770c492b1d81466787528893ad69134711e064cb61f52be778151c6833cb1a256a4f8af56ed83292241 WHIRLPOOL 9de75674ec6be2f59bd77a375712dfe739c4c4d2b582d014206b3c0b4e61684cf4eaee533b2509a59e237b23678d720fce136d6d824df53034f42dfe1e0f4bc6
+DIST kitemviews-5.19.0.tar.xz 73992 SHA256 56f632a57b874abbbb86666877c9b55ca4dd15aa612d03e85edce55d0dd91f85 SHA512 02c6caa43f2d0b0735e9db116006ec2c5cd27e1b5ebd21041ed2ce81e291f8b87bd037a45ed73558d0cf78203da1a9d8d983a4cbd88a5f98cc887de93a9bf0a3 WHIRLPOOL 95b36dc6ec45f6d773fca7033afb105592d2087024a5672f067d8076dcf9c209ef1c8c3c0be576a0d2593d0549a5b7b3dc29637b4bd0dce52230fc764c0d6ae9
diff --git a/kde-frameworks/kitemviews/kitemviews-5.19.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.19.0.ebuild
new file mode 100644
index 000000000000..d1b4880f23ac
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.19.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 9b7976889f72..5a7cfd199de1 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,2 +1,3 @@
 DIST kjobwidgets-5.17.0.tar.xz 88888 SHA256 3cfbb9871cfbb02b6755a8868fe6a1b1935b5632a243f9767e8635f04075470a SHA512 de83a29c3febf0d9137f9d049881ae2f7c1d0d756322f0430d73e1ad46a3959f94d6bb8317e4d505c0ee43a068154437ca4cbcfe03aa7ad72ae50b7695115971 WHIRLPOOL 9bf0ea42e3229bc66af791fb2dea88c570eddd61adac3b2a01f4c98458cbab8b7f64ff3a46d4d59a41f8453818d04c1b7d38b0055e70ca57919a72f677e95cc1
 DIST kjobwidgets-5.18.0.tar.xz 88900 SHA256 4f8be6a0161eca799d481a7b0763ed4377bad329dd1ff653ed793adb7982bb3f SHA512 075b50613c554e9f273fe2f23a5d9a2658fb09403ca1515fcf474640908ee6ca0fa80d885b9b7200a698d991a75bc8ecbc6fa241793430ddf7ace78c2ddbb4b3 WHIRLPOOL 41a000e5cd87380c9fe874e2c5663d8059298c10e6feb1047e80ff5eb50d63172a0fe82e207724d7df12ddd94f9385c40db87a15811d8d4ec12cb9add7243afe
+DIST kjobwidgets-5.19.0.tar.xz 89004 SHA256 5156a8727a7a8df3632f216071c12e4480c479f6544895a26ab367e4bf45eee3 SHA512 cd7208fda2f94935cedc37f5978325f56fb71511b2b67af241ae72ec8f120d150b3c3ecbcfbf69cb706c8c6f16e4e6d65fd65c0acc4774a76ab55497ae478691 WHIRLPOOL 1f2df42ffe1b3752d8d71b933ceeb167eaa120aedc880eac115a21f05a43bc79bfb0e09c47578ffbae7a6f04f44fe26861cb6e94410ea9d6d318e2398c2d0128
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.19.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.19.0.ebuild
new file mode 100644
index 000000000000..eb43c1639c28
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.19.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? (
+		x11-libs/libX11
+		x11-proto/xproto
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 9a2e4981c3e0..3db8a0bae539 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,2 +1,3 @@
 DIST kjs-5.17.0.tar.xz 290696 SHA256 044a0a1faf037c4586e19da4d8ea141e56c05547ab8ad087a295301c1fc30825 SHA512 37b0273718c1ae7d84033840aa937baae282d4689e2ac8206dbdd6db4e0c47b42bf4460fb3f005dad266a84c663ec7cf82ff78afd46abe82a26f3a0804eb4859 WHIRLPOOL e4cd3695f286ac499f2d5b489bbfe259933a077cbf67fd2f430ae1cdd157ce2e7e10a3c6df2593ea770ced38739bca8be4e92b79d0d382f13d1e1dfaec63e2b0
 DIST kjs-5.18.0.tar.xz 290720 SHA256 c23439fe7373d5e1e153e7e0f67ee6bb573da901659bb67068740f0dbda0097d SHA512 668ea565dc63d90c2664e86e826fe3f1895950aa6e92804c76cdfcfafb21c8a8bd806ebd27edc5da2fa732002935ce22719e0868123e3b8ddf897cf7f0edccf4 WHIRLPOOL 55bfb750a1a7d8b4b36e43a41a3c3276dea6a561c2e95ecb044ac29066785b33e4e95a23dc7caca34ec6eefe6a978a9a912321ba74dda949e5a8e39dbd5c4c70
+DIST kjs-5.19.0.tar.xz 290720 SHA256 4eb91a5337a9d35946a0b810991ddb8f0102d7197b3c2040dd452c28cc09a022 SHA512 f14b9f8344704d96f6d200d7321a46647bff926d5b60998c8bb5a2953e99dbe0dbe02bcbc90e1100b2a2600312bda2b54f928532df3a8c9edf60a5c7b565a6dc WHIRLPOOL 55ef494b32c435084f5894f051094a40626764b039cdfbeadbf66cd57c5e13d0163d5229eb44855683645b49277f5a42761d39d56a03aa11b45e1d7d30f0af4f
diff --git a/kde-frameworks/kjs/kjs-5.19.0.ebuild b/kde-frameworks/kjs/kjs-5.19.0.ebuild
new file mode 100644
index 000000000000..ab09cffd10c2
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 2b71960d9254..deef6af9dd7b 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,2 +1,3 @@
 DIST kjsembed-5.17.0.tar.xz 165064 SHA256 fa615df2ce0bd31a14f7c6a6f5811221234e91c1364681988eb25dc1da3da22a SHA512 c0a4eb93d40e65aa8b3a21493c573112ee473cd32bba8d061f94911f9aeed41b51ca45f253907943507eecf69ed78337b9d2bb2cec336278834f2b62067b9bb7 WHIRLPOOL 4b606a40f8f75aba20d5faf550f3bfbda077c861f04940d2dd00a5c14469dbc292e9507c989d320cdbac7e1ba1aa983f26c74625dcbd2fbfd9df1de1db2e2ea9
 DIST kjsembed-5.18.0.tar.xz 165024 SHA256 6dcc5fd2e53230076404e905416369d43f8f746c2267a746a0a65ecdbd3af856 SHA512 28d7948cb97925f46cf0bcef1d76aa4d0c42f49cf2a4a7099dd71f16741cf0e1acf84e7acaf27967cd1e58658f9a047f55a923384559e60590871e4a7c2cca36 WHIRLPOOL 3ab277be60a08401feb7b9f1094245be03acd9c1e524190a2fe46ffd728205442bb125e5791ac733bafcf4855191965b24a198e26e88c7c8d58072d0610601c7
+DIST kjsembed-5.19.0.tar.xz 165072 SHA256 8850cef16384aff5ff4447736391a2bdb7247673612fb699f041d427917fb3f2 SHA512 65291dec4773b770dd894f0b9836560717106bfbbcd8a218e55fd1003595cd2c71b3da553fc4370d1cce8c2e4df785ce715af4b403fb4949c69a8a9dfda150f7 WHIRLPOOL 8e8f2bbac78de6f993c79e6c96880eb561d4690531df7d59ea265f8729b7385d9954a7e61e41a66b73f8a25df65d35210564df1c8e911b7017617edd5cba19cf
diff --git a/kde-frameworks/kjsembed/kjsembed-5.19.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.19.0.ebuild
new file mode 100644
index 000000000000..741898341530
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.19.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjs)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 53e9721e49d2..415fd4e435f2 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,2 +1,3 @@
 DIST kmediaplayer-5.17.0.tar.xz 9420 SHA256 afe761bc19b88e71714ec281a5d3db36e351bc6730548cd72cc065e75b5bbfc5 SHA512 b9590115b562b5ce53d7f05b97923be8acd72559282b74eafffbc4d49dc180a4f22c942f1c1a4357f8c8b2170edd486fb1d05d9e1e1ee426e03dc3542185a589 WHIRLPOOL a6cdae6ae0011aef7e876b32e85fb3d420e0eebf0934142102e69ac58288a0bf15f14fa5fb08f0ae83f438c6d0575975bcc431843dbc6378db7e909c1bbd88f6
 DIST kmediaplayer-5.18.0.tar.xz 9432 SHA256 ab2f02b7efb879f745553130fc21fb33a7c184320ebce99175f5fb71fe53a31e SHA512 4d7f546ac4ea16e7f3db79d7a49fd4862d745f51a937eaef1d470376eac8609c5680577b549ec35decaea9f737c33b063e9064468e824d1c144153db25ce06de WHIRLPOOL be3381535a209ccd90eee6768ecc641e0dd0b8731cf9bcb22b94978d7845cc1270adf69dc6a54ca2129d2cba5f30c3f269f611e135dd3bb940709428e12883ac
+DIST kmediaplayer-5.19.0.tar.xz 9428 SHA256 5e15a49dd3666d9418b63947e7d2e5882a0f9d74f5ee2464fb7c237c98c818ee SHA512 45fcfece5199a1a69e8fcd87315512397dfe094756ba75ab69f9d83be031d81ece366e1378f320736e4eefeb0b88270c45d0e6b411057cc154499ded6d373040 WHIRLPOOL 953baf8bb375f9779a66c81133a19b9d934eb3b9d7bddd16278687e12913229b2e2b43179079fea763e876361f1e3dc786512ea3a40c8db605ceb7922538eaef
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.19.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.19.0.ebuild
new file mode 100644
index 000000000000..8e582bf412a1
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.19.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 9731e3736ff8..b8de9a5e4add 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,2 +1,3 @@
 DIST knewstuff-5.17.0.tar.xz 858516 SHA256 ba50503296ef084378db28f739cf773a59dcfab90263ca01e720a0f3bc0e59d2 SHA512 8468cc0d117d3fcf42c193d050cd9baf6cb53217c7cc1c92b20b556fdfaa141b0ca1d65e5bc7e3fb61612d255e3a2451e86d7cab9e977b9d8ec9f8cc043a2a38 WHIRLPOOL a1153f57e005aa9f08d2ff227adecdd482d0e88f3eec86d3bce3c352075f45172d9a52ccecef1cd6d2d918b8967823ba5e37b0e6e30c3db824211576af12db8c
 DIST knewstuff-5.18.0.tar.xz 858248 SHA256 e48578ee71e7604a1ad42dd03fb3d405aa34219cb0fc842e4fd51a7f810daa55 SHA512 3cda233d937f0ca7483f849faa1a8adfd6e66fc778697408deb201e4b6ed29f14df291e90c5d6f0e18ef606936fc73dbec646aa0329d3267a3fc8450196f0108 WHIRLPOOL 1c4d04556b5826234318eebe073f561d7576e201c08e061f51ba1aa1270de89dc432513de5b04a9953c92eeffb4a852aaaa5d6e334bc5399ba33c9bbd64a481e
+DIST knewstuff-5.19.0.tar.xz 859476 SHA256 64412b66f941333954d290b44fd33fe3a055eba6e8fbf1fe403fcdbe45684c89 SHA512 aa5d2d59d348bfa8e7b97391cb1bbf3072f01c240a35e4f1e112d891cb097612bc7c1b41f31f32f482c3a8ef9908725dafb6ac35bba076847a2b96e9422390a4 WHIRLPOOL 4e6a0830bf7eddeaeb575531328708aa6c803f6a670f7820b628de3415476342729fdec57a0a75fad5de0580317bbe9af7b77440a68dd2c4f216e18653336d1f
diff --git a/kde-frameworks/knewstuff/knewstuff-5.19.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.19.0.ebuild
new file mode 100644
index 000000000000..a3c57963dcb7
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.19.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 2ed7c5cad514..68883441d88a 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,2 +1,3 @@
 DIST knotifications-5.17.0.tar.xz 92948 SHA256 19e47eb755c9140b452bf80a6880bfd52a6f805eba48187fbacd2a48eb064f4c SHA512 c398873aa06056f7d7989c7cd9c0c719ec0f19972d4a809522096f6adcba84f41112820c181ffc0fd773beb7e1977ca505265bb530c891deb3e1b93213d18e3a WHIRLPOOL 3f6c039f5eeff73e4b64b662cbc4b222a091b0dca70d3f830e53558788102e5a03164450e8fa9139e7cee07ff9ecffb653d209b4f3a0f0d1ccd819be23aa9d41
 DIST knotifications-5.18.0.tar.xz 93244 SHA256 1f1aa098983c37cab4949c2d79b833986a8446910a18f76b3715e648b6c8f1da SHA512 6e72a43c052197a4ce1beab7d4760a7287d58df753301f88ee518e0312ca09f3dbe3eabbdec53aa3f42e30c6810f6d804314133ca674993f774ee250af33fe19 WHIRLPOOL 151dc46394b29c7a7e7adf373b767348b800804789b6113df0dad9421be6ee7124e57dd2d668ffe4bb4a3e134c81c95f104c61450a9f5ea29abe1a5553abb1fb
+DIST knotifications-5.19.0.tar.xz 93236 SHA256 5b116ba498ed57dbc33ef9a7f24c0571f52b03bd986a7b8e14f799a039a82f3f SHA512 ec471d4dc1a94358a10912f1972bac1d196b30722b8e18a61064e7a04642a583f4b637268eada058073573b4879b5f68ab9a6981f04f2c7c6e5d525a257dd8ab WHIRLPOOL e581f63ac9453ef2bf8ec5d65bba4ef9991efb943627d2b1dfcb37a0c3f198e0e0a5aeed84f3f50eacfd85db274bf211d987a6a633f2d6a553df7761e0cc864c
diff --git a/kde-frameworks/knotifications/knotifications-5.19.0.ebuild b/kde-frameworks/knotifications/knotifications-5.19.0.ebuild
new file mode 100644
index 000000000000..780a930607dd
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.19.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dbus nls speech X"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+	speech? ( $(add_qt_dep qtspeech) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus DBusMenuQt5)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 22f0cb576b16..07f26cb1abaf 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,2 +1,3 @@
 DIST knotifyconfig-5.17.0.tar.xz 82812 SHA256 d6f0356ded865f415532719feccbaa6112a0732a16b0e233494296a7f610cad1 SHA512 118eee03c36997df01cc6c5a2495a3ebb863c6044ef6e60b4e10eb7de6718b1fa0144e44c8b72c3ff7e5c3c638532bf30209992c65c0a0d392e66d3ea9d71532 WHIRLPOOL 4f744a77d9ca1dc167a85732afd2b4c59bd9cf073e1e26052652112918fd4375ea7684093a016376e821f759fe066065cfc64902d1ae58ae242ca23739ad186e
 DIST knotifyconfig-5.18.0.tar.xz 83016 SHA256 6b69c25bcd854ad02ccf3ff5ed0aebf23e7cbc5c9679f2ceb599872a6a194760 SHA512 127e8ca2f3cf398ff061db512f80cad6e32355b3cf3e5eba37400b6cea6d68e6d44b8abdfe2692ae33302222d92e536fc3e7d1d4499ee34cf28f3f9d8e8c59b7 WHIRLPOOL 5b618d38dccddc68289f49d76ba20826fa54e7487473e8f96d4fc21061fe5ae587430b1a33df0a884e60fca45565630386043f7c73177327aa4af97331504792
+DIST knotifyconfig-5.19.0.tar.xz 83016 SHA256 d2757b3b283b90575c7b0820260db7d9447f65b02c1aa78fb7b3fdeef3ce2b98 SHA512 bcca112fddad3cb7d6305cbedcb5801e3c6dd177173538d2d2793036074aaee0dd5c5a8abed8b2ab6ef484496c870b8d2ac7f8abb02226454fcf39af9ddd32c6 WHIRLPOOL e3e7e36c653c2f2368802d920aef12c264bdd597309fb28eb04574cc548e9ebc3435600a9ab4981f2c6333477f5e4d8f14a10f5cd15ef1d49cf816d211a1e3bf
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.19.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.19.0.ebuild
new file mode 100644
index 000000000000..66fa9402e272
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.19.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="phonon"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	phonon? ( media-libs/phonon[qt5] )
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index e758cb98137e..69171aacc081 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,2 +1,3 @@
 DIST kpackage-5.17.0.tar.xz 105448 SHA256 a727a94fadf87c539c801d77cb1197c1d0bc561afd9591d4aefecfbf2283e30f SHA512 50dcfcd7284cd498ef143f82b54ca60ef568299c6676d8c0869aaa1432fd91835b1e377091a58c715fbe2bb5b098272fe3a434e31df3c61caf8b54240743ec73 WHIRLPOOL d7baae4e1d63b8898d2cc68184a18655932b72026da1bff9e266e91578e5679e07c0095d9c48cfc2698e0991ad4992cec39ca821e8429b7c02a2034c2c75ba82
 DIST kpackage-5.18.0.tar.xz 106544 SHA256 29d295d9542ff18b4dd0a4cbe5039858a2babec0091f7cff54929e379cd60293 SHA512 2c75f5f94a6f51afe1ff62792755636032a306756fad9ae29c6f7999c8e8d9cc57818e3ecd71063e7fd8363c67ab86cfe2fe70dfe1ab306a8a3af899fc817b40 WHIRLPOOL 76266e823d350f84a88cf1906aadf12fdd4a20da86577850319fc7e0ba4c31559cf044bc47e78b6417a5cf5453b60173c11a08c909d8cbac141ca39d59585c6b
+DIST kpackage-5.19.0.tar.xz 107424 SHA256 bbf5efcf905c4217893d4505328edc9f9cc20646447e2bed155752d79fd4a4ce SHA512 1bbf542b2216f9ee4380bc54063b03e4014cc9dcbb06d78c5a80168340981a359398e88de26335af9131f40b32ac390756b8cc547369de273cae82e32fd10817 WHIRLPOOL 778227b7fc3a1a7edc3f0390313053d3094b4d12c5c1a8d11b9e92b57fe994207ee240b2688c97993b8880bb5edfca6f76e5a7c38c4ed9e250c5fc501ff4c97d
diff --git a/kde-frameworks/kpackage/kpackage-5.19.0.ebuild b/kde-frameworks/kpackage/kpackage-5.19.0.ebuild
new file mode 100644
index 000000000000..6e249e5e11ca
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index cc8fe4731274..4b899fd2b40f 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,2 +1,3 @@
 DIST kparts-5.17.0.tar.xz 153852 SHA256 9d739db5067dbf71ef87d323da5db35eb9f653bf9466a6d4aeaf9051fe09b021 SHA512 b4eeb8724a63562906062a6a30ef323251e920a6befebe78e699f73f6cfb07ceee6df22af62c70463af8bce17235c2c17c1d65b998c3188d952dc5ec7448ef6e WHIRLPOOL 32b20ded66dc7b84e17a69bad6e4fc7fa5688cfb64e6d383b692ee6cb305325140d082f8a817744c64a7196d31b963f538baf5f74b925d0f226368529e6825b3
 DIST kparts-5.18.0.tar.xz 153860 SHA256 1e766ce5c386615c926324a99abcd45110117c556ddfb79122b002e21b699de0 SHA512 0a11be9e9f3ea26bf24a56ed9222adcf4071151be90a4e136b2e8fc60d961771e3ea1021e2cf140e2961dc6f1782bd37e953fca1b54218845c370fbad3f4c9bc WHIRLPOOL 8736b79a1d60cdbbbca7ddd7d163166b962c046693cb03554c5caf835a1e93a598ca6805ffc8fe9e6ec9c30fc552afbc033e2c07c71138e3847f9ff614a7c5a7
+DIST kparts-5.19.0.tar.xz 154012 SHA256 f4bc12de449160a7cf80ff4e001331d4245be88b833fce3e57cfe35c454fe515 SHA512 d54838c33b2132fe6c4153437402f0ddc7ffd9ac8c35b5c90bba91ba8d4e6105fb48913838c5ff61089b9a8d5ca7409dfe40b7df89e9f183eba8283e86cbdbbe WHIRLPOOL 4a454848e4f8d48cadadb5ae63aa169cf42758b7dbe1e290fb8b4f1547d0d8888794032e282624eec8a949a7dfa86ecdf4cac0bd70d7493660362530d4945cc1
diff --git a/kde-frameworks/kparts/kparts-5.19.0.ebuild b/kde-frameworks/kparts/kparts-5.19.0.ebuild
new file mode 100644
index 000000000000..665f6e43e87c
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.19.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktextwidgets)
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 7afcdb02cf26..ef8dcf8cc288 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1,3 @@
 DIST kpeople-5.17.0.tar.xz 57740 SHA256 e3258f812310664213bba9a0f0494e4692562a37ce546c979a3c8a2c9214f234 SHA512 61388a5656cedf371a6f2955c8624057212157b42f2b38e558d2109c06ee5d9dfc0105916872672845c537ce2b953aaa0625bc4e71137220ecb296dbb4d13ded WHIRLPOOL f6d2e6c2f9bb000b8810e1e4578a72b263d4037610a438ff6b2bb8cef4a1c8454a699b5f782ecd17895d2f6357d720d62e8c94ff64e3f2696cd703a1f8366c35
 DIST kpeople-5.18.0.tar.xz 57744 SHA256 b3d0cc8e54f16230e01ed3805807b164d70cd8371d71974d9c2bb8f1b1b81534 SHA512 c0e0572090cda4658ee11b8039e9d0191f040a51c7eaafa2ce232d31c3e38b3967e83a1b047e057a39293a1f1826bed95a2c5e22cc957a5eff5c9f46c4f863b6 WHIRLPOOL 7fb39417b213f4762d90b1be16668335ad1cc5241f1a17fb9eb7bfce430edb29f0b045c2d0d15d75ce891cfc2747983143683430cbdc7e92defba3b699483b2c
+DIST kpeople-5.19.0.tar.xz 57916 SHA256 28717278348fbcc5dd0b7296804417e3a18aaa9a7c339430993d441ace334ecf SHA512 7ca3b94e5a83f113819f923157700776189e847f40c702426d2fafbc1ac190b42346609d64eafcae4a2dacc5d5630ec39faa0ed7d1a1ebbedeebb988b1044089 WHIRLPOOL 44f42633f6e348810f78a78bafefd6f8e855e5fe82f6101e40f0944486b8244d0441c9554396ba9c584a222e8ed6308450e76202e24bfedeb6b4f76117e46778
diff --git a/kde-frameworks/kpeople/kpeople-5.19.0.ebuild b/kde-frameworks/kpeople/kpeople-5.19.0.ebuild
new file mode 100644
index 000000000000..7690b56a9b38
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.19.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!net-libs/kpeople:5
+	!net-libs/libkpeople[-minimal(-)]
+"
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index effb66a3da76..42aebd6d0a85 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,2 +1,3 @@
 DIST kplotting-5.17.0.tar.xz 29496 SHA256 bdce3c19d491c9f8d7a1fea7e84973ab6ca463a29106ab24ee5d4527dc660f45 SHA512 4636d4cb10968b5dd48032f5a5bbbe7b0fcc541377cd99d90e722884834fece1d8f95df9e696e3cc49952b98f7f760f1ca7a1668daad7b89e496dbfa9b9882ee WHIRLPOOL 97c93e36d5e50723765525e925fd4f0ee0adae9aa7747673f3e8425eea0947fecd26889c99af0fe842f93ae675d51aadf6fa2361f45ad52e56e28017b846fb93
 DIST kplotting-5.18.0.tar.xz 29488 SHA256 8c15aeb060130fb04f5c11d28085ed7bb04fcd85d7aa8da0cb2e99dd5eea38ca SHA512 920ddca57903545edc895ed58455ac8dada55f5dee5846ae67d65d360b7032be28a7b63c249ffef3594f486ea414fd1e1dd3f29da567c235af3d337067874f41 WHIRLPOOL 2e8e1dcfde463c189382c482afa76e82073ce99e7a3573af2933dc208f13cfa83805985bbdec2afe0700720949cfcd60a321e390a9562dfdd2650ea5dc9c8547
+DIST kplotting-5.19.0.tar.xz 29500 SHA256 18db8a6766d710d05659e4717ea1c60e3a9b39a296b28f1474d0235d53253d99 SHA512 43631511aa9781a63cb633a00ca44c6e653cd6d50b3125eec8e6e412e8ae318d09d3f494d162a870be26120ecb8af275283a7a03158334db5bed335e7815eba6 WHIRLPOOL 9d8bb0bf03612189a96b88427d8447ce1ffd53c2b25bba68cfc4688d4542b96ae9d48c5200ff3be544d32dce73c1d63151f2dc6e3243ce46cd8044ce9761c8f9
diff --git a/kde-frameworks/kplotting/kplotting-5.19.0.ebuild b/kde-frameworks/kplotting/kplotting-5.19.0.ebuild
new file mode 100644
index 000000000000..412593fb4484
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.19.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 578fa5aa4c91..7ba5aac22665 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,2 +1,3 @@
 DIST kpty-5.17.0.tar.xz 57164 SHA256 ac6bad721a16b97a3ba8d8a8184365a2e9eaecc736f24aec7f4e8fe1d3e54fb3 SHA512 955a9fbf48864a751c3348a82c74b94a0e231bf329bbe82e6ceddff7ddf911a6b0992b84ec1de7aeb3a2bb0fdbe4b59a4583828a4b4292caf0bb62e102a46206 WHIRLPOOL 7ef49cbe0376cb0dbd6bfa0f11d6da6d5171edd2ca006885c4e436c8c75ec6842fd3e58d03ef9ab9c8319a93aa2d69e6296bfca2f1043de7449867952819f858
 DIST kpty-5.18.0.tar.xz 57160 SHA256 a107df2ed1dba12c6975e17def71042d3bdbab6497634d4ea4986421740f5fad SHA512 56af462fe1ec2adedc37a63641ab6f1defe1b2363da07968c7127a7e432de5fe285ba535f6a75dfac1403b2458720fcef58f48706144c313352c82f33500e5ff WHIRLPOOL 55e6e5f3732577a669486f5bfde5159bf1b603884b9c86bdcc16b23c4f166499520f2d437929179983ca5e5e4792fe6375760dd72c7f5b74e8c8b1f104bd6673
+DIST kpty-5.19.0.tar.xz 57184 SHA256 0358a20ccfa7839452860d6218c2efb6a15039fcd40d0093c4fc5e2edddf0909 SHA512 2b66740c45e1b27f92b88d3b4c1a90cea5704e8f91f9bcffbbf853f8510c188b818a78722c06b478cf3ad901e1989f6adfe84c9870d4a9697421d3016d3d7d3b WHIRLPOOL fafccf0bc2239767ee90eff98f5e1751fe430c4983166e04afd1dd6e15038d540b717ac7433b76677093c2e06a5e6c923cb5f13ea8c5df015c7a5612443d9d2f
diff --git a/kde-frameworks/kpty/kpty-5.19.0.ebuild b/kde-frameworks/kpty/kpty-5.19.0.ebuild
new file mode 100644
index 000000000000..c2bc3657e1be
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.19.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 1927f62c482d..1700c98c045e 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,2 +1,3 @@
 DIST kross-5.17.0.tar.xz 135060 SHA256 9dce7cb77b3daaeb4dade87aaa07fcf5a9ac164ee0bbd5c2c93f70b522ba532e SHA512 db961cc479ff7f7eefc3e7165cfd541af9cc3deb4939dba6d8d1e4cba062aa27378542c8da4f70a5434c2ff32f72c63d68b5bb4fc9b91ee46fd5c34b3d7da922 WHIRLPOOL 945649de4e88a80ae8fc7b55320b67b7f0882f1f3a4931c7deacec2f4907f6447568809bb61b64ca5dd5aca667ee4f1ef800bc2c0ff36e304b4c4c584bd03529
 DIST kross-5.18.0.tar.xz 134980 SHA256 26879a11c66a6692928cae8d0bf6d56f66ebe4cd36cb201aeef04dd8b11fc1cf SHA512 997d33a17c31668eae560f1f8f5abc89c40c1fbc819cfc266dcac6f7cbcda8233c88d2cc894f63900db11298a84ec83a65ed5643c10b3241bc5a736a43b86044 WHIRLPOOL 7b170a1145de20e018beab64ab05d7c7b26ff8a127926dc15b12c1be8107c59559fcaed2ed22d7c91f4afd7be283096f9b11276f928f065cd14060fb08c61b05
+DIST kross-5.19.0.tar.xz 135040 SHA256 17f0c945dee462571e431af709b79fea8c359a209d98a0845e44f16361ae67db SHA512 78cfae8747420270235d7a8f37a2182e6229d17c011408577957c8dc827ec514333e5c6685bd12a41ca8abaff83658f65e17c20c8199def1e17849e3827fd295 WHIRLPOOL 37eb57c65f1e6bb22c45479c60ad53c0cbc2b7a7a247fdb23cdb542dbc159924e2170612f0e5203dca378b91b8ad1fe5be958336a0b8eacff6027cb1dda90999
diff --git a/kde-frameworks/kross/kross-5.19.0.ebuild b/kde-frameworks/kross/kross-5.19.0.ebuild
new file mode 100644
index 000000000000..dbe5b0960fb1
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.19.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index ccc64c5b1f16..7ac288ca76de 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1,3 @@
 DIST krunner-5.17.0.tar.xz 48464 SHA256 93d80897820d008c20775f7d3755b1dab637941d2b4e63755e138878675d1d3e SHA512 59474caa2eeaf07a796a492f42ea330b8f9fc43a52eb942abf7cb4c95bd547551eb238dec380a24c5f9ceacc11ce8a80461e91745c78015efb7d8b3d28b725d4 WHIRLPOOL 4fd6eb4957dc31ef5d86eb3da6ed85e8949ec0a6df0061bb8eb59af7ad012e19dec3af0ccd41d7f934ba45cbc26f5c02757bf9f0de6ebf402159d583bfe2afb5
 DIST krunner-5.18.0.tar.xz 48440 SHA256 ee2601e916f13e126f19538c2625ba06a6ec6addd178f47a5b2d91cce30c8591 SHA512 72fdf9b510071174c03760eb8f7eec8e3ebf2b95006c892b94d210e591b9fd6ff160a53ca6a85cbf3e24adbdb2c9c397941c191cda93059f0fe8d61ce87b9b45 WHIRLPOOL 31d438ec8c0bee70d5eb1d87cec7eafd8642a579ff1ddbc77d3e023d1002951358b2d0e03c39b7718f63cab77fe9a5ec20b0f299c98ed70d6accdf581de9e945
+DIST krunner-5.19.0.tar.xz 48456 SHA256 bd164d588c3e29713f8283f3bf7ee6175cddd97a3e9eb7ee3b22769ac0409a14 SHA512 bbcdd2b1a4948718f4ad2584cb8622efc5207ea08ba0ed4263e2a86fed1a4081cae452bcccee54eb9d549d8c1ce24cc02ea4c6790611d019e8d3929d5d7e1dfd WHIRLPOOL fd4faabd92118cbf14aaa4dbe6435566c763f6834fd774093d48959da3c7e5b51f340384e90289d3eae6f6a82dc836a968fcf09d0480e6c4b17f47e647321f4b
diff --git a/kde-frameworks/krunner/krunner-5.19.0.ebuild b/kde-frameworks/krunner/krunner-5.19.0.ebuild
new file mode 100644
index 000000000000..c8bf7ccbddac
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.19.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 15d8f82c4c16..a70ca3007bd9 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,2 +1,3 @@
 DIST kservice-5.17.0.tar.xz 268772 SHA256 681159d8a05c0679a27009f6844dbac4f64d553d52d8fd00ad060ee98d35e45b SHA512 6de01267e293cc1d1509963b2debf353c4dc34777aff07131529dc06de05227debf16af6694b796f11e7c3f0e78afef838ccce12175efadab15aa0fc3316ec4e WHIRLPOOL 986ad53b2beb26eb261a9406240700500926c6d0a8aa58fdb1bb2fc542d552b9f979568638f73ebdd9db58aeee752015fbbfef2a3807034ddf2c0c194ec985a8
 DIST kservice-5.18.0.tar.xz 268836 SHA256 08e77511cd0e929a10c02aaca8027fb1c8fae743fa1e240f944fee13850d7a5d SHA512 f0262dadfdfd475acadd2ceffb19b447a3a07700e097807dba54a1e1a5cd4353f779fca30c889f9ff2eb5bc3cd51ae83ccf024b4957fdd5fb18c94e7243135f3 WHIRLPOOL 53c21c733aa18787b6aac613701c8e01df2ff7ffd0ec57df0a3dfd5161735d5d117f4aae99fbf13cadb3e82dd05adfee0e6a5cca0ae5b14535aa59e13bcc4c07
+DIST kservice-5.19.0.tar.xz 268868 SHA256 35ebb1193f4c2ed47d49e436318ec6d875389decea473db91586886c848a8b0a SHA512 4beeca7c5adb401e87eca5a25390136492e935333574e68abcc0c9acdc8ea8ea404844ced99196def0f1acfa0c7e9c974ddbf2f43941cc6a191bab6874c1461f WHIRLPOOL e51b15c43473a17bb6a078b0105a3d612c861c71d2513ec00c8701cd6b08ef0b16f9b4012b4be147059ad1f7795cc4e1d262b1ce0e55f086c94c469c644efe23
diff --git a/kde-frameworks/kservice/kservice-5.19.0.ebuild b/kde-frameworks/kservice/kservice-5.19.0.ebuild
new file mode 100644
index 000000000000..ecfcb6ef4a11
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.19.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Advanced plugin and service introspection"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index dbc6ede1cf40..093ca432dc1f 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1,3 @@
 DIST ktexteditor-5.17.0.tar.xz 2869676 SHA256 f992c5c7cf0d4f6427cb2194b18d27301c5e28b19bdaadd0ab370580bf71509b SHA512 e7b91810c7e26d7ae12bfd574f73cd6f23db527482c7dd1d38beaedf7b1a319bde3f822afb4036d2f787ca41e9ed6e5cc03fb8fe2c404a1509c9c30096309f53 WHIRLPOOL ea5928797a92f7f41831b188bfe802872e6a4a145c069e77ec1942bc9ff52e7c208e3d24acc3c1bd78da688aa75ce43d4091bd919904dfc74fada7a566a4b0ac
 DIST ktexteditor-5.18.0.tar.xz 2869476 SHA256 7b3cce5b1313561edd76113a92f651c9399b5d7d6a606cc61ecaf3e08b16a83b SHA512 7ca2a052ef5a7098ab1b9db4715f8a89ddae120a788b7541c973f1f77d4547e365e31619417c9e0a3f4333bc4c1053c99d553338f3cf18a952024d6c9800c785 WHIRLPOOL f46387c609bbe497ee7b0f093300dcfdbdeabe3ccb88abf7c17af868dd9b44eae87901fc3f0464bd6673b2a31d65e7ab0ee7308ee1fb3036548016bd7241b220
+DIST ktexteditor-5.19.0.tar.xz 2871304 SHA256 b79515d2851b257c961cdf2c2aa5caa78ff9353468a01890966a90493821746c SHA512 19610a162d491d331944f639b262ec40b887e221fc393bbccbfb113356b0fa16893f5e7c1ff96c590f55a9da3b21df4f584c664a6ec19ca51c5b5b333f4bd517 WHIRLPOOL 97f19a582e2a9e1b2b23a562243c17f391a3b8a6f901edf9932b21f6e418929952d9fbf50745e62aefa1a3c1d4f92224738a4f23c18b5d4c7cabe3c5824d2375
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.19.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.19.0.ebuild
new file mode 100644
index 000000000000..da503f92601c
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.19.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 4f5cc8cd88c9..9ba37bd91520 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,2 +1,3 @@
 DIST ktextwidgets-5.17.0.tar.xz 306676 SHA256 e3b08a4444e238f73811905d6a87f53181df3ecd7be49cca701c1204b45080a4 SHA512 a45a9ca565e8a42ebb3c1c261b9974f4fac35aefd43f240e009e45d77fa26ae43d53669f6caf56eae23d60892e962932aeb839b881329192a8c5fd3734d5b727 WHIRLPOOL 550385bfc1a21cd37356409d86446393443a74813988da38b403bf2a9531343fa1993abe84a86df9bebbe1322a2e0927056f7bb65eda71c3ef6171c436cd98be
 DIST ktextwidgets-5.18.0.tar.xz 306736 SHA256 e38c6e1458f34fc7a78ed8447ab6df94296662555a0877d5807428fcaac3d4f1 SHA512 ffd6368a390baae36d2116bfb717f09e8a1e194d11918c0131d8f223ae71db5d66d59d492a4da96ac2f4664a3478f0ac0d84a06cc917e086fa47616aba31f646 WHIRLPOOL 7371a459e22af7264dd212e182d57420679c8931f3eff9e1e0c7406bbc7db80d898ba480063bf07a0f3bfc3246859e52787eaacf8af5f4df4769b8c4ff216376
+DIST ktextwidgets-5.19.0.tar.xz 306580 SHA256 d74eb97b7184eed70481a029bc3fe2129d56c7c3d48a3c1708377493cd59cdf7 SHA512 8400163cd7dd895d09a90a64181d7c92e620c0c9360cf00359bbb5c12b804c238eca407a2dcb8fbc499e16b5c87acd9b5d9d020bd81098c496db9861b65e8006 WHIRLPOOL f773efb1eed7ee70f11a90359b1f7e109f9b49057728127266c55da872c21a927846211e76f69d90b7d7d3fb56f6e4693ac8e7d0d2945b8b224ac8e56f4cc399
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.19.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.19.0.ebuild
new file mode 100644
index 000000000000..dd14783c4ac0
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.19.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="speech"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 6c42df499c05..8e7c659b42c4 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,2 +1,3 @@
 DIST kunitconversion-5.17.0.tar.xz 627756 SHA256 4eae802b107e95ca39f28b7f08fa880a0e0fa3c678a9afcaa1b8d4901a988379 SHA512 ee3989270924b55ba638bf8055c2f8b1581087a61d9aa29b10e2cb3c8a8d6e4918b09d171d770d69f7ce9900019da58d797ac764fe94ac9fd9ef99e5284332dd WHIRLPOOL c68360774b49c91f7bde63e1a7fd85f6283df2687ae2837044b05a3097c5b5295a250d459607b72bc2e52badc0228571d6a633b1854bef745a1d97c77f30c4a9
 DIST kunitconversion-5.18.0.tar.xz 627564 SHA256 d150694ee1b852961c6fe5401b75c818303208062d43e7dd6fe7244f7db3f53e SHA512 911e57abad45d1a745b2af037f39946fe873aadee961104d094352dc860c542f246d48dee589102410d7a250e1e2b6348e3eaf6c4c1efc1226646362b03f77eb WHIRLPOOL 0786fb9036585012bfd6b046b488938434da6af415c3557bdc379cc7e65f879fb1a6a663752f2ca6feb654880ea2904338f86f58f377aa0d28a3fdcdd9ab2552
+DIST kunitconversion-5.19.0.tar.xz 620080 SHA256 6b22185ddfe88de2f063954db57c1b8ac9b3d6a4f3c8dc103933ac3c31dce185 SHA512 f2839c0601cd8f41b0fc1946f2b50baf9a5b31d9fea50152b02b155ebe2afbbde9ecca93360472410f4e718e1fffa367dc25af4d48704c2981488407b1798a76 WHIRLPOOL 826f9a4b461a1ad02c00493884691b620d53a0617b3655e15a5afe07eda688826b67f40814d053bd5e52b674ac080a8aa147dddd429fc9481f1258ac93550f5e
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.19.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.19.0.ebuild
new file mode 100644
index 000000000000..39ff39a5f7e4
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.19.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index f7cec2bf03bb..1bcbd746f11c 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,2 +1,3 @@
 DIST kwallet-5.17.0.tar.xz 286632 SHA256 3b6a119a44103d90cb25d4ee466bb301820156ed92f295771ac459534963a214 SHA512 43a6985b87fd11b32b4b5527f77797ab09e907dc189563d69292945eb8f080d22fb056617ae967bf1fbc3b7107b94f730b94acd47e1bd5fa02e2f5c271dcc7cb WHIRLPOOL cf0fade152e1828e034cc31bfbd1efa4bea1b41007a7b3a61403eb3e6e8c646125a08078b8da8670b0dd4e21d34bd458e2d8e49118da591cad4f6c1768bd0ea4
 DIST kwallet-5.18.0.tar.xz 286632 SHA256 3af64defd77219f6c128d3e92165dfc5063f803e1f98b09b673befdd3af0c970 SHA512 e82953536a9bb7bd7f20ca59dd2df84f73d9a5573693041176ff3d801d36799b226a39c7bdc0c40538a46923b021ecc60d5daa4bd182eef80a229dd839b3af0d WHIRLPOOL d1eb2f0acc64ed1891db6eb57c0291bedc55daf714c44b10531c9cae40fab0fe3d238691ecfec2b692005baea0e562e434b97ca8c932e2c92b561cd407b19da6
+DIST kwallet-5.19.0.tar.xz 287448 SHA256 555e2b499d494819eb808752e66ff7d813a66004739d6f70f63a75d79c300c7c SHA512 0fde73fa7cbdef1c8136abc9e1b83a27035cfdf5962bc56435b36282ab2237001b7cb0e7a14e59057180184dbf70e5b61392781f1c2aebb3df715e358308ef85 WHIRLPOOL 8db779a0676dd122d6101440b781e342fe6cf02a728f0116fd2d9ecc256ce29a9710f87e5851b6464b6e03d7e7792511daebc1df0975823b728dd20eef882ed3
diff --git a/kde-frameworks/kwallet/kwallet-5.19.0.ebuild b/kde-frameworks/kwallet/kwallet-5.19.0.ebuild
new file mode 100644
index 000000000000..1c53817450a9
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.19.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gpg"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-libs/libgcrypt:0=
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	gpg? (
+		$(add_kdeapps_dep gpgmepp)
+		app-crypt/gpgme
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gpg Gpgme)
+		$(cmake-utils_use_find_package gpg KF5Gpgmepp)
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 5729ade9a630..0d68748992de 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kwidgetsaddons-5.17.0.tar.xz 2134316 SHA256 76f75144dfa4f3bfd1389ecef4bd6aeeac5edc4b230a33fa9be58c4f3ef73294 SHA512 e6488ed6f816025773e41540d901762325173757060482321621be3f17d79630707010f122bca60209556803bff7b52f212b778715512ae9d5632673c6241c05 WHIRLPOOL b86269390c8292a8dbabc1263feab8cf978c22313ad738ae8090b829b0f44053dbc1f6886e438035c996fccf5509f45c37261e82aac95a2c1a75e714de5c1d82
 DIST kwidgetsaddons-5.18.0.tar.xz 2130488 SHA256 61eebbe729dba31fccfdd1178e50d4c2c9e4b221f193f2a0d2e57ec6d9f9d819 SHA512 d571ebb313fc8e773b1a0e73889c669cf26d125373685119ad70a8b93dd5ae9dac6f720cbadd8dfc25698e4f312dec61356a179a4d94ef4868cc162b787add9b WHIRLPOOL 8522beaf2b2dcd49921b18d728fa6d027e8f5a1c925dd344db089e8fcd67e9a6d778532b40f87692a710791774fbd51dc2da1a25c32ec9e7e307111d05eecc81
+DIST kwidgetsaddons-5.19.0.tar.xz 2129676 SHA256 7547ee8fb0e532fa95bb6e3fd00ede672c1b4c7fdfc38a5dfcf715d9c0b3052d SHA512 016e31554d3882825913fe18c41e1f1e3b3d19160776f4ba942a94b03fbe9747165b372db3d64a60ec6a58a473d0c7de6e4356ad3d3642d295a6996cae57c0d6 WHIRLPOOL 2c04072d00ee9a6461f0ccc9c19144a2b2474c68348fea58f028ab5917aaa3272f64fadd1118356f0b690aa080cf5f699721c7694ede50f9498d04951979bc2b
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.19.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.19.0.ebuild
new file mode 100644
index 000000000000..544015905711
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep designer) )
+"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 0a894ccee910..f2e27026c08e 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,2 +1,3 @@
 DIST kwindowsystem-5.17.0.tar.xz 162980 SHA256 a460f9d2a045c4fd8bb71578811caa93b1a39f04170adedc4164c71e8f290ba0 SHA512 bc5b32cc4d4ce966aec1ec3995c79b54fe448ef0106e1f21fe89317707356e077e5e516cf74f6c9a38a6288f37bdc580817a26fdf9b0684d3cd66c1eb88e5056 WHIRLPOOL 511a7664582555e554e1ac5af5638f990ec0c4ff0904ae8b3aee74deeb7510c3715a32cd98a42d2833bb1c8a2fe3a428a61a84a95ca08d8d78e88f5bd2018218
 DIST kwindowsystem-5.18.0.tar.xz 163260 SHA256 67567ba32268d0a5365106b7e98e69eb77880271580c68adbf0d128f32691f06 SHA512 4c67d23e62de3d34fb9f2055bfa6b8608d52c2faf1129e32426798e6c84d8f9d94452305ed9829b56663c24442c5d0cffc8ecb27fbf55f7a7d45cfa7a9b10691 WHIRLPOOL 48cb7b153d1ab4ca411d3c9ff5289c90b62be8994bb371b0fe62bfedda0503023007dfffc1862872efed4478f03a4033695f3192fbca558ed4c587a9d7249117
+DIST kwindowsystem-5.19.0.tar.xz 163636 SHA256 9039b4bc6143ccccb98af60d4bcc813ea6c211b4f425c335fb499293c9d0bd84 SHA512 dceb8da8c4e3f43c60782409cdf7e16c488e1838952001e7713aca82ae66b95deb71e5d345069c3e0ec21e2e31628ad6cd2bf93d06c2827cdb909e216ec0a3f5 WHIRLPOOL b885c70b4d19aef76d7f95f89ef45c980d27895282f3f6dffb74f61b1ec4157a5ab7df53652c20733163292fabb9569f8d989c00c9e3b8700a81ba4591912657
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.19.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.19.0.ebuild
new file mode 100644
index 000000000000..cfcc4942e332
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.19.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+DOCS=( "docs/README.kstartupinfo" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index bdc3412795ba..95ecc9d0b444 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,2 +1,3 @@
 DIST kxmlgui-5.17.0.tar.xz 864652 SHA256 b6fdb08a816f58aaca9419b9821c70e18641b371f2b22e63c095a3905c9a7d65 SHA512 65720962fef83e267252216918b7a1491aff110a2fb42e4a0ac57406f80aab9d308b5504922dce9887065f1e9b82e1b7a4c8416beaefd2173d7f1a3891a0b183 WHIRLPOOL 8a4fb9e369d35c08d1288830f56704da8852dd6ab2eee1e130cd1c3bc9edc0c9e58870fb0de8a1aeebd106a0b7514a3c71ba037ac1d188f43459eafd29d18ee0
 DIST kxmlgui-5.18.0.tar.xz 864752 SHA256 316324910ba63df52de57445b68aaf3f4b1689e86d568039f968eb7132f0357a SHA512 734e54cd39fcd23362dde7f45d2f9ee7bbaae175c8d93aeddb2a7442d2bdc5727f539b62e95ffb8f2d61e5e342f792e970331ef37efe8e35b4eca8b38235bf22 WHIRLPOOL ce3ea2deefd87616ee1b41ee473eac09b722ac5a298e019841fda28a1c7426ba452945673afefdbffe1737c6b2d94d7cfa50ee018973965e14f10d98a43d7523
+DIST kxmlgui-5.19.0.tar.xz 865088 SHA256 503d623d793c0b50abaf135a275c7d0e6fb31eba0adba4f6fd836e1f5dec82aa SHA512 7a6572b72eb530c6937c18286d0238387ca720f6045de832dc04e0fed48e2d99038187f352625e9629d69364e4ebe1b5d75a54d0785a0a0ffa7420d505411235 WHIRLPOOL b0aa9960e61edc95610bba613406e8bcd00cfbc4c8c3ad386cc2dffd969270f88fbbbfd340c580ac7fea80c423a5e8f023cb9cbe9d91dbea3a1c53802e3b51f7
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.19.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.19.0.ebuild
new file mode 100644
index 000000000000..cc57a95159fa
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.19.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 678cd957ea0f..dba94a176d90 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,2 +1,3 @@
 DIST kxmlrpcclient-5.17.0.tar.xz 28272 SHA256 9a1db5fa2fcd87e55ac74e0ea8c05e4ddd83bcef68a471749bd63271966147fe SHA512 2d410ec461b6e6a4077d245462bf92312fd125d27298c9a12b68cc635449bff9e2f4ac89741041fb24a69a6dad19a6165ea54052e3d529e745ac536e1fdc1a16 WHIRLPOOL 41b9d5a9c962a693a7321b57a52c7721ed0b07d5f733ec73fdb73cb86a5f554cae8b5d8dba2ee95e9e98be97afda1b66a30b60d4be5f97ccef0867e0f112b9af
 DIST kxmlrpcclient-5.18.0.tar.xz 28260 SHA256 695b33703b1966d9b767f6e7b89c4b17644e6732b6757c162a78fc0207bb0841 SHA512 9f648f1368bf635a5859985a794e7719c9416e0ce7279361ea90bc849604f727e0aa365cf97a2069bb7fd58a6a2613ddc990185da4ef5cad9db3d74b5d3a855d WHIRLPOOL 55d1a9b8e0eae3abc02527a1be5a27459df6015320263570caf0a7acb9a29eca30b706e0f559901463f56567a38c947481befd11959725dbdee44da083680bdf
+DIST kxmlrpcclient-5.19.0.tar.xz 28268 SHA256 0f25bcc12fd3fdb78b055fcfefb067243f61d2afde742ac897950ab83b3b5152 SHA512 43c88c39bbb7c88901ce58ea441cd04017cea393d0d809a94293ce79477d39353ee99ddc7eabc6ed6bac26d81e753020a58d98823abab96ce19fb9f0b9ef8c8e WHIRLPOOL bad1796c2331537af40add3d313ea4a240e4a13947e2c8f7793c3c78ceb97310e7a9d10a41371a07f3195250ee3a776bd7ed2aca2acb03aefc7f8f17579ba528
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.19.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.19.0.ebuild
new file mode 100644
index 000000000000..0468bbcad6bb
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.19.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+	!<kde-plasma/plasma-workspace-5.2.95
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index f60b52150aed..384643ce65c4 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1,3 @@
 DIST modemmanager-qt-5.17.0.tar.xz 98360 SHA256 237f212e0f8ad300c4c7f38547d4631ec9e4a51ed52a40fccf8c1e51f25b6ae0 SHA512 527a78e16edb55a3c420c4d5872a4ad680b4832eb577aae1cb69371130b60ee7500344b8211a270a3533d53482beaef88e3b72e5ef3c0bb0d70cfa2ba2873a6e WHIRLPOOL 02b1a3683356619f8339827dd20a1ba965aeb519672e6752ad23effea227094b729a12783ab128d826085d4b8d749275d5c80da62a31f8def2acf2703d116431
 DIST modemmanager-qt-5.18.0.tar.xz 98404 SHA256 5f25e9c9e1554338c8ffad30c5fee0d652d29d343a570e89d221143b3b3f6026 SHA512 a36c68172bfd67a51cb4d3f068aeba083c443e3f826f68df68e58d5b8e9019ba49a62a28bd27ce42f163a7759855cb91e392ebc0a5c7c9ba5f06a7eafcd55f0d WHIRLPOOL 2b6f18bbe1f8d2329f972c1f81d2b1898a2970f389a32f708df454f32c185c5840b23f6dae87ac7f30279433d2888cfe85ed106c1eef8fb53603705595177b79
+DIST modemmanager-qt-5.19.0.tar.xz 98380 SHA256 9c6c14934323deb316bf4e622ba9d5391da83b52fe66258074894b9f5994a917 SHA512 32b9fb3df408ec424119425e7b980262f68e9436455616758a6c11c2d2eaf0d6602b0eb964a1ad6324e8a54c27b1af7243261c0798b7b01d515dff0f916ba153 WHIRLPOOL 1d2cea436b7fb452f5e3d23c5db110e2bd39a85d8d4cee90b06420530a2668b6b2770a9473e1922dbc93714ee4ee640a4cb44c6e1e258e484aa2426df11cba8d
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.19.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.19.0.ebuild
new file mode 100644
index 000000000000..5267f27b489d
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+	net-misc/modemmanager
+	!kde-plasma/libmm-qt
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 8e27e8d0b100..ab9a71c9f2be 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1,3 @@
 DIST networkmanager-qt-5.17.0.tar.xz 155464 SHA256 346868911e14cd1db8977d5e2054abc3432e9d0d9ac85f5ba1d652e1c7774a21 SHA512 14418a443780d5972041a046d7bb7623ce6ebe589d77841985ba1600085d9eb583f8d86b58d346896626059f3e095d8bb0b8e309ea0cd963f2e1ee35b8fef46a WHIRLPOOL 548779d04051f9529ca03aeb1d04b80c42d45c0d2c2bbceefcaf470fac5c47345285449021ae1b67b91b52f5c3617f734f723072e0ee6f1afbd71ab83dc727b1
 DIST networkmanager-qt-5.18.0.tar.xz 155524 SHA256 96fec981a95c4e0a20e4b7878dd0d0702434af1dee3a1a3d1ce2cba2390a4886 SHA512 2a1eada0fff2f0746a4b099c8cd3cc034d5eb1287918e85f8305dfeb4775fefe8eed4fd527b2486b5488b3c3848761fe40a5207b176e71f1edbe3dd2f835d709 WHIRLPOOL 01fffe2d1aeee83bdba001548b2347126e4049cd46265b4efb45b2342e6e4dd049413a570d3bb062213a315c34da4970da3b3ee47396e2371e6e36d10e4970b2
+DIST networkmanager-qt-5.19.0.tar.xz 155696 SHA256 2360bd477a055d3466520a2b76a4e977d3f8601cec7b1b68f47baffffcac2072 SHA512 62033579912917ff2bd71e2a37f8069ba7f4af425e56eb0c2c4e415c3750567306b07c83b8ba5c88eb4781db311cf7d6284a79c700c792c7533982dad3482ef9 WHIRLPOOL fed51d58183852d1b59ef712a8a86d682a2dcced3694cd2e4b57cb26dfbad9fae5c00dd9305070313a5fe72a391bbdd8c6476b26a25f5eb30145504549e1c3f3
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.19.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.19.0.ebuild
new file mode 100644
index 000000000000..dfca01aaab74
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.19.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="teamd"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtnetwork)
+	|| (
+		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
+		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
+	)
+	!kde-frameworks/libnm-qt
+	!kde-plasma/libnm-qt
+	!net-libs/libnm-qt:5
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 95e43c839d39..e437645a2c38 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -2,3 +2,4 @@ DIST oxygen-icons-4.14.3.repacked.tar.xz 29341916 SHA256 1d076233882108f16424e09
 DIST oxygen-icons-4.14.3.tar.xz 229823240 SHA256 9b222399c8c188feb3af342b0744fde12d58cdb4e5b88ee2b056ea082a9392db SHA512 193a51d96df9adbec55624d576f63afc8139ffc157c6e9be49cdb2f8611631728690a06cb49fc53441dbe37b5c66ff87ab33f186db82c659da3b7164fa86dcaa WHIRLPOOL ea156f02e1a0cce4445129c5d0ec103f84e38ffc6b69c9ee30130192ed58ec930ae724236623e609c2079dd2681e1f206f3b15f133da90ee2b44814f1f39770a
 DIST oxygen-icons5-5.17.0.tar.xz 231711524 SHA256 c987bd3d830ba564ea6ea59948bbd44e14bae4d3600857c8b7f7aa4fbe83a5a2 SHA512 954a357bde4b2847c9d648e9fe5cc8fc162e027dc0a711baf921ed9e9fdec14dd17b114da2f415440f4e07b38539d576a3fda5aca7516c7f31cdb9ac1c31eb73 WHIRLPOOL 9ef278920165ed973e9543ff878ecca6657c2e32ea382f503f93b92c4d0dc84092025cc6f75d0e9704b745b4139a53f7fb65f07f8285f3e0446418e2a87c15da
 DIST oxygen-icons5-5.18.0.tar.xz 231712604 SHA256 286ea9fb618b26021acaff9e48a566d29f44409492773e59e3d1f46313ebf587 SHA512 698ca888dbf6837be42177cf06ff19429f47e323b54608b08c5b0544a652b95acd53cfefe27d470efc6c97afd114eb47ccf8ebbd62e656e3d2da278aaaa027cd WHIRLPOOL 0ccdfe34e5dfed23df1c0ccea8686b25f5aac4ac255f26658c77ae8f3b38190840d1723e0017409e3948861e88ad3e353fd167e83e15b58b7ec3dad02b10bc34
+DIST oxygen-icons5-5.19.0.tar.xz 233257760 SHA256 e0cd165241b8005fbcd20b5dde504ff727c3e642076b9231a06bc8163de36e27 SHA512 72c2df694021d7959feebc245d7253cc9068cf29fa5b126e5f314c0cd624206c696ba452158323ce70691fd22abcb4795f65fc7a0c2ef14cc4fdbd2755d4368c WHIRLPOOL 2739fcc6d97c5b268a2780e91b278285171a3a53c281cfa90eec3c808da7cd939706b0ac9983430f20209bd4b4bb0c65c0a3832308913be6694ad9bffa5b5be2
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild
new file mode 100644
index 000000000000..70071241d661
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="true"
+KMNAME="oxygen-icons5"
+inherit kde5
+
+DESCRIPTION="Oxygen SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	test? ( $(add_qt_dep qttest) )
+"
+RDEPEND="
+	!<kde-apps/kdepim-15.12.1-r1:5
+	!kde-apps/kdepim-icons:4
+	!kde-base/legacy-icons:4
+	!<kde-base/systemsettings-4.11.22-r1:4
+	!kde-frameworks/oxygen-icons:4
+"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 76734fc78e57..8330f15cdf0a 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-framework-5.17.0.tar.xz 4153152 SHA256 50bab98ec5c364cf57a5ea93b0ad7cd067b48a6115d5c4e3ef440398de0d295e SHA512 f50a84f21acb2c93137dd1f4b0c5940e7c0e8909fd5c96d9c1a3fff903ccbedaa9e0e6d1c04ce216527b61ff572ceae3326a07a4fb7c4dae74c6a68ae1174eb2 WHIRLPOOL 5fe9caff3258f3a9faca3b5547483d7722b35d9383e829552b952cb26351a693c279ab897b6845febc734e76e67304212da0b0f166a13e6f9ca02135c3308f3b
 DIST plasma-framework-5.18.0.tar.xz 4156132 SHA256 08d25ce2f6f2f93aa012c9f5f0a39cf9653bca451c513941ea1f3339faa7b0d3 SHA512 b30e47d5beb131354fcc8befe2b73efe87ba1f35f10b02476ca20e99dd10e71fc7df72ef8e73c83ccdba7ac7a2bb1fe9f31272ccb7f163ad593b821f0cf05efc WHIRLPOOL 2a0d637cbef6de415e4cd2ca68fd37e744e1311312627e188934befc361ec320888a92387ca3ea53ea6af65d88344ab2ecf41f9aec1976d02e56f8acf6d13b34
+DIST plasma-framework-5.19.0.tar.xz 3999124 SHA256 2711c298dbb0755468f8633d5bbe4a6db4c6aac8f5604c38844983a764c80895 SHA512 af8c4735dcd7ddcba2ba437f7624e98958c0e38d9db37aa5929b993ff1c6a8fa386695ce40c43079cc7dbb056c0899b94dca04b003832537c6e0e80a36959d55 WHIRLPOOL 2b038dbb114360f41a10f9afd77ed166552d274199e14dc6c793b64515fff87d5c8678220e1f07ce65fd4803774644ef489b2cc6587436bcc6bd07c9864a914a
diff --git a/kde-frameworks/plasma/files/plasma-5.19.0-crash.patch b/kde-frameworks/plasma/files/plasma-5.19.0-crash.patch
new file mode 100644
index 000000000000..8c3a60bf6d38
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.19.0-crash.patch
@@ -0,0 +1,27 @@
+From 1e196fdfb2a6eaf1664e1155c086616d55c6712b Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Mon, 15 Feb 2016 19:05:26 +0100
+Subject: [PATCH] WindowThumbnail: Discard glx pixmap in stopRedirecting()
+
+BUG: 357895
+FIXED-IN: 5.20
+REVIEW: 127072
+---
+ src/declarativeimports/core/windowthumbnail.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/declarativeimports/core/windowthumbnail.cpp b/src/declarativeimports/core/windowthumbnail.cpp
+index 21e655e..b838053 100644
+--- a/src/declarativeimports/core/windowthumbnail.cpp
++++ b/src/declarativeimports/core/windowthumbnail.cpp
+@@ -584,6 +584,7 @@ void WindowThumbnail::stopRedirecting()
+         return;
+     }
+     xcb_composite_unredirect_window(c, m_winId, XCB_COMPOSITE_REDIRECT_AUTOMATIC);
++    discardPixmap();
+     if (m_damage == XCB_NONE) {
+         return;
+     }
+-- 
+2.4.10
+
diff --git a/kde-frameworks/plasma/files/plasma-5.19.0-systrayicons.patch b/kde-frameworks/plasma/files/plasma-5.19.0-systrayicons.patch
new file mode 100644
index 000000000000..f8488cfe071d
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.19.0-systrayicons.patch
@@ -0,0 +1,34 @@
+From 525bf2d377c21b41971a72d694a507bf2af0ada6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Tue, 16 Feb 2016 17:59:32 +0100
+Subject: [PATCH] Fix IconItem not loading non-theme icons with name
+
+Commit 5184ac introduced a small regression that caused IconItem
+to no longer load non-theme icons with name set, for instance icons
+coming from sni-qt, causing sni-qt apps to not show in systray.
+
+BUG: 359388
+FIXED-IN: 5.20
+REVIEW: 127091
+---
+ src/declarativeimports/core/iconitem.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
+index 1d7921a..085f284 100644
+--- a/src/declarativeimports/core/iconitem.cpp
++++ b/src/declarativeimports/core/iconitem.cpp
+@@ -148,6 +148,10 @@ void IconItem::setSource(const QVariant &source)
+                 //fail, use QIcon
+                 } else {
+                     m_icon = QIcon::fromTheme(sourceString);
++                    if (m_icon.isNull()) {
++                        // fallback for non-theme icons
++                        m_icon = source.value<QIcon>();
++                    }
+                     delete m_svgIcon;
+                     m_svgIcon = 0;
+                     m_imageIcon = QImage();
+-- 
+2.4.10
+
diff --git a/kde-frameworks/plasma/plasma-5.19.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.19.0-r1.ebuild
new file mode 100644
index 000000000000..dae680851966
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.19.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles2 X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	egl? ( media-libs/mesa[egl] )
+	!gles2? ( virtual/opengl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	X? ( x11-proto/xproto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-15.08.3-r1:5
+	!<kde-plasma/kdeplasma-addons-5.4.3-r1
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crash.patch"
+	"${FILESDIR}/${P}-systrayicons.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/plasma/plasma-5.19.0.ebuild b/kde-frameworks/plasma/plasma-5.19.0.ebuild
new file mode 100644
index 000000000000..ace1e907b992
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.19.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles2 X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	egl? ( media-libs/mesa[egl] )
+	!gles2? ( virtual/opengl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	X? ( x11-proto/xproto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-15.08.3-r1:5
+	!<kde-plasma/kdeplasma-addons-5.4.3-r1
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 7ce3c246e422..501f28121ad4 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,2 +1,3 @@
 DIST solid-5.17.0.tar.xz 267260 SHA256 a333f6e3eb1468d87bca3b372777ba9ead09d89cbafd527424b8e7c7cac4edc5 SHA512 acef7667ad1ef603c410bd89495849f9d99239a2b3f7c855b68a9cbae7f8ab5fad89402b100622e74016807e2c15cc3ae5bb94bf11501aa23b4eca25181bad6b WHIRLPOOL 37f7b73d1440835c19a984be0355d54f467be564a01ad45b01cb789a542e1065282dd3012fd993f6838fa5bd74c5d67958ffd2b2dcdcc8a5e74e6711c381d45f
 DIST solid-5.18.0.tar.xz 267412 SHA256 909b0ebd982e028935885709983be2a22c01c9442a906f64d3f20d3734899346 SHA512 0d4b6cd2da5b75e93bc9f95054c133b4fd6cadaaa54c3f0fa2c4225b2838d655d0ff96d7965b11cff03bf6ac51bc9686c3a4fac6ff8a6ff19b4022eb09145a76 WHIRLPOOL d0151018677ff7d08095ebb458c879b0dc4fcb31e39348e302c5558a0c45b961ac7eb403e6fa152a4c1a526ad59477a6098e3b9d0aa7cdfd3be02193735b6b3b
+DIST solid-5.19.0.tar.xz 268088 SHA256 ff4dabd1d1ab038a22d4a90f4f4eca83e96f22ce07fa090b36b994c534dc7609 SHA512 232073be85547feeadacbaa61437811363c27d64f9d05c18024678afa53c04fc6a57fb14d3d2198d27274f158ff11a7393e3b9224b37e0eb96f41ddef90a2cd1 WHIRLPOOL 9ea4813f4287a787368b3f0554117dee0e3f4157ed6270f5887e8a5df326242bf50476ccae9bc7f4407bc6a9d7172fba7c1269c45b82221ff5bdd991452e73f9
diff --git a/kde-frameworks/solid/solid-5.19.0.ebuild b/kde-frameworks/solid/solid-5.19.0.ebuild
new file mode 100644
index 000000000000..df5217299644
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.19.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-fs/udisks:2
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "app-misc/media-player-info" ; then
+		einfo "For media player support, install app-misc/media-player-info"
+	fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index f95549cd633b..92e49aef64ae 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,2 +1,3 @@
 DIST sonnet-5.17.0.tar.xz 282052 SHA256 5bafe5540cfb07f0306027223893701e1d19d81f0ce0310261f3303b59fbeb38 SHA512 29b668b43c61bab0fe2b328fd9ac2359e82b80d3726e9adfc309f599e1902469f0f9d90a3ae0f4e68f2963b31965bc543f5f4dcdca0d302689ba54ea56bc75ff WHIRLPOOL 885ca4ca3407e4a4af0ea94c27d88dd671d6e303d64ab18236d00a4f8dfff5d8e6f65408ef38a5f37e82744c40bb6622f0968dfe14733ab3e5313bca3ad5a3b0
 DIST sonnet-5.18.0.tar.xz 282188 SHA256 6ffa49bab59dba0080c03a8b7863efd53006239350f634575b4aabe9f496009d SHA512 fa3052a3ce1a280fcf79a80963b996b2510056987126e427a860d653040a4692faa3f2c9fd9f4d0e6e2b006801cff15dfe3a93ad7f87492aba4364a7d2262ac4 WHIRLPOOL 29a45dc95f7363062d6487f081db1ba0778a761e84abf1de2ef657ccf36efd29eb7d3e789d975402a37edfa02525e79acacc8c55ed1f4c5861f9de0bb83dcf31
+DIST sonnet-5.19.0.tar.xz 282108 SHA256 a70ff0a2d4212af9a5db9d5dc0a12c5cf4e23c5b000896820d387a0ee0b3310b SHA512 4e0062f772bbb44628aecad6ab5ca27a49b9fc454179decd86d649bfd35e9daa3773ffc23b42d7c0b08702e333eec59fc4c94d4e03d16f5b28b113d216e81848 WHIRLPOOL fea82b76a29876336adb455d86e195a8291029ae0fcaf27995b80d87050a34e7ad3004a11fa257d283932cb74b1757711e80da26150cd4111ea13dd9d1bf31b9
diff --git a/kde-frameworks/sonnet/sonnet-5.19.0.ebuild b/kde-frameworks/sonnet/sonnet-5.19.0.ebuild
new file mode 100644
index 000000000000..43f93ea5b05b
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.19.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="aspell +hunspell nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aspell ASPELL)
+		$(cmake-utils_use_find_package hunspell HUNSPELL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 2fefb16da099..8eb1690cf074 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,2 +1,3 @@
 DIST threadweaver-5.17.0.tar.xz 1408600 SHA256 5c23052918c15024e45dbf28da1f7b16528698837f1d6a3e884a69c27fc6c7b1 SHA512 9799b37c3eb87ef17f4c0f99d3d40f1a36abd359d0e8332dc19b31f0c0f8dd0c1b1a2a0314f6539ecffd7bf8fc47a3aaa263c05c1c2585a8e6b8fa1898a4ab03 WHIRLPOOL 05de62ed00e89f27ad3aadb4924d953b51940c4aef7028e8960fc509334c2847e18e37acc5fbeb6f934e67992d63c3174c3080bb672a7e2497ee691ffa5664ea
 DIST threadweaver-5.18.0.tar.xz 1408596 SHA256 a4d417b3e9488e9c62a2a9d2ee38846bb53b20d0f4ee4a1b034f7b0ffdde8901 SHA512 8b1d97f91249a6d147bb49cd329fac2e0c9ce582114e5a86f7417285dc11a4f7f987657dd401055c6bad9223f17fb1616e00ebdd6233893e82df730f0f21d833 WHIRLPOOL cfd93c7db7984f9943cb24f61813c21334489b72b82eb0718355ee63d95c4bc3a9318e2327c8216a90ce2bccaacb8fa3ba8517761d3f75c52567065c6cf82c70
+DIST threadweaver-5.19.0.tar.xz 1408612 SHA256 fc921ebce06ae10056fbbfdc6393f75514726cc3d854f8de13da1cdc0fd7a1ca SHA512 d389dbb9b6eb1c87519bf90c295512d13cd17dd86f2237b9af9f012f59c9bd7c77b878602691041181ebddaea2429dd34d52701742b0ac340fbe22f8a5cdbf33 WHIRLPOOL 55e143865f37c5767cafad661ffb367b0fd410a14ecf57e9f4fb17d7530762d267adfb6d2efebcd041a28f7390b650f9e22cead04d68ad811d7fbb978b1cc6e1
diff --git a/kde-frameworks/threadweaver/threadweaver-5.19.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.19.0.ebuild
new file mode 100644
index 000000000000..79df56cc5b30
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.19.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	kde5_src_prepare
+}
diff --git a/kde-misc/kscreen/Manifest b/kde-misc/kscreen/Manifest
index 736f1ead13e1..2ce3b6c60c40 100644
--- a/kde-misc/kscreen/Manifest
+++ b/kde-misc/kscreen/Manifest
@@ -1,3 +1 @@
-DIST kscreen-1.0.2.1.tar.xz 79372 SHA256 bb9c77ec11f209bfe8170da04f979dbb5cb031681de457fea355517049cca005 SHA512 60841a69d9732071c13761b53bc6c51ce630c440cd09186eff9c7c806939b0afa9b5edddd6e3fa30d1e675d3571e4c23e08d926d409d7e1f05dc107bddac78c1 WHIRLPOOL 4feb2684c5a166333df9faf1abf11b46c24b64a817d4fa723683e262b02909433305c66b15c0260ac99a39b1e7bc0d1250f39bad6200bf99288499f078059a25
-DIST kscreen-1.0.71.tar.xz 87368 SHA256 7be811b79fa28420bd8a945e81d05e587b15bdfa7d7aec0ee21c9f1e2dfb540a SHA512 334f5846c596d0da47a19d37e53ac8ea3b5d2916026cfbbe66d604070b0ddae1a006a954a62b62d2bb27b1c3ccc89181201f8d4228b75b28c51f6f25cc14fc63 WHIRLPOOL 83718f928d809b3f226f855a20693da78da0889f9fbc472a33fc96aa984e9cd460b971f748ba5d758937bae9e14b6e51efd7c1fa267274a333832138853b90f3
 DIST kscreen-1.0.71_p20150824.tar.xz 93080 SHA256 ae0a1830d2d7dbb350e217188c77bd30a10decbd56f056f7e2fd0964071d95d4 SHA512 ac1f71219918363d298ee30022a9207da912c4293c6056d8875425b80c70010d7476591ca366eae5af97a298511c0e41ca748ba0c570d632f490eb5c3eae3c84 WHIRLPOOL 77721dc3a03a0a5eee543418379480da2c182497ab58a1aed7e513b228d406588187307ad848ddc3f6e6566e4a2039acec5428d04bcf597816c10b2d018a2f55
diff --git a/kde-misc/kscreen/kscreen-1.0.2.1.ebuild b/kde-misc/kscreen/kscreen-1.0.2.1.ebuild
deleted file mode 100644
index 01f4c04a0847..000000000000
--- a/kde-misc/kscreen/kscreen-1.0.2.1.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
-
-VIRTUALX_REQUIRED="test"
-DECLARATIVE_REQUIRED="always"
-KDE_LINGUAS="bs ca cs da de el es et fi fr ga gl hu it lt mr nl pt pt_BR ro ru
-sk sl sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="Alternative KDE screen management"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-libs/qjson-0.8
-	>=x11-libs/libkscreen-1.0.2:4
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-RESTRICT="test"
-
-DISPLAY_MESSAGE=false
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		DISPLAY_MESSAGE=true
-	fi
-
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	if [[ "${DISPLAY_MESSAGE}" = true ]]; then
-		echo
-		elog "Disable the old screen management:"
-		elog "# qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor"
-		elog "# qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false"
-		elog
-		elog "Enable the kded module for the kscreen based screen management:"
-		elog "# qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen"
-		elog
-		elog "Now simply (un-)plugging displays should enable/disable them, while"
-		elog "the last state is remembered."
-		echo
-	fi
-
-	unset DISPLAY_MESSAGE
-
-	kde4-base_pkg_postinst
-}
diff --git a/kde-misc/kscreen/kscreen-1.0.71.ebuild b/kde-misc/kscreen/kscreen-1.0.71.ebuild
deleted file mode 100644
index e5bdaf6c25e8..000000000000
--- a/kde-misc/kscreen/kscreen-1.0.71.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
-
-VIRTUALX_REQUIRED="test"
-DECLARATIVE_REQUIRED="always"
-KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu it ja ko lt mr
-nb nds nl pl pt pt_BR ro ru sk sl sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="Alternative KDE screen management"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-libs/qjson-0.8
-	>=x11-libs/libkscreen-1.0.4:4
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-DISPLAY_MESSAGE=false
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		DISPLAY_MESSAGE=true
-	fi
-
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	if [[ "${DISPLAY_MESSAGE}" = true ]]; then
-		echo
-		elog "Disable the old screen management:"
-		elog "# qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor"
-		elog "# qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false"
-		elog
-		elog "Enable the kded module for the kscreen based screen management:"
-		elog "# qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen"
-		elog
-		elog "Now simply (un-)plugging displays should enable/disable them, while"
-		elog "the last state is remembered."
-		echo
-	fi
-
-	unset DISPLAY_MESSAGE
-
-	kde4-base_pkg_postinst
-}
diff --git a/kde-misc/kscreen/kscreen-1.0.71_p20150824.ebuild b/kde-misc/kscreen/kscreen-1.0.71_p20150824.ebuild
index 7b71477c85c3..ab77905bf478 100644
--- a/kde-misc/kscreen/kscreen-1.0.71_p20150824.ebuild
+++ b/kde-misc/kscreen/kscreen-1.0.71_p20150824.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-misc/kscreen/metadata.xml b/kde-misc/kscreen/metadata.xml
index 0cf59224b009..2fdbf33d963d 100644
--- a/kde-misc/kscreen/metadata.xml
+++ b/kde-misc/kscreen/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/magneto-kde/Manifest b/kde-misc/magneto-kde/Manifest
deleted file mode 100644
index 520d012e476c..000000000000
--- a/kde-misc/magneto-kde/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/kde-misc/magneto-kde/magneto-kde-254.ebuild b/kde-misc/magneto-kde/magneto-kde-254.ebuild
deleted file mode 100644
index f94c5def65f3..000000000000
--- a/kde-misc/magneto-kde/magneto-kde-254.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Entropy Package Manager notification applet KDE frontend"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/magneto"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="~app-misc/magneto-loader-${PV}[${PYTHON_USEDEP}]
-	kde-base/pykde4
-	dev-python/PyQt4[dbus]
-	${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-kde-install || die "make install failed"
-	python_optimize "${D}/usr/lib/entropy/magneto/magneto/kde"
-}
diff --git a/kde-misc/magneto-kde/metadata.xml b/kde-misc/magneto-kde/metadata.xml
deleted file mode 100644
index 15f07e411445..000000000000
--- a/kde-misc/magneto-kde/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
-	<use>
-	</use>
-</pkgmetadata>
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index cfc6210a2a7e..35eaf964a054 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1 +1,2 @@
 DIST lxsession-0.4.9.2.tar.gz 745637 SHA256 eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 SHA512 cffcd15faab79ad165f969edf65b6b106c5b4405b78e6c102a74ab96da9cf61b781d0be7587849ce56672ae3015e8f63bc1b84465f5ec0084c299ec588992172 WHIRLPOOL 5a5c172cda30a4690d82a4a8acd3b983cbcc60ed71fefdfbfbb97e8b4363f4c26825267a0bd45c71589c2dd180f9699a2d05dd759fe23bcfdd5e9d3a10ccdda2
+DIST lxsession-0.5.2.tar.xz 354092 SHA256 2d55e9ea80057fe5ffd68a91a15bb004ad7bf019e50807a8bb9b342115efaada SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1 WHIRLPOOL 720144b89c7719b283478427d5858ee0de8ca25dce77a19eef1646983c22927b3af079ec24f218b92141b77c414ebf7f85e4f863e47646b29fccb96d94586ce7
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch b/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch
new file mode 100644
index 000000000000..672889997688
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch
@@ -0,0 +1,20 @@
+--- lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c.memmove	2014-10-05 08:49:49.000000000 +0900
++++ lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c	2016-02-15 19:21:23.780783021 +0900
+@@ -216,7 +216,7 @@ void update_enable_state(GKeyFile* kf, g
+                 if( strcmp(list[i], session_name) == 0 )
+                 {
+                     g_free(list[i]);
+-                    memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
++                    memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
+                     --n;
+                     break;
+                 }
+@@ -259,7 +259,7 @@ void update_enable_state(GKeyFile* kf, g
+                 if( strcmp(list[i], session_name) == 0 )
+                 {
+                     g_free(list[i]);
+-                    memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
++                    memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
+                     --n;
+                     break;
+                 }
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch b/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch
new file mode 100644
index 000000000000..31c88a9caa66
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch
@@ -0,0 +1,20 @@
+--- lxsession-0.5.2/lxsession/settings.vala.key2	2014-10-18 01:54:57.000000000 +0900
++++ lxsession-0.5.2/lxsession/settings.vala	2015-07-13 14:56:00.830117779 +0900
+@@ -56,7 +56,7 @@ namespace Lxsession
+             return return_map;
+         }
+ 
+-        public void create_config_item (string categorie, string key1, string key2, string type, string? variable)
++        public void create_config_item (string categorie, string key1, string? key2, string type, string? variable)
+         {
+             /* only support string for now */
+             string item_key = categorie + ";" + key1 + ";" + key2 + ";";
+@@ -71,7 +71,7 @@ namespace Lxsession
+             update_support_keys (categorie, key1, key2);
+         }
+ 
+-        public void delete_config_item (string categorie, string key1, string key2, string type)
++        public void delete_config_item (string categorie, string key1, string? key2, string type)
+         {
+             /* only support string for now */
+             string item_key = categorie + ";" + key1 + ";" + key2 + ";";
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-notify-daemon-default.patch b/lxde-base/lxsession/files/lxsession-0.5.2-notify-daemon-default.patch
new file mode 100644
index 000000000000..ffca8227209a
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-notify-daemon-default.patch
@@ -0,0 +1,13 @@
+--- lxsession-0.5.2/lxsession/settings.vala.notify	2015-08-11 14:14:22.187535605 +0900
++++ lxsession-0.5.2/lxsession/settings.vala	2015-08-11 14:37:18.868694268 +0900
+@@ -258,6 +258,10 @@
+             set_generic_default("Session", "proxy_manager", "command", "string", "build-in");
+             set_generic_default("Session", "keyring", "command", "string", "ssh-agent");
+ 
++            set_generic_default("Session", "notification", "command", "string", "/usr/libexec/notification-daemon");
++            set_generic_default("Session", "notification", "autostart", "string", "true");
++
++
+             /* Set Xsettings default */
+ 
+             set_generic_default("GTK", "iXft", "Antialias", "string", "1");
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-reload.patch b/lxde-base/lxsession/files/lxsession-0.5.2-reload.patch
new file mode 100644
index 000000000000..d7e9164e7286
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-reload.patch
@@ -0,0 +1,43 @@
+--- lxsession-0.5.2/Makefile.am.debug	2014-11-29 23:50:05.000000000 +0900
++++ lxsession-0.5.2/Makefile.am	2015-06-17 11:08:14.510501437 +0900
+@@ -424,6 +424,7 @@
+     --pkg gio-2.0 \
+     --pkg posix \
+     --pkg lxsettings-daemon \
++    --pkg xevent \
+     $(buildinclip_VALAFLAGS) \
+     $(buildinpolkit_VALAFLAGS) \
+     $(NULL)
+--- lxsession-0.5.2/lxsession/main.vala.debug	2014-10-05 08:49:49.000000000 +0900
++++ lxsession-0.5.2/lxsession/main.vala	2015-06-17 11:19:54.979024117 +0900
+@@ -96,6 +96,17 @@
+             return -1;
+         }
+ 
++		if (xevent_init() == false)
++		{
++			return 1;
++		}
++
++		if (reload == true)
++		{
++			send_internal_command(LXS_CMD.RELOAD);
++			return 0;
++		}
++
+         message ("Session is %s",session);
+         message ("DE is %s", desktop_environnement);
+ 
+--- lxsession-0.5.2/vapi/xevent.vapi.debug	2015-06-17 11:08:14.520501444 +0900
++++ lxsession-0.5.2/vapi/xevent.vapi	2015-06-17 11:20:16.384040089 +0900
+@@ -0,0 +1,10 @@
++[CCode (cprefix = "LxsessionXEvent", cheader_filename = "lxsettings-daemon/xevent.h")]
++    public static void send_internal_command( int cmd );
++    public static bool xevent_init();
++
++[CCode (cname = "int", cprefix = "LXS_", cheader_filename = "lxsettings-daemon/xevent.h", has_type_id = false)]
++	public enum LXS_CMD {
++		RELOAD,
++		EXIT,
++		LAST_CMD
++	}
diff --git a/lxde-base/lxsession/lxsession-0.5.2.ebuild b/lxde-base/lxsession/lxsession-0.5.2.ebuild
new file mode 100644
index 000000000000..e4ead8ebbe69
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="http://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
+SLOT="0"
+
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libgee:0
+	dev-libs/libunique:1
+	lxde-base/lxde-common
+	sys-auth/polkit
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	sys-apps/dbus
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${P}-reload.patch
+	"${FILESDIR}"/${P}-key2-null.patch
+	"${FILESDIR}"/${P}-notify-daemon-default.patch
+	"${FILESDIR}"/${P}-fix-invalid-memcpy.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+
+	# Don't start in Xfce to avoid bugs like
+	# https://bugzilla.redhat.com/show_bug.cgi?id=616730
+	sed -i 's/^NotShowIn=GNOME;KDE;/NotShowIn=GNOME;KDE;XFCE;/g' data/lxpolkit.desktop.in.in || die
+
+	# fix icon in desktop file
+	# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxsession-edit;a=commit;h=3789a96691eadac9b8f3bf3034a97645860bd138
+	sed -i 's/^Icon=xfwm4/Icon=session-properties/g' data/lxsession-edit.desktop.in || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+	# gtk3 looks to not be ready, follow what other distributions are
+	# doing
+	econf \
+		$(use_enable nls) \
+		--disable-gtk3
+}
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 253e2895197b..a5ae2ed42946 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,4 +1,3 @@
-DIST evolution-3.12.11.tar.xz 11360812 SHA256 f9ec78ae7b9aadb7efc76777c4c93a98f7c61be2a4cfaaf351dd051604e981f5 SHA512 aef832fbfd6d7449f234e9cb0fdfabc2b75373220e37f5bc58379a2e91a3eacc39e6f8f37078c46adc11d5aa8f2d466974b8dcdcf88a68e68e7ad4a5f659a49c WHIRLPOOL 34a83a6a9be6c2e65fad3732fd86a523282fb8a1cb876da33595cec92c6c16fb8144ad6188381be9c58a301cc4e52fce04e577fd663ebfe31b0f96678126edbc
 DIST evolution-3.16.5.tar.xz 11962476 SHA256 fef4e8d0a81dc4562f984dddc5ccfee885506a2e030692b5ac6cd50e32efce37 SHA512 6f99982c42d462cc449eb8c56e22cde1ff628111b52e12fd6c8cbcbf86dbc047431aea2507c7026589bfe54b020443f3a647190de72cc235ce45f72f8d55b222 WHIRLPOOL 462e71bd51a0d5be9d5f6d9f965ae3121612ebd56066de43d328dd003cd61ab155af0c48b58868bf220e6956eee01844cbe923ea64fb30a9b88ba10d1e4c74e3
-DIST evolution-3.18.3.tar.xz 12057880 SHA256 f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9 SHA512 8a4e6bda99838ca5a68d1a9868b4da37ca83a974d51883b26460f846c520069567559785d6bb33a5f948b8aeed5fd70a1ef225797a1ad8d75de1195037fc545d WHIRLPOOL 3638c61a4d74e1304621a36f949bc39bd5e4a4d0ccb8235946349f543a06fcecc2361f14523dbd2422ec1d1ef2f95b04a43d65fbd6355e98335057744217cd6a
 DIST evolution-3.18.4.tar.xz 12062432 SHA256 8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb SHA512 ddb7922cedd490808c21a21d6a2e23f7399f1569bea69d5e0434f27b0f5b75b898ff68f17883bfd75eddb2ec9059628406e1b1f7811e1962a6da2dff4777ade2 WHIRLPOOL 3f2be015121e5fa2114b47dc07c3453370d8028080d36d202b323b2ddafe29a4eeab43840a2278ceb06ec313ed5cffd7cc602ab47eafb7d4e93fbfe4f7cb87e8
+DIST evolution-3.18.5.1.tar.xz 12067580 SHA256 20e5acd345107fdfe19ac28cd1ea4252014f28428a59d273890944c415f0590b SHA512 d2e3468cf4cdfa76c3ca6fb0816938e1a40bdcccbe2e161750a021fd9e0b0dab758574f4ac07a46a460e3ae5dbd4ddfc842b04e8cc27e120888efbcbd72fa16a WHIRLPOOL d73f3dbbe4b5460efdb3da461d8217bc18c50cc8f414ebf016c27c86d4585c3f8a42716a77ebf3499305278b572ed8cb18f82f19b848398c2df6c7e57f5760e4
diff --git a/mail-client/evolution/evolution-3.12.11.ebuild b/mail-client/evolution/evolution-3.12.11.ebuild
deleted file mode 100644
index 06de1890603d..000000000000
--- a/mail-client/evolution/evolution-3.12.11.ebuild
+++ /dev/null
@@ -1,149 +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"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc 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] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# FIXME: You need to have gnome-icon-theme or adwaita-icon-theme installed
-# (last one not yet in the tree)
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.8.0:3
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	dev-libs/libical:=
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-2.0.1:3
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-	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
-"
-
-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
-
-	# Fix compilation flags crazyness, upstream bug #653157
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		--enable-gnome-desktop \
-		$(use_enable bogofilter) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spamassassin) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with ldap openldap) \
-		$(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.18.3.ebuild b/mail-client/evolution/evolution-3.18.3.ebuild
deleted file mode 100644
index 924b16980994..000000000000
--- a/mail-client/evolution/evolution-3.18.3.ebuild
+++ /dev/null
@@ -1,148 +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"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~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
-# 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/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.18.2:=[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.10: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
-"
-
-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/evolution/evolution-3.18.5.1.ebuild b/mail-client/evolution/evolution-3.18.5.1.ebuild
new file mode 100644
index 000000000000..5f4aa08c4e6b
--- /dev/null
+++ b/mail-client/evolution/evolution-3.18.5.1.ebuild
@@ -0,0 +1,150 @@
+# 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-r1 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="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~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
+# 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/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.18.2:=[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.10: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
+"
+
+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/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 6fcce0d1b46d..10c0dd945137 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -51,62 +51,6 @@ DIST thunderbird-31.8.0-uk.xpi 499656 SHA256 d5163a906069e20dd5e5b785dc1af32f694
 DIST thunderbird-31.8.0-vi.xpi 513835 SHA256 9885e46bca6670d6659bc9ddfd4d41eacd4cfd13a0b95646001093598943a945 SHA512 8b225f0b8a4d1d1dc11caaec9d043ee0e6cc5a4e86aaf608819f94182f67fac15bb540a9a95430bdb6053a46faa79ced741a8565b1bd926bfe7940ea8e87ed80 WHIRLPOOL 1cf0564d6293676c68335becb5e0294f2304359091a104ab7219cbef33082d6b3d78221fd57859c90f4f334d1553d1ac9afc5fe532ceb8e425605755c17e7f2d
 DIST thunderbird-31.8.0-zh-CN.xpi 462668 SHA256 09116541b41128d53caa6c14c6c6607896c82592723d6990e1ddb0888868e1a3 SHA512 823d24d53f025bbf8cc8d6fdb6a8056858659d743a2fd5c1c2851d138183186d6fc5c2ff1777005527a325f794d68c76df4ae007227d946b3ac3d19a011fbff9 WHIRLPOOL 573e35628df0f671a66a67313f4959963aa8807c717dbd88e96e325f7d2cef17a6fe6e148808d4ffeb5309fa2af948da1ffea890e5c2759dbd38e25332047303
 DIST thunderbird-31.8.0-zh-TW.xpi 463408 SHA256 2bfd0efd2a0695733bf59d0a8f2c184c4798cc1f3589672f3095a77217d9bbe5 SHA512 cd71d2e4a08ec157b95e70a2ff7acdd62c4c21ac93040b6183be55a14d6b3a4fdf5f9915078ce2487d544d3a2dde3954d5aed40ab3276f72615fb4462e4974a8 WHIRLPOOL 8939d94d9d5ca7ed72fe9e05ebbde37090410ed9b3d1d7d2a8f5495d718e2904f516a5bc123580c87d84baba01bde6c359c66ee371c003fbfc5f65a02111c6b1
-DIST thunderbird-38.4.0-ar.xpi 475296 SHA256 d4e60e78da33e68a2d9d6c38fbc21da120774f071d1ad66c8f64e45e7a1ab1bc SHA512 38dc4b83a5c008ae316336e82f32e1c8bbceb517f49457f5620fe5c2e1670b7fda930fc62f8b3c5a8684245d2e8c81c80bbc08e64f6ec45f3a346989b39c2e01 WHIRLPOOL c3660a5c824c8ba03e65e906cb183f3d8f18d212258d35284f8176572c09e3a3439ff67ce9a16764757b3ba239270842d24ab3aad7cf123b35e731aec7a3404c
-DIST thunderbird-38.4.0-ast.xpi 405873 SHA256 951fe8891f21179b800f540871c0845d29b33d1edaddf2b731e8359fd02b7d18 SHA512 db53a5fb60e9f4cc1743835b015d56a64ca238264c76f1993601fd4c1b58b547a33eae255308eacd7c707dd275fe960ddf04b69e651de3b33ebe8162f3a7ee17 WHIRLPOOL 463ba492cf37b0d0a204ed2f818e11a03a8760668717db70b1bef56cf67bbba7633f0fc87581c369f7033d81351f4a8eb4b60d6ff49236a1c7d079d36c0ac5ae
-DIST thunderbird-38.4.0-be.xpi 442452 SHA256 19da5332ba7beab567335fb53da020f00e37bc210b06606427c3da9663650569 SHA512 75e9d618b98645178ee5a220d0717ed1adf412142e033243a8827182835401e0d6e3c7a32ed0735374151d478b90b5efe2b17d75eaa981a4c9695bbe454968fe WHIRLPOOL d80beaaf5e587fac2e5688840d56ed8f2f348eb8dbbd03f0e63206c505c5b0162a46687c7420ef007a892ce60320dd918cb9d7036d80fb84227432386e346090
-DIST thunderbird-38.4.0-bg.xpi 506124 SHA256 81d7df7cf1e66d16801ce727c8142897e2f9a3ef78d6fcf84318f1d5bdced1c5 SHA512 6ebca1c04a2cc49c47786d7fb1ff9b33949b61f66661adc54799424e5bb98cde34f946a03bb03940dd801485c5af5f5342ff8f6fa2fb19056861a0ad1150a839 WHIRLPOOL cd3087299d08e4cb77ba1ea01644de5c2089825d4b32a617e9b9f8a1963e9a127f6913a583013bc896a10da94ffae7a2dfcaa0475a3fc737e10d274467054f35
-DIST thunderbird-38.4.0-bn-BD.xpi 560626 SHA256 444efce23211bb069b7528ae09e89129225a89fed49077d1cbfa4eb2c0a1d356 SHA512 da0549ed826dc7fa8d59ec8d954c622f0d6e918fffdacd9ee02160291d04017053788c5103735d70e01b911b2bb7cfbbc87f25f5de73528bb915fe35772a5a5f WHIRLPOOL 3588ea1ff9d9856584aa968fb9208080546e620ecc4866d3d05e8acf6cbd3e5b8e2b482fab9e0baeaa862739b648b937b2056ffc3c3a5b281bb0fe90608c48b8
-DIST thunderbird-38.4.0-br.xpi 449767 SHA256 9ed680b42abce45726df6b45586789a4d5ff069a658e7266368503c0eb2e9b3f SHA512 8f0e219755604ef5cf6fbd03ff02e658c22d8c3ebff70f9a44c841c9c28158b0c4fe836803467bd236d3e233a2be6c9ba4edb8204134b445332fcd7f4051017c WHIRLPOOL e574f2969ba0717103968e0a6922f58a25940c72ea22c3c94e2c089228adef61144e1f25974ad2b71cfb669b4980c0a0352e66798248ebdfbccb04dcfaa39713
-DIST thunderbird-38.4.0-ca.xpi 450326 SHA256 4203b358f6d9fe362f47a777ed131397de49e0fd3e4956ffe05284fac3bdd6a8 SHA512 9ef17ae680031eb3ef231285173cf4c176d93bb81c1777379be07973ffef6cd98b068fc1b3654eda7fc953a0a7c7358102d089ed5ddc0633e74586aae72fd2b3 WHIRLPOOL 044ba0db2697d198047925447da368fe09516bde6ede374a6cb798bc9976ff36bed45663297e013087fb17d7399a85506f2756ef8bdafe6c07144ff5f17cd13a
-DIST thunderbird-38.4.0-cs.xpi 448724 SHA256 5a2c41694f56c2804c9f1c0a46262f02e318a146bcd4c6a9c6c32a6569a6e729 SHA512 86448b4a18af2eefb413dfc49a82b6fffd26d9f659aea2befdcaa723ce022fe06415d9214997dedf5e3da578e06d054b775a80fe55d996e83bc726b0d51f64a1 WHIRLPOOL 7b9cd550841223527bd1a18f69c79f0e5a5eff23709f5f9d18fec5579e41b490a821b93e40cd4aaa8269aa82e96429a326b529602ef0a93a9ec2549b829d6924
-DIST thunderbird-38.4.0-cy.xpi 434848 SHA256 8aa599c3755cc40532cd0cde0ffd2d7ecb5d04cb05d92a068859fd4c772c2c74 SHA512 0b1466b9b0ba5048edb319578d89fe194082b17dabac54ff8c729bf4eae63285b17502f292869e7b16e2cbc7dcf6add7bff6eeb4363cdae35b938cdbb0e42c16 WHIRLPOOL c25d1b786b27395bcbcd131d7b93bc2a8ab2cc80c35ccf07eb38ae82f8f4814fea99488cbef62b0faf58971fc405b83a10cefcc307b722871710dd06025433fb
-DIST thunderbird-38.4.0-da.xpi 425829 SHA256 50e972efc741054a60a242963a357cb1330c91f1ce00226b948592135b0bd40a SHA512 57a523cdc0a7004343cb01961d2712fcdae74d1fc019685c7fb50da907f8dc2c793098cb2b9387574a623b936a6258638aae391f986aa509ef28c87232e3e6d3 WHIRLPOOL 3184b18cb3b94f3f16de389b2ac9f05187c450797ec25e1c4132cbd582791f7fc902d26b29cb09e323532ca5f414ffd64989baf54b8e788f020b3859d84a24bb
-DIST thunderbird-38.4.0-de.xpi 429877 SHA256 d65ea03a6f4a252b7533952c0dd970e9f202e15ab6cdc70300cb2c43158d00e8 SHA512 9b1691c4e441d22dbb9f328299bc92c8989db293fd3d3bb8940eae2d96ac00c29a6e73210ebcaf02c3e5b0a116b6d8858dedf5ac146babf4e7c36a404ebd3d18 WHIRLPOOL 7b3cc44db6ce914cd1d712ba8b68b9581f38d128f6c79f6dd5b0cf0b153bf88573cd31eb24306c3247919e844a0c7de01aa8fcfc4eff521f16d3e1d55d4e1bd6
-DIST thunderbird-38.4.0-el.xpi 493490 SHA256 dbc7a3c20f5f5a8f9d8117a9de9bdea1bed8ec86761a56b607b54d8e838c95dc SHA512 eedcf3d2354963176fafb56f02c4f75320b5a39af1468b194465c213714468e3a6fda4bbdaa87baeb09d49be84a999ab1bc99c6441948a53a23c89894801d163 WHIRLPOOL b7fd81e5d1d75f729aeec4c89f4215467d7316662f90165270c99be430d9343ea2a500c9b2b664ce9034595e491f3f52e379a8ed604857aae9e081b54466080f
-DIST thunderbird-38.4.0-en-GB.xpi 416573 SHA256 2a4b9996555f2aae4d146f138d91fb6d2033d4d92f9a406ee174f30eab4e79df SHA512 912bb49b5d695e846c642694e187b42cefc60dde8d051642a209bbc1212b18aafb5ffc88cc97be47d2320f207802403de827c69007db35d10dca5735f7d42294 WHIRLPOOL 56150a4f4b1bf7cc1aced318356a24cf7b2eaaa06dad620fa8dcb716214d95261ee6a5020c2f23703324ff3a4f50e7d484c05abe64232a1a30d7d2c2fd6b7fde
-DIST thunderbird-38.4.0-es-AR.xpi 442641 SHA256 7bd6def638093ff0e680728da782b07ce2e95276fbdeadba6e372cce31bb7cc4 SHA512 9dfff0753f4925c83fc4aa5e6c152e1e049ac3bcadf54ebb2b0df1e64fae1a441aa004250dc54469e5afa8862d08e821b86684d795b01d094ca2dadbfad43701 WHIRLPOOL 30155ee2ebdfcf0525e4e15fe6f48f3c5e92ba9fa6410c12debfe68015cf8f2976552880587ce5f9cd4f19ce474fcf00220be4f50e464356cc32ea9d16b9838a
-DIST thunderbird-38.4.0-es-ES.xpi 376067 SHA256 331b344422ff462cd96674e3162682db8b02e35078533e72a0f70d00ee8b6911 SHA512 1e81314e12f885e0e7675e336c07f8b766231fe343a6b810ad507c3072cafbae20eab5edbe97ae5d2060890fcb4537dc7b10295d6e167fc5ad5795b4cc518df3 WHIRLPOOL 3a76f38d1cee17b5920ecbfe29bcd5046a7337e44f98823663a3e2a493b7d916131acc746f008e4785e80d636d5686552e8eb81344ba96e46cf9578843f41fcd
-DIST thunderbird-38.4.0-et.xpi 438262 SHA256 3c38b229f6401e7d1d654f70da5bee4f21288c2b77c33e6e49f181ecf11c6661 SHA512 b70e86582c5462acd86fcbdddf8130b9b4f712b43b715b96d4c0b43fae49a3b630e96262d2fca5f33ef193f22a9547fe7cc3793be6950c5643fea01d13697f7d WHIRLPOOL db21a08ad9e392d167ce827b8e3491f2eb2dd5e3ab62dad305d88613f01544fbd888399a07f88939e5065394977bab89f1bb692d156ecc250f97f00fdbe76291
-DIST thunderbird-38.4.0-eu.xpi 434838 SHA256 bda4a1a17667f48d3982dd9b67993a8aa46054a1e31798686f5495e808b63d08 SHA512 9a4ce453ef369b59fbd3b4603ab6bdf369ea03b311193b58e88c4f6ba863cb53456058c0d91adfef582e048d97b14c0a774544bb6e78af644ef96b40d85c0ed5 WHIRLPOOL 7583605c156973ddc0694769dc1dc2d48af8a9e8229d65620985cd3f98af3b3ac11bd58867bca637a35c8ddbe0c559d534aa5eb41fa45976ffddf8120c19a759
-DIST thunderbird-38.4.0-fi.xpi 438890 SHA256 641a0ddd879d8964469caa3aaf590c26f147830c02245086c6b50f4a2097a201 SHA512 31a972f936e21efd5af8558087771915d228ef8a70a91c79a22b9ffafb32ccfa7d44773ae319a73f5b3e20e6781f1e2684cfffafcb24576f1e52c0c62d80ad7d WHIRLPOOL cdcba779aaf5cdb57aca171d25fe046f58109c0f419eec75ef29079882152d6fb0e16119ed5077829f36688deb31a9b1b35e6c4641563caf833ed5835566d8c0
-DIST thunderbird-38.4.0-fr.xpi 448228 SHA256 80dfd39499fc518b1682d4e02bdec7f31d2543a9da8a6588fa29e08ff1defec7 SHA512 50b2d260238da64febe40553cde12810de957a2c296b1a78389227c32917d9d8df199dfebd7d1daebe446839d0ae9571e5f4255fe77f9557a9f77fdfdee94145 WHIRLPOOL f23fce6b8f6233094cb1ce9b0da41ec5c8da878a3970fb2447e59cdbddc62be23b2b2a1679dc09a0d6a430d5be3a1858874b1192c26e3b3936bbcd09a534f56e
-DIST thunderbird-38.4.0-fy-NL.xpi 442162 SHA256 b08acf69e3811748d16633f57a2796135edcbc172baad4b760657afa2cc4f969 SHA512 bf200bf093cdc597865487154e822dfab0a7fe678a4416dd515a20c1b23921f43b75f5b2a2b6307dc14616a474168f311218240f0d8c09e0c563559ee9c913c7 WHIRLPOOL 6ffd2125c1d6e285b321587f71ce8beed88dbfd8ca149701c6b9871ce4a4e8939a4ccfe2a9d3289267a772adb670579fe07e4c9d8551aa6c45db7f993094ac02
-DIST thunderbird-38.4.0-ga-IE.xpi 457412 SHA256 1b22df1635e8284dfe8b0211b962f4e6dc1b6821c5be55bd86d3ab5fb32297af SHA512 3308097335bdabbee7ec2088ee36f750ee2bdf5325154532c59db28c6f63737605d825b34ffa73878a0f5e7438009d473db3854b7e9dcbcf7616610f43013d37 WHIRLPOOL 82759408c97215d1fdac8e5b0d4c6c63f60b41be79e1f6e57720659e89f7e9b9f21790d8b46b043416130eca8a3df892971bcdcede0a6e10ec639e2220563508
-DIST thunderbird-38.4.0-gd.xpi 456317 SHA256 d5df704f78a895e996d3c247ea9e09afe60f007963bb2f38db19ab31ea00b132 SHA512 37e6811da406578ee0fc0329f4f61ecb1b775a8d891230342de1d731275a297c088d6c2f35aed0f3ef564fff12b9e027ffecf4e3fe1a30b024813b3676300bdf WHIRLPOOL f726569304ab5201a1fb9a716050caed34b13e30fe3099a6fa008c5cbf008d664d75dbda2fc3ccca484a4ad8000b1fe2dcb44abccc8ff4caf3617d97a4175dd7
-DIST thunderbird-38.4.0-gl.xpi 457839 SHA256 77553c630648c6c497a2ae839c981aca14d09cca5d788bc1598ea8af31f45772 SHA512 2b1dda7b1df82469ede61a6b203240f9f1d787710b4a537ea75b802a42e6f595b1eae4aca0364a6a528e541d0f29b87f9c7a07b6c336458a4f7bc7cdbaf44a9b WHIRLPOOL 58e6b2ad3c0d47eb51c114e9bd5f320b812b3f425e734a44a7236472416b8c31e59b8928fd1a6568e35d6c140eb4beb055144939114c70fa40d0cb834621663d
-DIST thunderbird-38.4.0-he.xpi 485867 SHA256 e3b410c7c3a72d7a00a941d707c4c3b0c60d42bc30866a6c93665a18998e0e1c SHA512 584262cf819c81ee04c85fbcfdf8a8580709d4f6014cd1b42026478537c9a500eb2279d3b0542d9ff61b293dcc355e74ecd6a650c47b27a3f7e35a153ba3503a WHIRLPOOL 0a7ddf428e70dc3e369e5ffcca56cf24683c8ffd17214a2e4f43951b3e4e75eec26f4bb057742e93078ab729afac6b86b6bf9e04f80f64a600b4a8b9b6034f33
-DIST thunderbird-38.4.0-hr.xpi 440420 SHA256 d91376b2fcc6940ee0d0681d3926356ea2b7dff8d1083ea34c8584a305276644 SHA512 e6a61f70a9ae90e07dcfc2ab4ac378deb6ec2fa3a9febd03435edebf1a92712f52dab0a01158707b2f3c23ba8e88cb7a5e34ef05da3a017f3f50b0c413affc26 WHIRLPOOL e7719a78998c31ecf42fbcb72ec7aca2f80443a7ce931528955daaed52dd8b8dd8068f3421c4d90e57a35c54a41c8565466049b98a5b51d6a38221b319da303a
-DIST thunderbird-38.4.0-hsb.xpi 456451 SHA256 c258583b8d4830ea20bcaaa0f6b3f1d3fabd9b3fa4aa5725f3640f48240cd282 SHA512 c55fde478762fba6cacf0dbe1556cdc76692a047c24ba4485ccd314ac5371d17d793c63e6a86aa6491a6055204fe95d4268591982c4b8285eaa69cb80b31185d WHIRLPOOL e37efc74b55e2515f85bbba5595ef93ce224061a0ca9c745fe9c675bd73827ea7768b67667140c52a27fa902bc83684492467d93d183569d53affb8cb6a7fee7
-DIST thunderbird-38.4.0-hu.xpi 457988 SHA256 b73805280c9464e8d41e74ebbf6a2b2fbc58fb221fd17885e1b6fd2cd225d343 SHA512 029dccc8b32113d6181db53d2aacc0eaaa30cc0e448043f3fe20496d36728207096d4042ecbc23bef8d6b54f26d8abde01784ba7e64e462e2952e136f52e6569 WHIRLPOOL 6786876357bb702c7fbb24efcbf07af1f118f212c455f2c3ced68d4caf117b0a053834525051ed00318daf0af343da038d0676dcae552168dccc4e0828970e4e
-DIST thunderbird-38.4.0-hy-AM.xpi 500356 SHA256 3c8f349176d421e090a16034d4208375fd36f2ca0db664b9138f344f6eaaafb7 SHA512 3eec1efb2301c360ad8babd74fe614555d64ad9fa888c009190eaa5c7b1c58767646d586cc88936a72ce72711e92543fb25962eebebf60082c58df70adcc102c WHIRLPOOL 3930920078ad1ebd07a5bdf6e4c32354938e1b08dc145fe7441379537b52fb53884ef8190e8463f12b1b9082637ae96e0afabb93c0719ee2828824293b7b3457
-DIST thunderbird-38.4.0-id.xpi 483187 SHA256 294595cd419da412e8a907d9ec0b5934acbd8163cbfebf29d3472b5a6ca8fbee SHA512 4a59b0fa369d9065afcb27a204e12ad57eaa45ccd027650410f8f4d09ef264146484b5e5570283bca9ab52537cd3824a15d075e670157bab985b0d59bff4808c WHIRLPOOL 68b47760923272e5388d03a4269b07dab5738e2c41f0dd212cff07c54a957858753295703c1cc723040e537bc5ab797dead918f8102214e9e865bd9544e44b10
-DIST thunderbird-38.4.0-is.xpi 443008 SHA256 1c838ac49cf9c8cf64b1233abd685e996c284babee9a64964b4b90c6e2285105 SHA512 49d2c4b729ebb31cbf5212152b9c7c054c88ec6b653ebe080c6c14e78d14d36897c27f45c056bf7d95e0b44de5a213ef3be453d125dfca1b7fd68d255269e017 WHIRLPOOL aa75b703085bdde57f260aeddd3241ede24a67bb0331da2ab25057804308e0fa132b2267d212222f66c52390e7fb0c5ebf5cac3a8e21fffd9e2bca30c84c16e4
-DIST thunderbird-38.4.0-it.xpi 369024 SHA256 0c572cadf9b5a16696b78f2d1683b627db0a5702698f7477d367ee2690aeee69 SHA512 ca6aa1c90da6d88a7a92ae315dff8738d4df709097fad97b67596a2d25dcf1d5b66362f60dafae336ed55b759e43e24e4ff169b0dd1eaccfd9700e62fdfc8228 WHIRLPOOL 5e845de614c4307692243f9bba8c9b7dbabc22d9d5e4583859818ea96ca3eb4733b8a67391338b9deb5b137b4b5f74a1764c9aab377ee502d6ada32cab73ceba
-DIST thunderbird-38.4.0-ja.xpi 492861 SHA256 901b396f920d4dc88367b2828c945de1ecc4e0b1ed2f33d793e65a07dad8f054 SHA512 fcbe62fa6f0e57cec9f99217da62e6d1cfce316db0d6dc2be72f69506f99cd3109350c8101d39ef9275f308f54402b7a419906a66f901df610c740585588dca9 WHIRLPOOL 7743702f5f516ab8fa24a22b572795c023cc9ff3c231472ada116234b029536a268fda0eda9b297aded832839208f24ac0bd72b670d56921ba07012dcc7af804
-DIST thunderbird-38.4.0-ko.xpi 454852 SHA256 6f2f92f94c228c9da48a7c36c8b14868a029d9a2c3f54d5352740722aafc0da9 SHA512 5b0b17ffe5f9aaf6fc23c62e04a992c52d9b7a43e73d486be5fbdbcce1f79379e76d844102d34ec82a9a9a91d8815698e6f9593cc96b98e1e7e20d9f341d8eaa WHIRLPOOL 82dc0892f64a98eac168edbef8bda806c1588dd276cf5bd44c7c2afc025ea3f28a762e5febe649d673001750ca5d7f13771464bacd5a6e133187b2c268ef32d5
-DIST thunderbird-38.4.0-lt.xpi 454572 SHA256 c6fc41ca583092e314f19c3814cabbd275072b104a860f7644af00c5e9029c7a SHA512 6593f8d25112633bc1fe7ca3ee2c31eb33d980c337c5aeab0a7134ca1e44f40952c3216c358cec5df94a4e92dcd73c62beaa834351ba138ec5a2b5e432180a16 WHIRLPOOL 94b289adeca710abb34ae30263dcf117224cde6e9229b1147018bd498a70efee67bc7978f72fb8b60802dded6c2ba061ce9c57b9a924925e4f9724494a12115c
-DIST thunderbird-38.4.0-nb-NO.xpi 434341 SHA256 0c5614dd8c5ee6ef20dc5b57eadf496abc66361c9b0128bb172a314939557c56 SHA512 8d32b0214c814eb308b9d6796835bd80f17e07970115f47079cfead12a10213928e7108506a2bd0a4741a2d7b1a1fec50f1f738e6e94afcab670da3c2232ec73 WHIRLPOOL 07ab9c4a1c119d05d505099b783379093d7ff4c2d5969c31702ae577a6e0a1ac5592fe96217aa67e0e51114149df587031e1b42ca7ef270c844ebffba0cde929
-DIST thunderbird-38.4.0-nl.xpi 435108 SHA256 f0441f68a754a411b447f7b6423dd608de5716a64a5d486bb5275ddd0632c456 SHA512 22395d04e7da2ab71d4b696ff4d12646341e4ed9557154e5b684ea95ebb2d5c3040d44d7887587a6cea01d1d399c6a9993bb01ecb60a797d749462a0885c0927 WHIRLPOOL 2e6730d63f2b4d29512215cbb3e27ad5c4de77b0c959ad8d9de9251e9cffa15e9cb0a9a62449e922270265b5c03e40b88b048d0b4e2ec30629f942ddc1c9a77f
-DIST thunderbird-38.4.0-nn-NO.xpi 436623 SHA256 036789fff634d37159f7ba35d43e93f65d8299934c55aa4b76a217b3dabd0186 SHA512 0f10b6837f1a5988630803f4cdf0a602ed7a791d6e3d3e772f1244dcd1d5e9ca406fe3a20f1da044dd71108cf0068cd9abfe5b74c91dc89b7deb61f07434e690 WHIRLPOOL 20b62c10e8462dd5e116cf917f38e0fef922b6b48e57338d2c20f5a07fee7e576686ae6cde350689d8d4ac78b009e8869ae0498e96f4c68919baa99587f66e14
-DIST thunderbird-38.4.0-pa-IN.xpi 530461 SHA256 29acab11415d7ac3229cfcc17538f1f93c9dfbdfdfc32fe8dde9a621dac70111 SHA512 8516212b5b13878e742182f76c293e1f7fa9b6fde4a0c8fa172ef4bbd2120466a494b61bcc9a7ef468ae497b6eae35959a1ee092b2c3fc268d52412dc5d1a654 WHIRLPOOL 0b5f5274857e42fabbac83b8cdf8e85e8d22d9b7585e3be5754225785fbaa830447276b481f73364c26c6b8b20b3f5da2cedaff63bbf2e78a731d3958565f8ef
-DIST thunderbird-38.4.0-pl.xpi 411509 SHA256 63aa21e0cc3c3171b19a1196deeeb9a9179b2261dcc9517f491d911be69ef355 SHA512 d3996e11fb58feae739d73f4d0bb30145e1cc9869adb2a79959e5fc2e73409fe15542e67da240a3a71de8739f82e470bb033287266faa9b8b2eaeb64101c5aea WHIRLPOOL 4e3a08f2014a69b3e749e984f1253dcc08a2c6c37235e3b3120c7e60e881bd7465c80ce8c1b6a41901b92b37460458e5d782740b648aec4aa40241cb0da22f9a
-DIST thunderbird-38.4.0-pt-BR.xpi 443752 SHA256 97d632fcb86a8cd3d5d62a57bc6d0a4d06ecf37439e47397ea4f9016b056cd7f SHA512 32444b97284a8892e13be003e03664a32727d48fd3a2729d961ed87bfb462024d7a9240bb5213134557e4441fe639896b26117c7b404b212f6e4956ae7bcd7c1 WHIRLPOOL cbf599db89a87c307693e8e544ff443291b19c10130812f964d9985701d6263a314579e8281abf8c82ae0f1b1d7453701fec76280b059c01a627320504390f57
-DIST thunderbird-38.4.0-pt-PT.xpi 442064 SHA256 525147d8c2380a33fb32af4026972b0e814203c8f23c01104db371479c390d93 SHA512 f54db82c6503ae0ce28bcfecca470a8d1e9b35262391b6c4b44ac964f04d59be74f2efc220bf761ca34e9f583ef0e9040dd72469826ca29afb2f982d8f9a68a1 WHIRLPOOL 5ccbf44b1b27438cd40948a0af20f690b946c939334569c3572283c8dc966672db24c5584c6d5e17ba80813ff3baacc293efeaf7c8d45bb038e7c1987cef7c98
-DIST thunderbird-38.4.0-rm.xpi 442113 SHA256 24659e293dbecd52684bdb434bd4f3f21333459c67d311499451ad9787d97b9a SHA512 1c2102ea3dd3ca51c173aa1cf4782d513d59d46a5cffe4cf92acf1081c418eb1af352ad54392f2cf20b00e9c713498bd7cc0c2d3b9ce310cd79dc0c9fa691f63 WHIRLPOOL 4dee4f70aed28781ee129b6f80eb5112f84c82a0373f61cb182cdfb737e711f33c84903ee7662f3eb74ec0e3b2136f84e84d6ff025ebbaadef5da66bd397611a
-DIST thunderbird-38.4.0-ro.xpi 448349 SHA256 ca87bfc055d76231dca985b0a270633d5b4c092d09ad63a23ed7b87ab98f76ef SHA512 f2dfd030de65d17af79542490d267a0b04de370afec6632bd5a970206189b149f6cb0a5c014d6a634b81e8b48bac1620ab1a663ef919f719fbfbadb170c49904 WHIRLPOOL d4a554c4d724037b44b8f5bb4da81bf5b9844d47d582331abc5831d7e309305188c77a2f3f51d6d718945d181885ba864284bdc0287aec20aae0ca1984cee012
-DIST thunderbird-38.4.0-ru.xpi 437591 SHA256 ca82a950a4cab1c303b531c47017e8e753381a1ca35e229011e624b3659615b4 SHA512 036c0a611d2462fea41b46fb0adf78e2f744f4989333245a83b321057adaa86f8c1875d8dca78637a7581ce20091e7b9d319ae00ac0a06bbcc81c665b16130ed WHIRLPOOL c3df70a35bacd5a766f1c172a9a0dec3274d2932cc576f26b2ae8d24631ff561ae89a71571fcc2de1bd176c5691a5b425570eb0e78f4473b2bbbfd5137254962
-DIST thunderbird-38.4.0-si.xpi 535341 SHA256 9da32d2866ace3b5edb129a8a43f0b91e492fbf62c390671f8b88b87e245a618 SHA512 16f78741ff379ca3ad77936b5a788bbaff0b037da68854cdcf679587b491df6f0b672c0f4889104923531997602b380e9f502bcfdeebbf9679f88bd0c19bdbae WHIRLPOOL 49ae4995ff99241790dca7f9db5c970186231f5d0a1cb2c864f2e344cb52668e876f89ccdfbf4a07ce7813429a6b0181c2794890913cda24925ae73d10c4863d
-DIST thunderbird-38.4.0-sk.xpi 456606 SHA256 e9ab86a2c6d3dd032929f198a82b14ba7823ab973b85ed2dab146057aef99629 SHA512 19d61b2f20e546e15abbec4c376ba23469eab0de3f3cf50d1dfbf4b7c0c5ff3da8e25d4c89397c1503b1fa07279476bdfd2492fe4bacde66cb2d34bac05a1053 WHIRLPOOL 53eb81dc162d1bc7d3e8a5984de5da6b57bf903a4cf5591db06f07a514ba0d4717d9f93fa7680a498c1150059f56c409e09ecad56ff42dbd67e35e06b158dad5
-DIST thunderbird-38.4.0-sl.xpi 437848 SHA256 822208506a476e4df2629566861afec9fc739b49616aef1217f080cc2da195df SHA512 b8d06eababd83d2517a124b9dc5909731922a71479d7cd4e0757905d4c1609b35ea483293bc0f7895017c18a5183c3a4e4e832872ee6737df64e11d3116b2577 WHIRLPOOL 534399419ca069b26a8a2c75ff8d709af2c769159b08681427e9ff319d95a5da0e547ad9956413645442059e28e2b33328f0dc30a553e2f9f9188a6935f924b6
-DIST thunderbird-38.4.0-sq.xpi 446897 SHA256 2c20c2c288b8ab06b268ea1a055f61a2c7287cc7eaa342271a4511c6dd6a4052 SHA512 035f52e1d1bd6f8a8a881a62b549ac449992d534e62e3543061c0f192bd43d03e2f469dd7f5ffdb762566b22d3affb3a01eea2823ecbc962245eae199ebddcb0 WHIRLPOOL 88b945ef0b9e6c1f12d33576093831e0538784306a3c9e711e3e7104c028bb5592111985a18a19ca2941d951f62acecec5e3d6c68dcbc7280eb40c26470dbb38
-DIST thunderbird-38.4.0-sr.xpi 543314 SHA256 16f914f1cc1015ea798d3486b08aaa8c8b7de19a0bbee85631f2d910895758f7 SHA512 1c584a7bbae501cc5831aaf00673628fd7db55047b2fa823847943fe5150fbd351d6f687d5343415a29fb7a3d2069f968b965e07078cbd27ae5ad964adaf4891 WHIRLPOOL 3fcf8972d00af06af4390355e802797f5ab323f3d7a5a0cb21fd6d9a97c4cd75300d1e70e2d569e761cc149bc4a8df6bc98661ccea8b5f87b72a2ddda73b3cab
-DIST thunderbird-38.4.0-sv-SE.xpi 439634 SHA256 5d5f37c0104a08e0101e93b28a2ad5a3df8910e3c47cce4b25f4d61d1ef699f3 SHA512 5c2a95e64e314543059e4658418001a9d90386faf77cd2c6370c9cfdc75fab24e07cedb7db2642a9509dd923cda0bf3d1ff892eac89cef78c196a6b64a1230a5 WHIRLPOOL ea3183cbac87ffd5b5ddb38d92ab347c872a33b9ff2d084fa53317a7e452ba143744e728962a784aadb767381c9a2d1b6fa4c67513694d707cac8e90f0e13a6c
-DIST thunderbird-38.4.0-ta-LK.xpi 558738 SHA256 171851b7e75b8e7bf227bc15079b8608a9e63682d26057104452a3a697772cc5 SHA512 41ed8b5175bbf0c6eba31b1dc72e189d0b90be272eded054a3389f07573bc2d17e586dba76694e5b84caf5da09bd77aa3ea1fbb23cfebfeee48e6e4ae8b3d408 WHIRLPOOL 304c4df07e41093adb995e5eddb05f485289f31d7a6ab2f1f7f05c171883eab215a249eb0dcf3378cbc732c064c6720abe8978e4cd373af03be2a709f8364d60
-DIST thunderbird-38.4.0-tr.xpi 447800 SHA256 6d40b110a752fea21018d18430fdc95d7217e77f9a0cc912c14c882218c5e1bc SHA512 f67a71fa57c055858e4ddffd2feb9e49c42c2d01b74ba6d5cb40ca31e9405cf9120af6d9688648c544ce5946845b90de60e65cbe9f212e4e44f9b7321726ce9b WHIRLPOOL e2a0e3a3c4b0495937a20d4c25b5e74371bf570d258bc9b4cd4ff8a21c5a9e21ead8f5d362baad2120533a6ffed42f517f7155a2186821409b88f6f23a38bdba
-DIST thunderbird-38.4.0-uk.xpi 509601 SHA256 9cdc9926384d425473fc5c62d2bb35c20b248326cf98b73b2c98f7144f2a2061 SHA512 9299b9928fb832bdec005e0f1f71034b9ab2ca1eb9a9e015296c6b0bf5977a062117a366707a1c78caf6bd17e92564f07576de122bdf9573e53152b14035fb23 WHIRLPOOL d62831c8822206ddf78b0fd98da71c8027364143779f59ac13e8f3853cbf1c6a74b4f677fe2d0977126c80bd9d57e0eb16f3eda5e039b0f79fe2df58c59de6eb
-DIST thunderbird-38.4.0-vi.xpi 519843 SHA256 4b385a97569a40331a5434762af52c4561f045892f0c51e852aae3af748df87a SHA512 33f309a36fc356ecd278cea3c5d8c6d2e4eeb2a4fcdb11dcc51880e247594612136c88511a56e5f4e7aaffb379efa7f4317f5dcf2efca3334e2568aa12ca5732 WHIRLPOOL 3511f0bf3161ef9df2a73af2a0f5a1cb3343f25a350b989d54d683fcf22c622be52fe7c4525785975566349663f53deaf0ad05eb515a23d15f8b7b0668004d73
-DIST thunderbird-38.4.0-zh-CN.xpi 466412 SHA256 a30ec5320021565cc1602623a4e83017dc31e3dcb1ac83afaf68089ab2c2d321 SHA512 e511fe8c9675552390248af5e1e79a21494d39b0236aee47a0636e2e42a45deec72116b77fc3078309c683d878e6c4014c6733f16d27fe127ae6ae40afbe85a3 WHIRLPOOL c8a52237da630113b790db21d62a71d9d2e5d777ba14da462963342c26eaa70b32f919f9353a2f1d94a6ef61b066cfada78d6b881f231f0bf60251cc521d7808
-DIST thunderbird-38.4.0-zh-TW.xpi 466661 SHA256 4e8687e4862fbf46e0e3b45f3c691fcef649d468f8a14163a4945e9909e06d30 SHA512 2876141af71156201300e4e5601ebb01cc18e1e491aa09eaa8aacc20db2383f857786a83b86cac1bddac985aec4d6f477d9ab0188f15d1050a0eaba64bebbc6a WHIRLPOOL 3d703bb8fe15288cec785282df93361c009c743de35c8342a91ff396843521c0a5684d144fc5747ef4b4d26238fa6c793b077519016fa9393b36d6517675aff0
 DIST thunderbird-38.5.0-ar.xpi 475296 SHA256 871c5198f1a5a2b5fef7f817d583bd91300bfd32522b7a1801b7e32b478a4bb9 SHA512 e164b85d3745b3c3fbd2123575125fc60a19bd4aa55d1e41124d9c8739f423439e602d9ee1af75d5954a9934ffc7a409c13845604e68bd10a731617e58923cfc WHIRLPOOL 9ae7a17bd920e9525d08df1d7984f3770eb20445371a97f5e722e30dddc30dd0f350754ba8ade6eea3e217c4fa6a53324b88a9c68b2a79ac45933ffc22f13616
 DIST thunderbird-38.5.0-ast.xpi 405872 SHA256 b8a3c66806cb11447fffe54830a78f96fcf828722708365558bb74e173a43ad4 SHA512 9a45663736d066c8a8477bd1731c6c585c55c1acbaca1c63e508d4f135cae5eab8bdf9d8941ad108907b7ff8def0c72a745aa4c7fa30645ab7bc7e7881abfd68 WHIRLPOOL e004d3203a34f32288c742b44131d7fa6ce9713112d8a2088dd19b038992b6152288e4d866eef1e2c1ba5f5ee45b578153539b0b4f7ecbfc2d8d4edc6567b37f
 DIST thunderbird-38.5.0-be.xpi 442452 SHA256 ea1db89d0f5b511cd9ac513b97bee00cb42decd2b87e071b5da46a3aa2be81e6 SHA512 b01e55dba74139b4024d3fc5d67d27ad11df3f36ae64240fbd7ff171d54547cf59cbfc47102f3b2fdd807b81fc5e1e2333e7141076259560437abf7a4dd562ea WHIRLPOOL b86caebddb64f77b8122b44cec696dfeaa52b55e6788fa55ad0cfa7b714d727bdbc771c49e9a88ca2675385fda978e0d0a3583eeee451bee121c69a8ad3997ba
@@ -163,9 +107,65 @@ DIST thunderbird-38.5.0-uk.xpi 509600 SHA256 9868e0118257e6e7f3019954956fbb521e8
 DIST thunderbird-38.5.0-vi.xpi 519843 SHA256 43d25bbbf7d16c0d789ae2f98c16835b2accd51e3f0c97b564ecbf50b41260fd SHA512 687105a1cff243ece7f924ee92f3631cc4297209ef2f75b81965ea79bb166226daf40401c3e631351c4ad05c1c59d9cc2a36278fd01b5335b51dcdf5cff46820 WHIRLPOOL 36768ff5045c3814d0753913108827c5876b272ffd69e533c7b8029329d1852fe27a9057ce3042fb869fb3bef8523e041d4a3ba2455101fa5a3405672f3a872d
 DIST thunderbird-38.5.0-zh-CN.xpi 466412 SHA256 5a655ebd5fbba862542973834b4d6cc2f8a13c065f734bbc490f8d838d71dc6e SHA512 876e597c511721d3d83c74d1ad6cda7f73268ec7d5a91de312a11927986b9384886f42a2ac6ce0fb68fb0d9d7ce8aca081f5a90b116d5b9286ee3cbeaeac1a51 WHIRLPOOL 2d154a00f88ae784f4e51988d384f31bb18b2743f25ff78abb35f16f70ec6034598282467e43f105b41acd42fa11f2266c86645340fb9c537095cb4467ffb76e
 DIST thunderbird-38.5.0-zh-TW.xpi 466661 SHA256 87019d3d21edc402110fe3c18091f855e1946643b4e51392abecdd25ad775ffc SHA512 957bce9dd781e8b8aa17778e12c3335d0a3823bbf9f54a9ed4837ab724e27cc03feb6b7e1d2d85069a9ed2d480c9939c9f68bd3797d45f02c6d65bfabdd2f0ab WHIRLPOOL 4d79a8c4aa496c81af1751bb2830ed9e31886677a3b3aef58154cda37af7827ae355eb0a0de88a80ae765b071eb673e02c33851a65e21d41c8d9d5b25836e71a
+DIST thunderbird-38.6.0-ar.xpi 475296 SHA256 28930a981335d7926c826870f803f49049ffd3274519b338c1ec5a0dec5764c9 SHA512 c255b3473efb9f9e74cebac2c9adadd502a6f73153ca352313ff1c823c9c128c441600e112066406b54d08d5a908360c7cd4cd5f4ac971e68ba32d34f038494c WHIRLPOOL d198dfc62008259a65e1ebc72df93bc833d20a96bd4c6210ed3042786c5e1907ad730c22ee2306403d47be0234b03e34fa95849144d224c80b9a43039f331aca
+DIST thunderbird-38.6.0-ast.xpi 405872 SHA256 a53b1c56fd6b5f7226e74da4ce9046272c6dd831d06d3188285b18ac80875332 SHA512 2376da09fdb248ced96aa1da304342a7e20e74bd920df9b29493a35e78f5d5bd4aebd756912e739e26b1648e6fdb13de5f9026de4e651fa5c8b52181e3916651 WHIRLPOOL accf9aac9ae24705c3c3cb27e5af3a789aa687ccd56d2d42c7a13b0a48a96b13a5524e19f9d5c3a27ae9bcec9eb2962c90cb2526f2738669187f0a44d8d87bde
+DIST thunderbird-38.6.0-be.xpi 442452 SHA256 b3c78b9102efe155750a31ccfd3f964f410c9d00e6ca4fd02f886314805ae602 SHA512 de7aa166df63d6885bd9c37a97f3397f2eb92a08d582a9e4bc8f3c5edc524eab3c7c04db3b44427dd849f245269f7540bf4e0fa63f587bb3d61e2f427b75fb33 WHIRLPOOL b50b3acee2981f5766d4bfc3d73d822b50baa92a96b4cd453d642e4cbef9ae92bc81d5042a739a827545cf2e3091bde90c9c995dc919867c5beb0ab1ca7d3446
+DIST thunderbird-38.6.0-bg.xpi 506124 SHA256 65b6ed62f315738ef7ca10fd0e43cc0c4b0a433bddfaf6114fbe2499441affee SHA512 228d3e7c5553653a51f478698e1a28cc83ca6d2e3b307906a27ced788f2cefc6f68d6acbc43e82c6713485ac86238d4cd97f6be515b1013ac6f69006a0cb958b WHIRLPOOL 4310b40b357590d51ccf08a34d59ca699dedbb73ee77e5af37e2b1d420308568cd57aa94e725b86783a7f858482bd7d1347cfd8a6e348f32ac4856f81838a8a7
+DIST thunderbird-38.6.0-bn-BD.xpi 560627 SHA256 59e5b334ff1b58f6934fceb1573d12315ea258b4252c41c43f28da154251bede SHA512 2668dcc956009a8055fec2f050647c8d91687ff0f884a39136a9b0a12e72a9321a01823e916a1f5ef669a5897a38df240162f70fbda198eb25ab64cce8fff703 WHIRLPOOL 4318eb4cbf96192e53a19c44b469732d8d7c8162c52faf5859bb64665d78e8f145c448eb056b2bc629f6af698214356e2d5af0f5d71deca945ef7ab6704f3121
+DIST thunderbird-38.6.0-br.xpi 449767 SHA256 28bcd1093a2e2a2cab7cf6ca281bc14eb5051e34b8545f6f7bca11924a1c59f8 SHA512 d5965d74c3f867bff8c44727dafa664e1096695be1a5c95cc9448c9fd3735b2354c7697022d1cbdf0f274580d51fdb9a3854c9b2d9cf26b697507928e5a20ad8 WHIRLPOOL 57b03323f63bb7a30c443039f2eae1d34b157d77e918855bea3dc4dbd5288d11995ce4bcc3907fc7bdcac02765e867828117b2d950411c22a248263c4d71d5c8
+DIST thunderbird-38.6.0-ca.xpi 450325 SHA256 e5898fb1554dc18c083b2762100830806d4b22153fdf5d8f2583ee2c24b8b605 SHA512 65a95368e7d03095e34afb3fa982cc65c743868c5d9479e4bc70062d25f488dc51abf599869293a110bc96432a5ba908abdc2fb7fafeccdd40a5d3cd1a24ef16 WHIRLPOOL 48e1349865159175a42265153991b6f6d9eea9912c34983da6e10a5a5d236ae85b20eb0fcb659618f9983a2e366dbbf845b8865511cb65360349daaa4ba82b58
+DIST thunderbird-38.6.0-cs.xpi 448724 SHA256 8784f46765f33557fe14e89ef3142baa7280d490ed97ff7f29dfbe83695b87c8 SHA512 49a517e56f53a2ab629c21c5cd7cea5d2c98ebfd2fb63f49464bee4448cda1734a493bf53ee9895c443f013d00e2bdc65a930a6e09bc41b5b9289378bf329583 WHIRLPOOL c35ad8c6c5e7cf57340b02d6355fe9a6a183b5360030c4a510130135caafce9905e841ceae72f7f4aeb983e51e2b0a1c2ce8eada6d46fa0f0531fa199649ba71
+DIST thunderbird-38.6.0-cy.xpi 434848 SHA256 5b4b75487e3c478d072876877bac3737020a709116c24a0b55fe821af009582c SHA512 ff6e2829949e309b97250e891752d7755b851f152323e156cfd90f97db1b27cfb443ac2f54723e31de8bf0ff8c5778add96b4f013fa2b1d6b3281caf0d99296a WHIRLPOOL 5a4f147d6feed0262ef1e8fa035e834e3d842d20e4b551ca15ca930cc4e6fd49bb94cc4dec7e1f182bfb875dfde3548b14043eca20584e99f57e4d6964ead544
+DIST thunderbird-38.6.0-da.xpi 425829 SHA256 397deeceba72409863eda97d8b6b1b5d2f64b817c15057934ba99717de467a16 SHA512 86226f35330d0ba7d928fa8dcef3b2bd3a5147ba4ea510ea715af2561e9491e75b6aa8edb0e16a0faa1b72e22f31e32bd4979648c2bf4538dfa366cc6f70e1a2 WHIRLPOOL f06b888c1d42d36cb9ac511aedac6b1032a3bbe8daedc0aee27c31506adbc51f818349a09a046a1ac476d60033aedb3427a217a3b9093520fa7a969849f2d3c1
+DIST thunderbird-38.6.0-de.xpi 429877 SHA256 c39e277532044f724acfb50a23720fc8530785bcb4820906dac9401141b28342 SHA512 7e8aabc807d106f66b16dbb74a12330106e96c4c3e886b59396d280e975be58dde6f051fa3d42bbad705547af28b32032982bbd59060b1b71f77de593fc8f5f3 WHIRLPOOL 9790edc81a66ad35c8ae954d0b43990ae717082836aa29ebcb2fb9e9e54a44e7a937ccbfaad96ab1775b6f784f4b20d87832e2d61ccde7bd93e2c9d37655c69b
+DIST thunderbird-38.6.0-el.xpi 493490 SHA256 bc6b2ee8ee0d4fbed42ce203a8fc61c6e6dcbb8d6792e9432971b58c7aacb0e9 SHA512 220afdf26a63f32bb38535816c665200710e126ec6620c82b9397631e6216dd384ddf65ee0f34762eb61329892443a956dae3b8e54dad37d22e6ccbfba95f3d1 WHIRLPOOL b687f0a8fedb25f4ae1ef1e8b3e77d94d047ed63f457f6086d1df873f6c800d01909c67f9da0b2b3e0b65ba267b48b012ee30235720a9c5082bbd22c77ed3a40
+DIST thunderbird-38.6.0-en-GB.xpi 416572 SHA256 e6059b1e71f5ce5d2220dee78610c1fe26fefdfddd285ad11a74d13504122eb2 SHA512 681cc1e767381c85a6e503378b767d13d3f0c7b5123561569475d06f0d94727017d44a81050f656a4193e2b593263ba5bb766b2e44cb6011c57a7fce36a8ef42 WHIRLPOOL 2e8cba24872203cde157fbf632d996782b588de4bcf9aedd52afb03b5edd3c76cc6e249690a5d4a8d3afb19bc9fbebcba65917f2e2d065a395e7c9531066b5ed
+DIST thunderbird-38.6.0-es-AR.xpi 442641 SHA256 28c9037043e55b0288bee2e8c4f00589346fe0b5bd6c15c86fa491282c3f9c0c SHA512 7f382176349e9058978839f410f339653a983b0001e3726b9ea85acc2d2327e27a34adeee371bd6001019b49d3ff667de0eb63efd1995bdd7337c499f8b195af WHIRLPOOL 76f30b4f65b144b575943a3775ed9820cf50243b1c29c90671334318b2c55915373bd1a21fe60ca3454d0f5efd088d912c51eb206bd103646251c04cc0b132ea
+DIST thunderbird-38.6.0-es-ES.xpi 376067 SHA256 2ee5c0016b2a7d4917deb44eeaf6db2cb3dd62e6cf8ba80d1f56a8233b985fb5 SHA512 63c3ba7d66bb90fa4fd539f07a88bd138db7836e3bc875b6272e297742aaf7ebe045a72acf9c15a9ef86b0c2d8593b5ceecf6dd1320bc99e567dac99050be983 WHIRLPOOL 76b1f5f53b468db60fb7bc23f3e930eb686bbc5d632eeef31aaefc436ac784d26d08dd486e1829396b6dacc545ff8dcf9e095479a86050683069fbef15a99b93
+DIST thunderbird-38.6.0-et.xpi 438262 SHA256 196803cd3f5514611b5edcbea1d6a334a515e89f611d699733bccf0b9d142bff SHA512 ea426e07cb5160c205ebfaf9642d10b3b6bc9d4ff20880f272bbeb855e5a8a0a57e3ecf66d246cf92da147f41c041f3e760abde7f068c03f063ea735d9264a9f WHIRLPOOL 97ef812535d51d95d20618b65c80e514b7e96d00a1efd8200d8b8c0e9987b0c856f3b4c79c20cb59af244dedab51084785fc0197da65e024bcb8b9433fc537fc
+DIST thunderbird-38.6.0-eu.xpi 434838 SHA256 50e60cac8a7d06cf2582b00ca8ef1bd04fbe2cc1022715bff502a532cd6f3884 SHA512 e72ba8a523e6b79de7bd19d9d5cbc7dfdf4b607d595bcf1d91b787706bbfd496ef3c95c796845bf007308f15308664ce36f72806e47610f30f4b2aaabf6aed5e WHIRLPOOL 6460c96a662622eaed5613cd25649781de51bfe7b570cf30a31cb7b9f7be9686d734f05aebe413e7f097124954085939a04959f92ca669453abe2a1edcfaade2
+DIST thunderbird-38.6.0-fi.xpi 438889 SHA256 218dd0a0c55bdc8e5f598f7ba00240b948bb3f97e9d39033065b27484475bf31 SHA512 9c7a2b9046136ba04fa7419adcdcb56799f8b0ef6182600bcfe3888c66f85399454c744dba1d397facb786442bd68d33c45887989955c679bc2f7bfa5fc95bf3 WHIRLPOOL 35bcb72036adcaa825d3665330ec7cc15273e82c75f8fff977b026de210bea160f7bcefc1224a3b1f6c7ae2286419df5b7b9479932937d4e350eafbb6648f2ca
+DIST thunderbird-38.6.0-fr.xpi 448228 SHA256 7bedf795745122f284649e5e40e92b5920600e1cb548096d136343e0563d3dcc SHA512 e9c058cb81990472275daecb0dbeae99d64ac47b6bed051a76b4b9061e648392987f2b6db24fe41ddd11c1c9624787187e9d32f15b82cd00816ffa31a3a694cf WHIRLPOOL 87c96602fe0b13a4d9f6ecc4808568f1793b001619a868c1a3218244b2b8f3f59feed2067e1c2f3dfcbdc522b9c183a95632c8c98fd0516d0782902470b8b730
+DIST thunderbird-38.6.0-fy-NL.xpi 442161 SHA256 56e87bdbdbc771627461e66f30b60faa07919c59049afa6c6b63234453bd3376 SHA512 8400e1bdbc808454d6e87bddee7c2e95cb52fc213570f3477705dc70ffb58abba5ebd4bbfad452ea15695b0730c0efc6ebc7824ba616e09128579987ef27e000 WHIRLPOOL 67374fa81621a0a491bec524218f8f53c830727ef48671bea3102b5474e3a36f6f1372f3f3ecc8c9f8c1dfede847219d5c06223789d4e8faa3bf32f870f49394
+DIST thunderbird-38.6.0-ga-IE.xpi 457413 SHA256 d92d56be1ebe1283e5139bde9074941e01defbcfa07d3962afd87c3fe4f97de0 SHA512 09b3a67d533ec1924759611a61c44199e12f70a24e01545f88f53c7025c4a038ae4a6124d9311029889b2429ea86bd06bd27030d4ccb06e16f6fc1f614990fc7 WHIRLPOOL 090f3ea66e0344730edcaeb51f1f728716674c7cb6ad3e5bd9cbbc67ac246655e6c3ad82babe2531332ad030d3104fed994da170dde4553e95136b9e264d392a
+DIST thunderbird-38.6.0-gd.xpi 456318 SHA256 0f7c5b5dd1c57f70663c7ba1c145df56dd8670c47de9e6bb1cf42dfca247d0a9 SHA512 b9da3389592d8c5a2d77039f13c949eb932a17bc9eb46c905c9c7b2d814b20396a0955bd5f9a87d620da074318dc1cef515a52c507167f8dde0e7516bb44c436 WHIRLPOOL 4eb556e764ef3b6729af5584d32f9165fee50bdc92524e6181eb17315f2efaf96291483f092cf12edb6f89fa9daa3f03fbc8a623192dda288d2962179154ee09
+DIST thunderbird-38.6.0-gl.xpi 457839 SHA256 70e19f7549d5cbcf9a854322e00cc505fb691c3f9b88df6f0df45d97657c4e09 SHA512 f385631faeac06b14bf14fe1e1bb5574d057416db8e6e09516a950aff3e07be4d54d2cd6004490c714a152ad5b9d7b1187662a5a9558d9e565b89e0ae6955a9c WHIRLPOOL 15bc3ee523c78326c85baed4da48ec948b236702aa3605acd5229705257ffde594f2dbbd5650f0399441ec42cac1fd0dd6492c1373b078363a4e3424c4751337
+DIST thunderbird-38.6.0-he.xpi 485868 SHA256 1eea8bb56ee3c17a6bbfde43ebc48543efeb58857445e8fa0d7e0c9464232e1e SHA512 8801b351569210f0f261a9c0e7ebaab597391d35b279f90ff6c685dd9714efcaa16530618257233a2ec4d02ed880667028d4705a878792ca3e4cec8a7062b3e5 WHIRLPOOL 6c7f6db7bde1e5290e7c8a210e0f9bde8e928bd52b79785da2b002d185ce227f386f73a41fcc6305e2e86e9904af47621c30ab08d277db53de9bfbca4b5709b9
+DIST thunderbird-38.6.0-hr.xpi 440420 SHA256 9498c4e3e4b6086bd801a4c06b4474bbc8decdbe3dd2a654eab2d5cdd8c1d161 SHA512 ea6cfd51b0820583b9e7f7655a82e76237acfb3a1ff4743731f293b9ef0b31150f407264f1e9bbfaf3426148a2610b1bcf5010f1aad72bcf506bcbb2dcb767bf WHIRLPOOL a38069f98ceb05cfeb97c86983a338f1753f79e2841df6b77408c930142f6be8a4bbdd66a760a201b36fc0beefc0542e8ca127ed59cc49ae43320d1d8f52af04
+DIST thunderbird-38.6.0-hsb.xpi 456451 SHA256 f3471c34b1e01fdfa5696ec35c10b2063fb4240cc4a453801fcc269937446081 SHA512 b1d4f840f31c88e92f20ea5eb397922a4fb94478e27d021197c30100b65dfa802f8cec434c60ef31adb3d7865e45ea67eae26c00c228509b44e973e3f88e7664 WHIRLPOOL 129b6b972f6d4a223d8483244ff20258eb72364d87142c2a7198edd154014ad3f523fda8e1b5f21e50966072a0cedd40854741b6f188ab0a0e73339636d5f9fe
+DIST thunderbird-38.6.0-hu.xpi 457988 SHA256 52d2737a6c7a4b3c88c0deb91a104a6ec167e19be9612704612f8ff947ca7495 SHA512 f99930e65742fc2fa474df28e3dcfa64c3a1fd613c0b5f8becd5567aaafe2f32a756a1683a4656b9b36224813637b8512784312645db7ad43d424bbe03d37417 WHIRLPOOL e139d5298ac138a491b74ac2484a0178ff2434f6069aaa296b4b6476c9391e162379e26a1f16e22b524ca4300e2a54d772a01c0cd956914cf0813cb62b22706a
+DIST thunderbird-38.6.0-hy-AM.xpi 500356 SHA256 12d0149b3f605312dda2e970f41a93fe7a8770dac5fe518c3c5d5d6e30f6e995 SHA512 bd04b2b71a1c6c4a4d6b66ef13103cbaecac1eae5b6faa4e756cf7383930a593a302b85b50c6ced58c32fd1f79e7df7cd65100c5918cd3f4301d88106c0ad08c WHIRLPOOL 6c4f8a89e7fd9637f2f741c82fe1e1bfd1fb92ad27c67e6ed24f95792c03c2130ab0d6993b0207bb897c2759da248232c9c82516db038bff6789f461da7a78da
+DIST thunderbird-38.6.0-id.xpi 483188 SHA256 9c65c7e1549882665e2f4ad679e112d7d7b374c2804393878d1c0ba022392419 SHA512 ddc0f7be70f6189b98b9a60911abfc248049026191efab3b2b0991c912beae116984fd60bb75775b05415dd4d10297b6a0719a89fd3fbf74bed11f8b9d51f67c WHIRLPOOL 7fab077a3c1745e2b45b5b9f602433f33e40579668dee93fa1e85327cf3a57c5eebceb1ab72577d8ccfb9cc139d486af2e05851193997b32a125f19b57419545
+DIST thunderbird-38.6.0-is.xpi 443008 SHA256 f7e73157267c1a0e174b4a4e031ab1fada1b8d709963b3387c22246f4a1644e2 SHA512 f8cdcdbad24b1a8b3ec0e07626b05efe81183de46cee429d428fb4a1d0ed0c1c5c5050670b3651146335dbc928fa9bd3fd3617f18cda70ee17658aeaaa072edc WHIRLPOOL ee7f1c04f8bf34cf74949aaeeec8c67919503e8f4bfaa04c7c536a279573236b604940d5e51a2667451c80233b248adbf758b0b2f3746f7ddf7b7edca6c56372
+DIST thunderbird-38.6.0-it.xpi 369024 SHA256 1fa2c9a54083444b5ca71f587466853f402c22138cda699bc73b09159c1cd6d5 SHA512 79b899f6581731034ae8ceaa54a754255fb265350dd6a6f37bd01b2983351b8ee73462de65884b069d9828b3d5ab201a5896140cc6bf63d1d2a0c82337922a20 WHIRLPOOL bb78df601a5b932c6ced3d0e34b648f996e3a8f66a381404210d903dadaae37f29255409587e3cef446e5f1d7135953097f4a6780b01d4078c6f1c05b03bbfc7
+DIST thunderbird-38.6.0-ja.xpi 492861 SHA256 bde3d7878e11a61dab8c0827bedd01c6222dca6c05994cb0d00b08fa6c675a7f SHA512 4178868f0bbbc4ad3e2d57610d90ed5cef374ff4debedcfa9f520445571062f3b9fe1fca8d924981c143d1c95ed32773845f5031878a97690f84fe0c213886c7 WHIRLPOOL 480640483450c6d4853f9be353282fc5196e320b0fa249e484954d1909100c74b374a2a6aeb7a8a0a4b57c0062a2cab6430b7ee888727228af7e4a841abe4a38
+DIST thunderbird-38.6.0-ko.xpi 454852 SHA256 d5309d91d3d5c626bab4215101533c7791d5aae52b847054bfa7fe890664885a SHA512 bd43686b5ea5b198d9ca712816ee056dd2a5c6e6e8f894f975711c7d1cf93fd6a2ded993deeef71a137bff9b7dab6497aaf55bd51005b17c74f0fb3cb6af00ae WHIRLPOOL 01e2ddfc6a0c377f8164596a0c25776c2aed2c410a6842fcd55e607e307797ddd8bbd69d78fd011f112fff2233ce5b7919b53649d9484cdd0a894852dff1dc9c
+DIST thunderbird-38.6.0-lt.xpi 454572 SHA256 8653ed361d98e5b2d91fc12c4e8be23b8b78b7818ad4c5f507742608dbe475c9 SHA512 8c0cbc575841bc42eb0c278b1d56ae0d8d3a9c2782802c27c9b189933e33cb04047930d9f6277e42acbb84aa2447f4f55b22e518761de43c5bc0b1b6b662640d WHIRLPOOL 0365dc2cf73a945aa2e5de7f224bb2f5831899318d57f167906795aca440713a0fc461bc33135051797f51a60c3eca07f64c8ca2916ea07d1bea4981a549ddf4
+DIST thunderbird-38.6.0-nb-NO.xpi 434341 SHA256 4c24ee81c26da045ea936d2ea6b461b103a7fd17681420ac4fde5abe4a69b929 SHA512 b0cb592f6e4bcd7412a24d4fd0bd65497637c18dc84a7ce0d482803b24fdbbd0325d57b228578df6b5e0300bd4dd830b507ef180556bc5c215c027f69bdc0329 WHIRLPOOL ee5a672d035086b037b7c7e179f436a44404c28bea0cb37aa5ecafd619d0e69887bb01246f9b0bf83d238471e43f3efa5ce2d1c2e6d105e8ad4adb98531b338b
+DIST thunderbird-38.6.0-nl.xpi 435108 SHA256 d1c3bf3eaf28d5d89e220f94a86665ba1a996bc27aaed3ffcb893b6fe0b66840 SHA512 da400eee03f859edbea152ec979780b62ec408ba5cad7b4936cc734debac575cf9d5005eeab6b6fedfd35ec262c61ba226011091377ff5976a8d03ea46ce6e2e WHIRLPOOL 34b5d8454790cfce3fd327cecbcb6e2e1ddc07be97d1fd3fa6e39e4e33b464122207cac0f71ec42ab4796427e1bd797debf09e174329dbaae41803567bcb5f1f
+DIST thunderbird-38.6.0-nn-NO.xpi 436623 SHA256 300efb229c853456bf566f9825646b780f1a1090e9eaf4eba79f85a8bf2b62a5 SHA512 34f3c8b6bd4bbe0eb717efda251c56d0d08a29dcf9e5660fde370adb4e4807897e70f1d21b537c94153543e84c9588b7e5ce6982f8e19886e72a24002a292f17 WHIRLPOOL 28e37f0edef2ac1a043e168eae6c87a7f66aefeda4e01ae79df38588c864a942eb8afcb63ebe847ec6e7735c6217dddd1757d9fe9e902c8ca19dac7437ae4f38
+DIST thunderbird-38.6.0-pa-IN.xpi 530462 SHA256 6f424ff9e4f3f28f254c4dcd548f0533cbc30b458e5f43cd95f71608c3421141 SHA512 f12e8b571d30f724d15e7e15b0c443def9a6c0c14d25c560456001847e0f58c35c67be0ddf2e5a32db2e955f06103329b89449c5cb8d14a4464b0ff6924f1a57 WHIRLPOOL ce5f7d9208561edb9e913ebaaa5d8c1d33b540f4b132354836728c26ee7c3f71503b2ab929637b0728d51a397d9ac5ceaab880e7c7e9266cc0462ff04cb6a584
+DIST thunderbird-38.6.0-pl.xpi 411509 SHA256 209907758b695762f0e47dc53613fecb7b409d976c1de5515ae3dc9319200583 SHA512 667954e7aea894073289803b90c9031f5c413b33f7e9a5a62f94aef52b02897b57cb4c1d9a43a43f9f99e6c96c8ab78d7698c7dee7c78e83ce8469e71b80f95e WHIRLPOOL a314a83dc481f1ce981eb50eeb34f4f592f43c684904cc1cd4059e921d27133b5ca3cb52b27c59d72c73bf42df92f1320b7b69801824b3d2b9c6177b5f336063
+DIST thunderbird-38.6.0-pt-BR.xpi 443752 SHA256 f8e1b89268f81c72151bd6415fb348f8e5b523cb98eb08fdc9dbf894ec0e1dcb SHA512 7e13c54930cb18bfe4820d8ebd07c43f9b4b1972cdfa86413b25a87e9472fa0120abc728965684c3bddf132d04df3d17ec45a96bf26f42ce018645ddaf64d698 WHIRLPOOL 60ef07db17e91d608c5900b7f664975aa78196fdc285483c270fa9e4456f67576960a87c820ba172ea29cfa304c4ff74694c712fd70b6934c6615997480adeb1
+DIST thunderbird-38.6.0-pt-PT.xpi 442064 SHA256 e93ec0fd53a5be55413c58273ad88eee5eb47d0827d6c6ff2926c4c9f1167bf3 SHA512 6387c75dcb963cc8b02ea56c545483b93cc127cc9b461fab3ffa92436d25dd10d11294afa452c11a731679780ee5cf89509268fd6a8c5b4068bfebf1e3f4a09a WHIRLPOOL 8b7c1dc3ed8731edfcc8b3b9efcfbc6d00ada588491fce4aac1262b3af424b7325c117218febff192b00a160777a69e8199cf968afc55fb836171febca54441a
+DIST thunderbird-38.6.0-rm.xpi 442112 SHA256 87c901e37a0c48b8a5d26a1154fc0f4300de20ce071612a89012c3131ffb951b SHA512 cd7a6171ec9962a9b956f3c9bd25578b75dbe47aad9b9217ea27859c4aa22fe6b7c2145db73a4d26392c1d43ec626764d931c7b6da7c5c5d830b474c5827631a WHIRLPOOL 4691b84bd4648397057df9d7dc635084f02248bfd66dc0c7798c9df2002cfac06eb95dfe5653d45fe30f81b65202f2067610a2b598be849dd7cda05f8e4c621c
+DIST thunderbird-38.6.0-ro.xpi 448349 SHA256 f2816b4fcec6216855a93ff98467d1e9a1d878b266f3e55d71cb5829a81fd532 SHA512 e0b3db8ee7428ccc48f0b556b9814c4645866017b14d64248e9133052f45bed9f93cc214295398caae4be4b6ba6d12e9e1da51bc9235957c63e9947b09e59a60 WHIRLPOOL 98e8d12b0ca94925d43a0efe3e400768274b4c52a2b2cbc9e2204cd9cd410833441104d45a61a33ab36b496a1b5be23d2822da7da1a1c7f72ad6080d48783a43
+DIST thunderbird-38.6.0-ru.xpi 437591 SHA256 353fdf5febd4aeaf035b3683a3e397b8c50357924b2ef91251bfe6c10e0e0fd7 SHA512 8f8918a5cc99017fd78055e5338fe0297878c66fcbe3c8c0919dddb185ecf88322b9684f8f2dbdabde8eaf6a366e4773322fe992e2c2c75b8003cfe799c0ed06 WHIRLPOOL 0cd6ecc05b7c030da811edbe8adbf797719db9e24893c2ba73e579a5ea0e87120ea7004e20537e925aca9164260b8d5d01fc124e5d91fff7136c3608d728b7a6
+DIST thunderbird-38.6.0-si.xpi 535341 SHA256 1ac4fa83e849116d143f712db4120ad6101adf1d4d4ae7cf800e84c5f2c9a7a2 SHA512 a075860f8be48023da148707003e959ebf09d6b6f00d87d5669e33119091d2361199497e083dee39311f16f8cf6c223712f6289eceefe3e59865909dda6ecca2 WHIRLPOOL 3558583555fd130d3f58ec5607c021539e20fa3775a5732b85e99ff71c6279cc8482af6e3cad3f5e3f2a5719fe7aa77bc6afd28ed2ba0ef0f3db048e9ab1a713
+DIST thunderbird-38.6.0-sk.xpi 456606 SHA256 6c820a6aebe98c180da5c7b0f4f54f556168b63a42f68d225a0749bb07de2331 SHA512 1de0672350eb1a9e071e98801210b395cee23bb835037305d809937d0b476b0661a58db7adec88762240de3abd01ef2446c82088dc53d7ed04ed13bddc19d7b9 WHIRLPOOL fbde377a2ccca6b4b4f840d8464a17dada857d90f648dba4bbdedadb3db7bbebdd419ada05552d235b0172210ae1b6e36ff275410b1073eff90727763a0ae647
+DIST thunderbird-38.6.0-sl.xpi 437848 SHA256 b88549dd84041a03065bf2611a22786d2381e50bca8cf02c7d8fafc7aed9cecc SHA512 15b3485b4a602b823701c8a11e582a994af54853dbb0663e7ae71aa9455822d595ae6b3a408ec675165e6136a32d15919b15ced47d2d789c55d37b0f80c05fef WHIRLPOOL 7b96856879890d0bde221b8ea4698f5e886057a112748847521b571b3e640f2f75e237356560544d5e4530a71427eb2204489d97ec27a9b4ac325848b6ef52be
+DIST thunderbird-38.6.0-sq.xpi 446897 SHA256 05281cd921ac62b51dde330fbe6a797239110d94512c72434ed4633185d3af0f SHA512 2799cc949148571720b4807621d59d4d913dc69eed9c3148c7e7b174f2f7ca88ae0c1d80788af71020aba5e79a99f4d21aa241f342e929bbc45d4acdc60c1988 WHIRLPOOL 1de66b2b3ae8579dacf089a2f4af332d648e80dca9ce26903f49122060af0f2abbed9426ddd5f7b79e8206c54b89a5e3ccc3b1e660f7ce03f3b5dcd8a9714c2a
+DIST thunderbird-38.6.0-sr.xpi 543315 SHA256 a98ce4dab9e2aa612a6edf7edc02285cab54e8f859b2545b28948066b4bee18a SHA512 453fb4118d87e2babc888efeb9228e0e884bb7bc16c13212c4c4de76435222e4d7a376036dfa27aeb2fdeb3d7d8adf0e1171ee182ed5912105dbce5c2bafd345 WHIRLPOOL 351f17e052b76cac1f385263b09e6f14252022bd706ab7f877d964979851503652db753fa011efe7b64231efd9e44d5f9bf80f3aa6f16044f2882ad46643b79a
+DIST thunderbird-38.6.0-sv-SE.xpi 439633 SHA256 0f3bbfc238c197416278063ade0391331e036e6cf148281f96b75a960a1e1d0f SHA512 876e4ff1cc4ed5d1c83e5ed3b07fa8a6f437c16a331aac006bb517b9fd76655efb6e29bf726d86f20de5992657adc2126d66636b7986a3d92ada301577dcd86d WHIRLPOOL 38f8693c459f4b73b76110dcbd0c843bf5d18c9174feb6b8c973d33b39bdac6ac7fcfa4859acf63ba9ace2af104bf6df93e3dbbd994b10fb799e1566d7a414b6
+DIST thunderbird-38.6.0-ta-LK.xpi 558738 SHA256 e66ec44352cd8dae3e385e37d2ea643092a37690e1dcaf37a1749a93d75f0492 SHA512 5698bc6e4e1b3c5f0f178dfb5f66e5c9d730763f11cd49905656089edf14bd5a19d0d7f82558f36634faedf8ba9022195eed4406c6e506112d9f6f75c51d671c WHIRLPOOL 687838b51c7f8cb0441dd78c98c8f526f567c9d358a1b311bca66fdc457fc4366953907ca66ebb7a238af35399f25aa875b05029330912f53e672d116208b3c0
+DIST thunderbird-38.6.0-tr.xpi 447800 SHA256 fca37b424413ab88902777bbe8845081373211dc8040c42271d06e189ada0edc SHA512 ac2e1036380db78501178c143bb74acede3b6d3668f8eff4e85cfaaee98eaf5963b5fce6cc5043a857a7f6813e9bbb0d61daf4555855c59568378f3838ff68b9 WHIRLPOOL f8daedff99a1f84068d6542622fbfddce7b949c6100d2c03d2a9edeab89ad1d3aa790fa2963431594ad884f664260fa9f9d542d24666864215d8da25ba67216c
+DIST thunderbird-38.6.0-uk.xpi 509600 SHA256 06f4f580d343357469af58c989892df7ad1124d0e67e6fc9d7083bd948ccc484 SHA512 9b8871d1bbd745ea9775f2c697be1e56f9ddde9e5a0189c9817f1ab3d9958a1aa121163a9eb9eaee2b11d9ccd3365247ac9137fe782e24d2d5cf2436f0a835f6 WHIRLPOOL 9ade16032a915885ab995c9440a6aee0df72e1bed925234d6cfff39519c41a9d4488705c499e5f18a5ea357d9dd9bace81805e682356f595632ed8f2b692ef44
+DIST thunderbird-38.6.0-vi.xpi 519844 SHA256 c0d48764556a3563e2e86c1f9cc385d02f82c7b73b348ed0400a7df117bd1c18 SHA512 18d4e00c207c33c360511ce55f25e2fe2a6e0bc8cea1ab96ee77cc006d7620edf8a4cd75224936553043323d25142f67810f71b8775d7e2a5fc3a2b4665f92f0 WHIRLPOOL a1dc32eb3b9e7ef757e5c24268db8357b67d4110819cc22e21127cdcc739ae2a555fc5912bf999dc78b48519ad8762f827524d5bb646d132b4337622f8775ecc
+DIST thunderbird-38.6.0-zh-CN.xpi 466412 SHA256 075021cafc597470cfa881da57c599cf6770281698529bdf01dddc6525078a5d SHA512 a0ac8e60a38f3a001e836472febd5d2e5118c5ea1449f8d136696d65df15dfa61c505555416143c9b10358537e10f6a7cc56a2888119480fc88cf4f9874128be WHIRLPOOL b7a6a5f837cc38dd9783a274f34cfd5979644c53feecd37400a65d013a97d18662a7ffae714242956ac3e8ef85b1e02cb82fac46a93908e697318f200e511223
+DIST thunderbird-38.6.0-zh-TW.xpi 466661 SHA256 36480d80d2268a0f01b61ad5ab4d8ef85fc88cf531e5ee6c60744abb3a31f45f SHA512 e948cb17026693b786ba1d0c21fa94d2716b854467f4f96260e2654b232fb2a0169786d6fce0206cea307f65bbca953603cf600cfb46bfc2c64c8dd7316bf877 WHIRLPOOL a505be408092edf3db41a4298fd06434b5c5a977877b520f0c25421c3c4c6e7e40b26db2aa5dfd8856cfbd17833fedde8391de36068531f2e80396c4813d6215
 DIST thunderbird-bin_i686-31.8.0.tar.bz2 36887073 SHA256 b0dae02046e97849d8e0136787b823a05ba38f85ac757b549f02f2672608407d SHA512 542d01ebbbf6c63c6d051e98964614aad628678ff9089382a080a8fecea8f84f8cf5b9bcc68e89fcd838c0c74cb9947de41eabf850be15b4363c94b35bb16e5e WHIRLPOOL fbe97109c8669a9aa7dca01942001ae59b7dd2af60394344428c26746d83d0e77205896faee1947c8054fe3180c8c2b1488263c6cfd2b9e33553ad66d007ad4f
-DIST thunderbird-bin_i686-38.4.0.tar.bz2 41915481 SHA256 bca69f68e6296608e50bb798e46e209cc3be9f20b5baacc102f7571316f7f65e SHA512 18229a66ef8cd68f9b86bf0e2970ba1882811ec26dda746c822045ce84fb765ed545f6a77a39c0e777e395aa98b46c96d7b2bb586c63b3a1d0f6edf9bda21aa7 WHIRLPOOL 0b8b89afff551497403a95d61015d2babb2c987cc78a293e248b503b7af893d225d66e40a86e0b950f293744610b3df2864e64d865d95c463847a375127865d1
 DIST thunderbird-bin_i686-38.5.0.tar.bz2 41923849 SHA256 c7794f3e1d51fa7e0935d689078b348114d3abf010a0525b22e5375950b6098e SHA512 1c4319e5ced3ecffce26a9eaadc6202b3a23f66ad887852e56daedfd45f510cf1abe112cdabed13a58f81115534d349a2244b7cd9a29b5dc7c44ab8787a3c1b5 WHIRLPOOL 9e31389c5b3666332eb28936f1e8e73e791ebb74dba655c391db91879f3dd6271b5281ce2227b0069612bc7773ac9600cd8546e67d2b1e621034f9e534eca5a1
+DIST thunderbird-bin_i686-38.6.0.tar.bz2 41962265 SHA256 2e60a2a5764cdee16659b125f7ad2dde7ff6e993c69a738d86fb39530e469328 SHA512 25d8e2305b9df88474b9879948884371627eb24f7636b7412954fdbb223751b165e2f0d0c797586d11fa5ae1480108a38f92b0a040498bdf30808cbd756f1f5d WHIRLPOOL cd7a0d61ce999863f1cd70f4f986e2054e04765e06a8ca473c779de056e72618ac840a15100781bbd5cc3d9458bbc7ee1aa8c0c993831ef488c78613843ad1fa
 DIST thunderbird-bin_x86_64-31.8.0.tar.bz2 35851678 SHA256 5e2fc9deb0726f5d1b685bb64e28046401468a8f8249e599a6a0cd003b105d62 SHA512 ce81356925208b92c06211a1568dbdf2a494c5bb03c7d37e5c3d1d2a46a83b817725e6f2f3bd818a811ab3404885f44260a9b892b7143fc505d04f23470a584c WHIRLPOOL 585e8d6970d518ff1067fa149dc59762f2f70ba8b54e459c264213fcbf7b9e6d90b6ce8f5a8e465398b053604d484561ccdb61253e2b936f49e2527fa4e28855
-DIST thunderbird-bin_x86_64-38.4.0.tar.bz2 40776681 SHA256 e8d9a31537a6db91efec6372106e655d73ab3e55f3c0ff2e42e564e2a4da7781 SHA512 d01db7bc6b217e6506412bfd93c59bede516b5757955b85ad8dc8b1b4d55826cf8c54e068ffc3b09e8f6ac23bd978699bedce0668fbbeb8e24cbddd3b028ed1d WHIRLPOOL 2b254376651896754d8f67c46eed6979dfb055b27ef7a3ba8b633625351fd890ab0768907bf47e05643fd223e273e24dd509b17a18094750aac877e04cb7a80a
 DIST thunderbird-bin_x86_64-38.5.0.tar.bz2 40776609 SHA256 01bb4a3bd43aa5dde30197178cb50ac35ac62cde637227aca8bdd410c9f62546 SHA512 842ddc48f2c2ce342e11491e213b1623bb99ae15c01c3b0d4b395bbd849eb819ffa314c025757d7511b94df0a5382571368e059d70a2869d9968b6dc6a3b4bc9 WHIRLPOOL c033617357d6b8c707538f35ddd847fa04dd4177b0174c580c5f6aa1fa60ee2acaece803481f5688804503c8aa984a282b7847ff8a1af41a4972d079c425c343
+DIST thunderbird-bin_x86_64-38.6.0.tar.bz2 40801901 SHA256 f0b4b0d5a7f4b21845e76411cd75d59b0e34a341747cafcb3e871a00b1b2535e SHA512 e73f581bd9dccc4d26dc9375a04a9b37de875ab041a1ba0e103854223c7215031eb453460d31f9f6d62961735897168ed8370602766c67bc590b647fb6e7f592 WHIRLPOOL b1758ff6d123829ae02b03f678aafefe051fc0b8bfd3769e7903462a57f8d6ec8f3882a3ba857c8632f4de3251fa66cbef5680340ec8a58bf1f9859292ea9f7a
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-38.4.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-38.4.0.ebuild
deleted file mode 100644
index a79316c8843f..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-38.4.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MOZ_ESR="0"
-MOZ_LIGHTNING_VER="4.0.2"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.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 )
-	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter selinux"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="virtual/freedesktop-icon-theme
-	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
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10:2
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	crashreporter? ( net-misc/curl )
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	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
-	xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	local size sizes icon_path icon name
-	sizes="16 22 24 32 48 256"
-	icon_path="${S}/chrome/icons/default"
-	icon="${PN}-icon"
-	name="Thunderbird"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/bundles" \
-	mozlinguas_src_install
-
-	# Install language packs for calendar
-	mozlinguas_xpistage_langpacks \
-		"${ED%/}/${MOZILLA_FIVE_HOME%/}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}" \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "If calendar fails to show up in extensions, or if you need to force it"
-	elog "to be reloaded in your profile (ie: after re-emerging ${PN}"
-	elog "to enable or disable locales via LINGUAS), please open config editor"
-	elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-	elog "fails to show the calendar extension after restarting with above change"
-	elog "please file a bug report."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-38.6.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-38.6.0.ebuild
new file mode 100644
index 000000000000..691c4e6be5a1
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-38.6.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MOZ_ESR="0"
+MOZ_LIGHTNING_VER="4.0.2"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.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 )
+	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+"
+HOMEPAGE="http://www.mozilla.com/thunderbird"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter selinux"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+	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
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	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
+	xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 256"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/bundles" \
+	mozlinguas_src_install
+
+	# Install language packs for calendar
+	mozlinguas_xpistage_langpacks \
+		"${ED%/}/${MOZILLA_FIVE_HOME%/}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}" \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "If calendar fails to show up in extensions, or if you need to force it"
+	elog "to be reloaded in your profile (ie: after re-emerging ${PN}"
+	elog "to enable or disable locales via LINGUAS), please open config editor"
+	elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+	elog "fails to show the calendar extension after restarting with above change"
+	elog "please file a bug report."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 86cfb65d7905..86785cbfcef2 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -9,7 +9,6 @@ DIST gdata-provider-1.9.tar.xz 80812 SHA256 8e60960999c752c49d6414d14c35c2d0cc47
 DIST gdata-provider-2.6.3.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e WHIRLPOOL 70d87e73d355559879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
 DIST lightning-2.6.5.xpi 3645840 SHA256 c4bc84f7e21148d6d06f4f61de70c7b4e331b53dce12979309e91294d4289b31 SHA512 880002e1c01a06b22ca20a120a5e4d893c364b058d7d52d12dddcdd3f4215652ae2c20332c3ca29fa6c5012df71330abda05bf3b862485043ddd481628ef801b WHIRLPOOL 5003a341a174cbe7da8b069d9f5d6ade0a7c0e8d842a0c25f74702e997942b3ea43be1e0eb6913d75bc78ef23fb2ee57551860d02b331db039cd6adbfcfa1f5c
 DIST lightning-3.3.xpi 4226096 SHA256 eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34 WHIRLPOOL abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
-DIST lightning-4.0.4.1.xpi 6637975 SHA256 29cd494fdd4281b51991d22bf94b6d1329bf783636ec165aa1b587b58150f7d6 SHA512 119c449b69f55314272fa35d774056d9ef7900d80133f7589482966a06fb297b1681ee20bab27fe6aa0a0bcb6b39938c644ae453973793e76a7d7b814e93278b WHIRLPOOL a1299b4030448549ff3e97ba8931a2ea8465f8b45e17c56675b694a268c5db2f57b6a4f932e3d5aaca52c2f1bf298d98e84ccc990b60d9182c4fd152b37a879c
 DIST lightning-4.0.5.tar.xz 2312932 SHA256 8386208ecb915172a48d77fc758f5040933c13619c0f9d820903ce37ba610184 SHA512 9f1fbec0520d24158af78ffe8a790502fd2843facd17bac2e278006d7b1998067b5803e1fa2e3172511d298cebb4e0b7047edb7b0aa18a8dc4712d0f1e2e08d3 WHIRLPOOL 8f6074f6038fda3a4946ea8fe788194cb2eda0c7e4a6c68a7c349781b8acb7602a70baf66bd5148ebd712e197cf4974268b5f40cedec520280c355e4f03de701
 DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffebbbb210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f
 DIST thunderbird-24.8.0-ar.xpi 457862 SHA256 e954ec8c64356b82006b01f3bb30d247994ce81f37a7e96de93c606b464c55cc SHA512 f8267f4ef885d900e15bc8609503ea6da37dde39b17362b0e35d384ec51416847c4c898a638708dcbc792bfb1a819bacc1b1f9f8bbff45623ea521c902929cce WHIRLPOOL 8116a679e37eae740e880fcadb48ade6d49cb96732a4f4212038f1ed03c15288219fc7be9a308709a658882872dc79aa794907643df7ab2c139358192635eb98
@@ -124,63 +123,6 @@ DIST thunderbird-31.8.0-zh-CN.xpi 462668 SHA256 09116541b41128d53caa6c14c6c66078
 DIST thunderbird-31.8.0-zh-TW.xpi 463408 SHA256 2bfd0efd2a0695733bf59d0a8f2c184c4798cc1f3589672f3095a77217d9bbe5 SHA512 cd71d2e4a08ec157b95e70a2ff7acdd62c4c21ac93040b6183be55a14d6b3a4fdf5f9915078ce2487d544d3a2dde3954d5aed40ab3276f72615fb4462e4974a8 WHIRLPOOL 8939d94d9d5ca7ed72fe9e05ebbde37090410ed9b3d1d7d2a8f5495d718e2904f516a5bc123580c87d84baba01bde6c359c66ee371c003fbfc5f65a02111c6b1
 DIST thunderbird-31.8.0.source.tar.bz2 171428094 SHA256 16731f49640e01b908d704e7477b4d9628cb2af9c2a492e5b996adf5218112df SHA512 a37133ca0764df44cde41429b5165e53496d58db1168529388d565c8169b2078492241bf9c95c864b76b226e7b2ec95ac1c121561bc0a87bd5faa8b94a1862d0 WHIRLPOOL 47a8fc9c9828a785e660dbf4e2313be46a6a53d290f489334b7cf2d9bb78129e6a7dd3b9f22f0a1bbbc3bc18145d78751a272190f3e0a503b40962ccee542b08
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
-DIST thunderbird-38.4.0-ar.xpi 475296 SHA256 d4e60e78da33e68a2d9d6c38fbc21da120774f071d1ad66c8f64e45e7a1ab1bc SHA512 38dc4b83a5c008ae316336e82f32e1c8bbceb517f49457f5620fe5c2e1670b7fda930fc62f8b3c5a8684245d2e8c81c80bbc08e64f6ec45f3a346989b39c2e01 WHIRLPOOL c3660a5c824c8ba03e65e906cb183f3d8f18d212258d35284f8176572c09e3a3439ff67ce9a16764757b3ba239270842d24ab3aad7cf123b35e731aec7a3404c
-DIST thunderbird-38.4.0-ast.xpi 405873 SHA256 951fe8891f21179b800f540871c0845d29b33d1edaddf2b731e8359fd02b7d18 SHA512 db53a5fb60e9f4cc1743835b015d56a64ca238264c76f1993601fd4c1b58b547a33eae255308eacd7c707dd275fe960ddf04b69e651de3b33ebe8162f3a7ee17 WHIRLPOOL 463ba492cf37b0d0a204ed2f818e11a03a8760668717db70b1bef56cf67bbba7633f0fc87581c369f7033d81351f4a8eb4b60d6ff49236a1c7d079d36c0ac5ae
-DIST thunderbird-38.4.0-be.xpi 442452 SHA256 19da5332ba7beab567335fb53da020f00e37bc210b06606427c3da9663650569 SHA512 75e9d618b98645178ee5a220d0717ed1adf412142e033243a8827182835401e0d6e3c7a32ed0735374151d478b90b5efe2b17d75eaa981a4c9695bbe454968fe WHIRLPOOL d80beaaf5e587fac2e5688840d56ed8f2f348eb8dbbd03f0e63206c505c5b0162a46687c7420ef007a892ce60320dd918cb9d7036d80fb84227432386e346090
-DIST thunderbird-38.4.0-bg.xpi 506124 SHA256 81d7df7cf1e66d16801ce727c8142897e2f9a3ef78d6fcf84318f1d5bdced1c5 SHA512 6ebca1c04a2cc49c47786d7fb1ff9b33949b61f66661adc54799424e5bb98cde34f946a03bb03940dd801485c5af5f5342ff8f6fa2fb19056861a0ad1150a839 WHIRLPOOL cd3087299d08e4cb77ba1ea01644de5c2089825d4b32a617e9b9f8a1963e9a127f6913a583013bc896a10da94ffae7a2dfcaa0475a3fc737e10d274467054f35
-DIST thunderbird-38.4.0-bn-BD.xpi 560626 SHA256 444efce23211bb069b7528ae09e89129225a89fed49077d1cbfa4eb2c0a1d356 SHA512 da0549ed826dc7fa8d59ec8d954c622f0d6e918fffdacd9ee02160291d04017053788c5103735d70e01b911b2bb7cfbbc87f25f5de73528bb915fe35772a5a5f WHIRLPOOL 3588ea1ff9d9856584aa968fb9208080546e620ecc4866d3d05e8acf6cbd3e5b8e2b482fab9e0baeaa862739b648b937b2056ffc3c3a5b281bb0fe90608c48b8
-DIST thunderbird-38.4.0-br.xpi 449767 SHA256 9ed680b42abce45726df6b45586789a4d5ff069a658e7266368503c0eb2e9b3f SHA512 8f0e219755604ef5cf6fbd03ff02e658c22d8c3ebff70f9a44c841c9c28158b0c4fe836803467bd236d3e233a2be6c9ba4edb8204134b445332fcd7f4051017c WHIRLPOOL e574f2969ba0717103968e0a6922f58a25940c72ea22c3c94e2c089228adef61144e1f25974ad2b71cfb669b4980c0a0352e66798248ebdfbccb04dcfaa39713
-DIST thunderbird-38.4.0-ca.xpi 450326 SHA256 4203b358f6d9fe362f47a777ed131397de49e0fd3e4956ffe05284fac3bdd6a8 SHA512 9ef17ae680031eb3ef231285173cf4c176d93bb81c1777379be07973ffef6cd98b068fc1b3654eda7fc953a0a7c7358102d089ed5ddc0633e74586aae72fd2b3 WHIRLPOOL 044ba0db2697d198047925447da368fe09516bde6ede374a6cb798bc9976ff36bed45663297e013087fb17d7399a85506f2756ef8bdafe6c07144ff5f17cd13a
-DIST thunderbird-38.4.0-cs.xpi 448724 SHA256 5a2c41694f56c2804c9f1c0a46262f02e318a146bcd4c6a9c6c32a6569a6e729 SHA512 86448b4a18af2eefb413dfc49a82b6fffd26d9f659aea2befdcaa723ce022fe06415d9214997dedf5e3da578e06d054b775a80fe55d996e83bc726b0d51f64a1 WHIRLPOOL 7b9cd550841223527bd1a18f69c79f0e5a5eff23709f5f9d18fec5579e41b490a821b93e40cd4aaa8269aa82e96429a326b529602ef0a93a9ec2549b829d6924
-DIST thunderbird-38.4.0-cy.xpi 434848 SHA256 8aa599c3755cc40532cd0cde0ffd2d7ecb5d04cb05d92a068859fd4c772c2c74 SHA512 0b1466b9b0ba5048edb319578d89fe194082b17dabac54ff8c729bf4eae63285b17502f292869e7b16e2cbc7dcf6add7bff6eeb4363cdae35b938cdbb0e42c16 WHIRLPOOL c25d1b786b27395bcbcd131d7b93bc2a8ab2cc80c35ccf07eb38ae82f8f4814fea99488cbef62b0faf58971fc405b83a10cefcc307b722871710dd06025433fb
-DIST thunderbird-38.4.0-da.xpi 425829 SHA256 50e972efc741054a60a242963a357cb1330c91f1ce00226b948592135b0bd40a SHA512 57a523cdc0a7004343cb01961d2712fcdae74d1fc019685c7fb50da907f8dc2c793098cb2b9387574a623b936a6258638aae391f986aa509ef28c87232e3e6d3 WHIRLPOOL 3184b18cb3b94f3f16de389b2ac9f05187c450797ec25e1c4132cbd582791f7fc902d26b29cb09e323532ca5f414ffd64989baf54b8e788f020b3859d84a24bb
-DIST thunderbird-38.4.0-de.xpi 429877 SHA256 d65ea03a6f4a252b7533952c0dd970e9f202e15ab6cdc70300cb2c43158d00e8 SHA512 9b1691c4e441d22dbb9f328299bc92c8989db293fd3d3bb8940eae2d96ac00c29a6e73210ebcaf02c3e5b0a116b6d8858dedf5ac146babf4e7c36a404ebd3d18 WHIRLPOOL 7b3cc44db6ce914cd1d712ba8b68b9581f38d128f6c79f6dd5b0cf0b153bf88573cd31eb24306c3247919e844a0c7de01aa8fcfc4eff521f16d3e1d55d4e1bd6
-DIST thunderbird-38.4.0-el.xpi 493490 SHA256 dbc7a3c20f5f5a8f9d8117a9de9bdea1bed8ec86761a56b607b54d8e838c95dc SHA512 eedcf3d2354963176fafb56f02c4f75320b5a39af1468b194465c213714468e3a6fda4bbdaa87baeb09d49be84a999ab1bc99c6441948a53a23c89894801d163 WHIRLPOOL b7fd81e5d1d75f729aeec4c89f4215467d7316662f90165270c99be430d9343ea2a500c9b2b664ce9034595e491f3f52e379a8ed604857aae9e081b54466080f
-DIST thunderbird-38.4.0-en-GB.xpi 416573 SHA256 2a4b9996555f2aae4d146f138d91fb6d2033d4d92f9a406ee174f30eab4e79df SHA512 912bb49b5d695e846c642694e187b42cefc60dde8d051642a209bbc1212b18aafb5ffc88cc97be47d2320f207802403de827c69007db35d10dca5735f7d42294 WHIRLPOOL 56150a4f4b1bf7cc1aced318356a24cf7b2eaaa06dad620fa8dcb716214d95261ee6a5020c2f23703324ff3a4f50e7d484c05abe64232a1a30d7d2c2fd6b7fde
-DIST thunderbird-38.4.0-es-AR.xpi 442641 SHA256 7bd6def638093ff0e680728da782b07ce2e95276fbdeadba6e372cce31bb7cc4 SHA512 9dfff0753f4925c83fc4aa5e6c152e1e049ac3bcadf54ebb2b0df1e64fae1a441aa004250dc54469e5afa8862d08e821b86684d795b01d094ca2dadbfad43701 WHIRLPOOL 30155ee2ebdfcf0525e4e15fe6f48f3c5e92ba9fa6410c12debfe68015cf8f2976552880587ce5f9cd4f19ce474fcf00220be4f50e464356cc32ea9d16b9838a
-DIST thunderbird-38.4.0-es-ES.xpi 376067 SHA256 331b344422ff462cd96674e3162682db8b02e35078533e72a0f70d00ee8b6911 SHA512 1e81314e12f885e0e7675e336c07f8b766231fe343a6b810ad507c3072cafbae20eab5edbe97ae5d2060890fcb4537dc7b10295d6e167fc5ad5795b4cc518df3 WHIRLPOOL 3a76f38d1cee17b5920ecbfe29bcd5046a7337e44f98823663a3e2a493b7d916131acc746f008e4785e80d636d5686552e8eb81344ba96e46cf9578843f41fcd
-DIST thunderbird-38.4.0-et.xpi 438262 SHA256 3c38b229f6401e7d1d654f70da5bee4f21288c2b77c33e6e49f181ecf11c6661 SHA512 b70e86582c5462acd86fcbdddf8130b9b4f712b43b715b96d4c0b43fae49a3b630e96262d2fca5f33ef193f22a9547fe7cc3793be6950c5643fea01d13697f7d WHIRLPOOL db21a08ad9e392d167ce827b8e3491f2eb2dd5e3ab62dad305d88613f01544fbd888399a07f88939e5065394977bab89f1bb692d156ecc250f97f00fdbe76291
-DIST thunderbird-38.4.0-eu.xpi 434838 SHA256 bda4a1a17667f48d3982dd9b67993a8aa46054a1e31798686f5495e808b63d08 SHA512 9a4ce453ef369b59fbd3b4603ab6bdf369ea03b311193b58e88c4f6ba863cb53456058c0d91adfef582e048d97b14c0a774544bb6e78af644ef96b40d85c0ed5 WHIRLPOOL 7583605c156973ddc0694769dc1dc2d48af8a9e8229d65620985cd3f98af3b3ac11bd58867bca637a35c8ddbe0c559d534aa5eb41fa45976ffddf8120c19a759
-DIST thunderbird-38.4.0-fi.xpi 438890 SHA256 641a0ddd879d8964469caa3aaf590c26f147830c02245086c6b50f4a2097a201 SHA512 31a972f936e21efd5af8558087771915d228ef8a70a91c79a22b9ffafb32ccfa7d44773ae319a73f5b3e20e6781f1e2684cfffafcb24576f1e52c0c62d80ad7d WHIRLPOOL cdcba779aaf5cdb57aca171d25fe046f58109c0f419eec75ef29079882152d6fb0e16119ed5077829f36688deb31a9b1b35e6c4641563caf833ed5835566d8c0
-DIST thunderbird-38.4.0-fr.xpi 448228 SHA256 80dfd39499fc518b1682d4e02bdec7f31d2543a9da8a6588fa29e08ff1defec7 SHA512 50b2d260238da64febe40553cde12810de957a2c296b1a78389227c32917d9d8df199dfebd7d1daebe446839d0ae9571e5f4255fe77f9557a9f77fdfdee94145 WHIRLPOOL f23fce6b8f6233094cb1ce9b0da41ec5c8da878a3970fb2447e59cdbddc62be23b2b2a1679dc09a0d6a430d5be3a1858874b1192c26e3b3936bbcd09a534f56e
-DIST thunderbird-38.4.0-fy-NL.xpi 442162 SHA256 b08acf69e3811748d16633f57a2796135edcbc172baad4b760657afa2cc4f969 SHA512 bf200bf093cdc597865487154e822dfab0a7fe678a4416dd515a20c1b23921f43b75f5b2a2b6307dc14616a474168f311218240f0d8c09e0c563559ee9c913c7 WHIRLPOOL 6ffd2125c1d6e285b321587f71ce8beed88dbfd8ca149701c6b9871ce4a4e8939a4ccfe2a9d3289267a772adb670579fe07e4c9d8551aa6c45db7f993094ac02
-DIST thunderbird-38.4.0-ga-IE.xpi 457412 SHA256 1b22df1635e8284dfe8b0211b962f4e6dc1b6821c5be55bd86d3ab5fb32297af SHA512 3308097335bdabbee7ec2088ee36f750ee2bdf5325154532c59db28c6f63737605d825b34ffa73878a0f5e7438009d473db3854b7e9dcbcf7616610f43013d37 WHIRLPOOL 82759408c97215d1fdac8e5b0d4c6c63f60b41be79e1f6e57720659e89f7e9b9f21790d8b46b043416130eca8a3df892971bcdcede0a6e10ec639e2220563508
-DIST thunderbird-38.4.0-gd.xpi 456317 SHA256 d5df704f78a895e996d3c247ea9e09afe60f007963bb2f38db19ab31ea00b132 SHA512 37e6811da406578ee0fc0329f4f61ecb1b775a8d891230342de1d731275a297c088d6c2f35aed0f3ef564fff12b9e027ffecf4e3fe1a30b024813b3676300bdf WHIRLPOOL f726569304ab5201a1fb9a716050caed34b13e30fe3099a6fa008c5cbf008d664d75dbda2fc3ccca484a4ad8000b1fe2dcb44abccc8ff4caf3617d97a4175dd7
-DIST thunderbird-38.4.0-gl.xpi 457839 SHA256 77553c630648c6c497a2ae839c981aca14d09cca5d788bc1598ea8af31f45772 SHA512 2b1dda7b1df82469ede61a6b203240f9f1d787710b4a537ea75b802a42e6f595b1eae4aca0364a6a528e541d0f29b87f9c7a07b6c336458a4f7bc7cdbaf44a9b WHIRLPOOL 58e6b2ad3c0d47eb51c114e9bd5f320b812b3f425e734a44a7236472416b8c31e59b8928fd1a6568e35d6c140eb4beb055144939114c70fa40d0cb834621663d
-DIST thunderbird-38.4.0-he.xpi 485867 SHA256 e3b410c7c3a72d7a00a941d707c4c3b0c60d42bc30866a6c93665a18998e0e1c SHA512 584262cf819c81ee04c85fbcfdf8a8580709d4f6014cd1b42026478537c9a500eb2279d3b0542d9ff61b293dcc355e74ecd6a650c47b27a3f7e35a153ba3503a WHIRLPOOL 0a7ddf428e70dc3e369e5ffcca56cf24683c8ffd17214a2e4f43951b3e4e75eec26f4bb057742e93078ab729afac6b86b6bf9e04f80f64a600b4a8b9b6034f33
-DIST thunderbird-38.4.0-hr.xpi 440420 SHA256 d91376b2fcc6940ee0d0681d3926356ea2b7dff8d1083ea34c8584a305276644 SHA512 e6a61f70a9ae90e07dcfc2ab4ac378deb6ec2fa3a9febd03435edebf1a92712f52dab0a01158707b2f3c23ba8e88cb7a5e34ef05da3a017f3f50b0c413affc26 WHIRLPOOL e7719a78998c31ecf42fbcb72ec7aca2f80443a7ce931528955daaed52dd8b8dd8068f3421c4d90e57a35c54a41c8565466049b98a5b51d6a38221b319da303a
-DIST thunderbird-38.4.0-hsb.xpi 456451 SHA256 c258583b8d4830ea20bcaaa0f6b3f1d3fabd9b3fa4aa5725f3640f48240cd282 SHA512 c55fde478762fba6cacf0dbe1556cdc76692a047c24ba4485ccd314ac5371d17d793c63e6a86aa6491a6055204fe95d4268591982c4b8285eaa69cb80b31185d WHIRLPOOL e37efc74b55e2515f85bbba5595ef93ce224061a0ca9c745fe9c675bd73827ea7768b67667140c52a27fa902bc83684492467d93d183569d53affb8cb6a7fee7
-DIST thunderbird-38.4.0-hu.xpi 457988 SHA256 b73805280c9464e8d41e74ebbf6a2b2fbc58fb221fd17885e1b6fd2cd225d343 SHA512 029dccc8b32113d6181db53d2aacc0eaaa30cc0e448043f3fe20496d36728207096d4042ecbc23bef8d6b54f26d8abde01784ba7e64e462e2952e136f52e6569 WHIRLPOOL 6786876357bb702c7fbb24efcbf07af1f118f212c455f2c3ced68d4caf117b0a053834525051ed00318daf0af343da038d0676dcae552168dccc4e0828970e4e
-DIST thunderbird-38.4.0-hy-AM.xpi 500356 SHA256 3c8f349176d421e090a16034d4208375fd36f2ca0db664b9138f344f6eaaafb7 SHA512 3eec1efb2301c360ad8babd74fe614555d64ad9fa888c009190eaa5c7b1c58767646d586cc88936a72ce72711e92543fb25962eebebf60082c58df70adcc102c WHIRLPOOL 3930920078ad1ebd07a5bdf6e4c32354938e1b08dc145fe7441379537b52fb53884ef8190e8463f12b1b9082637ae96e0afabb93c0719ee2828824293b7b3457
-DIST thunderbird-38.4.0-id.xpi 483187 SHA256 294595cd419da412e8a907d9ec0b5934acbd8163cbfebf29d3472b5a6ca8fbee SHA512 4a59b0fa369d9065afcb27a204e12ad57eaa45ccd027650410f8f4d09ef264146484b5e5570283bca9ab52537cd3824a15d075e670157bab985b0d59bff4808c WHIRLPOOL 68b47760923272e5388d03a4269b07dab5738e2c41f0dd212cff07c54a957858753295703c1cc723040e537bc5ab797dead918f8102214e9e865bd9544e44b10
-DIST thunderbird-38.4.0-is.xpi 443008 SHA256 1c838ac49cf9c8cf64b1233abd685e996c284babee9a64964b4b90c6e2285105 SHA512 49d2c4b729ebb31cbf5212152b9c7c054c88ec6b653ebe080c6c14e78d14d36897c27f45c056bf7d95e0b44de5a213ef3be453d125dfca1b7fd68d255269e017 WHIRLPOOL aa75b703085bdde57f260aeddd3241ede24a67bb0331da2ab25057804308e0fa132b2267d212222f66c52390e7fb0c5ebf5cac3a8e21fffd9e2bca30c84c16e4
-DIST thunderbird-38.4.0-it.xpi 369024 SHA256 0c572cadf9b5a16696b78f2d1683b627db0a5702698f7477d367ee2690aeee69 SHA512 ca6aa1c90da6d88a7a92ae315dff8738d4df709097fad97b67596a2d25dcf1d5b66362f60dafae336ed55b759e43e24e4ff169b0dd1eaccfd9700e62fdfc8228 WHIRLPOOL 5e845de614c4307692243f9bba8c9b7dbabc22d9d5e4583859818ea96ca3eb4733b8a67391338b9deb5b137b4b5f74a1764c9aab377ee502d6ada32cab73ceba
-DIST thunderbird-38.4.0-ja.xpi 492861 SHA256 901b396f920d4dc88367b2828c945de1ecc4e0b1ed2f33d793e65a07dad8f054 SHA512 fcbe62fa6f0e57cec9f99217da62e6d1cfce316db0d6dc2be72f69506f99cd3109350c8101d39ef9275f308f54402b7a419906a66f901df610c740585588dca9 WHIRLPOOL 7743702f5f516ab8fa24a22b572795c023cc9ff3c231472ada116234b029536a268fda0eda9b297aded832839208f24ac0bd72b670d56921ba07012dcc7af804
-DIST thunderbird-38.4.0-ko.xpi 454852 SHA256 6f2f92f94c228c9da48a7c36c8b14868a029d9a2c3f54d5352740722aafc0da9 SHA512 5b0b17ffe5f9aaf6fc23c62e04a992c52d9b7a43e73d486be5fbdbcce1f79379e76d844102d34ec82a9a9a91d8815698e6f9593cc96b98e1e7e20d9f341d8eaa WHIRLPOOL 82dc0892f64a98eac168edbef8bda806c1588dd276cf5bd44c7c2afc025ea3f28a762e5febe649d673001750ca5d7f13771464bacd5a6e133187b2c268ef32d5
-DIST thunderbird-38.4.0-lt.xpi 454572 SHA256 c6fc41ca583092e314f19c3814cabbd275072b104a860f7644af00c5e9029c7a SHA512 6593f8d25112633bc1fe7ca3ee2c31eb33d980c337c5aeab0a7134ca1e44f40952c3216c358cec5df94a4e92dcd73c62beaa834351ba138ec5a2b5e432180a16 WHIRLPOOL 94b289adeca710abb34ae30263dcf117224cde6e9229b1147018bd498a70efee67bc7978f72fb8b60802dded6c2ba061ce9c57b9a924925e4f9724494a12115c
-DIST thunderbird-38.4.0-nb-NO.xpi 434341 SHA256 0c5614dd8c5ee6ef20dc5b57eadf496abc66361c9b0128bb172a314939557c56 SHA512 8d32b0214c814eb308b9d6796835bd80f17e07970115f47079cfead12a10213928e7108506a2bd0a4741a2d7b1a1fec50f1f738e6e94afcab670da3c2232ec73 WHIRLPOOL 07ab9c4a1c119d05d505099b783379093d7ff4c2d5969c31702ae577a6e0a1ac5592fe96217aa67e0e51114149df587031e1b42ca7ef270c844ebffba0cde929
-DIST thunderbird-38.4.0-nl.xpi 435108 SHA256 f0441f68a754a411b447f7b6423dd608de5716a64a5d486bb5275ddd0632c456 SHA512 22395d04e7da2ab71d4b696ff4d12646341e4ed9557154e5b684ea95ebb2d5c3040d44d7887587a6cea01d1d399c6a9993bb01ecb60a797d749462a0885c0927 WHIRLPOOL 2e6730d63f2b4d29512215cbb3e27ad5c4de77b0c959ad8d9de9251e9cffa15e9cb0a9a62449e922270265b5c03e40b88b048d0b4e2ec30629f942ddc1c9a77f
-DIST thunderbird-38.4.0-nn-NO.xpi 436623 SHA256 036789fff634d37159f7ba35d43e93f65d8299934c55aa4b76a217b3dabd0186 SHA512 0f10b6837f1a5988630803f4cdf0a602ed7a791d6e3d3e772f1244dcd1d5e9ca406fe3a20f1da044dd71108cf0068cd9abfe5b74c91dc89b7deb61f07434e690 WHIRLPOOL 20b62c10e8462dd5e116cf917f38e0fef922b6b48e57338d2c20f5a07fee7e576686ae6cde350689d8d4ac78b009e8869ae0498e96f4c68919baa99587f66e14
-DIST thunderbird-38.4.0-pa-IN.xpi 530461 SHA256 29acab11415d7ac3229cfcc17538f1f93c9dfbdfdfc32fe8dde9a621dac70111 SHA512 8516212b5b13878e742182f76c293e1f7fa9b6fde4a0c8fa172ef4bbd2120466a494b61bcc9a7ef468ae497b6eae35959a1ee092b2c3fc268d52412dc5d1a654 WHIRLPOOL 0b5f5274857e42fabbac83b8cdf8e85e8d22d9b7585e3be5754225785fbaa830447276b481f73364c26c6b8b20b3f5da2cedaff63bbf2e78a731d3958565f8ef
-DIST thunderbird-38.4.0-pl.xpi 411509 SHA256 63aa21e0cc3c3171b19a1196deeeb9a9179b2261dcc9517f491d911be69ef355 SHA512 d3996e11fb58feae739d73f4d0bb30145e1cc9869adb2a79959e5fc2e73409fe15542e67da240a3a71de8739f82e470bb033287266faa9b8b2eaeb64101c5aea WHIRLPOOL 4e3a08f2014a69b3e749e984f1253dcc08a2c6c37235e3b3120c7e60e881bd7465c80ce8c1b6a41901b92b37460458e5d782740b648aec4aa40241cb0da22f9a
-DIST thunderbird-38.4.0-pt-BR.xpi 443752 SHA256 97d632fcb86a8cd3d5d62a57bc6d0a4d06ecf37439e47397ea4f9016b056cd7f SHA512 32444b97284a8892e13be003e03664a32727d48fd3a2729d961ed87bfb462024d7a9240bb5213134557e4441fe639896b26117c7b404b212f6e4956ae7bcd7c1 WHIRLPOOL cbf599db89a87c307693e8e544ff443291b19c10130812f964d9985701d6263a314579e8281abf8c82ae0f1b1d7453701fec76280b059c01a627320504390f57
-DIST thunderbird-38.4.0-pt-PT.xpi 442064 SHA256 525147d8c2380a33fb32af4026972b0e814203c8f23c01104db371479c390d93 SHA512 f54db82c6503ae0ce28bcfecca470a8d1e9b35262391b6c4b44ac964f04d59be74f2efc220bf761ca34e9f583ef0e9040dd72469826ca29afb2f982d8f9a68a1 WHIRLPOOL 5ccbf44b1b27438cd40948a0af20f690b946c939334569c3572283c8dc966672db24c5584c6d5e17ba80813ff3baacc293efeaf7c8d45bb038e7c1987cef7c98
-DIST thunderbird-38.4.0-rm.xpi 442113 SHA256 24659e293dbecd52684bdb434bd4f3f21333459c67d311499451ad9787d97b9a SHA512 1c2102ea3dd3ca51c173aa1cf4782d513d59d46a5cffe4cf92acf1081c418eb1af352ad54392f2cf20b00e9c713498bd7cc0c2d3b9ce310cd79dc0c9fa691f63 WHIRLPOOL 4dee4f70aed28781ee129b6f80eb5112f84c82a0373f61cb182cdfb737e711f33c84903ee7662f3eb74ec0e3b2136f84e84d6ff025ebbaadef5da66bd397611a
-DIST thunderbird-38.4.0-ro.xpi 448349 SHA256 ca87bfc055d76231dca985b0a270633d5b4c092d09ad63a23ed7b87ab98f76ef SHA512 f2dfd030de65d17af79542490d267a0b04de370afec6632bd5a970206189b149f6cb0a5c014d6a634b81e8b48bac1620ab1a663ef919f719fbfbadb170c49904 WHIRLPOOL d4a554c4d724037b44b8f5bb4da81bf5b9844d47d582331abc5831d7e309305188c77a2f3f51d6d718945d181885ba864284bdc0287aec20aae0ca1984cee012
-DIST thunderbird-38.4.0-ru.xpi 437591 SHA256 ca82a950a4cab1c303b531c47017e8e753381a1ca35e229011e624b3659615b4 SHA512 036c0a611d2462fea41b46fb0adf78e2f744f4989333245a83b321057adaa86f8c1875d8dca78637a7581ce20091e7b9d319ae00ac0a06bbcc81c665b16130ed WHIRLPOOL c3df70a35bacd5a766f1c172a9a0dec3274d2932cc576f26b2ae8d24631ff561ae89a71571fcc2de1bd176c5691a5b425570eb0e78f4473b2bbbfd5137254962
-DIST thunderbird-38.4.0-si.xpi 535341 SHA256 9da32d2866ace3b5edb129a8a43f0b91e492fbf62c390671f8b88b87e245a618 SHA512 16f78741ff379ca3ad77936b5a788bbaff0b037da68854cdcf679587b491df6f0b672c0f4889104923531997602b380e9f502bcfdeebbf9679f88bd0c19bdbae WHIRLPOOL 49ae4995ff99241790dca7f9db5c970186231f5d0a1cb2c864f2e344cb52668e876f89ccdfbf4a07ce7813429a6b0181c2794890913cda24925ae73d10c4863d
-DIST thunderbird-38.4.0-sk.xpi 456606 SHA256 e9ab86a2c6d3dd032929f198a82b14ba7823ab973b85ed2dab146057aef99629 SHA512 19d61b2f20e546e15abbec4c376ba23469eab0de3f3cf50d1dfbf4b7c0c5ff3da8e25d4c89397c1503b1fa07279476bdfd2492fe4bacde66cb2d34bac05a1053 WHIRLPOOL 53eb81dc162d1bc7d3e8a5984de5da6b57bf903a4cf5591db06f07a514ba0d4717d9f93fa7680a498c1150059f56c409e09ecad56ff42dbd67e35e06b158dad5
-DIST thunderbird-38.4.0-sl.xpi 437848 SHA256 822208506a476e4df2629566861afec9fc739b49616aef1217f080cc2da195df SHA512 b8d06eababd83d2517a124b9dc5909731922a71479d7cd4e0757905d4c1609b35ea483293bc0f7895017c18a5183c3a4e4e832872ee6737df64e11d3116b2577 WHIRLPOOL 534399419ca069b26a8a2c75ff8d709af2c769159b08681427e9ff319d95a5da0e547ad9956413645442059e28e2b33328f0dc30a553e2f9f9188a6935f924b6
-DIST thunderbird-38.4.0-sq.xpi 446897 SHA256 2c20c2c288b8ab06b268ea1a055f61a2c7287cc7eaa342271a4511c6dd6a4052 SHA512 035f52e1d1bd6f8a8a881a62b549ac449992d534e62e3543061c0f192bd43d03e2f469dd7f5ffdb762566b22d3affb3a01eea2823ecbc962245eae199ebddcb0 WHIRLPOOL 88b945ef0b9e6c1f12d33576093831e0538784306a3c9e711e3e7104c028bb5592111985a18a19ca2941d951f62acecec5e3d6c68dcbc7280eb40c26470dbb38
-DIST thunderbird-38.4.0-sr.xpi 543314 SHA256 16f914f1cc1015ea798d3486b08aaa8c8b7de19a0bbee85631f2d910895758f7 SHA512 1c584a7bbae501cc5831aaf00673628fd7db55047b2fa823847943fe5150fbd351d6f687d5343415a29fb7a3d2069f968b965e07078cbd27ae5ad964adaf4891 WHIRLPOOL 3fcf8972d00af06af4390355e802797f5ab323f3d7a5a0cb21fd6d9a97c4cd75300d1e70e2d569e761cc149bc4a8df6bc98661ccea8b5f87b72a2ddda73b3cab
-DIST thunderbird-38.4.0-sv-SE.xpi 439634 SHA256 5d5f37c0104a08e0101e93b28a2ad5a3df8910e3c47cce4b25f4d61d1ef699f3 SHA512 5c2a95e64e314543059e4658418001a9d90386faf77cd2c6370c9cfdc75fab24e07cedb7db2642a9509dd923cda0bf3d1ff892eac89cef78c196a6b64a1230a5 WHIRLPOOL ea3183cbac87ffd5b5ddb38d92ab347c872a33b9ff2d084fa53317a7e452ba143744e728962a784aadb767381c9a2d1b6fa4c67513694d707cac8e90f0e13a6c
-DIST thunderbird-38.4.0-ta-LK.xpi 558738 SHA256 171851b7e75b8e7bf227bc15079b8608a9e63682d26057104452a3a697772cc5 SHA512 41ed8b5175bbf0c6eba31b1dc72e189d0b90be272eded054a3389f07573bc2d17e586dba76694e5b84caf5da09bd77aa3ea1fbb23cfebfeee48e6e4ae8b3d408 WHIRLPOOL 304c4df07e41093adb995e5eddb05f485289f31d7a6ab2f1f7f05c171883eab215a249eb0dcf3378cbc732c064c6720abe8978e4cd373af03be2a709f8364d60
-DIST thunderbird-38.4.0-tr.xpi 447800 SHA256 6d40b110a752fea21018d18430fdc95d7217e77f9a0cc912c14c882218c5e1bc SHA512 f67a71fa57c055858e4ddffd2feb9e49c42c2d01b74ba6d5cb40ca31e9405cf9120af6d9688648c544ce5946845b90de60e65cbe9f212e4e44f9b7321726ce9b WHIRLPOOL e2a0e3a3c4b0495937a20d4c25b5e74371bf570d258bc9b4cd4ff8a21c5a9e21ead8f5d362baad2120533a6ffed42f517f7155a2186821409b88f6f23a38bdba
-DIST thunderbird-38.4.0-uk.xpi 509601 SHA256 9cdc9926384d425473fc5c62d2bb35c20b248326cf98b73b2c98f7144f2a2061 SHA512 9299b9928fb832bdec005e0f1f71034b9ab2ca1eb9a9e015296c6b0bf5977a062117a366707a1c78caf6bd17e92564f07576de122bdf9573e53152b14035fb23 WHIRLPOOL d62831c8822206ddf78b0fd98da71c8027364143779f59ac13e8f3853cbf1c6a74b4f677fe2d0977126c80bd9d57e0eb16f3eda5e039b0f79fe2df58c59de6eb
-DIST thunderbird-38.4.0-vi.xpi 519843 SHA256 4b385a97569a40331a5434762af52c4561f045892f0c51e852aae3af748df87a SHA512 33f309a36fc356ecd278cea3c5d8c6d2e4eeb2a4fcdb11dcc51880e247594612136c88511a56e5f4e7aaffb379efa7f4317f5dcf2efca3334e2568aa12ca5732 WHIRLPOOL 3511f0bf3161ef9df2a73af2a0f5a1cb3343f25a350b989d54d683fcf22c622be52fe7c4525785975566349663f53deaf0ad05eb515a23d15f8b7b0668004d73
-DIST thunderbird-38.4.0-zh-CN.xpi 466412 SHA256 a30ec5320021565cc1602623a4e83017dc31e3dcb1ac83afaf68089ab2c2d321 SHA512 e511fe8c9675552390248af5e1e79a21494d39b0236aee47a0636e2e42a45deec72116b77fc3078309c683d878e6c4014c6733f16d27fe127ae6ae40afbe85a3 WHIRLPOOL c8a52237da630113b790db21d62a71d9d2e5d777ba14da462963342c26eaa70b32f919f9353a2f1d94a6ef61b066cfada78d6b881f231f0bf60251cc521d7808
-DIST thunderbird-38.4.0-zh-TW.xpi 466661 SHA256 4e8687e4862fbf46e0e3b45f3c691fcef649d468f8a14163a4945e9909e06d30 SHA512 2876141af71156201300e4e5601ebb01cc18e1e491aa09eaa8aacc20db2383f857786a83b86cac1bddac985aec4d6f477d9ab0188f15d1050a0eaba64bebbc6a WHIRLPOOL 3d703bb8fe15288cec785282df93361c009c743de35c8342a91ff396843521c0a5684d144fc5747ef4b4d26238fa6c793b077519016fa9393b36d6517675aff0
-DIST thunderbird-38.4.0.source.tar.bz2 204397619 SHA256 326a4408d6dc79890cba8466dbc337acf99df76b58dadb0ed453e5e42af7fdbe SHA512 93f1a40c9d3a5c46904ab7faa1aa19c636489789988c11b439eb9c8de635df709ac32fae776a8fd31a77c71629131939e933fa3ba87ce789910dbb652661a791 WHIRLPOOL e75b7c2ea37d7847fd2509b554c33956babc19bb3bc2de15388260afb8b59dd53f6bd26849d996409054215c6b81c9826cd1762a768bcc73bb6800456d4aae6d
 DIST thunderbird-38.5.0-ar.xpi 475296 SHA256 871c5198f1a5a2b5fef7f817d583bd91300bfd32522b7a1801b7e32b478a4bb9 SHA512 e164b85d3745b3c3fbd2123575125fc60a19bd4aa55d1e41124d9c8739f423439e602d9ee1af75d5954a9934ffc7a409c13845604e68bd10a731617e58923cfc WHIRLPOOL 9ae7a17bd920e9525d08df1d7984f3770eb20445371a97f5e722e30dddc30dd0f350754ba8ade6eea3e217c4fa6a53324b88a9c68b2a79ac45933ffc22f13616
 DIST thunderbird-38.5.0-ast.xpi 405872 SHA256 b8a3c66806cb11447fffe54830a78f96fcf828722708365558bb74e173a43ad4 SHA512 9a45663736d066c8a8477bd1731c6c585c55c1acbaca1c63e508d4f135cae5eab8bdf9d8941ad108907b7ff8def0c72a745aa4c7fa30645ab7bc7e7881abfd68 WHIRLPOOL e004d3203a34f32288c742b44131d7fa6ce9713112d8a2088dd19b038992b6152288e4d866eef1e2c1ba5f5ee45b578153539b0b4f7ecbfc2d8d4edc6567b37f
 DIST thunderbird-38.5.0-be.xpi 442452 SHA256 ea1db89d0f5b511cd9ac513b97bee00cb42decd2b87e071b5da46a3aa2be81e6 SHA512 b01e55dba74139b4024d3fc5d67d27ad11df3f36ae64240fbd7ff171d54547cf59cbfc47102f3b2fdd807b81fc5e1e2333e7141076259560437abf7a4dd562ea WHIRLPOOL b86caebddb64f77b8122b44cec696dfeaa52b55e6788fa55ad0cfa7b714d727bdbc771c49e9a88ca2675385fda978e0d0a3583eeee451bee121c69a8ad3997ba
@@ -238,3 +180,60 @@ DIST thunderbird-38.5.0-vi.xpi 519843 SHA256 43d25bbbf7d16c0d789ae2f98c16835b2ac
 DIST thunderbird-38.5.0-zh-CN.xpi 466412 SHA256 5a655ebd5fbba862542973834b4d6cc2f8a13c065f734bbc490f8d838d71dc6e SHA512 876e597c511721d3d83c74d1ad6cda7f73268ec7d5a91de312a11927986b9384886f42a2ac6ce0fb68fb0d9d7ce8aca081f5a90b116d5b9286ee3cbeaeac1a51 WHIRLPOOL 2d154a00f88ae784f4e51988d384f31bb18b2743f25ff78abb35f16f70ec6034598282467e43f105b41acd42fa11f2266c86645340fb9c537095cb4467ffb76e
 DIST thunderbird-38.5.0-zh-TW.xpi 466661 SHA256 87019d3d21edc402110fe3c18091f855e1946643b4e51392abecdd25ad775ffc SHA512 957bce9dd781e8b8aa17778e12c3335d0a3823bbf9f54a9ed4837ab724e27cc03feb6b7e1d2d85069a9ed2d480c9939c9f68bd3797d45f02c6d65bfabdd2f0ab WHIRLPOOL 4d79a8c4aa496c81af1751bb2830ed9e31886677a3b3aef58154cda37af7827ae355eb0a0de88a80ae765b071eb673e02c33851a65e21d41c8d9d5b25836e71a
 DIST thunderbird-38.5.0.source.tar.bz2 204393357 SHA256 7da187d4d5df17b1457bd93b584f78f5e41d2094f87c14e74ee9d8064de25d0d SHA512 fed8376375c3ad7df8b773ced7944fb07edbd28e82c907dc6451ad538b8944d6f2a1d5632399f255ab1c7f74a40a9170912fefdbb2fdf423d7dc35108d1baa65 WHIRLPOOL 93853218ce7bb585e1515e62ea02bbe51e723d0071f8bfcddd5da9c4ea0a888a5c78fe86afbd46ab049a2e59424dc5f2a04d3157ef720e524ad6e2bf99614e01
+DIST thunderbird-38.6.0-ar.xpi 475296 SHA256 28930a981335d7926c826870f803f49049ffd3274519b338c1ec5a0dec5764c9 SHA512 c255b3473efb9f9e74cebac2c9adadd502a6f73153ca352313ff1c823c9c128c441600e112066406b54d08d5a908360c7cd4cd5f4ac971e68ba32d34f038494c WHIRLPOOL d198dfc62008259a65e1ebc72df93bc833d20a96bd4c6210ed3042786c5e1907ad730c22ee2306403d47be0234b03e34fa95849144d224c80b9a43039f331aca
+DIST thunderbird-38.6.0-ast.xpi 405872 SHA256 a53b1c56fd6b5f7226e74da4ce9046272c6dd831d06d3188285b18ac80875332 SHA512 2376da09fdb248ced96aa1da304342a7e20e74bd920df9b29493a35e78f5d5bd4aebd756912e739e26b1648e6fdb13de5f9026de4e651fa5c8b52181e3916651 WHIRLPOOL accf9aac9ae24705c3c3cb27e5af3a789aa687ccd56d2d42c7a13b0a48a96b13a5524e19f9d5c3a27ae9bcec9eb2962c90cb2526f2738669187f0a44d8d87bde
+DIST thunderbird-38.6.0-be.xpi 442452 SHA256 b3c78b9102efe155750a31ccfd3f964f410c9d00e6ca4fd02f886314805ae602 SHA512 de7aa166df63d6885bd9c37a97f3397f2eb92a08d582a9e4bc8f3c5edc524eab3c7c04db3b44427dd849f245269f7540bf4e0fa63f587bb3d61e2f427b75fb33 WHIRLPOOL b50b3acee2981f5766d4bfc3d73d822b50baa92a96b4cd453d642e4cbef9ae92bc81d5042a739a827545cf2e3091bde90c9c995dc919867c5beb0ab1ca7d3446
+DIST thunderbird-38.6.0-bg.xpi 506124 SHA256 65b6ed62f315738ef7ca10fd0e43cc0c4b0a433bddfaf6114fbe2499441affee SHA512 228d3e7c5553653a51f478698e1a28cc83ca6d2e3b307906a27ced788f2cefc6f68d6acbc43e82c6713485ac86238d4cd97f6be515b1013ac6f69006a0cb958b WHIRLPOOL 4310b40b357590d51ccf08a34d59ca699dedbb73ee77e5af37e2b1d420308568cd57aa94e725b86783a7f858482bd7d1347cfd8a6e348f32ac4856f81838a8a7
+DIST thunderbird-38.6.0-bn-BD.xpi 560627 SHA256 59e5b334ff1b58f6934fceb1573d12315ea258b4252c41c43f28da154251bede SHA512 2668dcc956009a8055fec2f050647c8d91687ff0f884a39136a9b0a12e72a9321a01823e916a1f5ef669a5897a38df240162f70fbda198eb25ab64cce8fff703 WHIRLPOOL 4318eb4cbf96192e53a19c44b469732d8d7c8162c52faf5859bb64665d78e8f145c448eb056b2bc629f6af698214356e2d5af0f5d71deca945ef7ab6704f3121
+DIST thunderbird-38.6.0-br.xpi 449767 SHA256 28bcd1093a2e2a2cab7cf6ca281bc14eb5051e34b8545f6f7bca11924a1c59f8 SHA512 d5965d74c3f867bff8c44727dafa664e1096695be1a5c95cc9448c9fd3735b2354c7697022d1cbdf0f274580d51fdb9a3854c9b2d9cf26b697507928e5a20ad8 WHIRLPOOL 57b03323f63bb7a30c443039f2eae1d34b157d77e918855bea3dc4dbd5288d11995ce4bcc3907fc7bdcac02765e867828117b2d950411c22a248263c4d71d5c8
+DIST thunderbird-38.6.0-ca.xpi 450325 SHA256 e5898fb1554dc18c083b2762100830806d4b22153fdf5d8f2583ee2c24b8b605 SHA512 65a95368e7d03095e34afb3fa982cc65c743868c5d9479e4bc70062d25f488dc51abf599869293a110bc96432a5ba908abdc2fb7fafeccdd40a5d3cd1a24ef16 WHIRLPOOL 48e1349865159175a42265153991b6f6d9eea9912c34983da6e10a5a5d236ae85b20eb0fcb659618f9983a2e366dbbf845b8865511cb65360349daaa4ba82b58
+DIST thunderbird-38.6.0-cs.xpi 448724 SHA256 8784f46765f33557fe14e89ef3142baa7280d490ed97ff7f29dfbe83695b87c8 SHA512 49a517e56f53a2ab629c21c5cd7cea5d2c98ebfd2fb63f49464bee4448cda1734a493bf53ee9895c443f013d00e2bdc65a930a6e09bc41b5b9289378bf329583 WHIRLPOOL c35ad8c6c5e7cf57340b02d6355fe9a6a183b5360030c4a510130135caafce9905e841ceae72f7f4aeb983e51e2b0a1c2ce8eada6d46fa0f0531fa199649ba71
+DIST thunderbird-38.6.0-cy.xpi 434848 SHA256 5b4b75487e3c478d072876877bac3737020a709116c24a0b55fe821af009582c SHA512 ff6e2829949e309b97250e891752d7755b851f152323e156cfd90f97db1b27cfb443ac2f54723e31de8bf0ff8c5778add96b4f013fa2b1d6b3281caf0d99296a WHIRLPOOL 5a4f147d6feed0262ef1e8fa035e834e3d842d20e4b551ca15ca930cc4e6fd49bb94cc4dec7e1f182bfb875dfde3548b14043eca20584e99f57e4d6964ead544
+DIST thunderbird-38.6.0-da.xpi 425829 SHA256 397deeceba72409863eda97d8b6b1b5d2f64b817c15057934ba99717de467a16 SHA512 86226f35330d0ba7d928fa8dcef3b2bd3a5147ba4ea510ea715af2561e9491e75b6aa8edb0e16a0faa1b72e22f31e32bd4979648c2bf4538dfa366cc6f70e1a2 WHIRLPOOL f06b888c1d42d36cb9ac511aedac6b1032a3bbe8daedc0aee27c31506adbc51f818349a09a046a1ac476d60033aedb3427a217a3b9093520fa7a969849f2d3c1
+DIST thunderbird-38.6.0-de.xpi 429877 SHA256 c39e277532044f724acfb50a23720fc8530785bcb4820906dac9401141b28342 SHA512 7e8aabc807d106f66b16dbb74a12330106e96c4c3e886b59396d280e975be58dde6f051fa3d42bbad705547af28b32032982bbd59060b1b71f77de593fc8f5f3 WHIRLPOOL 9790edc81a66ad35c8ae954d0b43990ae717082836aa29ebcb2fb9e9e54a44e7a937ccbfaad96ab1775b6f784f4b20d87832e2d61ccde7bd93e2c9d37655c69b
+DIST thunderbird-38.6.0-el.xpi 493490 SHA256 bc6b2ee8ee0d4fbed42ce203a8fc61c6e6dcbb8d6792e9432971b58c7aacb0e9 SHA512 220afdf26a63f32bb38535816c665200710e126ec6620c82b9397631e6216dd384ddf65ee0f34762eb61329892443a956dae3b8e54dad37d22e6ccbfba95f3d1 WHIRLPOOL b687f0a8fedb25f4ae1ef1e8b3e77d94d047ed63f457f6086d1df873f6c800d01909c67f9da0b2b3e0b65ba267b48b012ee30235720a9c5082bbd22c77ed3a40
+DIST thunderbird-38.6.0-en-GB.xpi 416572 SHA256 e6059b1e71f5ce5d2220dee78610c1fe26fefdfddd285ad11a74d13504122eb2 SHA512 681cc1e767381c85a6e503378b767d13d3f0c7b5123561569475d06f0d94727017d44a81050f656a4193e2b593263ba5bb766b2e44cb6011c57a7fce36a8ef42 WHIRLPOOL 2e8cba24872203cde157fbf632d996782b588de4bcf9aedd52afb03b5edd3c76cc6e249690a5d4a8d3afb19bc9fbebcba65917f2e2d065a395e7c9531066b5ed
+DIST thunderbird-38.6.0-es-AR.xpi 442641 SHA256 28c9037043e55b0288bee2e8c4f00589346fe0b5bd6c15c86fa491282c3f9c0c SHA512 7f382176349e9058978839f410f339653a983b0001e3726b9ea85acc2d2327e27a34adeee371bd6001019b49d3ff667de0eb63efd1995bdd7337c499f8b195af WHIRLPOOL 76f30b4f65b144b575943a3775ed9820cf50243b1c29c90671334318b2c55915373bd1a21fe60ca3454d0f5efd088d912c51eb206bd103646251c04cc0b132ea
+DIST thunderbird-38.6.0-es-ES.xpi 376067 SHA256 2ee5c0016b2a7d4917deb44eeaf6db2cb3dd62e6cf8ba80d1f56a8233b985fb5 SHA512 63c3ba7d66bb90fa4fd539f07a88bd138db7836e3bc875b6272e297742aaf7ebe045a72acf9c15a9ef86b0c2d8593b5ceecf6dd1320bc99e567dac99050be983 WHIRLPOOL 76b1f5f53b468db60fb7bc23f3e930eb686bbc5d632eeef31aaefc436ac784d26d08dd486e1829396b6dacc545ff8dcf9e095479a86050683069fbef15a99b93
+DIST thunderbird-38.6.0-et.xpi 438262 SHA256 196803cd3f5514611b5edcbea1d6a334a515e89f611d699733bccf0b9d142bff SHA512 ea426e07cb5160c205ebfaf9642d10b3b6bc9d4ff20880f272bbeb855e5a8a0a57e3ecf66d246cf92da147f41c041f3e760abde7f068c03f063ea735d9264a9f WHIRLPOOL 97ef812535d51d95d20618b65c80e514b7e96d00a1efd8200d8b8c0e9987b0c856f3b4c79c20cb59af244dedab51084785fc0197da65e024bcb8b9433fc537fc
+DIST thunderbird-38.6.0-eu.xpi 434838 SHA256 50e60cac8a7d06cf2582b00ca8ef1bd04fbe2cc1022715bff502a532cd6f3884 SHA512 e72ba8a523e6b79de7bd19d9d5cbc7dfdf4b607d595bcf1d91b787706bbfd496ef3c95c796845bf007308f15308664ce36f72806e47610f30f4b2aaabf6aed5e WHIRLPOOL 6460c96a662622eaed5613cd25649781de51bfe7b570cf30a31cb7b9f7be9686d734f05aebe413e7f097124954085939a04959f92ca669453abe2a1edcfaade2
+DIST thunderbird-38.6.0-fi.xpi 438889 SHA256 218dd0a0c55bdc8e5f598f7ba00240b948bb3f97e9d39033065b27484475bf31 SHA512 9c7a2b9046136ba04fa7419adcdcb56799f8b0ef6182600bcfe3888c66f85399454c744dba1d397facb786442bd68d33c45887989955c679bc2f7bfa5fc95bf3 WHIRLPOOL 35bcb72036adcaa825d3665330ec7cc15273e82c75f8fff977b026de210bea160f7bcefc1224a3b1f6c7ae2286419df5b7b9479932937d4e350eafbb6648f2ca
+DIST thunderbird-38.6.0-fr.xpi 448228 SHA256 7bedf795745122f284649e5e40e92b5920600e1cb548096d136343e0563d3dcc SHA512 e9c058cb81990472275daecb0dbeae99d64ac47b6bed051a76b4b9061e648392987f2b6db24fe41ddd11c1c9624787187e9d32f15b82cd00816ffa31a3a694cf WHIRLPOOL 87c96602fe0b13a4d9f6ecc4808568f1793b001619a868c1a3218244b2b8f3f59feed2067e1c2f3dfcbdc522b9c183a95632c8c98fd0516d0782902470b8b730
+DIST thunderbird-38.6.0-fy-NL.xpi 442161 SHA256 56e87bdbdbc771627461e66f30b60faa07919c59049afa6c6b63234453bd3376 SHA512 8400e1bdbc808454d6e87bddee7c2e95cb52fc213570f3477705dc70ffb58abba5ebd4bbfad452ea15695b0730c0efc6ebc7824ba616e09128579987ef27e000 WHIRLPOOL 67374fa81621a0a491bec524218f8f53c830727ef48671bea3102b5474e3a36f6f1372f3f3ecc8c9f8c1dfede847219d5c06223789d4e8faa3bf32f870f49394
+DIST thunderbird-38.6.0-ga-IE.xpi 457413 SHA256 d92d56be1ebe1283e5139bde9074941e01defbcfa07d3962afd87c3fe4f97de0 SHA512 09b3a67d533ec1924759611a61c44199e12f70a24e01545f88f53c7025c4a038ae4a6124d9311029889b2429ea86bd06bd27030d4ccb06e16f6fc1f614990fc7 WHIRLPOOL 090f3ea66e0344730edcaeb51f1f728716674c7cb6ad3e5bd9cbbc67ac246655e6c3ad82babe2531332ad030d3104fed994da170dde4553e95136b9e264d392a
+DIST thunderbird-38.6.0-gd.xpi 456318 SHA256 0f7c5b5dd1c57f70663c7ba1c145df56dd8670c47de9e6bb1cf42dfca247d0a9 SHA512 b9da3389592d8c5a2d77039f13c949eb932a17bc9eb46c905c9c7b2d814b20396a0955bd5f9a87d620da074318dc1cef515a52c507167f8dde0e7516bb44c436 WHIRLPOOL 4eb556e764ef3b6729af5584d32f9165fee50bdc92524e6181eb17315f2efaf96291483f092cf12edb6f89fa9daa3f03fbc8a623192dda288d2962179154ee09
+DIST thunderbird-38.6.0-gl.xpi 457839 SHA256 70e19f7549d5cbcf9a854322e00cc505fb691c3f9b88df6f0df45d97657c4e09 SHA512 f385631faeac06b14bf14fe1e1bb5574d057416db8e6e09516a950aff3e07be4d54d2cd6004490c714a152ad5b9d7b1187662a5a9558d9e565b89e0ae6955a9c WHIRLPOOL 15bc3ee523c78326c85baed4da48ec948b236702aa3605acd5229705257ffde594f2dbbd5650f0399441ec42cac1fd0dd6492c1373b078363a4e3424c4751337
+DIST thunderbird-38.6.0-he.xpi 485868 SHA256 1eea8bb56ee3c17a6bbfde43ebc48543efeb58857445e8fa0d7e0c9464232e1e SHA512 8801b351569210f0f261a9c0e7ebaab597391d35b279f90ff6c685dd9714efcaa16530618257233a2ec4d02ed880667028d4705a878792ca3e4cec8a7062b3e5 WHIRLPOOL 6c7f6db7bde1e5290e7c8a210e0f9bde8e928bd52b79785da2b002d185ce227f386f73a41fcc6305e2e86e9904af47621c30ab08d277db53de9bfbca4b5709b9
+DIST thunderbird-38.6.0-hr.xpi 440420 SHA256 9498c4e3e4b6086bd801a4c06b4474bbc8decdbe3dd2a654eab2d5cdd8c1d161 SHA512 ea6cfd51b0820583b9e7f7655a82e76237acfb3a1ff4743731f293b9ef0b31150f407264f1e9bbfaf3426148a2610b1bcf5010f1aad72bcf506bcbb2dcb767bf WHIRLPOOL a38069f98ceb05cfeb97c86983a338f1753f79e2841df6b77408c930142f6be8a4bbdd66a760a201b36fc0beefc0542e8ca127ed59cc49ae43320d1d8f52af04
+DIST thunderbird-38.6.0-hsb.xpi 456451 SHA256 f3471c34b1e01fdfa5696ec35c10b2063fb4240cc4a453801fcc269937446081 SHA512 b1d4f840f31c88e92f20ea5eb397922a4fb94478e27d021197c30100b65dfa802f8cec434c60ef31adb3d7865e45ea67eae26c00c228509b44e973e3f88e7664 WHIRLPOOL 129b6b972f6d4a223d8483244ff20258eb72364d87142c2a7198edd154014ad3f523fda8e1b5f21e50966072a0cedd40854741b6f188ab0a0e73339636d5f9fe
+DIST thunderbird-38.6.0-hu.xpi 457988 SHA256 52d2737a6c7a4b3c88c0deb91a104a6ec167e19be9612704612f8ff947ca7495 SHA512 f99930e65742fc2fa474df28e3dcfa64c3a1fd613c0b5f8becd5567aaafe2f32a756a1683a4656b9b36224813637b8512784312645db7ad43d424bbe03d37417 WHIRLPOOL e139d5298ac138a491b74ac2484a0178ff2434f6069aaa296b4b6476c9391e162379e26a1f16e22b524ca4300e2a54d772a01c0cd956914cf0813cb62b22706a
+DIST thunderbird-38.6.0-hy-AM.xpi 500356 SHA256 12d0149b3f605312dda2e970f41a93fe7a8770dac5fe518c3c5d5d6e30f6e995 SHA512 bd04b2b71a1c6c4a4d6b66ef13103cbaecac1eae5b6faa4e756cf7383930a593a302b85b50c6ced58c32fd1f79e7df7cd65100c5918cd3f4301d88106c0ad08c WHIRLPOOL 6c4f8a89e7fd9637f2f741c82fe1e1bfd1fb92ad27c67e6ed24f95792c03c2130ab0d6993b0207bb897c2759da248232c9c82516db038bff6789f461da7a78da
+DIST thunderbird-38.6.0-id.xpi 483188 SHA256 9c65c7e1549882665e2f4ad679e112d7d7b374c2804393878d1c0ba022392419 SHA512 ddc0f7be70f6189b98b9a60911abfc248049026191efab3b2b0991c912beae116984fd60bb75775b05415dd4d10297b6a0719a89fd3fbf74bed11f8b9d51f67c WHIRLPOOL 7fab077a3c1745e2b45b5b9f602433f33e40579668dee93fa1e85327cf3a57c5eebceb1ab72577d8ccfb9cc139d486af2e05851193997b32a125f19b57419545
+DIST thunderbird-38.6.0-is.xpi 443008 SHA256 f7e73157267c1a0e174b4a4e031ab1fada1b8d709963b3387c22246f4a1644e2 SHA512 f8cdcdbad24b1a8b3ec0e07626b05efe81183de46cee429d428fb4a1d0ed0c1c5c5050670b3651146335dbc928fa9bd3fd3617f18cda70ee17658aeaaa072edc WHIRLPOOL ee7f1c04f8bf34cf74949aaeeec8c67919503e8f4bfaa04c7c536a279573236b604940d5e51a2667451c80233b248adbf758b0b2f3746f7ddf7b7edca6c56372
+DIST thunderbird-38.6.0-it.xpi 369024 SHA256 1fa2c9a54083444b5ca71f587466853f402c22138cda699bc73b09159c1cd6d5 SHA512 79b899f6581731034ae8ceaa54a754255fb265350dd6a6f37bd01b2983351b8ee73462de65884b069d9828b3d5ab201a5896140cc6bf63d1d2a0c82337922a20 WHIRLPOOL bb78df601a5b932c6ced3d0e34b648f996e3a8f66a381404210d903dadaae37f29255409587e3cef446e5f1d7135953097f4a6780b01d4078c6f1c05b03bbfc7
+DIST thunderbird-38.6.0-ja.xpi 492861 SHA256 bde3d7878e11a61dab8c0827bedd01c6222dca6c05994cb0d00b08fa6c675a7f SHA512 4178868f0bbbc4ad3e2d57610d90ed5cef374ff4debedcfa9f520445571062f3b9fe1fca8d924981c143d1c95ed32773845f5031878a97690f84fe0c213886c7 WHIRLPOOL 480640483450c6d4853f9be353282fc5196e320b0fa249e484954d1909100c74b374a2a6aeb7a8a0a4b57c0062a2cab6430b7ee888727228af7e4a841abe4a38
+DIST thunderbird-38.6.0-ko.xpi 454852 SHA256 d5309d91d3d5c626bab4215101533c7791d5aae52b847054bfa7fe890664885a SHA512 bd43686b5ea5b198d9ca712816ee056dd2a5c6e6e8f894f975711c7d1cf93fd6a2ded993deeef71a137bff9b7dab6497aaf55bd51005b17c74f0fb3cb6af00ae WHIRLPOOL 01e2ddfc6a0c377f8164596a0c25776c2aed2c410a6842fcd55e607e307797ddd8bbd69d78fd011f112fff2233ce5b7919b53649d9484cdd0a894852dff1dc9c
+DIST thunderbird-38.6.0-lt.xpi 454572 SHA256 8653ed361d98e5b2d91fc12c4e8be23b8b78b7818ad4c5f507742608dbe475c9 SHA512 8c0cbc575841bc42eb0c278b1d56ae0d8d3a9c2782802c27c9b189933e33cb04047930d9f6277e42acbb84aa2447f4f55b22e518761de43c5bc0b1b6b662640d WHIRLPOOL 0365dc2cf73a945aa2e5de7f224bb2f5831899318d57f167906795aca440713a0fc461bc33135051797f51a60c3eca07f64c8ca2916ea07d1bea4981a549ddf4
+DIST thunderbird-38.6.0-nb-NO.xpi 434341 SHA256 4c24ee81c26da045ea936d2ea6b461b103a7fd17681420ac4fde5abe4a69b929 SHA512 b0cb592f6e4bcd7412a24d4fd0bd65497637c18dc84a7ce0d482803b24fdbbd0325d57b228578df6b5e0300bd4dd830b507ef180556bc5c215c027f69bdc0329 WHIRLPOOL ee5a672d035086b037b7c7e179f436a44404c28bea0cb37aa5ecafd619d0e69887bb01246f9b0bf83d238471e43f3efa5ce2d1c2e6d105e8ad4adb98531b338b
+DIST thunderbird-38.6.0-nl.xpi 435108 SHA256 d1c3bf3eaf28d5d89e220f94a86665ba1a996bc27aaed3ffcb893b6fe0b66840 SHA512 da400eee03f859edbea152ec979780b62ec408ba5cad7b4936cc734debac575cf9d5005eeab6b6fedfd35ec262c61ba226011091377ff5976a8d03ea46ce6e2e WHIRLPOOL 34b5d8454790cfce3fd327cecbcb6e2e1ddc07be97d1fd3fa6e39e4e33b464122207cac0f71ec42ab4796427e1bd797debf09e174329dbaae41803567bcb5f1f
+DIST thunderbird-38.6.0-nn-NO.xpi 436623 SHA256 300efb229c853456bf566f9825646b780f1a1090e9eaf4eba79f85a8bf2b62a5 SHA512 34f3c8b6bd4bbe0eb717efda251c56d0d08a29dcf9e5660fde370adb4e4807897e70f1d21b537c94153543e84c9588b7e5ce6982f8e19886e72a24002a292f17 WHIRLPOOL 28e37f0edef2ac1a043e168eae6c87a7f66aefeda4e01ae79df38588c864a942eb8afcb63ebe847ec6e7735c6217dddd1757d9fe9e902c8ca19dac7437ae4f38
+DIST thunderbird-38.6.0-pa-IN.xpi 530462 SHA256 6f424ff9e4f3f28f254c4dcd548f0533cbc30b458e5f43cd95f71608c3421141 SHA512 f12e8b571d30f724d15e7e15b0c443def9a6c0c14d25c560456001847e0f58c35c67be0ddf2e5a32db2e955f06103329b89449c5cb8d14a4464b0ff6924f1a57 WHIRLPOOL ce5f7d9208561edb9e913ebaaa5d8c1d33b540f4b132354836728c26ee7c3f71503b2ab929637b0728d51a397d9ac5ceaab880e7c7e9266cc0462ff04cb6a584
+DIST thunderbird-38.6.0-pl.xpi 411509 SHA256 209907758b695762f0e47dc53613fecb7b409d976c1de5515ae3dc9319200583 SHA512 667954e7aea894073289803b90c9031f5c413b33f7e9a5a62f94aef52b02897b57cb4c1d9a43a43f9f99e6c96c8ab78d7698c7dee7c78e83ce8469e71b80f95e WHIRLPOOL a314a83dc481f1ce981eb50eeb34f4f592f43c684904cc1cd4059e921d27133b5ca3cb52b27c59d72c73bf42df92f1320b7b69801824b3d2b9c6177b5f336063
+DIST thunderbird-38.6.0-pt-BR.xpi 443752 SHA256 f8e1b89268f81c72151bd6415fb348f8e5b523cb98eb08fdc9dbf894ec0e1dcb SHA512 7e13c54930cb18bfe4820d8ebd07c43f9b4b1972cdfa86413b25a87e9472fa0120abc728965684c3bddf132d04df3d17ec45a96bf26f42ce018645ddaf64d698 WHIRLPOOL 60ef07db17e91d608c5900b7f664975aa78196fdc285483c270fa9e4456f67576960a87c820ba172ea29cfa304c4ff74694c712fd70b6934c6615997480adeb1
+DIST thunderbird-38.6.0-pt-PT.xpi 442064 SHA256 e93ec0fd53a5be55413c58273ad88eee5eb47d0827d6c6ff2926c4c9f1167bf3 SHA512 6387c75dcb963cc8b02ea56c545483b93cc127cc9b461fab3ffa92436d25dd10d11294afa452c11a731679780ee5cf89509268fd6a8c5b4068bfebf1e3f4a09a WHIRLPOOL 8b7c1dc3ed8731edfcc8b3b9efcfbc6d00ada588491fce4aac1262b3af424b7325c117218febff192b00a160777a69e8199cf968afc55fb836171febca54441a
+DIST thunderbird-38.6.0-rm.xpi 442112 SHA256 87c901e37a0c48b8a5d26a1154fc0f4300de20ce071612a89012c3131ffb951b SHA512 cd7a6171ec9962a9b956f3c9bd25578b75dbe47aad9b9217ea27859c4aa22fe6b7c2145db73a4d26392c1d43ec626764d931c7b6da7c5c5d830b474c5827631a WHIRLPOOL 4691b84bd4648397057df9d7dc635084f02248bfd66dc0c7798c9df2002cfac06eb95dfe5653d45fe30f81b65202f2067610a2b598be849dd7cda05f8e4c621c
+DIST thunderbird-38.6.0-ro.xpi 448349 SHA256 f2816b4fcec6216855a93ff98467d1e9a1d878b266f3e55d71cb5829a81fd532 SHA512 e0b3db8ee7428ccc48f0b556b9814c4645866017b14d64248e9133052f45bed9f93cc214295398caae4be4b6ba6d12e9e1da51bc9235957c63e9947b09e59a60 WHIRLPOOL 98e8d12b0ca94925d43a0efe3e400768274b4c52a2b2cbc9e2204cd9cd410833441104d45a61a33ab36b496a1b5be23d2822da7da1a1c7f72ad6080d48783a43
+DIST thunderbird-38.6.0-ru.xpi 437591 SHA256 353fdf5febd4aeaf035b3683a3e397b8c50357924b2ef91251bfe6c10e0e0fd7 SHA512 8f8918a5cc99017fd78055e5338fe0297878c66fcbe3c8c0919dddb185ecf88322b9684f8f2dbdabde8eaf6a366e4773322fe992e2c2c75b8003cfe799c0ed06 WHIRLPOOL 0cd6ecc05b7c030da811edbe8adbf797719db9e24893c2ba73e579a5ea0e87120ea7004e20537e925aca9164260b8d5d01fc124e5d91fff7136c3608d728b7a6
+DIST thunderbird-38.6.0-si.xpi 535341 SHA256 1ac4fa83e849116d143f712db4120ad6101adf1d4d4ae7cf800e84c5f2c9a7a2 SHA512 a075860f8be48023da148707003e959ebf09d6b6f00d87d5669e33119091d2361199497e083dee39311f16f8cf6c223712f6289eceefe3e59865909dda6ecca2 WHIRLPOOL 3558583555fd130d3f58ec5607c021539e20fa3775a5732b85e99ff71c6279cc8482af6e3cad3f5e3f2a5719fe7aa77bc6afd28ed2ba0ef0f3db048e9ab1a713
+DIST thunderbird-38.6.0-sk.xpi 456606 SHA256 6c820a6aebe98c180da5c7b0f4f54f556168b63a42f68d225a0749bb07de2331 SHA512 1de0672350eb1a9e071e98801210b395cee23bb835037305d809937d0b476b0661a58db7adec88762240de3abd01ef2446c82088dc53d7ed04ed13bddc19d7b9 WHIRLPOOL fbde377a2ccca6b4b4f840d8464a17dada857d90f648dba4bbdedadb3db7bbebdd419ada05552d235b0172210ae1b6e36ff275410b1073eff90727763a0ae647
+DIST thunderbird-38.6.0-sl.xpi 437848 SHA256 b88549dd84041a03065bf2611a22786d2381e50bca8cf02c7d8fafc7aed9cecc SHA512 15b3485b4a602b823701c8a11e582a994af54853dbb0663e7ae71aa9455822d595ae6b3a408ec675165e6136a32d15919b15ced47d2d789c55d37b0f80c05fef WHIRLPOOL 7b96856879890d0bde221b8ea4698f5e886057a112748847521b571b3e640f2f75e237356560544d5e4530a71427eb2204489d97ec27a9b4ac325848b6ef52be
+DIST thunderbird-38.6.0-sq.xpi 446897 SHA256 05281cd921ac62b51dde330fbe6a797239110d94512c72434ed4633185d3af0f SHA512 2799cc949148571720b4807621d59d4d913dc69eed9c3148c7e7b174f2f7ca88ae0c1d80788af71020aba5e79a99f4d21aa241f342e929bbc45d4acdc60c1988 WHIRLPOOL 1de66b2b3ae8579dacf089a2f4af332d648e80dca9ce26903f49122060af0f2abbed9426ddd5f7b79e8206c54b89a5e3ccc3b1e660f7ce03f3b5dcd8a9714c2a
+DIST thunderbird-38.6.0-sr.xpi 543315 SHA256 a98ce4dab9e2aa612a6edf7edc02285cab54e8f859b2545b28948066b4bee18a SHA512 453fb4118d87e2babc888efeb9228e0e884bb7bc16c13212c4c4de76435222e4d7a376036dfa27aeb2fdeb3d7d8adf0e1171ee182ed5912105dbce5c2bafd345 WHIRLPOOL 351f17e052b76cac1f385263b09e6f14252022bd706ab7f877d964979851503652db753fa011efe7b64231efd9e44d5f9bf80f3aa6f16044f2882ad46643b79a
+DIST thunderbird-38.6.0-sv-SE.xpi 439633 SHA256 0f3bbfc238c197416278063ade0391331e036e6cf148281f96b75a960a1e1d0f SHA512 876e4ff1cc4ed5d1c83e5ed3b07fa8a6f437c16a331aac006bb517b9fd76655efb6e29bf726d86f20de5992657adc2126d66636b7986a3d92ada301577dcd86d WHIRLPOOL 38f8693c459f4b73b76110dcbd0c843bf5d18c9174feb6b8c973d33b39bdac6ac7fcfa4859acf63ba9ace2af104bf6df93e3dbbd994b10fb799e1566d7a414b6
+DIST thunderbird-38.6.0-ta-LK.xpi 558738 SHA256 e66ec44352cd8dae3e385e37d2ea643092a37690e1dcaf37a1749a93d75f0492 SHA512 5698bc6e4e1b3c5f0f178dfb5f66e5c9d730763f11cd49905656089edf14bd5a19d0d7f82558f36634faedf8ba9022195eed4406c6e506112d9f6f75c51d671c WHIRLPOOL 687838b51c7f8cb0441dd78c98c8f526f567c9d358a1b311bca66fdc457fc4366953907ca66ebb7a238af35399f25aa875b05029330912f53e672d116208b3c0
+DIST thunderbird-38.6.0-tr.xpi 447800 SHA256 fca37b424413ab88902777bbe8845081373211dc8040c42271d06e189ada0edc SHA512 ac2e1036380db78501178c143bb74acede3b6d3668f8eff4e85cfaaee98eaf5963b5fce6cc5043a857a7f6813e9bbb0d61daf4555855c59568378f3838ff68b9 WHIRLPOOL f8daedff99a1f84068d6542622fbfddce7b949c6100d2c03d2a9edeab89ad1d3aa790fa2963431594ad884f664260fa9f9d542d24666864215d8da25ba67216c
+DIST thunderbird-38.6.0-uk.xpi 509600 SHA256 06f4f580d343357469af58c989892df7ad1124d0e67e6fc9d7083bd948ccc484 SHA512 9b8871d1bbd745ea9775f2c697be1e56f9ddde9e5a0189c9817f1ab3d9958a1aa121163a9eb9eaee2b11d9ccd3365247ac9137fe782e24d2d5cf2436f0a835f6 WHIRLPOOL 9ade16032a915885ab995c9440a6aee0df72e1bed925234d6cfff39519c41a9d4488705c499e5f18a5ea357d9dd9bace81805e682356f595632ed8f2b692ef44
+DIST thunderbird-38.6.0-vi.xpi 519844 SHA256 c0d48764556a3563e2e86c1f9cc385d02f82c7b73b348ed0400a7df117bd1c18 SHA512 18d4e00c207c33c360511ce55f25e2fe2a6e0bc8cea1ab96ee77cc006d7620edf8a4cd75224936553043323d25142f67810f71b8775d7e2a5fc3a2b4665f92f0 WHIRLPOOL a1dc32eb3b9e7ef757e5c24268db8357b67d4110819cc22e21127cdcc739ae2a555fc5912bf999dc78b48519ad8762f827524d5bb646d132b4337622f8775ecc
+DIST thunderbird-38.6.0-zh-CN.xpi 466412 SHA256 075021cafc597470cfa881da57c599cf6770281698529bdf01dddc6525078a5d SHA512 a0ac8e60a38f3a001e836472febd5d2e5118c5ea1449f8d136696d65df15dfa61c505555416143c9b10358537e10f6a7cc56a2888119480fc88cf4f9874128be WHIRLPOOL b7a6a5f837cc38dd9783a274f34cfd5979644c53feecd37400a65d013a97d18662a7ffae714242956ac3e8ef85b1e02cb82fac46a93908e697318f200e511223
+DIST thunderbird-38.6.0-zh-TW.xpi 466661 SHA256 36480d80d2268a0f01b61ad5ab4d8ef85fc88cf531e5ee6c60744abb3a31f45f SHA512 e948cb17026693b786ba1d0c21fa94d2716b854467f4f96260e2654b232fb2a0169786d6fce0206cea307f65bbca953603cf600cfb46bfc2c64c8dd7316bf877 WHIRLPOOL a505be408092edf3db41a4298fd06434b5c5a977877b520f0c25421c3c4c6e7e40b26db2aa5dfd8856cfbd17833fedde8391de36068531f2e80396c4813d6215
+DIST thunderbird-38.6.0.source.tar.bz2 204415129 SHA256 0417711325a4ba6fa61882bfcd9a7ce325fa0b903474e087f16e13a70be15a6b SHA512 9f6cb6b7c9b4935603333366a21cbb3e142fbdbded61adea44c39d45327207e1478d268fb721ee914ae1b0e762507f3665e40e1c315bd454fe1d019bd7972a08 WHIRLPOOL c2d16955efeff1b05a8ec2c57304bd5ffa600f20303564db1eaaff04ba97fa3669993cd60d1a3a78ee3250c695122c39cb29939445ded5e144aa7737c48ed0c2
diff --git a/mail-client/thunderbird/thunderbird-38.4.0.ebuild b/mail-client/thunderbird/thunderbird-38.4.0.ebuild
deleted file mode 100644
index 128b3cfa9b18..000000000000
--- a/mail-client/thunderbird/thunderbird-38.4.0.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.0.4.1"
-MOZ_LIGHTNING_GDATA_VER="1.9"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.8.2"
-
-# Patches
-PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-38.0-patches-05"
-
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
-	${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.xpi
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.19.2
-	>=dev-libs/nspr-4.10.10
-	!x11-plugins/enigmail
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${CDEPEND}
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-if [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/comm-beta"
-else
-	S="${WORKDIR}/comm-esr${PV%%.*}"
-fi
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-
-	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
-		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
-		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
-		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
-		ewarn "emerging the package with USE=-jit"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="8011_bug1194520-freetype261_until_moz43.patch" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
-	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-		eqawarn "The version of lightning used for localization differs from the version"
-		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	fi
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# We want rpath support to prevent unneeded hacks on different libc variants
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	mozconfig_use_enable ldap
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	if use crypt; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
-		econf
-		popd &>/dev/null ||die
-	fi
-}
-
-src_compile() {
-	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake -f "${S}"/client.mk
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake -j1 xpi
-		popd &>/dev/null || die
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/mozilla/dist/bin/xpcshell
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	if use crypt ; then
-		local enigmail_xpipath="${WORKDIR}/enigmail/build"
-		cd "${T}" || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
-	fi
-
-	# Required in order for jit to work on hardened, for mozilla-31 and above
-	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_postinst() {
-	if use crypt; then
-		local peimpl=$(eselect --brief --colour=no pinentry show)
-		case "${peimpl}" in
-		*gtk*|*qt*) ;;
-		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-			ewarn "You may be prompted for your password in an inaccessible shell!!"
-			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-			;;
-		esac
-	fi
-	elog
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}
diff --git a/mail-client/thunderbird/thunderbird-38.6.0.ebuild b/mail-client/thunderbird/thunderbird-38.6.0.ebuild
new file mode 100644
index 000000000000..6b2c5bc67d33
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-38.6.0.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="4.0.5"
+MOZ_LIGHTNING_GDATA_VER="1.9"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.8.2"
+
+# Patches
+PATCH="thunderbird-38.0-patches-0.1"
+PATCHFF="firefox-38.0-patches-05"
+
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
+RESTRICT="!bindist? ( bindist )"
+
+# URI for upstream lightning package (when it is available)
+#${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.21
+	>=dev-libs/nspr-4.10.10
+	!x11-plugins/enigmail
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${CDEPEND}
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+fi
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+
+	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
+		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
+		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
+		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
+		ewarn "emerging the package with USE=-jit"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
+			8011_bug1194520-freetype261_until_moz43.patch" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# We want rpath support to prevent unneeded hacks on different libc variants
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	if use crypt; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
+		econf
+		popd &>/dev/null ||die
+	fi
+}
+
+src_compile() {
+	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake -f "${S}"/client.mk
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake -j1 xpi
+		popd &>/dev/null || die
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	if use crypt ; then
+		local enigmail_xpipath="${WORKDIR}/enigmail/build"
+		cd "${T}" || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
+	fi
+
+	# Required in order for jit to work on hardened, for mozilla-31 and above
+	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
+
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_postinst() {
+	if use crypt; then
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gtk*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+			ewarn "You may be prompted for your password in an inaccessible shell!!"
+			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+			;;
+		esac
+	fi
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index 8648467d309f..77193bea1236 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index 56fb844168a6..e431ff81d631 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static static-libs"
 
 DEPEND=""
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
index 7077e5fe131c..9f3390a9317b 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://srs.mirtol.com/libsrs_alt-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 7da87da330d3..c419f4b73c6b 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,5 +1 @@
-DIST opendkim-2.10.0.tar.gz 1213007 SHA256 4a747c9028e1cba40b5f8ba64ec5fbcf9f7d27a8a41fec4b4a398e2a6001c747 SHA512 c1ef4a8e80ed8a6e64e9a9a4f6d2ec684622fb4248d1d1c9b696f14ec9f4163e7b37f1a936ec8d522b6531b91fc869ca875fd6ff58c96c75ba41c919bed40d53 WHIRLPOOL 8443c330265dd47774ed476e4a88da10e586dc27fe6f7d98bec8f88c9129e04df334bf2d4dcfa0c65ca9b5287d8fa478b9d9bd6da9672add32074d0d6d9da0bf
-DIST opendkim-2.10.2.tar.gz 1209812 SHA256 ff5dc58ca8ad94de9b999bde3c53f49ac040dc09ad4b295ea22984d8d7df4f82 SHA512 b3c3e5fa3c265082d6f68def987a6805edba3798b37390c1e8099e2cecc71a9f6080481036991f654fa02b1a09d6b2107156aa533d14d0bfc0cb2d09bc7e398c WHIRLPOOL a3ca0262d1d2b3d01e28406224afa3ae914fd9f21bb455b34070d5821dbd8211696204fd7143b2e3046a6d3afa098a1d179e7be2433126fa8c763459cb448032
 DIST opendkim-2.10.3.tar.gz 1210224 SHA256 43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 WHIRLPOOL 36bbf0f3e81fa291f31123d3614ba113b893d4ba76a5fe017cc9a393888c1ea95525b85e6042bc1db96e9a00e52aa13a251c38438cd03b0fd92b47d17036d680
-DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0 SHA512 f6fe77897927a93c9f57d09e5e9f43b1e73e2b21a586461b5665fb430eee1362b33d9601c8643d50d5a53c8e01b03c7af331f28cd992c9163f959723f21ebf63 WHIRLPOOL b61212d272d07c367c7d9ecb951466b66759b6d449047c10947681ea6889a1f2b2c12986e6c11a59620fb8ace3c0a177235f65f58c54c993909f61dee5cf3c3a
-DIST opendkim-2.9.3.tar.gz 1230406 SHA256 79a84fc17fa6aa9428ed449b1b2b773b0a4cb4ac7fa69b01b178fe0b4691c533 SHA512 9ed79f4cc595ef6dded8c1c1af77404ed629d88d2dad11c72fc0ff961bb9ab62037e010b29b651bc2cdcbdbabf001199b12544330a3af851b61d05518cf92053 WHIRLPOOL 5f24ecb5084babcd572f9cce9645aba92f1a68643bd4928b5040f3cad21f299380af746ad2dcefacc5803438a06c021a85da2be80ecf91308e7519d2df93cf51
diff --git a/mail-filter/opendkim/opendkim-2.10.0.ebuild b/mail-filter/opendkim/opendkim-2.10.0.ebuild
deleted file mode 100644
index 0e845b94a3fb..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	memcached? ( dev-libs/libmemcached )
-	sasl? ( dev-libs/cyrus-sasl )
-	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing \
-		--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		elog "If you want to sign your mail messages and need some help"
-		elog "please run:"
-		elog "  emerge --config ${CATEGORY}/${PN}"
-		elog "It will help you create your key and give you hints on how"
-		elog "to configure your DNS and MTA."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	fi
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${selector}.txt
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/opendkim/opendkim-2.10.2.ebuild b/mail-filter/opendkim/opendkim-2.10.2.ebuild
deleted file mode 100644
index ec16223826f7..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua:* )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	memcached? ( dev-libs/libmemcached )
-	sasl? ( dev-libs/cyrus-sasl )
-	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		elog "If you want to sign your mail messages and need some help"
-		elog "please run:"
-		elog "  emerge --config ${CATEGORY}/${PN}"
-		elog "It will help you create your key and give you hints on how"
-		elog "to configure your DNS and MTA."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	fi
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${selector}.txt
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
index 503067708e77..f0d9a69a613e 100644
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
diff --git a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
deleted file mode 100644
index 6f7cb7dedb4f..000000000000
--- a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	memcached? ( dev-libs/libmemcached )
-	sasl? ( dev-libs/cyrus-sasl )
-	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-adsp_lists \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing
-		#--disable-rpath \
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		elog "If you want to sign your mail messages and need some help"
-		elog "please run:"
-		elog "  emerge --config ${CATEGORY}/${PN}"
-		elog "It will help you create your key and give you hints on how"
-		elog "to configure your DNS and MTA."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	fi
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${selector}.txt
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/opendkim/opendkim-2.9.3.ebuild b/mail-filter/opendkim/opendkim-2.9.3.ebuild
deleted file mode 100644
index 03b441ca1086..000000000000
--- a/mail-filter/opendkim/opendkim-2.9.3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	memcached? ( dev-libs/libmemcached )
-	sasl? ( dev-libs/cyrus-sasl )
-	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	#sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-adsp_lists \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing
-		#--disable-rpath \
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		elog "If you want to sign your mail messages and need some help"
-		elog "please run:"
-		elog "  emerge --config ${CATEGORY}/${PN}"
-		elog "It will help you create your key and give you hints on how"
-		elog "to configure your DNS and MTA."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	fi
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${selector}.txt
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
index e890ce05a5d5..de8d4494e442 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
 IUSE="spf"
 
 DEPEND="dev-perl/DBI
diff --git a/mail-filter/rmilter/Manifest b/mail-filter/rmilter/Manifest
index 06a3f10ce66d..fcbb36dcd8fc 100644
--- a/mail-filter/rmilter/Manifest
+++ b/mail-filter/rmilter/Manifest
@@ -1,4 +1,3 @@
-DIST rmilter-1.6.7.tar.gz 117993 SHA256 d8312be6ab79cf42fd28a85c4eda3868e20a4d182f06c1491ce8cdc8c2bed8df SHA512 015393e803603d2e6e95344c1b30f748e7d4460c4dc0cb2551639d25f9b4554963bc072c872608f94cd6e2110afd4623e9083eb82df8d23f47c36c84585052ca WHIRLPOOL e4913d46a57e370e57b64141a1f4247757f9a621db2f53a01f624ae3082bf693b87198c54a125eba7ce5853c452650b3e6621947d9ccf330c3f5df6ca6e677ec
-DIST rmilter-1.7.0.tar.gz 159459 SHA256 0337c1e643f1c9115ae9a53cb79d883ef857ca8457a94b37ef135ee89166ea3d SHA512 a5d458d1de085a6c92eaf9c3da90f285ac16572b9be999277b8f2d4f4a6d7976faa32cc51c933b4738c1f521db7fbeba3f19cf43dba1323915f996d77795d0b1 WHIRLPOOL d80de10ff925d1695cd249f9d371da01f20df3259ff40a3cec4dcc03050e4fff17e7ac788251648097c957281574865c7e96fddfab582bb01bd9f2fb56e44bdd
-DIST rmilter-1.7.1.tar.gz 159549 SHA256 4b239acba55e80620c3906ec11bc086eaa814122117b5afeeb16712279f3e13e SHA512 e8aa4b5fd8e8c474cec047b174d45eae1bb552845fd378a52c863b0f2f8c36009cde9ab6e002b4ffb0947d058e66c5c2e460776223f0d3eeb64cbbdaaa914d51 WHIRLPOOL b042eb0bf2520b0363112c3c51ef6079c78f8a791646e259509ca5522183981d3297f4252be5d96c02ee61ca23acf34a4589ea0719139fe434d931e331db8cfe
 DIST rmilter-1.7.2.tar.gz 159934 SHA256 3033c190667276f1d716784cb6b485971a3249ab9a6151d7a5ae3848e6de61eb SHA512 9b80d55b93335b45b9928dd0ae2caf8cd5757533c8281a24cd2395ef89fe7879fac836368263cdefed3f6df3f83f4134175a161182b7bcdfcbc6de6fd6fe3e31 WHIRLPOOL 137796cab3968f40ec4dcae81fa3ea68d2ba80fff9c9738d140816cca29ca4ff3bd9c02c98e4ef2aaa6b35ff18b455060c20f372614ef6e76ec7d4dbcade8e03
+DIST rmilter-1.7.3.tar.gz 160323 SHA256 515e0f69af9f702cc36fd565e30c9f715bff819df250679d0a24e4f07ba5f081 SHA512 4e65dbcccd7f378eb1dd93ffca1983614df19edf62b531483a59c636eb4564dbb531da2ecce3ea789c038913c8623e78db8636eff64f574eb5abc709cf8fc0e1 WHIRLPOOL 6ae75ec8190f58893b3c33e66cf07dee5ac9326056c3da23005d4c2dcad5a8760c1db08701226ece96b6e3bb12f15337ff686d2eafc6e6323abc299d289de456
+DIST rmilter-1.7.4.tar.gz 162081 SHA256 ad32c2efe23c8b49f6b52a5b78b80943b93082d30c799e3de05f9df1c02b83fb SHA512 189f792664e30a0d60c618b902c393a4af570bea38810001aa759acae27fbb625389576eb3923678fddaca806b946e99e0444738b24aa3124e988bbc2ab1552b WHIRLPOOL 10e549b9d3461252c6213a35145a2f158d67613733bf89b9c939d3eac7b77080b6886a3386e9a6358f31ad6ffe4e0c35ed9cfc025294392aeff5f4b9e15d987c
diff --git a/mail-filter/rmilter/rmilter-1.6.7.ebuild b/mail-filter/rmilter/rmilter-1.6.7.ebuild
deleted file mode 100644
index 674c1f42aea9..000000000000
--- a/mail-filter/rmilter/rmilter-1.6.7.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
-
-inherit cmake-utils user
-
-DESCRIPTION="Another sendmail milter for different mail checks"
-SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/vstakhov/rmilter"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-		mail-filter/libmilter
-		mail-filter/opendkim
-		mail-filter/libspf2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup rmilter
-	enewuser rmilter -1 -1 /var/run/rmilter rmilter
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rmilter.initd" rmilter
-	insinto /etc/rmilter
-	newins rmilter.conf.sample rmilter.conf.sample
-	newins rmilter-grey.conf rmilter-grey.conf
-}
diff --git a/mail-filter/rmilter/rmilter-1.7.0.ebuild b/mail-filter/rmilter/rmilter-1.7.0.ebuild
deleted file mode 100644
index 132cab0ef1a0..000000000000
--- a/mail-filter/rmilter/rmilter-1.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Another sendmail milter for different mail checks"
-SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/vstakhov/rmilter"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libpcre
-		dev-libs/openssl:0
-		mail-filter/libmilter
-		mail-filter/opendkim"
-DEPEND="sys-devel/flex
-		sys-devel/bison
-		${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rmilter
-	enewuser rmilter -1 -1 /var/run/rmilter rmilter
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rmilter.initd" rmilter
-	insinto /etc/rmilter
-	newins rmilter.conf.sample rmilter.conf.sample
-	newins rmilter-grey.conf rmilter-grey.conf
-}
diff --git a/mail-filter/rmilter/rmilter-1.7.1.ebuild b/mail-filter/rmilter/rmilter-1.7.3.ebuild
index 6c033267452d..6c033267452d 100644
--- a/mail-filter/rmilter/rmilter-1.7.1.ebuild
+++ b/mail-filter/rmilter/rmilter-1.7.3.ebuild
diff --git a/mail-filter/rmilter/rmilter-1.7.4.ebuild b/mail-filter/rmilter/rmilter-1.7.4.ebuild
new file mode 100644
index 000000000000..6c033267452d
--- /dev/null
+++ b/mail-filter/rmilter/rmilter-1.7.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Another sendmail milter for different mail checks"
+SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/vstakhov/rmilter"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+		dev-libs/openssl:0
+		mail-filter/libmilter
+		mail-filter/opendkim"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup rmilter
+	enewuser rmilter -1 -1 /var/run/rmilter rmilter
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rmilter.initd" rmilter
+	insinto /etc/rmilter
+	newins rmilter.conf.sample rmilter.conf.sample
+	newins rmilter-grey.conf rmilter-grey.conf
+}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 0f256421dbeb..99160f68ca36 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,2 @@
-DIST rspamd-1.1.1.tar.xz 1291968 SHA256 3c4bda66b533861a84d82ea26bd7c19ccd1b1befe8b3e33a0fc211c036569a06 SHA512 c971000f9e6c09ae8c4a175fcd96471efa3f5e73689b038a45cc2212dcf296babfd4000fa41f0451b2fdd989e00192cbb234a73cef026c16466bfe78b04b5385 WHIRLPOOL e1ef4042e9a38bcff20a2a3ea0e9fa29fa813adede28867e176d3aeff952fe243fd4a083a60d810fe16c1ad22e6489583b50a38825bc20c338ddf1710f9294da
-DIST rspamd-1.1.2.tar.xz 1351768 SHA256 211a0ff0c83d3ef4b586f59b0d3d6e12b9e10b2a2c72894c5f9116e649fb6d41 SHA512 78bbcd0130f3449b5e50f57049b1a0bca48bcfda808e08108c8dc2bfe2bb4a286b2d74084b8b9619299499105e3bf7085d086cc4cb929eb03e427c80aa49021c WHIRLPOOL 953b2d4dbe13d14c45adf445a3b7a4e039083cd44b7ea90a0bedb039962cc1f82b664ab12f6eebb2c7c5783c2433c5d955973bd333f894d4075b58ef1d07e6a5
+DIST rspamd-1.1.3.tar.xz 1357696 SHA256 8604e980a81d6586d18d02f90236c83384754ef1debce0b4f0ca32f87e1ec135 SHA512 42152dd64f6265e3a17d6d53b041ded3b4a262e4d63237bc11e21dca96a4946334ab33c13fffa779b95717ed48629a9cc7a79f1af897d4dd3a831f7c121061ed WHIRLPOOL f9164ff3373bc928414b49d27fedff1d2990f4e01646f4959d759d9b3e4737aa77cced4de9bd9f8548145729fbdb765da78295b2d2e610c0f2bedb29b29ebd73
+DIST rspamd-1.1.4.tar.xz 1357172 SHA256 7186d0448aaddc1e347af580e7ec14e34ff38859db99bf2173139a6bbc18821d SHA512 de4afb82beba9d8d28a6cf6d7eb222806671fcca51114b9668fe0484c5a2b0680763d3fe6095cb7d4b301991a5f17effef6cfbf70d6d98c8e79476bbdb8b6ee3 WHIRLPOOL 0dab7e399a9319e82c1cacbf856cf4977376f78b12aa7de563912f6a5ed6280a8ec2b2bd0a07fe46dc684112b725717fb4fb9031b9d9d69ac2da59ba98724dea
diff --git a/mail-filter/rspamd/rspamd-1.1.1-r1.ebuild b/mail-filter/rspamd/rspamd-1.1.1-r1.ebuild
deleted file mode 100644
index c5ecabb41092..000000000000
--- a/mail-filter/rspamd/rspamd-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Rapid spam filtering system"
-SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+jit"
-
-DEPEND="dev-libs/openssl:0
-		jit? (
-			dev-libs/libpcre[jit]
-			dev-lang/luajit:2
-		)
-		!jit? (
-			dev-libs/libpcre[-jit]
-			>=dev-lang/lua-5.1:0
-		)
-		dev-libs/libevent
-		dev-db/sqlite:3
-		dev-libs/glib:2
-		dev-libs/gmime
-		sys-apps/file
-		virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup rspamd
-	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-		-DENABLE_LUAJIT=$(usex jit)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rspamd.init" rspamd
-
-	dodir /var/lib/rspamd
-	dodir /var/log/rspamd
-
-	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/rspamd.logrotate" rspamd
-}
diff --git a/mail-filter/rspamd/rspamd-1.1.1.ebuild b/mail-filter/rspamd/rspamd-1.1.1.ebuild
deleted file mode 100644
index ed352f4c77e4..000000000000
--- a/mail-filter/rspamd/rspamd-1.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Rapid spam filtering system"
-SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0
-		dev-libs/libpcre
-		dev-lang/luajit:2
-		dev-libs/libevent
-		dev-db/sqlite:3
-		dev-libs/glib:2
-		dev-libs/gmime
-		sys-apps/file
-		virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup rspamd
-	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rspamd.init" rspamd
-
-	dodir /var/lib/rspamd
-	dodir /var/log/rspamd
-
-	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/rspamd.logrotate" rspamd
-}
diff --git a/mail-filter/rspamd/rspamd-1.1.2.ebuild b/mail-filter/rspamd/rspamd-1.1.2.ebuild
deleted file mode 100644
index fead741e37d5..000000000000
--- a/mail-filter/rspamd/rspamd-1.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Rapid spam filtering system"
-SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+jit"
-
-DEPEND="dev-libs/openssl:0
-		jit? (
-			dev-libs/libpcre[jit]
-			dev-lang/luajit:2
-		)
-		!jit? (
-			dev-libs/libpcre[-jit]
-			>=dev-lang/lua-5.1:0
-		)
-		dev-libs/libevent
-		dev-db/sqlite:3
-		dev-libs/glib:2
-		dev-libs/gmime
-		sys-apps/file
-		virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup rspamd
-	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-		-DENABLE_LUAJIT=$(usex jit)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rspamd.init-r1" rspamd
-
-	dodir /var/lib/rspamd
-	dodir /var/log/rspamd
-
-	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/rspamd.logrotate" rspamd
-}
diff --git a/mail-filter/rspamd/rspamd-1.1.3.ebuild b/mail-filter/rspamd/rspamd-1.1.3.ebuild
new file mode 100644
index 000000000000..5656b031ce36
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.1.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+jit"
+
+DEPEND="dev-libs/openssl:0
+		jit? (
+			dev-libs/libpcre[jit]
+			dev-lang/luajit:2
+		)
+		!jit? (
+			dev-libs/libpcre[-jit]
+			>=dev-lang/lua-5.1:0
+		)
+		dev-libs/libevent
+		dev-db/sqlite:3
+		dev-libs/glib:2
+		dev-libs/gmime
+		sys-apps/file
+		virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r1" rspamd
+
+	dodir /var/lib/rspamd
+	dodir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+}
diff --git a/mail-filter/rspamd/rspamd-1.1.4.ebuild b/mail-filter/rspamd/rspamd-1.1.4.ebuild
new file mode 100644
index 000000000000..5656b031ce36
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.1.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+jit"
+
+DEPEND="dev-libs/openssl:0
+		jit? (
+			dev-libs/libpcre[jit]
+			dev-lang/luajit:2
+		)
+		!jit? (
+			dev-libs/libpcre[-jit]
+			>=dev-lang/lua-5.1:0
+		)
+		dev-libs/libevent
+		dev-db/sqlite:3
+		dev-libs/glib:2
+		dev-libs/gmime
+		sys-apps/file
+		virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r1" rspamd
+
+	dodir /var/lib/rspamd
+	dodir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+}
diff --git a/mail-mta/exim/exim-4.86-r2.ebuild b/mail-mta/exim/exim-4.86-r2.ebuild
index 8d54cbac9dfd..afad1483e3e5 100644
--- a/mail-mta/exim/exim-4.86-r2.ebuild
+++ b/mail-mta/exim/exim-4.86-r2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2
@@ -28,7 +28,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
 		libressl? ( dev-libs/libressl:= )
 	)
 	gnutls? ( net-libs/gnutls[pkcs11?]
diff --git a/mail-mta/exim/exim-4.87_rc3.ebuild b/mail-mta/exim/exim-4.87_rc3.ebuild
index 356e2ffefc0e..2bcd19282d75 100644
--- a/mail-mta/exim/exim-4.87_rc3.ebuild
+++ b/mail-mta/exim/exim-4.87_rc3.ebuild
@@ -28,7 +28,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
 		libressl? ( dev-libs/libressl:= )
 	)
 	gnutls? ( net-libs/gnutls[pkcs11?]
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index dab1022b8864..9f254a4e4d69 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,2 +1,3 @@
 DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c
+DIST nullmailer-2.0.tar.gz 249538 SHA256 d70f4cc4a0c1ff2630d9e2c54c967700d641d06035dd8998a43e616469834f84 SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6 WHIRLPOOL c6ed5dcf5669beff4d440b1862a8155bc414c202382de0d998e76c0d241b7974c255bbfebcee2853ca7997cd239c44b5d472d15a913aa7cd0646bdda9f1797c9
 DIST nullmailer-patches-1.13.tar.xz 8384 SHA256 8685dfbf23e9dc15269b1a0d14f700c4ef990cf49d4e6e830c0217289e8f4733 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c WHIRLPOOL 84f523be7963ceb7fbafd3f5632571e7bc12085b1b4bce5bb5c63871fd6c7ed1367a49ddf5ed66acad7055e28856b23fb1dcb59e60158fed26447128edd0a4fa
diff --git a/mail-mta/nullmailer/asd b/mail-mta/nullmailer/asd
new file mode 100644
index 000000000000..c461dea32331
--- /dev/null
+++ b/mail-mta/nullmailer/asd
@@ -0,0 +1,123 @@
+# 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 multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	sed -e "s#/usr/local/etc#/etc#" -e "s#/usr/local/libexec#/usr/libexec#" -i doc/nullmailer-send.8
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(use_enable ssl tls)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO doc/DIAGRAM
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-1.13 remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r4 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then
+		mkfifo "${ROOT}"/var/spool/nullmailer/trigger
+	fi
+	chown nullmail:nullmail \
+		"${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die
+	chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then
+		rm "${ROOT}"/var/spool/nullmailer/trigger || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
+		einfo "Setting /etc/nullmailer/me"
+		/bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
+	fi
+	if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		/bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
+	fi
+}
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r5 b/mail-mta/nullmailer/files/init.d-nullmailer-r5
new file mode 100644
index 000000000000..6d27d8b91a89
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r5
@@ -0,0 +1,52 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
+start_stop_daemon_args+=" --stdout /var/log/nullmailer/nullmailer.log"
+start_stop_daemon_args+=" --stderr /var/log/nullmailer/nullmailer.log"
+
+required_dirs="/var/spool/nullmailer /var/log/nullmailer"
+pidfile="/run/nullmailer.pid"
+command_background="true"
+
+depend() {
+	use net logger
+}
+
+checkconfig() {
+	local error=0
+	local f=/etc/nullmailer/me
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	f=/etc/nullmailer/defaultdomain
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	if [ ${error} -eq 1 ]; then
+		einfo "You need to run 'emerge --config nullmailer'!"
+	fi
+	if [ -e /service/nullmailer ]; then
+		eerror "Nullmailer is already running under svscan!"
+		error=2
+	fi
+	if [ ${error} -ne 0 ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+start_pre() {
+	checkconfig
+}
+
+stop_pre() {
+	checkconfig # to avoid init.d stopping svscan instance
+}
diff --git a/mail-mta/nullmailer/files/remotes.sample-2.0 b/mail-mta/nullmailer/files/remotes.sample-2.0
new file mode 100644
index 000000000000..59535d691034
--- /dev/null
+++ b/mail-mta/nullmailer/files/remotes.sample-2.0
@@ -0,0 +1,30 @@
+# Format is: HOST PROTOCOL [OPTIONS]
+# HOST = IP or DNS
+# PROTOCOL = smtp | qmtp
+# OPTIONS = [port=NUMBER] [user] [pass] [starttls | ssl [insecure] ]
+#
+# Examples:
+# A standard SMTP server:
+# somesendmailserver.domain.com smtp
+#
+# A qmail server with QMQP setup:
+# someqmailserver.domain.com qmqp
+#
+# A nonstandard SMTP server setup:
+# someotherserver.domain.com smtp port=2525
+#
+# SMTP server supporting AUTH PLAIN
+# mailserver smtp user=<user> pass=<pass>
+#
+# SMTP server supporting AUTH LOGIN 
+# mailserver smtp user=<user> pass=<pass> auth-login
+#
+# SMTP server with smtps (legacy - use starttls instead)
+# mailserver smtp user=<user> pass=<pass> port=465 ssl
+#
+# SMTP server on submission port with starttls
+# mailserver smtp user=<user> pass=<pass> port=587 starttls
+#
+# SMTP server on submission port with starttls and self-signed certificate
+# mailserver smtp user=<user> pass=<pass> port=587 starttls insecure
+
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml
index eddb655411ab..fc963bb3597f 100644
--- a/mail-mta/nullmailer/metadata.xml
+++ b/mail-mta/nullmailer/metadata.xml
@@ -5,7 +5,7 @@
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>net-mail@gentoo.org</email>
     <name>Net-Mail</name>
   </maintainer>
diff --git a/mail-mta/nullmailer/nullmailer-2.0.ebuild b/mail-mta/nullmailer/nullmailer-2.0.ebuild
new file mode 100644
index 000000000000..1c3e959c890b
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-2.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	default
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	sed \
+		-e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \
+		-e 's:/usr/etc/:/etc/:g' \
+		-i doc/nullmailer-send.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(use_enable ssl tls)
+}
+
+src_install () {
+	default
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-${PV} remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r5 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then
+		mkfifo "${ROOT}"/var/spool/nullmailer/trigger || die
+	fi
+	chown nullmail:nullmail \
+		"${ROOT}"/var/log/nullmailer \
+		"${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 \
+		"${ROOT}"/var/log/nullmailer \
+		"${ROOT}"/var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die
+	chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then
+		rm "${ROOT}"/var/spool/nullmailer/trigger || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
+		einfo "Setting /etc/nullmailer/me"
+		/bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
+	fi
+	if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		/bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
+	fi
+}
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index f33bba905d7a..402b52187563 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1 +1 @@
-DIST opensmtpd-5.7.3p1.tar.gz 709178 SHA256 848a3c72dd22b216bb924b69dc356fc297e8b3671ec30856978950208cba74dd SHA512 e75ed2e148d25716df3af7b6746332c475eb671b91d3832b9a56b11a1e567749065f1332cd06d928cf6bd5122427cd33cc3e0f5f4e2bec0f2269db695be65b7e WHIRLPOOL 191fe5e30f71aa1076434f95b46c1ffbc893ef15d355c485bbb2df503d0af986af6602424ab04f984a9041ca6074cf975289e7708e1362fa483f423a6c1e0d51
+DIST opensmtpd-5.7.3p2.tar.gz 709074 SHA256 0d2973008d0f66bebb84bed516be6c32617735241cc54dd26643529281a8e52b SHA512 bac0b8d6a6969a5e49a1d45b2c74cb2f3da44d06b12c7162500adf3ca312751020762bc8301075a9d7634d94cf51f978d04fac327f843680646e9e687737c42f WHIRLPOOL 7c82fe76f9185472781b24332b6c7acd3b062e1bb6e426e122e1d2b2caf90e33a46770d6504fb7a3b32d50c9e31aa7284d2e47968e43d706b590936223f03dc6
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.3_p2-r1.ebuild
index ef9a28680ae7..ef9a28680ae7 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.7.3_p2-r1.ebuild
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.3_p2.ebuild
index fe35e0f7025a..fe35e0f7025a 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.7.3_p2.ebuild
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d6887f343f9f..716f71a389b3 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,5 +2,7 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
 DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
 DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
-DIST postfix-3.1-20160207.tar.gz 4320251 SHA256 4131dde89bc665c18a06a8ecac5cb2d7c4b94293ee45668856cb521fe50cb41f SHA512 4c5e5cc3afa199fce96aa27b0970be0a927684e96de23a4c8354beba1858737416b1fbbefa7297a9d76e90fd18802143f55c09ba479aab6b304081bc8e2e3f18 WHIRLPOOL 9cfc29d05ff4c0a57a51b9e18c9510ece72cf130852ca4440c45998c81207f337c853835c03fe2564d2a001730586791fae31987adbe7092124301ea91190b5b
+DIST postfix-3.0.4.tar.gz 4240805 SHA256 b81ce81176b9df7183ad99b9c98000135f5e88e659493ab50db5d9fe5b8dba0e SHA512 ca1ad1b7a0c552825d820e1ea017bdd79cf31e6262c9d2b801fa11011be5e10549cfb57745cec4177046a178fab104f3b7f79bf08708bb7772b127970970949d WHIRLPOOL e1a00ba9733522109ebbefa902021abda3bed0316da98cfb98a305122e736f5889b8b5a6426f152d0c68a9f8cb675683fddb80fd12fa6b278f1ae8c024c5fc1c
+DIST postfix-3.1.0-RC1.tar.gz 4336847 SHA256 a94c5aeaa9305393467c78bb7a97b454eec8f363d57528ab883d45a694577558 SHA512 f203189885b58aec0f93fb3dffcdd57c262958c2d5035d3d707a50597408c33a3860e08723ac241195446a6df9a2515ed2cf66eef2245ac9cc1ff281f1f75c4f WHIRLPOOL a9a5a5f4f4a5ff189bb4688d4710c92955ab5ee05c1a673b43a7a40a1a09affd16929c82ccf960d5d683bedcc0174a8baca645ab5992dfdcf9ed6a0d09a77eac
+DIST postfix-3.2-20160221.tar.gz 4328066 SHA256 f9cd8af9bde5b5b10ce401ef69da5344da1c6d12d34c90e5215972a339de0eb6 SHA512 3be6f1cf53f18c0df129794338e3bef12357290fcbc9bddd04d64425e13f45bb4ad8282d5d8eefacf4d56a444bc09adb22f719935d83181d03bc131b28c67c10 WHIRLPOOL b3b4a8d3bb7a497b084b4c6426208c646f7e291a51977ab0572c396b4c217650d15ffef720b65392658794e1cd9eecd169d40d031589bba8b5be38521c6cd40e
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.0.4.ebuild b/mail-mta/postfix/postfix-3.0.4.ebuild
new file mode 100644
index 000000000000..9cbe08f78cdb
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.0.4.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+# No vda support for postfix-3.0
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+		!vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	if use vda; then
+		epatch "${DISTDIR}"/${VDA_P}.patch
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Remove unnecessary files
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.1.0_rc1.ebuild b/mail-mta/postfix/postfix-3.1.0_rc1.ebuild
new file mode 100644
index 000000000000..febec018b14f
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.1.0_rc1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Keep config_dir clean
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	[ "${EROOT}" == "/" ] && pkg_config
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+}
+
+pkg_config() {
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"usr/sbin/postfix tls all-default-client ; then
+			elog "Configuring client side TLS settings"
+			"${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"usr/sbin/postfix tls all-default-server ; then
+			elog "Configuring server side TLS settings"
+			"${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.1_pre20160207.ebuild b/mail-mta/postfix/postfix-3.1_pre20160207.ebuild
deleted file mode 100644
index 0eec0d7f2dbd..000000000000
--- a/mail-mta/postfix/postfix-3.1_pre20160207.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-
-RDEPEND="${DEPEND}
-	dovecot-sasl? ( net-mail/dovecot )
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
-		!vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	if use vda; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
-	epatch_user
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
-	local myconf
-	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
-		html_directory=\"/usr/share/doc/${PF}/html\""
-
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		${myconf} \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool and posttls-finger
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.2_pre20160221.ebuild b/mail-mta/postfix/postfix-3.2_pre20160221.ebuild
new file mode 100644
index 000000000000..790c62efd05d
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.2_pre20160221.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Keep config_dir clean
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	[ "${EROOT}" == "/" ] && pkg_config
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+}
+
+pkg_config() {
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"usr/sbin/postfix tls all-default-client ; then
+			elog "Configuring client side TLS settings"
+			"${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"usr/sbin/postfix tls all-default-server ; then
+			elog "Configuring server side TLS settings"
+			"${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
index 5acf34de129e..403072691625 100644
--- a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="X +introspection networkmanager"
 
diff --git a/mate-base/mate/mate-1.10.0-r2.ebuild b/mate-base/mate/mate-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..930c145e1967
--- /dev/null
+++ b/mate-base/mate/mate-1.10.0-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit versionator
+
+MATE_MV="$(get_version_component_range 1-2)"
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+base -bluetooth +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_MV}*:0
+	=mate-base/mate-menus-${MATE_MV}*:0
+	=mate-base/mate-panel-${MATE_MV}*:0
+	=mate-base/mate-session-manager-${MATE_MV}*:0
+	=mate-base/mate-settings-daemon-${MATE_MV}*:0
+	=x11-wm/marco-${MATE_MV}*:0
+	base? (
+		=mate-base/caja-${MATE_MV}*:0
+		=mate-base/mate-applets-meta-${MATE_MV}*:0
+		=mate-base/mate-control-center-${MATE_MV}*:0
+		=mate-extra/mate-media-${MATE_MV}*:0
+		=x11-misc/mozo-${MATE_MV}*:0
+		=x11-terms/mate-terminal-${MATE_MV}*:0
+	)
+	bluetooth? ( net-wireless/blueman:0 )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_MV}*:0
+		=x11-themes/mate-icon-theme-${MATE_MV}*:0
+		=x11-themes/mate-themes-meta-${MATE_MV}*:0
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_MV}*:0
+		=app-editors/pluma-${MATE_MV}*:0
+		=app-text/atril-${MATE_MV}*:0
+		gnome-extra/gnome-calculator:0
+		=mate-extra/caja-extensions-${MATE_MV}*:0
+		=mate-extra/mate-netbook-${MATE_MV}*:0
+		=mate-extra/mate-power-manager-${MATE_MV}*:0
+		=mate-extra/mate-screensaver-${MATE_MV}*:0
+		=mate-extra/mate-system-monitor-${MATE_MV}*:0
+		=mate-extra/mate-utils-${MATE_MV}*:0
+		=media-gfx/eom-${MATE_MV}*:0
+		=net-analyzer/mate-netspeed-${MATE_MV}*:0
+		sys-apps/gnome-disk-utility:0
+	)
+"
+
+PDEPEND="
+	notification? ( x11-misc/mate-notification-daemon )
+	virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	if ! has_version x11-misc/mate-notification-daemon; then
+		elog "If you experience any issues with notifications, please try using"
+		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
+		elog ""
+	fi
+	elog "MATE 1.10 had some packages renamed, replaced and/or dropped; for more"
+	elog "details, see http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/"
+	elog ""
+	elog "Some packages that are not included in this meta-package but may be of interest:"
+	elog "		mate-extra/caja-dropbox"
+	elog "		mate-extra/mate-user-share"
+}
diff --git a/mate-base/mate/mate-1.10.0.ebuild b/mate-base/mate/mate-1.10.0.ebuild
deleted file mode 100644
index 236acf7cfece..000000000000
--- a/mate-base/mate/mate-1.10.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit versionator
-
-MATE_MV="$(get_version_component_range 1-2)"
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+base -bluetooth +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_MV}*:0
-	=mate-base/mate-menus-${MATE_MV}*:0
-	=mate-base/mate-panel-${MATE_MV}*:0
-	=mate-base/mate-session-manager-${MATE_MV}*:0
-	=mate-base/mate-settings-daemon-${MATE_MV}*:0
-	=x11-wm/marco-${MATE_MV}*:0
-	base? (
-		=mate-base/caja-${MATE_MV}*:0
-		=mate-base/mate-applets-meta-${MATE_MV}*:0
-		=mate-base/mate-control-center-${MATE_MV}*:0
-		=mate-extra/mate-media-${MATE_MV}*:0
-		=x11-misc/mozo-${MATE_MV}*:0
-		=x11-terms/mate-terminal-${MATE_MV}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_MV}*:0
-		=x11-themes/mate-icon-theme-${MATE_MV}*:0
-		=x11-themes/mate-themes-${MATE_MV}*:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_MV}*:0
-		=app-editors/pluma-${MATE_MV}*:0
-		=app-text/atril-${MATE_MV}*:0
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_MV}*:0
-		=mate-extra/mate-netbook-${MATE_MV}*:0
-		=mate-extra/mate-power-manager-${MATE_MV}*:0
-		=mate-extra/mate-screensaver-${MATE_MV}*:0
-		=mate-extra/mate-system-monitor-${MATE_MV}*:0
-		=mate-extra/mate-utils-${MATE_MV}*:0
-		=media-gfx/eom-${MATE_MV}*:0
-		=net-analyzer/mate-netspeed-${MATE_MV}*:0
-		sys-apps/gnome-disk-utility:0
-	)
-"
-
-PDEPEND="virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	elog "MATE 1.10 had some packages renamed, replaced and/or dropped; for more"
-	elog "details, see http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/"
-	elog ""
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
diff --git a/mate-base/mate/metadata.xml b/mate-base/mate/metadata.xml
index 0eced4b81626..d617e6093745 100644
--- a/mate-base/mate/metadata.xml
+++ b/mate-base/mate/metadata.xml
@@ -10,6 +10,9 @@
 			recommended for the most common usage; for example, this installs
 			the file manager. Disable this and other USE flags if you want a
 			more minimal MATE Desktop.</flag>
+		<flag name="notification">Force notification daemon to default to MATE's
+			notification daemon. Enabled by default. Disable if it causes conflicts
+			with other installed desktop environments.</flag>
 		<flag name="themes">Install MATE Desktop's themes; if you use other
 			themes, you can disable this to spare some space and time.</flag>
 		<flag name="extras">Install additional MATE Desktop applications that
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
index b5a915f400da..8b104f715dd6 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -6,6 +6,7 @@
         <name>Gentoo MATE Desktop</name>
     </maintainer>
 	<use>
+		<flag name="cdr">Add an extension to burn files to cds using <pkg>app-cdr/brasero</pkg>.</flag>
 		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
 		<flag name="image-converter">Add image conversion support.</flag>
 		<flag name="mail">Add an extension to support e-mail functionality.</flag>
diff --git a/mate-extra/mate-user-share/mate-user-share-1.10.1-r1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..c9e9dac0936f
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.10.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 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 multilib versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Personal file sharing for the MATE desktop"
+HOMEPAGE="http://www.mate-desktop.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.15.2:2
+	>=dev-libs/libunique-1:1
+	>=mate-base/caja-1.10:0
+	media-libs/libcanberra:0[gtk]
+	>=sys-apps/dbus-1.1.1:0
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/libnotify-0.7:0
+	>=www-apache/mod_dnssd-0.6:0
+	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+		--disable-bluetooth \
+		$(use_with X x)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild
deleted file mode 100644
index 09806cc7c15d..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 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 multilib versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Personal file sharing for the MATE desktop"
-HOMEPAGE="http://www.mate-desktop.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X bluetooth"
-
-RDEPEND=">=app-mobilephone/obex-data-server-0.4:0
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=dev-libs/libunique-1:1
-	>=mate-base/caja-1.10:0
-	media-libs/libcanberra:0[gtk]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	virtual/libintl:0
-	bluetooth? ( >=net-wireless/bluez-4.18:0= )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		$(use_enable bluetooth) \
-		$(use_with X x)
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..3fe2309dc647
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 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 multilib versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Personal file sharing for the MATE desktop"
+HOMEPAGE="http://www.mate-desktop.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.15.2:2
+	>=dev-libs/libunique-1:1
+	>=mate-base/caja-1.8:0
+	media-libs/libcanberra:0[gtk]
+	>=sys-apps/dbus-1.1.1:0
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/libnotify-0.7:0
+	>=www-apache/mod_dnssd-0.6:0
+	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+		--disable-bluetooth \
+		$(use_with X x)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 030160ca0151..2b3451bce103 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,2 +1,3 @@
 DIST cantarell-fonts-0.0.18.1.tar.xz 289248 SHA256 9c5b1a2edee1d3acf30eaae3d559b2b2e1d835249cf2770f6f8bfc6af861e8f0 SHA512 eeabffc1f51f1c5423c7eba29b9dd47b4e7595146a1f380bd2742ee692a95fafb159e5f0d67c2b8864da23d277a782eeb65939a3fb82f70b09d0c89d38663f7d WHIRLPOOL 5a610d9be666fa7b4aac9edebdbe6bd71c1d948fbdb4556dff8f4635db8298d7bf11b6d0d02f4a5a112e1653c3d32d14ab5756a2614879c815dc8694f77ed3bd
 DIST cantarell-fonts-0.0.21.tar.xz 359408 SHA256 2d3e925574648f0902c61975f84acac445ee9cda826280644bdf772960b46e85 SHA512 4c22123ff6aeb1d7325ef8933c86778f6df9fac370a415028cc45a193051454b06cf32673d872b9fc6c55c0000923221c7501348bea8606b247deb3f997f820a WHIRLPOOL 0a937eaacfa027aaab421ba89e569cfb4e750e8d83589d8ff0d732608dccb18ec472ee12fc17e06bb15e918337eb7580eae8a63cc17d25c19ddebe9f312589b2
+DIST cantarell-fonts-0.0.22.tar.xz 360352 SHA256 6dacb87e5a4e20837741aca07a202c0872065c4df8735a6f016b516a09b41e82 SHA512 396df675fc4359e1f5e139845c6efcc4891e44a31095b80b09455517ef152688052b0974d09e9c4b26758db4eabbb847c7b31c00c5ff90a1c7de8ce806b25b4f WHIRLPOOL 96e706e9f5c1bc34e0b16355f1cdd7125a59a1d9f02e193145c0c29c82cc0993229f60ce88ae736ed0d580afff429b441b8a573a198f2a03208c4c6d77acb8bf
diff --git a/media-fonts/cantarell/cantarell-0.0.22.ebuild b/media-fonts/cantarell/cantarell-0.0.22.ebuild
new file mode 100644
index 000000000000..daa3b3297108
--- /dev/null
+++ b/media-fonts/cantarell/cantarell-0.0.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="${PN}-fonts"
+
+inherit font gnome.org
+
+DESCRIPTION="Default fontset for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/fontconfig"
+DEPEND="virtual/pkgconfig"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+# Font eclass settings
+FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
+FONT_S="${S}/otf"
+FONT_SUFFIX="otf"
diff --git a/media-fonts/source-han-sans/source-han-sans-1.001-r1.ebuild b/media-fonts/source-han-sans/source-han-sans-1.001-r1.ebuild
new file mode 100644
index 000000000000..b43edfd92850
--- /dev/null
+++ b/media-fonts/source-han-sans/source-han-sans-1.001-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit font
+
+# Note to maintainers:
+# The upstream tarball is huge (over 780 MB), so we repackage the
+# regional subset OTF fonts per region, for the user's convenience.
+
+DESCRIPTION="Pan-CJK OpenType/CFF font family"
+HOMEPAGE="https://github.com/adobe-fonts/source-han-sans/"
+SRC_URI="cjk? ( https://dev.gentoo.org/~yngwin/distfiles/${PN}-ja-${PV}.tar.xz
+		https://dev.gentoo.org/~yngwin/distfiles/${PN}-ko-${PV}.tar.xz
+		https://dev.gentoo.org/~yngwin/distfiles/${PN}-zh_CN-${PV}.tar.xz
+		https://dev.gentoo.org/~yngwin/distfiles/${PN}-zh_TW-${PV}.tar.xz )
+	linguas_ja? ( https://dev.gentoo.org/~yngwin/distfiles/${PN}-ja-${PV}.tar.xz )
+	linguas_ko? ( https://dev.gentoo.org/~yngwin/distfiles/${PN}-ko-${PV}.tar.xz )
+	linguas_zh_CN? ( https://dev.gentoo.org/~yngwin/distfiles/${PN}-zh_CN-${PV}.tar.xz )
+	linguas_zh_TW? ( https://dev.gentoo.org/~yngwin/distfiles/${PN}-zh_TW-${PV}.tar.xz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
+IUSE="cjk linguas_ja linguas_ko +linguas_zh_CN linguas_zh_TW"
+REQUIRED_USE="|| ( cjk linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW )"
+
+S=${WORKDIR}
+FONT_SUFFIX="otf"
+RESTRICT="binchecks strip"
+
+src_install() {
+	for l in ja ko zh_CN zh_TW; do
+		( use cjk || use linguas_${l} ) \
+			&& FONT_S="${S}/source-han-sans-${l}-${PV}" font_src_install
+	done
+	dodoc source-han-sans-*-${PV}/*md source-han-sans-*-${PV}/*pdf
+}
diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
index b3261ba34969..f9cf09ce38b3 100644
--- a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
+++ b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # Tests need valgrind, that needs glibc with debugging symbols
diff --git a/media-gfx/comical/Manifest b/media-gfx/comical/Manifest
deleted file mode 100644
index 5a4e6ede55a9..000000000000
--- a/media-gfx/comical/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST comical-0.8.tar.gz 480270 SHA256 0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e SHA512 db50cbf37dfcce5326c0e58c3fcbb1d941ceb24a99f7e3c9d7e3af1a72a63779014d955f8e7cb5adcc3ba95e022ec9bf741d0847f87191377c245fe271be4b0d WHIRLPOOL 5794243c97d3fdb4f719c931715f4da5ddeb4498d5bff5d9f8f173509e5337090e2a2d4a7d0c315abc228dd33221e86552d69c5e1ea3d2a9d427adeca6383c23
diff --git a/media-gfx/comical/comical-0.8-r3.ebuild b/media-gfx/comical/comical-0.8-r3.ebuild
deleted file mode 100644
index df2d14d13caa..000000000000
--- a/media-gfx/comical/comical-0.8-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils gnome2-utils toolchain-funcs wxwidgets
-
-DESCRIPTION="A sequential image display program, to deal with .cbr and .cbz files"
-HOMEPAGE="http://comical.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-arch/unrar-4.1.4-r2
-	sys-libs/zlib[minizip]
-	x11-libs/wxGTK:2.8[X]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	export WX_GTK_VER=2.8
-	need-wxwidgets unicode
-
-	epatch \
-		"${FILESDIR}"/${P}-wxGTK-2.8.patch \
-		"${FILESDIR}"/${P}-syslibs.patch
-
-	sed -i -e "s:wx-config:${WX_CONFIG}:" {.,src}/Makefile || die
-
-	rm -rf un{rar,zip}
-}
-
-src_compile() {
-	tc-export CXX
-	emake -j1
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc AUTHORS ChangeLog README TODO
-
-	doicon 'Comical Icons'/${PN}.xpm
-	doicon -s 128 'Comical Icons'/${PN}.png
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-gfx/comical/files/comical-0.8-syslibs.patch b/media-gfx/comical/files/comical-0.8-syslibs.patch
deleted file mode 100644
index e831bc82c4a7..000000000000
--- a/media-gfx/comical/files/comical-0.8-syslibs.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Use system libminizip (zlib) wrt http://bugs.gentoo.org/407269.
-Use system libunrar. Use CXX and CXXFLAGS instead of CC and CFLAGS for g++.
-Stop using passing libraries from LDFLAGS and use LDLIBS instead.
-
---- Makefile
-+++ Makefile
-@@ -1,5 +1,5 @@
--CC = `wx-config --cxx`
--LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
-+CXX ?= `wx-config --cxx`
-+LDLIBS = `wx-config --libs` -lunrar `pkg-config --libs minizip`
- INSTALL = install
- INSTALL_PROGRAM = $(INSTALL)
- prefix = /usr/local
-@@ -12,18 +12,12 @@
- 
- all: comical
- 
--comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
--	$(CC) -o $@ $(OBJS) $(LDFLAGS)
-+comical: $(OBJS)
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDLIBS)
- 
- $(OBJS):
- 	$(MAKE) -C src
- 
--unrar/libunrar.a:
--	$(MAKE) lib -C unrar -f makefile.linux
--
--unzip/libminiunzip.a:
--	$(MAKE) -C unzip
--
- install: comical
- 	$(INSTALL_PROGRAM) comical $(DESTDIR)$(bindir)/comical
- 
-@@ -39,8 +33,6 @@
- 
- distclean:
- 	$(MAKE) clean
--	$(MAKE) clean -C unrar -f makefile.linux
--	$(MAKE) clean -C unzip
- 	rm -f $(DEPS) bin2h src/bin2h.o
- 
- .PHONY : install install-strip uninstall clean distclean
---- src/ComicBookRAR.h
-+++ src/ComicBookRAR.h
-@@ -29,7 +29,7 @@
- #define _ComicBookRAR_h_
- 
- #include "ComicBook.h"
--#include "dll.hpp"
-+#include <dll.hpp>
-  
- class ComicBookRAR : public ComicBook {
- 
---- src/ComicBookZIP.cpp
-+++ src/ComicBookZIP.cpp
-@@ -27,7 +27,7 @@
- 
- #include "ComicBookZIP.h"
- #include <wx/mstream.h>
--#include "unzip.h"
-+#include <unzip.h>
- #include "Exceptions.h"
- #include <cstring>
- #include <errno.h>
---- src/Makefile
-+++ src/Makefile
-@@ -1,6 +1,5 @@
--INCLUDE = -I../unrar -I../unzip
--CFLAGS = -O2 -Wall -pipe
--CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
-+CXXFLAGS += -Wall `wx-config --cxxflags` `pkg-config --cflags minizip` -I/usr/include/libunrar
-+CPPFLAGS += -D_UNIX $(CXXFLAGS)
- 
- .SUFFIXES: .cpp .png .h .d .o
- 
-@@ -21,11 +20,11 @@
- 	@echo -e "};\n\n#endif" >> $@
- 
- %.o : %.cpp
--	$(CC) $(CPPFLAGS) -c -o $*.o $<
-+	$(CXX) $(CPPFLAGS) -c -o $*.o $<
- 
- %.d : %.cpp
- 	@set -e; rm -f $@; \
--	 $(CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
-+	 $(CXX) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
- 	 sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
- 	 rm -f $@.$$$$
- 
diff --git a/media-gfx/comical/files/comical-0.8-wxGTK-2.8.patch b/media-gfx/comical/files/comical-0.8-wxGTK-2.8.patch
deleted file mode 100644
index 007aab3e3738..000000000000
--- a/media-gfx/comical/files/comical-0.8-wxGTK-2.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://comical.svn.sourceforge.net/viewvc/comical/trunk/src/ComicalApp.cpp?r1=170&r2=171
-
---- src/ComicalApp.cpp
-+++ src/ComicalApp.cpp
-@@ -28,6 +28,7 @@
- #include "ComicalApp.h"
- #include "ComicalFrame.h"
- #include <wx/log.h>
-+#include <wx/icon.h>
- 
- #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
- #include "../Comical Icons/comical.xpm"
diff --git a/media-gfx/comical/files/comical.desktop b/media-gfx/comical/files/comical.desktop
deleted file mode 100644
index 14a3a08e8202..000000000000
--- a/media-gfx/comical/files/comical.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Comical
-GenericName=Comic Book Reader
-Exec=comical %F
-Icon=comical
-Type=Application
-Terminal=false
-Categories=Graphics;Viewer;
-MimeType=application/x-cbr;application/x-cbz;
diff --git a/media-gfx/comical/metadata.xml b/media-gfx/comical/metadata.xml
deleted file mode 100644
index 62a044a59941..000000000000
--- a/media-gfx/comical/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 type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">comical</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
index 500c9c8179f6..e48eea90c119 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.3.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/Manifest b/media-gfx/eog/Manifest
index 814eedf43c35..ebea10d5d14e 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,2 +1,3 @@
 DIST eog-3.16.3.tar.xz 4306536 SHA256 ee6d101f8e73aacc8d48256f06a780c6d0d5f3975990f375f58cd0e70816b766 SHA512 bd60712278ed7c4a6a3342b32086f0a471b74869a17da36d0043459260fd923fe908981454c3efbe0b1e128512b1e19e276eb66f091e7839e65a67fbfe9e0daf WHIRLPOOL 62b2fa6ca82d708aab11dbb1f96d851bfdb9d9a6db7f59501a2845c471b42ffb0debd545266987fb2b62be01363257b648ab71746629e02afd6ef668b8d1c46e
 DIST eog-3.18.1.tar.xz 4327208 SHA256 7b7bb47a680518701e2e724c8632fcf12dcb3c3e45ce1f2bdd4c4ace325793a7 SHA512 4bb2891cfa412d1a09adfb83f4fb1780fc03cbf2373292b869b6ec8e35b92e2e410f98c94f8dc898fe052c1499f0d42096111dc6e03105fb71aa4e00925f58b7 WHIRLPOOL fca554a05460d241ec8eb57d3f37cc79a9bcdc6b61ca20bffc2fc39771e4756e09a2a7f68fd919c46fd8f78be75a62e111960ec594079f8917e7c2eea69a3009
+DIST eog-3.18.2.tar.xz 4327676 SHA256 dc2d16e3754cad12703261fe586e7599c4df2e39282f6c28681a514f749fe636 SHA512 6c5b14f5e3915e1821a0883036c546b9bb2f8c578c5d5d23b863f7f4210d76b169e23de552888e17579241c382697b4576e52a2ca7495eb06cd3375c6d6206ee WHIRLPOOL d443cec6fa86eedd6eeafa9623940542b70b5ee4b9d90e8c10f9971f13af235203ca8c58391f14f3990951a3088840ea5d1ae108624208ac4c9bce7416670d16
diff --git a/media-gfx/eog/eog-3.18.2.ebuild b/media-gfx/eog/eog-3.18.2.ebuild
new file mode 100644
index 000000000000..8c8aa2657dbc
--- /dev/null
+++ b/media-gfx/eog/eog-3.18.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"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-libs/gtk+-3.14:3[introspection,X]
+	>=x11-misc/shared-mime-info-0.20
+
+	>=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?]
+	x11-libs/libX11
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( media-libs/exempi:2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.16
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with lcms cms) \
+		$(use_with xmp) \
+		$(use_with svg librsvg)
+}
diff --git a/media-gfx/exiv2/exiv2-0.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
index c75be0b10793..1e1cbcb68c4e 100644
--- a/media-gfx/exiv2/exiv2-0.25-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.exiv2.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~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 ~x64-solaris ~x86-solaris"
 IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
 IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
 
diff --git a/media-gfx/fbida/fbida-2.10.ebuild b/media-gfx/fbida/fbida-2.10.ebuild
index d8830863ac94..cfe5defc9841 100644
--- a/media-gfx/fbida/fbida-2.10.ebuild
+++ b/media-gfx/fbida/fbida-2.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ~ppc ppc64 ~sh ~sparc x86"
 IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
 REQUIRED_USE="
 	pdf? ( tiff )
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index b0cdc37794d1..aca47ad8b1b4 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="dev-cpp/eigen:3
+COMMON_DEPEND=">dev-cpp/eigen-3.2.2:3
 	dev-libs/boost
 	dev-libs/xerces-c[icu]
 	dev-python/matplotlib
diff --git a/media-gfx/geeqie/geeqie-1.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
index 1450f807ca02..a3a810d0b17a 100644
--- a/media-gfx/geeqie/geeqie-1.2-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ RDEPEND="x11-libs/gtk+:2
 	lirc? ( app-misc/lirc )
 	lua? ( >=dev-lang/lua-5.1:= )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 	tiff? ( media-libs/tiff:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-gfx/geeqie/geeqie-1.2.1.ebuild b/media-gfx/geeqie/geeqie-1.2.1.ebuild
index d5e374e5e30b..b654441d55b9 100644
--- a/media-gfx/geeqie/geeqie-1.2.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 )
 	lirc? ( app-misc/lirc )
 	lua? ( >=dev-lang/lua-5.1:= )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 	tiff? ( media-libs/tiff:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild
index 76157420b1a1..d60ed58c5c71 100644
--- a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 )
 	lirc? ( app-misc/lirc )
 	lua? ( >=dev-lang/lua-5.1:= )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 	tiff? ( media-libs/tiff:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
index 91b99a33bfa0..e947a6dc9b61 100644
--- a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 )
 	lirc? ( app-misc/lirc )
 	lua? ( >=dev-lang/lua-5.1:= )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 	tiff? ( media-libs/tiff:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-gfx/geeqie/geeqie-1.2.2.ebuild b/media-gfx/geeqie/geeqie-1.2.2.ebuild
index 46fb3742348d..9212c0fc1dfd 100644
--- a/media-gfx/geeqie/geeqie-1.2.2.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 )
 	lirc? ( app-misc/lirc )
 	lua? ( >=dev-lang/lua-5.1:= )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 	tiff? ( media-libs/tiff:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 8f860d580537..dd6cf2b53f81 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -138,6 +138,7 @@ src_configure() {
 
 src_compile() {
 	addwrite /dev/nvidiactl  # bug #569738
+	addwrite /dev/dri/  # bug #574038
 	gnome2_src_compile
 }
 
diff --git a/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
index 98340a3537eb..c52994cfde4c 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
@@ -13,7 +13,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.18.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
index e2d3c37bb85a..181254b8d638 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.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/gphoto2-2.5.9.ebuild b/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
index b94a9c0da8ac..b7103ddc8a86 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index e952aaad4772..1605d31b442c 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,2 +1,3 @@
 DIST graphite2-1.2.1.tgz 4665169 SHA256 7b15b749ae65c1ce3cfb4b98b8d4125e91b695ca31fa83aa51d6542109ab449d SHA512 834de9185c861f1fe54cffc2b6d12117cdd956e64167b0021ea5cb1b83deacff91a2e9d78df9a1a1c038016bf2aad252c88836c49315ca027a0fd0386d8392d9 WHIRLPOOL ec13995a19f9251bf66eeb3d66b7c8ff504ae8993868aa716cb475a69db8f675012445cd2dcb1ac594121c657aafcc1276abfa5ee38620dc6d428c1c8f51e755
 DIST graphite2-1.2.4.tgz 6938866 SHA256 4bc3d5168029bcc0aa00eb2c973269d29407be2796ff56f9c80e10736bd8b003 SHA512 fb4a7bfd5656233975ce339e4e155ccb4fd401b87e30440edab98739355596e41abf5dccf6487d53f6353840a7c87b8270ee33e79c6630cf13a25ac2cb2114de WHIRLPOOL a869dcf293ba1f1d547f86ad88c6bb27879c8ad793135ba29ea12daf19d4fb84f9660fb43bd524934970d163e8bb779a050ec37a734784e25de99bd6463f3d57
+DIST graphite2-1.3.5.tgz 3880214 SHA256 f4712626eda0a1804367133460770560b545bbe75b1c4aab480c9b8e4e1c64bd SHA512 70e85ff44d63dcca6beb55aa68966888453610c4ec1fca0d0986910a8f396ad64fd0b9f393270fd403c93e7e5d45cdc134c3965f47761cd40cd659b92b8abcec WHIRLPOOL 90f5e9858c63f9c452b8457dc5dac9cb78d319dd2bfd13207bbe7e73b60dbfa701be5c17cabe4e11ce2d1be8e0054c23186834425f40d614a1002c3eff2bdcc5
diff --git a/media-gfx/graphite2/files/graphite2-1.3.5-includes-libs-perl.patch b/media-gfx/graphite2/files/graphite2-1.3.5-includes-libs-perl.patch
new file mode 100644
index 000000000000..b6168828dc26
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.5-includes-libs-perl.patch
@@ -0,0 +1,14 @@
+diff -ruN graphite2-1.3.5.orig/contrib/perl/Build.PL graphite2-1.3.5/contrib/perl/Build.PL
+--- graphite2-1.3.5.orig/contrib/perl/Build.PL	2016-01-15 05:17:18.000000000 +0100
++++ graphite2-1.3.5/contrib/perl/Build.PL	2016-02-16 11:11:23.922397562 +0100
+@@ -8,8 +8,8 @@
+     dist_author         => 'Simon Cozens <simon@cpan.org>',
+     dist_version_from   => 'lib/Text/Gr2.pm',
+     extra_compiler_flags => $^O ne 'MSWin32' ? '-Wall -Wno-unused-variable' : '',
+-    extra_linker_flags  => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-lgraphite2',
+-    include_dirs        => ['.', '../include'],
++    extra_linker_flags  => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-L @BUILD_DIR@ -lgraphite2',
++    include_dirs        => ['.', '../include', '../../include'],
+     requires => {
+         'Test::More' => 0,
+     },
diff --git a/media-gfx/graphite2/graphite2-1.3.5.ebuild b/media-gfx/graphite2/graphite2-1.3.5.ebuild
new file mode 100644
index 000000000000..6faa6fcabae2
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GENTOO_DEPEND_ON_PERL="no"
+inherit eutils perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="http://graphite.sil.org/"
+SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="perl test"
+
+RDEPEND="
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="${RDEPEND}
+	perl? (
+		dev-perl/Module-Build
+		dev-perl/Locale-Maketext-Lexicon
+		)
+	test? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/silgraphite
+		${PYTHON_DEPS}
+		perl? ( virtual/perl-Test-Simple )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# make tests optional
+	if ! use test; then
+		sed -i \
+			-e '/tests/d' \
+			CMakeLists.txt || die
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DVM_MACHINE_TYPE=direct"
+		# http://sourceforge.net/p/silgraphite/bugs/49/
+		$([[ ${CHOST} == powerpc*-apple* ]] && \
+			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
+	)
+
+	cmake-utils_src_configure
+
+	# fix perl linking
+	if multilib_is_native_abi && use perl; then
+		_cmake_check_build_dir init
+		sed -i \
+			-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			"${S}"/contrib/perl/Build.PL || die
+	fi
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	cmake-multilib_src_test
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_install
+		perl_delete_localpod
+	fi
+
+	prune_libtool_files --all
+}
diff --git a/media-gfx/llgal/llgal-0.13.17-r1.ebuild b/media-gfx/llgal/llgal-0.13.17-r1.ebuild
deleted file mode 100644
index a36320d7a6c5..000000000000
--- a/media-gfx/llgal/llgal-0.13.17-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Command-line static web gallery generator"
-HOMEPAGE="http://home.gna.org/llgal"
-SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-# Package warrants IUSE doc and possibly examples
-IUSE="exif"
-
-LINS="de en it fr"
-for i in ${LINS}; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-RDEPEND="media-gfx/imagemagick
-	 dev-perl/ImageSize
-	 dev-perl/URI
-	 dev-perl/Locale-gettext
-	 exif? ( media-libs/exiftool )"
-
-src_compile() {
-	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
-	mv doc/llgalrc . || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
-		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
-		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
-	perl_delete_localpod
-	dodoc README llgalrc llgalrc.5
-}
diff --git a/media-gfx/llgal/llgal-0.13.17-r2.ebuild b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
new file mode 100644
index 000000000000..bb94239e8453
--- /dev/null
+++ b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Command-line static web gallery generator"
+HOMEPAGE="http://home.gna.org/llgal"
+SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+# Package warrants IUSE doc and possibly examples
+IUSE="exif"
+
+LINS="de en it fr"
+for i in ${LINS}; do
+	IUSE="${IUSE} linguas_${i}"
+done
+
+RDEPEND="media-gfx/imagemagick
+	 dev-perl/Image-Size
+	 dev-perl/URI
+	 dev-perl/Locale-gettext
+	 exif? ( media-libs/exiftool )"
+
+src_compile() {
+	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
+	mv doc/llgalrc . || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
+		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
+		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
+	perl_delete_localpod
+	dodoc README llgalrc llgalrc.5
+}
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 4abf41495ad2..b8ffbf1cd96f 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,3 +1,2 @@
 DIST luminance-hdr-2.3.0.tar.bz2 5398576 SHA256 dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676 SHA512 6806782bec25cde92eeafc1e6a6aeb801226c0db27bd9163829b4556209267a9f5f0ecaae934fbb42a25a780cd131bc34880bc48d6d68867fe1ab117bb4cde08 WHIRLPOOL 8f1430b0e46d53e79e7ba565b73e190b0ad6efb9f2937f8612b0ddda4d442fbc4c31b055a4904c48338e00dc8719cefb94b7f43fff040255f403ebeb4e8aac95
-DIST luminance-hdr-2.3.1.tar.bz2 10323806 SHA256 c2a4764986bf8860d448530f3c8d76143d7504cebb07b3e58e37eb0db5347722 SHA512 d42bcb0cc43594f2ac7d97efd658cfb5a3d34d485ed62822682592a69550c2c00fddbdc202e75fe1617cf1354d44c2f9a83122958d5f4f950380ff5d533191ee WHIRLPOOL 74728c214f9c1d333c2b0afa782cb567d5d6051edfbc875fad9c40c5f33ff2bcdc49ea6d0ea7e37850b62790673cf70dc6b99a2ecca8a0ba8b9b29e64ff9f85a
 DIST luminance-hdr-2.4.0.tar.bz2 10507522 SHA256 14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401 SHA512 aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702 WHIRLPOOL 24c377d8f0b420fde96b1e9055d631668c8285068cec7d5763e94ac91ad24bae2d1cd74ee55b25a28142aaa6ddf3761159ccf28044b690ce817251699234eb8f
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.3.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.3.1.ebuild
deleted file mode 100644
index 20b421461f0c..000000000000
--- a/media-gfx/luminance-hdr/luminance-hdr-2.3.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 cmake-utils toolchain-funcs eutils flag-o-matic
-
-MY_P=${P/_/.}
-DESCRIPTION="Luminance HDR is a graphical user interface that provides a workflow for HDR imaging"
-HOMEPAGE="http://qtpfsgui.sourceforge.net"
-SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
-IUSE="openmp cpu_flags_x86_sse2 test ${LANGS// / linguas_}"
-
-RDEPEND="
-	dev-libs/boost:0=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	>=media-gfx/exiv2-0.14:0=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/libraw-0.13.4:=
-	>=media-libs/openexr-1.2.2-r2:=
-	>=media-libs/tiff-3.8.2-r2:0
-	sci-libs/fftw:3.0[threads]
-	sci-libs/gsl
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-DOCS=( AUTHORS BUGS Changelog README TODO )
-
-pkg_pretend() {
-	if use cpu_flags_x86_sse2 ; then
-		append-flags -msse2
-	else
-		eerror "This package requires a CPU supporting the SSE2 instruction set."
-		die "SSE2 support missing"
-	fi
-
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	# don't try to define the git version of the release
-	epatch "${FILESDIR}"/${P}-no-git.patch
-
-	# don't install extra docs and fix install dir
-	epatch "${FILESDIR}"/${P}-docs.patch
-
-	# fix openmp automagic support
-	epatch "${FILESDIR}"/${P}-openmp-automagic.patch
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use openmp OPENMP)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	for lang in ${LANGS} ; do
-		if ! use linguas_${lang} ; then
-			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
-		fi
-	done
-}
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 848fefe718bd..54fab4697234 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,2 +1,3 @@
 DIST mcomix-1.00.tar.bz2 527779 SHA256 d8453109a297153f67fdc898d822fa57057d575b71ed857e538da9a7426f0cde SHA512 9fc975afa92ad7130fe0d39058463cf26f8a9415257869e45e4cf83fae5e2bd8f4f264821046fcf425ee3729ec3dacfa59cd52342055a6246cf0b61b866f09b1 WHIRLPOOL 6aed2176904d5f12cd66e7f6f41fc23914d5a81cd514242a209994222b7ee1d18ceca4367e78f8a61bb6edbec559d0da94165f4db841c44840d6d768ba700f14
 DIST mcomix-1.01.tar.bz2 543293 SHA256 da333d0bce5157fc8e15d13de6d9ce46b1c35692aa510cb20d6b2230f7c2774c SHA512 d31ed5d851c761d9680643df5c5bac1af817c61b49455bfd887381e0d7651593f9fb70fdbdb7533ae7bb6f8a203f0cabcbfdcce8a9681aa1d9ceaa3a411c1e70 WHIRLPOOL eb57890b612341d9920894b757c2eed8d1b6e8d31c911f2d7aff33a76c7cc2d1c3f5ebf3bfe96945fc0fa3ad612c369e6d96517b200ead3679559be69924329a
+DIST mcomix-1.2.1.tar.bz2 571128 SHA256 7e43159dc585bc9bc31970a44bd2b4e42c303660c4c8cf7f0eda413a6f72fa3b SHA512 efa4d57edc3a48d9e711767fb3e233ef9b334ff8ba467999e572e60ed747a4ee4aa420c8aa7788b16d7eb6e0901d454d6a405fcec47a8c74098a49491e915cd0 WHIRLPOOL cabebccb5793bdd78686c22448688826bc4ba7b9e422e3aa712f0930b8e8029721cf48bbe4e8d06e34c8f76515785ff259d08a7021e60beb1719c9b35d356619
diff --git a/media-gfx/mcomix/mcomix-1.2.1.ebuild b/media-gfx/mcomix/mcomix-1.2.1.ebuild
new file mode 100644
index 000000000000..4e1087fe036f
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-1.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+PLOCALES="ca cs de el es fa fr gl he hr hu id it ja ko nl pl pt_BR ru sv uk zh_CN zh_TW"
+
+inherit distutils-r1 fdo-mime l10n
+
+DESCRIPTION="A fork of comix, a GTK image viewer for comic book archives"
+HOMEPAGE="http://mcomix.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/pygtk-2.14[${PYTHON_USEDEP}]
+	virtual/jpeg
+	dev-python/pillow[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf
+	!media-gfx/comix"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	local checklocales
+	for l in $(find "${S}"/mcomix/messages/* -maxdepth 0 -type d);
+		do checklocales+="$(basename $l) "
+	done
+
+	[[ ${PLOCALES} == ${checklocales% } ]] \
+		|| eqawarn "Update to PLOCALES=\"${checklocales% }\""
+
+	my_rm_loc() {
+		rm -rf "${S}/mcomix/messages/${1}/LC_MESSAGES" || die
+		rmdir "${S}/mcomix/messages/${1}" || die
+	}
+
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	echo
+	elog "Additional packages are required to open the most common comic archives:"
+	elog
+	elog "    cbr: app-arch/unrar"
+	elog "    cbz: app-arch/unzip"
+	elog
+	elog "You can also add support for 7z or LHA archives by installing"
+	elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for"
+	elog "pdf support."
+	echo
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/pixie/pixie-2.2.6-r1.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
index 50baf2d88cc7..5556a0cc2909 100644
--- a/media-gfx/pixie/pixie-2.2.6-r1.ebuild
+++ b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -55,6 +55,9 @@ src_prepare() {
 	# parallelism can break the regeneration process, with resulting
 	# missing shaders.
 	rm "${S}"/shaders/*.sdr
+
+	# FIX: flex does not translate variable name in custom YY_DECL
+	sed -i -e '/define YY_DECL/ s/yylval/riblval/' src/ri/rib.l || die
 }
 
 src_configure() {
diff --git a/media-gfx/simple-scan/simple-scan-3.18.2.ebuild b/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
index a60ff942d5e8..2f6865aa6902 100644
--- a/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="colord"
 
 COMMON_DEPEND="
diff --git a/media-gfx/splash-themes-livecd/files/use-new-path-for-functions.sh.patch b/media-gfx/splash-themes-livecd/files/use-new-path-for-functions.sh.patch
new file mode 100644
index 000000000000..67128fbe5393
--- /dev/null
+++ b/media-gfx/splash-themes-livecd/files/use-new-path-for-functions.sh.patch
@@ -0,0 +1,11 @@
+--- scripts/rc_init-pre.orig	2016-02-18 13:31:23.610276701 -0200
++++ scripts/rc_init-pre	2016-02-18 13:31:57.405275206 -0200
+@@ -77,7 +77,7 @@
+   return 0
+ }
+ 
+-[ -r /etc/init.d/functions.sh ] && . /etc/init.d/functions.sh
++[ -r /lib/gentoo/functions.sh ] && . /lib/gentoo/functions.sh
+ 
+ if [ -z "${1}" ]; then
+   log err "no internal runlevel provided"
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild
new file mode 100644
index 000000000000..ee8fface6a76
--- /dev/null
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_P="gentoo-livecd-${PV}"
+MY_REV="0.9.6"
+DESCRIPTION="Gentoo theme for gensplash consoles"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${PN}/${MY_P}-${MY_REV}.tar.bz2"
+
+SLOT=${PV}
+LICENSE="Artistic GPL-2 BitstreamVera"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+RESTRICT="binchecks strip"
+
+RDEPEND=">=media-gfx/splashutils-1.5.4[png]
+	sys-apps/gentoo-functions"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! built_with_use media-gfx/splashutils mng
+	then
+		ewarn "MNG support is missing from splashutils.  You will not see the"
+		ewarn "service icons as services are starting."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+}
+
+src_install() {
+	dodir /etc/splash/livecd-${PV}
+	cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV} || die
+}
diff --git a/media-gfx/splash-themes-livedvd/files/use-new-path-for-functions.sh.patch b/media-gfx/splash-themes-livedvd/files/use-new-path-for-functions.sh.patch
new file mode 100644
index 000000000000..62f269ed862f
--- /dev/null
+++ b/media-gfx/splash-themes-livedvd/files/use-new-path-for-functions.sh.patch
@@ -0,0 +1,11 @@
+--- scripts/rc_init-pre.orig	2016-02-18 13:31:23.610276701 -0200
++++ scripts/rc_init-pre	2016-02-18 13:31:57.405275206 -0200
+@@ -77,7 +77,7 @@
+   return 0
+ }
+
+-[ -r /etc/init.d/functions.sh ] && . /etc/init.d/functions.sh
++[ -r /lib/gentoo/functions.sh ] && . /lib/gentoo/functions.sh
+
+ if [ -z "${1}" ]; then
+   log err "no internal runlevel provided"
diff --git a/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r2.ebuild b/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r2.ebuild
new file mode 100644
index 000000000000..1c6c31a0552b
--- /dev/null
+++ b/media-gfx/splash-themes-livedvd/splash-themes-livedvd-12.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Gentoo theme for gensplash consoles"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.bz2"
+
+LICENSE="Artistic GPL-2 BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="binchecks strip"
+
+DEPEND=">=media-gfx/splashutils-1.4.1[png]"
+RDEPEND="${DEPEND}
+	sys-apps/gentoo-functions"
+
+src_prepare() {
+	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+}
+
+src_install() {
+	dodir /etc/splash/livedvd-${PV}
+	insinto /etc/splash/livedvd-${PV}
+	doins -r *
+	insopts -m 0755
+	doins -r scripts
+}
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
new file mode 100644
index 000000000000..dd83a3029656
--- /dev/null
+++ b/media-gfx/valentina/Manifest
@@ -0,0 +1 @@
+DIST valentina-0.4.2.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
diff --git a/media-gfx/valentina/files/disable-tests-compilation.patch b/media-gfx/valentina/files/disable-tests-compilation.patch
new file mode 100644
index 000000000000..a819a02a336b
--- /dev/null
+++ b/media-gfx/valentina/files/disable-tests-compilation.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1455906661 -7200
+# Branch develop
+# Node ID 8edb1b0f161a5f472a0e6a8a8b5b8a1ae7cf33c5
+# Parent  42a73e7a17757ce9d12e16f616a41f52efdf4b91
+CONFIG key to disable building tests.
+
+diff --git a/src/src.pro b/src/src.pro
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -1,8 +1,17 @@
+ TEMPLATE = subdirs
+-SUBDIRS = \
+-    libs \
+-    app \
+-    test
+ 
+-app.depends = libs
+-test.depends = libs
++noTests{ # For enable run qmake with CONFIG+=noTests
++	SUBDIRS = \
++		libs \
++		app
++
++} else {
++	SUBDIRS = \
++		libs \
++		app \
++		test
++
++	test.depends = libs
++}
++
++app.depends = libs 
diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch
new file mode 100644
index 000000000000..a98a069dfb5a
--- /dev/null
+++ b/media-gfx/valentina/files/fix-insecure-runpaths.patch
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1455895311 -7200
+# Branch develop
+# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725
+# Parent  a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c
+CONFIG key to disable setting custom rpath option.
+
+diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
+--- a/src/app/tape/tape.pro
++++ b/src/app/tape/tape.pro
+@@ -348,10 +348,16 @@
+ # Path to recource file.
+ win32:RC_FILE = share/resources/tape.rc
+ 
+-unix:!macx{
+-    # suppress the default RPATH
+-    QMAKE_LFLAGS_RPATH =
+-    QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
++noRunPath{ # For enable run qmake with CONFIG+=noRunPath
++    # do nothing
++} else {
++    unix:!macx{
++        # suppress the default RPATH
++        # helps to run the program without Qt Creator
++        # see problem with path to libqmuparser and libpropertybrowser
++        QMAKE_LFLAGS_RPATH =
++        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
++    }
+ }
+ 
+ # When the GNU linker sees a library, it discards all symbols that it doesn't need.
+diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
+--- a/src/app/valentina/valentina.pro
++++ b/src/app/valentina/valentina.pro
+@@ -476,10 +476,16 @@
+     copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
+ }
+ 
+-unix:!macx{
+-    # suppress the default RPATH
+-    QMAKE_LFLAGS_RPATH =
+-    QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
++noRunPath{ # For enable run qmake with CONFIG+=noRunPath
++    # do nothing
++} else {
++    unix:!macx{
++        # suppress the default RPATH
++        # helps to run the program without Qt Creator
++        # see problem with path to libqmuparser and libpropertybrowser
++        QMAKE_LFLAGS_RPATH =
++        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
++    }
+ }
+ 
+ # When the GNU linker sees a library, it discards all symbols that it doesn't need.
diff --git a/media-gfx/valentina/files/locales.patch b/media-gfx/valentina/files/locales.patch
new file mode 100644
index 000000000000..a9084627df57
--- /dev/null
+++ b/media-gfx/valentina/files/locales.patch
@@ -0,0 +1,48 @@
+diff --git a/src/app/translations.pri b/src/app/translations.pri
+index b2dd2c4..87c55f7 100755
+--- a/src/app/translations.pri
++++ b/src/app/translations.pri
+@@ -9,22 +9,27 @@ PMSYSTEMS += \
+     p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \
+     p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998
+ 
+-LANGUAGES += \
+-    ru_RU \
+-    uk_UA \
+-    de_DE \
+-    cs_CZ \
+-    he_IL \
+-    fr_FR \
+-    it_IT \
+-    nl_NL \
+-    id_ID \
+-    es_ES \
+-    fi_FI \
+-    en_US \
+-    en_CA \
+-    en_IN \
+-    ro_RO
++isEmpty(LOCALES){
++ LANGUAGES += \
++ ru_RU \
++ uk_UA \
++ de_DE \
++ cs_CZ \
++ he_IL \
++ fr_FR \
++ it_IT \
++ nl_NL \
++ id_ID \
++ es_ES \
++ fi_FI \
++ en_US \
++ en_CA \
++ en_IN \
++ ro_RO \
++ zh_CN
++ } else {
++ LANGUAGES = $${LOCALES}
++ }
+ 
+ for(lang, LANGUAGES) {
+     INSTALL_TRANSLATIONS += $${TRANSLATIONS_PATH}/valentina_$${lang}.qm
diff --git a/media-gfx/valentina/metadata.xml b/media-gfx/valentina/metadata.xml
new file mode 100644
index 000000000000..d1051ee5c758
--- /dev/null
+++ b/media-gfx/valentina/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>fordfrog@gentoo.org</email>
+	<name>Miroslav Šulc</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/valentina/valentina-0.4.2-r3.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild
new file mode 100644
index 000000000000..cb70b611b4b2
--- /dev/null
+++ b/media-gfx/valentina/valentina-0.4.2-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils gnome2-utils fdo-mime
+
+DESCRIPTION="Cloth patternmaking software"
+HOMEPAGE="http://valentinaproject.bitbucket.org/"
+SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+# en_IN not supported in Gentoo so not added here
+LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
+
+for LANG in ${LANGS}; do
+	IUSE="${IUSE} linguas_${LANG}"
+done
+
+CDEPEND="
+	app-text/poppler
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/dismine-${PN}-44d43351cb59
+
+src_prepare() {
+	epatch "${FILESDIR}/locales.patch" \
+		"${FILESDIR}/fix-insecure-runpaths.patch" \
+		"${FILESDIR}/disable-tests-compilation.patch"
+}
+
+src_configure() {
+	local locales=""
+
+	for LANG in ${LANGS}; do
+		if use linguas_${LANG}; then
+			locales="${locales} ${LANG}"
+		fi
+	done
+
+	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
+
+	doman dist/debian/${PN}.1
+	doman dist/debian/tape.1
+
+	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
+	insinto /usr/share/mime/packages
+	doins dist/debian/${PN}.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use gnome ; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
new file mode 100644
index 000000000000..3ce700b2810f
--- /dev/null
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit mercurial qmake-utils gnome2-utils fdo-mime
+
+DESCRIPTION="Cloth patternmaking software"
+HOMEPAGE="http://valentinaproject.bitbucket.org/"
+SRC_URI=""
+EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
+EHG_REVISION="develop"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+# en_IN not supported in Gentoo so not added here
+LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
+
+for LANG in ${LANGS}; do
+	IUSE="${IUSE} linguas_${LANG}"
+done
+
+CDEPEND="
+	app-text/poppler
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+src_configure() {
+	local locales=""
+
+	for LANG in ${LANGS}; do
+		if use linguas_${LANG}; then
+			locales="${locales} ${LANG}"
+		fi
+	done
+
+	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
+
+	doman dist/debian/${PN}.1
+	doman dist/debian/tape.1
+
+	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
+	insinto /usr/share/mime/packages
+	doins dist/debian/${PN}.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use gnome ; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/media-gfx/xv/xv-3.10a-r18.ebuild b/media-gfx/xv/xv-3.10a-r18.ebuild
deleted file mode 100644
index 795224b3af0c..000000000000
--- a/media-gfx/xv/xv-3.10a-r18.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-JUMBOV=20070520
-DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
-HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
-SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
-	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
-	mirror://gentoo/${P}.png.bz2"
-
-LICENSE="xv"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="jpeg tiff png"
-
-DEPEND="x11-libs/libXt
-	jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt"
-	"${FILESDIR}/${P}-osx-bsd-${JUMBOV}.patch"
-	"${FILESDIR}/${P}-vdcomp-osx-${JUMBOV}.patch"
-	"${FILESDIR}/${P}-disable-jp2k-${JUMBOV}.patch"
-	"${FILESDIR}/${P}-fix-wait-${JUMBOV}.patch"
-	"${FILESDIR}/${P}-add-ldflags-${JUMBOV}.patch"
-	"${FILESDIR}/${P}-libpng15-r1.patch"
-	"${FILESDIR}/${P}-wformat-security.patch"
-)
-
-src_prepare() {
-	default
-
-	append-cppflags -DUSE_GETCWD -DLINUX -DUSLEEP
-	use jpeg && append-cppflags -DDOJPEG
-	use png && append-cppflags -DDOPNG
-	use tiff && append-cppflags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
-
-	# Link with various image libraries depending on use flags
-	IMAGE_LIBS=""
-	use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg"
-	use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng"
-	use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff"
-
-	sed -i \
-		-e 's/\(^JPEG.*\)/#\1/g' \
-		-e 's/\(^PNG.*\)/#\1/g' \
-		-e 's/\(^TIFF.*\)/#\1/g' \
-		-e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile || die
-
-	# /usr/bin/gzip => /bin/gzip
-	sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h || die
-
-	# Fix installation of ps docs
-	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		LIBDIR="${T}"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		LIBDIR="${T}" install
-
-	dodoc CHANGELOG BUGS IDEAS
-	newicon "${WORKDIR}"/${P}.png ${PN}.png
-	make_desktop_entry xv "" "" "Graphics;Viewer"
-}
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
new file mode 100644
index 000000000000..2b502b789d33
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
+SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
+	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
+	mirror://gentoo/${P}.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png"
+
+DEPEND="x11-libs/libXt
+	jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt"
+	"${FILESDIR}/${P}-osx-bsd-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-vdcomp-osx-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-disable-jp2k-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-fix-wait-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-add-ldflags-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-libpng15-r1.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
+
+src_prepare() {
+	default
+
+	append-cppflags -DUSE_GETCWD -DLINUX -DUSLEEP
+	use jpeg && append-cppflags -DDOJPEG
+	use png && append-cppflags -DDOPNG
+	use tiff && append-cppflags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+
+	# Link with various image libraries depending on use flags
+	IMAGE_LIBS=""
+	use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg"
+	use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng"
+	use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff"
+
+	sed -i \
+		-e 's/\(^JPEG.*\)/#\1/g' \
+		-e 's/\(^PNG.*\)/#\1/g' \
+		-e 's/\(^TIFF.*\)/#\1/g' \
+		-e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile || die
+
+	# /usr/bin/gzip => /bin/gzip
+	sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h || die
+
+	# Fix installation of ps docs
+	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" CCOPTS="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}" install
+
+	dodoc CHANGELOG BUGS IDEAS
+	newicon "${WORKDIR}"/${P}.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index e0313e5f2055..0d3339670c4b 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,3 +1,4 @@
 DIST babl-0.1.10.tar.bz2 449537 SHA256 943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4 SHA512 2950d94c255ee05d405e003a46138da0f4e0cad65e2d2a882089b788c2deac0524014f7c5758c3097253bdbebaded433caf0447c7d218c9cc96798df9e6f0c92 WHIRLPOOL a71907a531bc71c7ac0c84a197a559c50321a5d96b5d846083935390890ef116780d49bd458577aef0e948395dc14897e6fbbc75478b2a59d57d4381cf7f8db8
 DIST babl-0.1.12.tar.bz2 642234 SHA256 2f802b7f1a17b72c10bf0fe1e69b7a888cf7ce62b7cf1537b030f7f88d55a407 SHA512 b69c8e3870f25372b2223aa4a716383af30342822461fc847039af964cdd194603dbc327a5c3547369d64b206b54280a5a9a227197ca6b7bcfbfa8e2e560df6a WHIRLPOOL b1a170492f1c1e6f030f418cc66c3be02cd2bd7e10896a416b5feaf2d7aa82de4fa15c9d2a65e6e1038ab6822e4dc3333f96102e18d757a6b1e07f4017b4beba
 DIST babl-0.1.14.tar.bz2 718238 SHA256 e6dcb112c8f8f75471823fdcc5a6a65f753b4d0e96e377979ea01a5d6fad7d4f SHA512 fb7c48738b968c2cf01aab20b50c7768501b73c8c34957ef500cf7a77bb2dce519ede34463a8a100037533d5f3566e1cd23d898c41eb29fc01620a0dde131398 WHIRLPOOL e85a868e751f490a9dee002bd93214033f0fbaab7dbd65c0062c55f98af810be83e6899804bdd2c4e45f2625f2e75a36784890c950e34b35baf0104c69bd2a79
+DIST babl-0.1.16.tar.bz2 730441 SHA256 7d6ba55ec53ee6f6bf6945beec28839d09ff72376f4d83035eb379cd4f3e980e SHA512 a129247a827ccd79bb92204e49d6b6614183bff5961ef6b41cb466c51973b01a15aa7720f7401f1ab7d64885ede69ad84e99f628e48beb4525644d109c7f9a5a WHIRLPOOL 77e0c53d4cd809fd43c9a3e775cd8ea3042bd94e8bffd58e06e99d07fa1c7c630fe41ba403aab3c2228744803fe5e9ad64cf28913c4ca99549f290e97df856d1
diff --git a/media-libs/babl/babl-0.1.14.ebuild b/media-libs/babl/babl-0.1.14.ebuild
index ce739efbe576..74f36162e658 100644
--- a/media-libs/babl/babl-0.1.14.ebuild
+++ b/media-libs/babl/babl-0.1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/media-libs/babl/babl-0.1.16.ebuild b/media-libs/babl/babl-0.1.16.ebuild
new file mode 100644
index 000000000000..74f36162e658
--- /dev/null
+++ b/media-libs/babl/babl-0.1.16.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/babl"
+	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"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch_user
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse sse2)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index fcdbdff6a0c2..e5de346b331c 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1 +1,2 @@
 DIST chromaprint-1.2.tar.gz 529646 SHA256 822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb WHIRLPOOL b2efb45c23e950b6a4d95c078bed15b03ef35e423b106428a7607034276b343b8c223ffa71e021846ed48f535663e062ae8042d281d769a04effc9afd8a600dd
+DIST chromaprint-1.3.1.tar.gz 538251 SHA256 8f95a011e6fe3a75281520daa9376b7f028300e20a5be9af08ef9c851d4bb581 SHA512 b900d9c94057354982c2c32b37d10bb8ac1b63d005ece1fe6aae38a037e18ea8e77c5e95faff51b8c725b3ff9f3551ab0ef2baf470b49952e5c3c3662da46aae WHIRLPOOL f0045dda0f5e3e29bdb9f2fc1a5ebe8922a7d976c351ca8d8ab817cc7ed6a026cf1b86732e5dda6a3cd1110281d5a0f3006cfb3e1c2f58adc8f9fc0cffc2fbce
diff --git a/media-libs/chromaprint/chromaprint-1.3.1.ebuild b/media-libs/chromaprint/chromaprint-1.3.1.ebuild
new file mode 100644
index 000000000000..12d082395a20
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-1.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib
+
+DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
+HOMEPAGE="http://acoustid.org/chromaprint"
+SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="libav test tools"
+
+# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
+RDEPEND="
+	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+		dev-libs/boost[${MULTILIB_USEDEP}]
+	)"
+
+DOCS="NEWS.txt README.md"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		-DWITH_AVFFT=ON
+		)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 18cd07501547..d8c6b82b1814 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,4 +1,3 @@
 DIST clutter-gst-2.0.16.tar.xz 357380 SHA256 a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039 SHA512 ace0eceb8f99ad78190f6ebb9caf45ccc5597fff2e4dfda4e3bf539e87f41d3d60f66637219244bd28fe32f374460e3456c8dc5d0c60ac057cc73f2f1d60c764 WHIRLPOOL dd60f5722381f8e7678cd9e47b191a1e80c313c138d3cd5cb0acb1131d13ca565dd4f9e8117eda7ed1c81ae0b0bb9cca44530403615f3545ba44c012c12b70eb
-DIST clutter-gst-3.0.10.tar.xz 391424 SHA256 2dbdbc3292e92684bbdbf1694c61f6b781f5810e4d79a415dfdee2f7ee42148c SHA512 e1ab8e57bade63c076c1426ed3b87d20034ff8fb54146c754ec4b990ec6d2102c4d87a1b1c3c9def17abe6985e2a59e44253cae1053f64a779dc8ef71a2951e7 WHIRLPOOL 5f8fba3a49c268650cdfee6d0959202a19288042f09acebdc3457f138193fae27fd0074a478032d8773446e05df3f0214e2038ea77feb90a6ea6046d7e361c86
-DIST clutter-gst-3.0.12.tar.xz 390880 SHA256 cd2b2f8db9c21d6295ed0b2811d4c3036fac5796be71d7affdb2b8746f12066c SHA512 4ad92dfcc7c3d0b83c90a7a216267b86899f2206c8e4405f57ecb08b66e4380c3154d289954c6f60093f47f1a8aa44a2269f41b3e666cf19684fa2d92afdc0c9 WHIRLPOOL ceb2870e52f277812de53d65dbef354b9652fd719184cb8ba25e4ccdea0acd448a76bb2b3a406a93b14b3bb57ac65ffbe3461e00a35c6bb12300c04954a4304a
 DIST clutter-gst-3.0.14.tar.xz 391596 SHA256 f7c8a7dc479759cad5ff7483cb5a1abbe3efd0b4f83ed0e443dc602430a82de2 SHA512 6d50607e684e6c57525b9408f9b256c045fc1425d0646809fc9bdfc43536b0f8d3d2bd54b0176996e1894824c77cf9269d2c6d62adb29a5e2485f8a671126145 WHIRLPOOL bc2c289dbcd518eb4087d092cf97c0c3a0ccbe60742556b436897657cd9e9007658630d6487bbcd585923ed451e9a3cca922d72fa0ec8793ade7b04748da150a
+DIST clutter-gst-3.0.16.tar.xz 406328 SHA256 803e8b7265e63e0581e21fd0c6064792dfe951512e9f515e9e7a9b452caaf9f0 SHA512 ad543156e05828a28d89d49080618fb64a010247eceee87d5930c14cd4ddc4fd276f6b30be8790d9003c988be45ead8c258157d72e60db0ea089eb068229da21 WHIRLPOOL 5ddf357183baed580fddf3b1171f30139495cfb7eb36571724b8c7ad7e758d6850aed6ef5ac3eb7452a2491bcf11c7748b9ce639a069b00c6078960d2e8e91dc
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.10.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.10.ebuild
deleted file mode 100644
index 49592d016655..000000000000
--- a/media-libs/clutter-gst/clutter-gst-3.0.10.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-gst/clutter-gst-3.0.12.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.12.ebuild
deleted file mode 100644
index 31518c7e63bc..000000000000
--- a/media-libs/clutter-gst/clutter-gst-3.0.12.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="https://blogs.gnome.org/clutter/"
-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.16.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild
new file mode 100644
index 000000000000..aa46d6b126a6
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.16.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="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X examples +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+COMMON_DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[X=,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?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+	udev? ( virtual/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+	!udev? ( media-plugins/gst-plugins-v4l2 )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# --enable-gl-texture-upload is experimental
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+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.6-r1.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
index dfdf56326a23..c6f7f8f779e4 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.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="X examples gtk +introspection wayland"
 
 RDEPEND="
diff --git a/media-libs/clutter/clutter-1.24.2.ebuild b/media-libs/clutter/clutter-1.24.2.ebuild
index 48b6a355ef4f..c0478120dd3c 100644
--- a/media-libs/clutter/clutter-1.24.2.ebuild
+++ b/media-libs/clutter/clutter-1.24.2.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.22.0-r2.ebuild b/media-libs/cogl/cogl-1.22.0-r2.ebuild
index eb8ad4a3cc84..c7028a034c40 100644
--- a/media-libs/cogl/cogl-1.22.0-r2.ebuild
+++ b/media-libs/cogl/cogl-1.22.0-r2.ebuild
@@ -19,7 +19,7 @@ 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/elementary/Manifest b/media-libs/elementary/Manifest
index ded23c4e0237..197eb035c64b 100644
--- a/media-libs/elementary/Manifest
+++ b/media-libs/elementary/Manifest
@@ -1,3 +1,4 @@
 DIST elementary-1.12.2.tar.bz2 16726431 SHA256 c6aa5e83224400babdd2a6ed848eeb09aa9bed2e1f573619d4d8c0dbf29fcd12 SHA512 05c9fb012bd933fe52978d0bdec7d80be06a54531d6c026de0cd32c7ba218c2c9960ed6c5f5aa94360c88a4465dbd3b8df7d92e73bc6bb754493b44825858232 WHIRLPOOL 97666a5072e280a613f21b3c32566b6a47a0d5a46fbe4983ec3e40c35bba6bd1f5d8f4d09557023494a9eaa89dc14711b8cc007d81e4c19881601955c1acf3df
 DIST elementary-1.15.2.tar.xz 18514048 SHA256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f SHA512 7ee796898aee7667e0ae6e8e7d1a604287fc9b009a7a3f4ab75c15b10160e0a38975dfbf6586c20ad2fdc8075dd867287d4d5617ad6b6be2e522c74beb03ce38 WHIRLPOOL 6d42e6063c8d697d237b003781f33e6b3bf562c2785458cd3cf1cf84319325ac1ff39704e33bae641610b1ff669b2fe115135a5f939eca0314a25ee7a6a6bf0a
 DIST elementary-1.16.1.tar.xz 18536148 SHA256 7e3863640a9c6dff91d62a06a3119c6c6682247e4669583033b80c7d608da860 SHA512 fa5dce7c40be55f57e145ee459df5452b946b3701fe61f2f160e90c65720bcb1c24730b6fec9892c51d29af3d2898f38c8cbce83225b00e2aec5a27cb3081a5f WHIRLPOOL 6d0f1d40e91de42eb42552fa6c39578d8577f47e0ee2028f32e4e625b25a32ee229f7129f5ec4b6d54787ff669f8f3b5b0ca26e6334475565440a36f982381cd
+DIST elementary-1.17.0.tar.xz 18491592 SHA256 6a6a5883939eab8d87179c7980c0dbd6b53d82bf460a161045a891694d036b2b SHA512 60862e164770a93c0b864f35b5880f8d28f9fec520b7b440935143a14ffc9cd2dacbb650463c2abb7ce364c631509e1ddefce6eb49def1b016a752416d619065 WHIRLPOOL 76499e687908b8c2c885429c614a493b226f5e2d73edc040a5d6e8e287dab3b342b517fa46e4a37ca6560e4a9c617415d8138da1308865aa5d07187d60c7ea61
diff --git a/media-libs/elementary/elementary-1.17.0.ebuild b/media-libs/elementary/elementary-1.17.0.ebuild
new file mode 100644
index 000000000000..a719301834b2
--- /dev/null
+++ b/media-libs/elementary/elementary-1.17.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
+HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
+
+LICENSE="LGPL-2.1"
+IUSE="debug examples fbcon javascript quicklaunch sdl wayland X static-libs"
+
+DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]
+	javascript? ( net-libs/nodejs )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	E_ECONF=(
+		$(use_enable debug)
+		$(use_enable doc)
+		--disable-ecore-cocoa
+		--disable-ecore-psl1ght
+		--disable-ecore-win32
+		--disable-elocation
+		--disable-emap
+		--disable-eweather
+		# broken: make[4]: *** No rule to make target 'prefs_example_01.epb', needed by 'all-am'.  Stop
+		#$(use_enable examples build-examples)
+		$(use_enable examples install-examples)
+		$(use_enable fbcon ecore-fb)
+		$(use_enable javascript js-bindings)
+		$(use_enable sdl ecore-sdl)
+		$(use_enable wayland ecore-wl2)
+		$(use_enable X ecore-x)
+		$(use_enable quicklaunch quick-launch)
+	)
+
+	enlightenment_src_configure
+}
diff --git a/media-libs/elementary/elementary-9999.ebuild b/media-libs/elementary/elementary-9999.ebuild
index 7cef5b066732..a719301834b2 100644
--- a/media-libs/elementary/elementary-9999.ebuild
+++ b/media-libs/elementary/elementary-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,9 +20,10 @@ DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
 HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
 
 LICENSE="LGPL-2.1"
-IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs"
+IUSE="debug examples fbcon javascript quicklaunch sdl wayland X static-libs"
 
-DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]"
+DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]
+	javascript? ( net-libs/nodejs )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -41,8 +42,9 @@ src_configure() {
 		#$(use_enable examples build-examples)
 		$(use_enable examples install-examples)
 		$(use_enable fbcon ecore-fb)
+		$(use_enable javascript js-bindings)
 		$(use_enable sdl ecore-sdl)
-		$(use_enable wayland ecore-wayland)
+		$(use_enable wayland ecore-wl2)
 		$(use_enable X ecore-x)
 		$(use_enable quicklaunch quick-launch)
 	)
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 2e16ad133833..8abc2f38264b 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -2,4 +2,5 @@ DIST Image-ExifTool-10.00.tar.gz 4013694 SHA256 7b573331eba3921b56339018e95dd5e6
 DIST Image-ExifTool-10.07.tar.gz 4035921 SHA256 012ac8bf1b48b78d3f09b17d172765956968423f0ded737f8e0a6cf3f3316218 SHA512 3a93902a6b1bcc72b425c76ad1b34ea8d8e681787421bdb37130825cd9222758196acdd453ac63858d228da019e70c738417088b5f0139704d0e299331f72c09 WHIRLPOOL a2904e08e156f331a1bb8249494c798c2d6cf16434974a341c73374303e7f1756753f435fd108e8104026c5a0f87e94629566d321b1d329132cee056ab9017d5
 DIST Image-ExifTool-10.09.tar.gz 4041349 SHA256 b6e621bfd2de6ea6c16bd7ee709f6c7ec47344c70de39b8c5c911e4ac930cad5 SHA512 cc814850ab01d1eaf00614355c689682d04dffa88f65f75308861954a9c4f1bf4a347624b1068b81050ecafa9043701941e6d53914b2a5892f2e336a18c24e5d WHIRLPOOL 2d7ad180004dadd7cced67f438e6d75f7697072770e2e4530131e31ca75e45acc0d28d6c4459681ee11eca5a0e86afe7dafd518c293a3fe9c0ababbd0e72bd61
 DIST Image-ExifTool-10.10.tar.gz 4056189 SHA256 f9fcecf8954cfd6b1f5658e1fc82801e8b98f891c88a60adbd6bc5c716471e09 SHA512 c18963020f02f196c68d89d22126834dbde31b2e13da0b56509d1d25f9adb6248f8e4ea9ec7cba7f144a44d6c81e966e9aafd36d4e2d76d92e3b7a0c7e4fdacd WHIRLPOOL e5bd0791dfc7fa4b16d4ee770d866626a119cf68b8e2736cda1181a2fcb7a32e96ad885a706d25da0241bd9ba1c0637c23be49e5662fe813fa8fb48b4100768c
+DIST Image-ExifTool-10.11.tar.gz 4060513 SHA256 8cf8b2ec192fdbec5e1946bcf1ed9c7c681e6d16896298bbf7adb8eb59356729 SHA512 c61f70782fbe9f7ce55fb1e0a66aaa0310be17b483b39505ba6255964798d46a8887254a9f635abfc5edc544b3c52cf180575ba7ccf72b4ed209608f78d4e427 WHIRLPOOL 5cbed0ea1516760339cfd93c6f3a73eda9b4413b58a7871c604da61bd0d484f6c6772ea1efa31d6b5d5a8da2d23fe1de4a81469bcc32eb28bb5122ff8134be98
 DIST Image-ExifTool-9.98.tar.gz 4002089 SHA256 cf7e89b40e942ff582b06b958edfce2e2c7ba2986a650212a96fa74cf5bbc74b SHA512 138bcf0aeab6fe893df3f051ca9d5d2e7fabbfb19e6b68ee0529515c1e6f6d89d75ca8aacabfb7edc2e380caa04f8bb97536ef284b0bf140edfcf9c8363a482c WHIRLPOOL edb5c4799079b27a008ebb95e2ae13ec2c37cb123f3664582f6ddc8a0b3cb351410d12b2c1d5352a10a4213c8e7fcc591f64fb514c83bbecdf582780f27a0237
diff --git a/media-libs/exiftool/exiftool-10.11.ebuild b/media-libs/exiftool/exiftool-10.11.ebuild
new file mode 100644
index 000000000000..0d48581c279e
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=Image-ExifTool
+MY_P=${MY_PN}-${PV}
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dohtml -r html/
+}
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 26d9dff4564b..323ca2bf8777 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,2 +1 @@
-DIST ffmpegsource-2.20.tar.gz 539587 SHA256 c7d880172756c253f2c5673044dabf03c19890dcfe64da5104ee9f42a1a573a0 SHA512 77cfb027a6be21952700fadee66467d18bc0521569cf3d5eef3f7fd3ff9785ba1c6b7a251a5ccfb8b6e8dd965aef9928cf27459dca28591eeddd1fd5a2905295 WHIRLPOOL 321cc4a3ff37201def87bfb7596e84e76cb58fb05a43d99901eaca8f46f712fa4d86af9cdc65a24749c2715a4f52c9106ab2b24d7060cfe87f5401e520ac7fb1
 DIST ffmpegsource-2.22.tar.gz 487244 SHA256 7c5202fa2e49186fb3bb815e5b12ca71f05ec09cb707ffd9465852e21a06fdad SHA512 af92766f19b5db15c2f0b08e4d894e26bb66f93360b12461d37f38983a4e1916656514d52bf86f8a5def83207e2433d04f58384b1cf8f617ab19aafd2f0d7d56 WHIRLPOOL 2fb1b189ba573fd2e1f65e61cfa365201a419a3bb066ef54e06c07c5f8eabcfb93dc3191c860a8816a797eb9e47a62929a35c1c786a43712ab80ac2df69ee811
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
deleted file mode 100644
index 5ada34310bf6..000000000000
--- a/media-libs/ffmpegsource/ffmpegsource-2.20.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
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
-HOMEPAGE="https://github.com/FFMS/ffms2"
-SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/3"
-KEYWORDS="amd64 x86"
-IUSE="libav static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	libav? ( >=media-video/libav-9.17:0= )
-	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-S="${WORKDIR}/ffms2-${PV}"
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
index 47a6d5698448..4103c1a9401f 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav static-libs"
 
 RDEPEND="
diff --git a/media-libs/fontconfig-ultimate/metadata.xml b/media-libs/fontconfig-ultimate/metadata.xml
index 238096be9f09..dfa34e3f6c61 100644
--- a/media-libs/fontconfig-ultimate/metadata.xml
+++ b/media-libs/fontconfig-ultimate/metadata.xml
@@ -5,7 +5,11 @@
     <email>witold.pilat@gmail.com</email>
     <description>Proxied/co-maintainer. CC on bugs.</description>
   </maintainer>
-  <maintainer type="project">
+ <maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+  </maintainer>  
+ <maintainer type="project">
     <email>fonts@gentoo.org</email>
     <name>Fonts</name>
   </maintainer>
diff --git a/media-libs/gd/gd-2.1.1-r1.ebuild b/media-libs/gd/gd-2.1.1-r1.ebuild
index 5ddceaffffa2..8896c5460b0e 100644
--- a/media-libs/gd/gd-2.1.1-r1.ebuild
+++ b/media-libs/gd/gd-2.1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index ef9429bb4510..1d8a019f304b 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -3,3 +3,4 @@ DIST glm-0.9.3.2.zip 6451695 SHA256 ee66ab8336b9b6b3dff69268c497688268cf5a9d2b3a
 DIST glm-0.9.5.1.zip 4071873 SHA256 4f621657a3a7e73e2062f0c9b4366ba5e14a3c3b3c04928378f37fdd70bd0bf5 SHA512 9644e7d76dda057fb25c3c387316c551e964a179662baf095cc2519ec84693499fd1f9c8d614ed617c3a0e406843aad7a01cbbc9399e86d52cdd8cf72f1b9194 WHIRLPOOL 5a5e2e64c4236f46d97f286b6675fd01b92905fa86c02fe9812d272d0dd0319a1bff8ab0c8d27d1bb706b0033ba08b49085bd83264b72954ca7704fe7260333c
 DIST glm-0.9.6.1.zip 4232099 SHA256 1a8a0c84dee47b0493aa8d45ccd38dc02b917d9f14da835c5b06fb0b93bb33e8 SHA512 7f1468c5e60e65181f4685a2429fa8d70350a3576175a55b7c9e8597a03837cb84aeaeb88d311e1e1948c5bd90ad9cee9286433cb78fdee54b0fbe5313ce2f84 WHIRLPOOL 88e0c6df25ee1bf73b625614be61c21c07389a7ecc05e2e74714da08412ab3ab0eba6c99c6a793f7b08d52f6748ef5202d8301c1b6cf4d64ab06184bc9482030
 DIST glm-0.9.7.1.tar.gz 3453078 SHA256 285a0dc8f762b4e523c8710fbd97accaace0c61f45bc8be2bdb0deed07b0e6f3 SHA512 380d3611b5867a4680c213bfec00e974d29c9aa92ed374adc9ca2ae04d6c4d29f20b88ccf3359df5faabf5050f9e6dc6e417ee9f5f4b484a3ef5aefecd3827a2 WHIRLPOOL 7a76f6efb7acacd7d2025d9ccf9d3feb0887e55dd10c757387ad07dbae44d2aba41758994ca870c64e55e501a9916b3dbdf3606dc9c7cf44368cc405d6c26a4e
+DIST glm-0.9.7.2.tar.gz 3454084 SHA256 8fb3049a620cee153462c8c41df9c9ecebfc44cddf823828b25f9eb53a541890 SHA512 edcfc8df59e3adfd6131156bc817a7880afb336d9bea1f2e7324b7c3937057fc8c6eca3b47f5c0c33b08e79ed7ca4f69d884fdfe75204c070b7b79d24256b81a WHIRLPOOL ab296f91ed27cbe24c0ad3fa6fa03787e42aa27ae1c7bf9e31ebadada00a0d00f228aaf8a762ec1f1aaf7096c79db8642ad31926bbe2383a019b2b813e29de23
diff --git a/media-libs/glm/glm-0.9.7.2.ebuild b/media-libs/glm/glm-0.9.7.2.ebuild
new file mode 100644
index 000000000000..5af7bf4ff524
--- /dev/null
+++ b/media-libs/glm/glm-0.9.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+RDEPEND="virtual/opengl"
+
+src_configure() {
+	if use test; then
+		local mycmakeargs=( -DGLM_TEST_ENABLE=ON )
+
+		use cpu_flags_x86_sse2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE2=ON )
+		use cpu_flags_x86_sse3 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE3=ON )
+		use cpu_flags_x86_avx  && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX=ON )
+		use cpu_flags_x86_avx2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX2=ON )
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/grilo/grilo-0.2.15.ebuild b/media-libs/grilo/grilo-0.2.15.ebuild
index e87bbcf01188..1b474bbe8715 100644
--- a/media-libs/grilo/grilo-0.2.15.ebuild
+++ b/media-libs/grilo/grilo-0.2.15.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/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
index d9f8dafa274f..6d5ad2b49abb 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="X egl gles2 gtk +introspection opengl +orc vcd vnc wayland"
 REQUIRED_USE="
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
index 8a4b31acb42b..00acd6293af6 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
 REQUIRED_USE="
 	ivorbis? ( ogg )
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
index a1db969f2d21..548bd516b026 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 # dtmf plugin moved from bad to good in 1.2
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
index 15e8d22b0720..9de5a7078cfe 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
index 71a6596d6952..2a9e33c8c13b 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A GStreamer based RTSP server"
 HOMEPAGE="http://people.freedesktop.org/~wtay/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples +introspection static-libs test"
 
 # FIXME: check should depend on USE=test but check is losy
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
index 3ffda41adfa6..3ebdd9a7cc7e 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection"
 
 # FIXME: There is something odd with pygobject check for >=4.22,
diff --git a/media-libs/gstreamer/gstreamer-1.6.3.ebuild b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
index 1409bf676d2e..50d8049cdcd6 100644
--- a/media-libs/gstreamer/gstreamer-1.6.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test"
 
 RDEPEND="
diff --git a/media-libs/gupnp-dlna/Manifest b/media-libs/gupnp-dlna/Manifest
index eed1a0145bd7..8b9b935f6b3c 100644
--- a/media-libs/gupnp-dlna/Manifest
+++ b/media-libs/gupnp-dlna/Manifest
@@ -1,2 +1,2 @@
-DIST gupnp-dlna-0.10.2.tar.xz 314088 SHA256 158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3 SHA512 b4a889e77022339a25ba532c3160e590c080a732de9fd6961d4109ab310937dec531b9a92ba6d6a7918f3b96bf70b85e068cda116d33c58bc55f015809889402 WHIRLPOOL 67d6c135429c0b30c4464907025065c3666fb7433538e13117cc5b83e42ebc04f227b4e692a5a334c3cd47e2c2d8ac4ea89791a05e72d81af835c4d47af49a51
 DIST gupnp-dlna-0.10.3.tar.xz 328376 SHA256 dcbe5f5f721c76781f3d3bb1bfcdf9818df0905203d4e5759aecb9cb127872d5 SHA512 751969c117a21534a8137e3b89268518ee93a086e70a3d985656a14719c19abdae5c604195bbe68c114725be8ef3f56960b6288f82be59cb13b2e2ff27809f35 WHIRLPOOL b1f8680086564d661de5ff24ede40b635cc4e68597316a5c1ff1b55aa7082d9c7cd73d3e771ad0fa9540f666d36cdebc6a1df010544cf581470b92d727452069
+DIST gupnp-dlna-0.10.4.tar.xz 328596 SHA256 5641134baa8fe3a2e129de15fc6a992f2fe1006ea446b7566483eada4840e1d6 SHA512 167562dd493f6de0a7afd43337b8c191157b7903653c834c4219313e60e7725adf3d30f21f4c0655f9e6849677ecac80ea7d7e8a9786387204a387f1b9afa598 WHIRLPOOL 546dfed0a9ae93ceb73112855bf5a964d39d782fa215eb4fe6d0d054b0f851fa58e0c7309fa9e083a5a58eeb79dc1735a691bc32025ac09fa0f679ea44fa69fe
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.ebuild
deleted file mode 100644
index 5debb4e844c9..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 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 gnome2 vala
-
-DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libxml2-2.5:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Make doc parallel installable
-	cd "${S}"/doc/gupnp-dlna
-	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
-		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
-		-i Makefile.am Makefile.in || die
-	sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
-		-i html/${PN}.devhelp2 || die
-	mv ${PN}-docs{,-${SLOT}}.sgml || die
-	mv ${PN}-overrides{,-${SLOT}}.txt || die
-	mv ${PN}-sections{,-${SLOT}}.txt || die
-	mv ${PN}{,-${SLOT}}.types || die
-	mv html/${PN}{,-${SLOT}}.devhelp2
-
-	cd "${S}"
-
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	# Parallel install fails, upstream bug #720053
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
new file mode 100644
index 000000000000..de13a357bc7a
--- /dev/null
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
@@ -0,0 +1,62 @@
+# 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 gnome2 vala
+
+DESCRIPTION="Library providing DLNA-related functionality for MediaServers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/libxml2-2.5:2
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# Make doc parallel installable
+	cd "${S}"/doc/gupnp-dlna
+	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
+		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
+		-i Makefile.am Makefile.in || die
+	sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
+		-i html/${PN}.devhelp2 || die
+	mv ${PN}-docs{,-${SLOT}}.sgml || die
+	mv ${PN}-overrides{,-${SLOT}}.txt || die
+	mv ${PN}-sections{,-${SLOT}}.txt || die
+	mv ${PN}{,-${SLOT}}.types || die
+	mv html/${PN}{,-${SLOT}}.devhelp2
+
+	cd "${S}"
+
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	# Parallel install fails, upstream bug #720053
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 205d42c68461..7bbafc79eef6 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,5 @@
 DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb
 DIST harfbuzz-1.0.6.tar.bz2 1240522 SHA256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 SHA512 20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 WHIRLPOOL 63eab91311674417b66fa92e0b92a5482321dfa8dc48edcc3ae1ed459483222ab08229438356245cc183234a65388fbb6bdb73222359dea0ec2a35a1bf141c78
-DIST harfbuzz-1.1.2.tar.bz2 1233019 SHA256 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f SHA512 ac2866a3267d7a55311abbdb8f8c38511799c471fb750f203494749ad26edd91ad36c995ee1ce756fa1fcc1625633435cd616e90b794d70f4bb8d213c6d693f9 WHIRLPOOL ef744ddccf30a387823021606304c9f888b99686b397270c2e742191e4c4a885e5872e3c4e8370d0079175a1a026d4c4b21bacf9adf27ccc2837c73294fee121
 DIST harfbuzz-1.1.3.tar.bz2 1294579 SHA256 d93d7cb7979c32672e902fdfa884599e63f07f2fa5b06c66147d20c516d4b8f7 SHA512 e418a1543ec2a1e58e5d8d0ba9a40e8675eda13c94c664ff83ed6303c724f078cf1744883b454c46ec40157db8dc05e7f2cf5e52200601bb1e13827d8dfbaccf WHIRLPOOL 9d18d985df77ff841b1a87d25f17eb472517e109a051f2ed213b44ec91de3a499853cf7d93e23f5ac4c199ec65f2dd02300e05097cb4983565ebb9227c8d3810
+DIST harfbuzz-1.2.0.tar.bz2 1333335 SHA256 79ff5305153d15931fbdda80c9612783b0283dee44f4c2af71aa37353daaa685 SHA512 92a2203ab3491992081c3cbcb7b151e1c632a98c9b2cc27863df377e08d3951387f513c7f5184a05b0523b99517775e083edfccac8386981c242ed02d34052c5 WHIRLPOOL ddcb6b3afb3b56bc326086e01450da978cdfe3832b2f2eb136cec0a6a089f701a0e572b5a3a256a186ef88a2232d336279fd8348223bcbf1eccc42db2338ff07
+DIST harfbuzz-1.2.1.tar.bz2 1335074 SHA256 0c189aa386c5ea8d7c315adf273f56f48f412081a367b3f92abc2d0855fa2226 SHA512 537da15b217096a3acf3ac6077e5fab1c9c7d473a924ba241ccdcf5f375051e9d34be9f309165daae8db05ca1819204e8b95b95a7508216526145b0c2d46d0dc WHIRLPOOL 1b05eb7e511b8405358dfd1d1317cdb793b6931568bc86f6808595a9cc51ec38b5775d33b15a34623fff7ba086a2ec75a34c10920b84d43ee7de8c4dcb9429df
diff --git a/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild
deleted file mode 100644
index cdfd7a5ea536..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.1.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=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils libtool multilib-minimal python-any-r1
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-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"
-
-IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
index 11e371fb7ad8..3ac3b49a16f3 100644
--- a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.1.3.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/harfbuzz/harfbuzz-1.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-1.2.0.ebuild
new file mode 100644
index 000000000000..5c0e26bddf75
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.2.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+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"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-1.2.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.2.1.ebuild
new file mode 100644
index 000000000000..5c0e26bddf75
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+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"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index cdfd7a5ea536..5c0e26bddf75 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-r3 autotools
@@ -49,6 +49,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
 		# on Darwin/Solaris we need to link with g++, like automake defaults
 		# to, but overridden by upstream because on Linux this is not
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 4685eff553aa..a79e471cac53 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -2,3 +2,4 @@ DIST libass-0.11.2.tar.xz 297172 SHA256 499dbaf14d7743e5899c9ca918988e81a9894f67
 DIST libass-0.12.3.tar.xz 313852 SHA256 a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c SHA512 84931e89f02487ff01bfe24be3d90b1db8599ab2a5ec2277824b4330cd9219189a54f19d2d83f223d2d6f973b5e7474f2691905091749a776147669b72754be2 WHIRLPOOL 7187d678dfec621d5736ecb4d9dbf6559c74d6c1b4dfcdd7bc4f78313e8f10f73d3cefd33bfa9a1ceed87cb00767e4235b95e144c527e74746e680b6bb12c719
 DIST libass-0.13.0.tar.xz 336128 SHA256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 SHA512 0253d0cd306603b2721bd128ad6eb050c74f1ee415145f238f3a10c4041b054bf94857f4c0043a6578c4fd0865e809e25fa9f61071631ba647c731c13418627f WHIRLPOOL 7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28
 DIST libass-0.13.1.tar.xz 318840 SHA256 4aa36b1876a61cab46fc9284fee84224b9e2840fe7b3e63d96a8d32574343fe7 SHA512 0558e6bb139d9e3c506fa358b02dbeecf574098defb9a4d4c935dac402fc9cf09725114612d3a987f54dee5a08d55f135a64fd87d35fc25dda1bef72bc23d720 WHIRLPOOL ef128daecc0a4a3a026d8fb90da44088c9451bb1acd91fb3b8c90b0e564b62576e7328bd7c4442b6e6f6efa1b18cb3c9a0ac80e44acbfec45d65d834f712f1c2
+DIST libass-0.13.2.tar.xz 348444 SHA256 d698d0a6adca7c36c5a86b540d67b05bfd36cebc3c351ab7646497c43fe1face SHA512 71d495c02ea478b8632c177cef8605d23377e2da2c56dd3a1fa59f9a2d01cc642d4d9dc383083ef1dee8ccf2a6e6f25a4ad9bb7dff3618e7646161731b7312c7 WHIRLPOOL 0c5517fc0cae9ae775300b9c03eb1f141b607b6e43413e56f2dc5de490f5cbe57fd9acc2caa9b6dc5505d7c7b2aec0ae4426fbe2e75010e0c9ffaf2f7a0f7fed
diff --git a/media-libs/libass/libass-0.13.2.ebuild b/media-libs/libass/libass-0.13.2.ebuild
new file mode 100644
index 000000000000..20df06146ee7
--- /dev/null
+++ b/media-libs/libass/libass-0.13.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
+inherit eutils multilib-minimal
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="https://github.com/libass/libass"
+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"
+IUSE="+fontconfig +harfbuzz static-libs"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+X86_CPU_OPTS="abi_x86_32 abi_x86_64"
+for i in ${X86_CPU_OPTS} ; do
+	DEPEND="${DEPEND}
+		${i}? ( dev-lang/yasm )"
+done
+
+DOCS="Changelog"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable fontconfig) \
+		$(use_enable harfbuzz) \
+		$(use_enable static-libs static) \
+		--disable-require-system-font-provider
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index ff1bb4f1f9d4..cc1bdc98d76e 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -2,3 +2,4 @@ DIST libcdr-0.0.14.tar.xz 570728 SHA256 720b693ba5e777f099f41ecd40418a16674ab29d
 DIST libcdr-0.0.16.tar.xz 569644 SHA256 4c8a6586920f7b040ce51fa375eb87507291e0de4f568469db25f52915bc1135 SHA512 59b65b95806bce3c97c1a0762bb80ce0845e444a23b7b4683c74d6c0c9155664e7a7e558d787f6cfa69460f657e4d7416ae8e8947e426f04e369b42fc5da4838 WHIRLPOOL a0021dc4b8640fc2c192ead7b34a9c98536dcfcc2d13b65028768cb61a0ed96a163e8189a1b16751a62bdb7853d210fdfd9d3343870140eb6fe9cd95011c24af
 DIST libcdr-0.1.0.tar.xz 562240 SHA256 a9bd1faca049cf1e2285b27da213a499434591919227beb209b191ad1bb240e8 SHA512 823c98a7185d5dd31bac240d007056f36fb290085efa3392d75f4ed26a4703ffeb2b9be0d9a19417473fb44c4e3abad7242773f5455431040bcfffc8aa51d18e WHIRLPOOL a1dfe38eec531eb10c01416aa7b83ec70c9736cba24aa6d2e4cf3f7f0bf0e6260f38d746663537b97c2875af9f9c87fa755d695effdb58a87cf2f3ee9f24eeb5
 DIST libcdr-0.1.1.tar.xz 564668 SHA256 d0a6e0667e5a37fe059bcb81d5077fc2abffc7e7bac86fe302fbcf927d58df1f SHA512 a655b5390022fb5049d2f75fe836a693033943060d820942d59eb0a34548363ff183e0f32d22ec277d1f8b5c7ab89ab1fba933f17ef1239d14d053bd6a5cf624 WHIRLPOOL f7d5b6b1655f86ac3b843957e476ab17f2ef234bb5073678d182760cd6a370d24c98b14570474221d9f5ef9b24ffc76a5f4f82d596f466a7324dac95a04b9d77
+DIST libcdr-0.1.2.tar.xz 602024 SHA256 6bdb20bcdec5ad1a115d0a3aada7d4b2758e9d22801d72b4ecc2e55fb3d5d42c SHA512 c5c08444fa28be13b60ba1aa515a47606de80b079cbabb0276f54064820fecb2a6ee50a8b33a6cc1b2f5f46323d3de7f00822aadec5c3058a14adebf5255da91 WHIRLPOOL bd3137e234bfa37e82f121b431bb47c5fe5844d3ccf3d73b1aa5660ee732a2705fca0280777111f22bac4056f2f82be7df1e93eb6668dc7c4062727635d89b10
diff --git a/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch b/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch
new file mode 100644
index 000000000000..e32f3fe8a668
--- /dev/null
+++ b/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch
@@ -0,0 +1,32 @@
+From 882a4b3f83a4b5097da53670c720a26f4e2750eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Sun, 13 Dec 2015 20:37:16 +0100
+Subject: [PATCH] Some boost 1.59 fixes
+
+Change-Id: I0054c977a6d8ff5a9b93c147578e890476365999
+---
+ src/lib/Makefile.am | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 3f00cc5..e14fa8c 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -13,8 +13,16 @@ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
+ 	$(top_srcdir)/inc/libcdr/CDRDocument.h \
+ 	$(top_srcdir)/inc/libcdr/CMXDocument.h
+ 
+-AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
++AM_CXXFLAGS = -I$(top_srcdir)/inc \
++	$(REVENGE_CFLAGS) \
++	$(LCMS2_CFLAGS) \
++	$(ZLIB_CFLAGS) \
++	$(ICU_CFLAGS) \
++	$(DEBUG_CXXFLAGS) \
++	-DLIBCDR_BUILD=1 \
++	-DBOOST_ERROR_CODE_HEADER_ONLY \
++	-DBOOST_SYSTEM_NO_DEPRECATED
+ 
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
diff --git a/media-libs/libcdr/libcdr-0.1.0.ebuild b/media-libs/libcdr/libcdr-0.1.0.ebuild
index 3484f9b3c89e..da99f3dc091e 100644
--- a/media-libs/libcdr/libcdr-0.1.0.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -32,9 +32,10 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
+	epatch_user
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/libcdr/libcdr-0.1.1.ebuild b/media-libs/libcdr/libcdr-0.1.1.ebuild
index 158c828fc6cd..c7dba09ebc06 100644
--- a/media-libs/libcdr/libcdr-0.1.1.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -32,9 +32,10 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
+	epatch_user
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/libcdr/libcdr-0.1.2-r1.ebuild b/media-libs/libcdr/libcdr-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..d818832699f5
--- /dev/null
+++ b/media-libs/libcdr/libcdr-0.1.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing the Corel cdr documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	media-libs/lcms:2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	eapply_user
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild
index 77db09ef2224..d818832699f5 100644
--- a/media-libs/libcdr/libcdr-9999.ebuild
+++ b/media-libs/libcdr/libcdr-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -15,8 +15,8 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc static-libs"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="doc static-libs test"
 
 RDEPEND="
 	dev-libs/icu:=
@@ -29,10 +29,11 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
 "
 
 src_prepare() {
-	base_src_prepare
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
@@ -42,7 +43,8 @@ src_configure() {
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable static-libs static) \
 		--disable-werror \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable test tests)
 }
 
 src_install() {
diff --git a/media-libs/libchamplain/libchamplain-0.12.12.ebuild b/media-libs/libchamplain/libchamplain-0.12.12.ebuild
index 9eb401a9dbb7..37f71c37ea9b 100644
--- a/media-libs/libchamplain/libchamplain-0.12.12.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.12.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="debug +gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/libde265/libde265-1.0.2.ebuild b/media-libs/libde265/libde265-1.0.2.ebuild
index 1f4c85fb4f6f..7b52f0011412 100644
--- a/media-libs/libde265/libde265-1.0.2.ebuild
+++ b/media-libs/libde265/libde265-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools"
 
 DEPEND="
diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
new file mode 100644
index 000000000000..ea0aeeb1c404
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/571902
+
+------------------------------------------------------------------------
+r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line
+
+Add giflib-5.1.0 compatibility
+
+Index: src/plugins/gif_extractor.c
+===================================================================
+--- src/plugins/gif_extractor.c	(revision 34094)
++++ src/plugins/gif_extractor.c	(revision 34095)
+@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+   if (gif_file == NULL || gif_error != 0)
+   {
+     if (gif_file != NULL)
++#if GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+       EGifCloseFile (gif_file);
++#else
++      EGifCloseFile (gif_file, NULL);
++#endif
+     return; /* not a GIF */
+   }
+ #endif
+@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+ 	       DGifGetExtensionNext(gif_file, &ext)) &&
+ 	      (NULL != ext) ) ; /* keep going */
+     }
++#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+   DGifCloseFile (gif_file);
++#else
++  DGifCloseFile (gif_file, NULL);
++#endif
+ }
+ 
+ /* end of gif_extractor.c */
+
+------------------------------------------------------------------------
diff --git a/media-libs/libextractor/libextractor-1.3.ebuild b/media-libs/libextractor/libextractor-1.3.ebuild
index 1faf2267e40f..08e3508a62a7 100644
--- a/media-libs/libextractor/libextractor-1.3.ebuild
+++ b/media-libs/libextractor/libextractor-1.3.ebuild
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-giflib-5.patch #571902
+
 	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
 	sed -i \
 		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 2ea3eeedb56d..2d2291125a90 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1 +1,2 @@
 DIST libfpx-1.3.0-1.tar.bz2 2285921 SHA256 0cc240e9458d099c0a50db9c771b3e5b109164472c08f40f31e1190716af48b6 SHA512 f045edb01046ec3d2fee8eeee8a861ebcb63b3b9094a93d4bda28e8009117bdbb7e843bdf4aa8d0502482acec7c2ea51df53b88ab2bf6a61c37aed8653579e67 WHIRLPOOL 16dc643d2602d44fe626fd2c1d35e743dbcfb825fc53e8a20a95145275d71d770fafd75e59b4b74fa5b42ef52f9339474fe877455c04a8f668c47d700d580fb3
+DIST libfpx-1.3.1-6.tar.bz2 2358328 SHA256 84e663bb23619e19195777a7c5d348046756f28cffda3d0ea2160ed0b55a698a SHA512 d33bc59f091100f4e0f7db396ba2f3a93951b348f8b175070fa23186f7ce488e71b7be43a45ebd9a3af21affe5342f63955df8549ff15582f8b29e67601531fb WHIRLPOOL d107a1ee69d018699567761603ce21ba6f6b80e25d5e3e53f6a76ef262602d0d344127c6a0c7f372c2da60a3b293882184513d4a77e674c32b384d5c8798a4bf
diff --git a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
new file mode 100644
index 000000000000..c8d0eba37fa0
--- /dev/null
+++ b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="A library for manipulating FlashPIX images"
+HOMEPAGE="http://www.i3a.org/"
+SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
+
+LICENSE="Flashpix"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="static-libs"
+
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
+
+	eapply_user
+
+	# we're not windows, even though we don't define __unix by default
+	[[ ${CHOST} == *-darwin* ]] && append-flags -D__unix
+
+	elibtoolize
+}
+
+src_configure() {
+	append-ldflags -Wl,--no-undefined
+	econf \
+		$(use_enable static-libs static) \
+		LIBS="-lstdc++ -lm"
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog doc/*.txt
+
+	insinto /usr/share/doc/${PF}/pdf
+	doins doc/*.pdf
+}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
index 2e949f98d7f2..a0b67abb37c0 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 6038f79493d0..9fd94aa1351f 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1 +1,2 @@
 DIST libilbc-1.1.1.tar.xz 302324 SHA256 c52a3f46cf5671ac67494371e78281fa72c87a1af1fd8b8e1731693b6541be87 SHA512 7c9fa6da4d8b32fd49ea62f9e876e385930501c9caedcafac94ea74b9372722b06dd28062dc4fcca765ad6c519cfb52bb595d396ca50d361f563c715f6679845 WHIRLPOOL 120a041823e58d0db3d05549491c00e1b74340f2eefd51f2903f29aacefbbbc94f12cc821451e772c7434ea21fc86ff0c5f8ff15a26e732d1e698d2e7ef44c0a
+DIST libilbc-2.0.2.tar.bz2 392643 SHA256 88e2dc14e1fccd7b7a0d7f84e96ac22a33c3c86820cee4b0a05e3dcc08c2b096 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8 WHIRLPOOL 091280c168f0877e4d05386161db119e3c0ee029488e28c87de15137cbb79d3bc5536dfb9c9b1fe1ca65cb65d7688e4b8784f65107427d62905989f8c4eb992f
diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild
new file mode 100644
index 000000000000..b056c4a0a7e1
--- /dev/null
+++ b/media-libs/libilbc/libilbc-2.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == 9999 ]] ; then
+	SCM="autotools git-2"
+	EGIT_REPO_URI="https://github.com/TimothyGu/libilbc"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/TimothyGu/libilbc/releases/download/v${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+inherit eutils multilib ${SCM} autotools-multilib
+
+DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
+HOMEPAGE="https://github.com/TimothyGu/libilbc"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="static-libs"
+
+src_prepare() {
+	[[ ${PV} == *9999 ]] && eautoreconf
+	autotools-multilib_src_prepare
+}
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild
index 232636092892..b056c4a0a7e1 100644
--- a/media-libs/libilbc/libilbc-9999.ebuild
+++ b/media-libs/libilbc/libilbc-9999.ebuild
@@ -2,32 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 if [[ ${PV} == 9999 ]] ; then
 	SCM="autotools git-2"
-	EGIT_REPO_URI="git://github.com/lu-zero/libilbc.git"
+	EGIT_REPO_URI="https://github.com/TimothyGu/libilbc"
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/TimothyGu/libilbc/releases/download/v${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
-inherit eutils multilib ${SCM}
+inherit eutils multilib ${SCM} autotools-multilib
 
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
-HOMEPAGE="https://github.com/dekkers/libilbc"
+HOMEPAGE="https://github.com/TimothyGu/libilbc"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="static-libs"
 
 src_prepare() {
 	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${D}"usr/$(get_libdir) -name '*.la' -delete
+	autotools-multilib_src_prepare
 }
diff --git a/media-libs/libmimic/Manifest b/media-libs/libmimic/Manifest
deleted file mode 100644
index 2dac852d2f35..000000000000
--- a/media-libs/libmimic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libmimic-1.0.4.tar.gz 331326 SHA256 bd7b9bd52ee7bf25df46f6d3d0ed896d212fc3d96907ac1b01d3d126a48bbb34 SHA512 2754aa7d8dd1bc62a72a03646417c295e0711cd5ceb612ad301147579be3e17efcda504fa4d934969e62a9d2c9bdea7294a9eff751c847616620896264594607 WHIRLPOOL a88e1ccaece257858dee1da94a3d31055b8c3e70a19703c9f26a261db71f90e6ab004fb78a27f84d7394d42f419b7a5f667480c17bcce048712bde6cca4900bd
diff --git a/media-libs/libmimic/libmimic-1.0.4-r2.ebuild b/media-libs/libmimic/libmimic-1.0.4-r2.ebuild
deleted file mode 100644
index c61fc493283a..000000000000
--- a/media-libs/libmimic/libmimic-1.0.4-r2.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 multilib-minimal
-
-DESCRIPTION="Video encoding/decoding library for the codec used by msn"
-HOMEPAGE="http://farsight.sourceforge.net/"
-SRC_URI="mirror://sourceforge/farsight/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-multilib_src_configure() {
-	local myconf="--disable-doxygen-docs"
-	multilib_is_native_abi && myconf="$(use_enable doc doxygen-docs)"
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc && multilib_is_native_abi; then
-		dohtml doc/api/html/*
-	fi
-}
diff --git a/media-libs/libmimic/metadata.xml b/media-libs/libmimic/metadata.xml
deleted file mode 100644
index 5acffc2ccbaf..000000000000
--- a/media-libs/libmimic/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">farsight</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index c154e2a72f41..2dfd4651b5ce 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,3 +1,4 @@
 DIST libmtp-1.1.10.tar.gz 787654 SHA256 1eee8d4c052fe29e58a408fedc08a532e28626fa3e232157abd8fca063c90305 SHA512 7b0d06ac11a7476b6d8c84eb452c4abe08f8f61dafd8b1900e87f550665d5d3add182bbcba6d774426c8c9f6e978cef499a1f0d09283e5d6d02b812eb2eb3072 WHIRLPOOL 77df823382cb5756db4967e9131877888491eb11b9ef2ffdc8fecbb55a5f1df70223be54ef816899ddb0997bc73c8f445e25f2f8a22675da680d3017d2eb08df
+DIST libmtp-1.1.11.tar.gz 788911 SHA256 15d96dff79a4f7ad14338894a4096d4ac584c6ad25fdcca955bc4726303287e9 SHA512 966d5d831695dc02411fbe0a153873d9e5604a00e75bf0d4cc1a957887a2e7656c82209f5bf86150f7b9af037d66a96b3e3523e16d5b52ae013b835febf622c9 WHIRLPOOL 16e31709054de63d954c691b6396d7e1ad23c3327228188a5b918326a2ac9458d5701dabd73f86568dc5d7cd8512cbe2ddbaccb96d1e31d7e2c69ff0ac14b9a5
 DIST libmtp-1.1.8.tar.gz 757109 SHA256 3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282 SHA512 34952fbe1ae1dcee456f4fc0d6208cf18e3ced22891bb748350927f06ee433f806e8339d6275085e70b6fd09a43eb0f18ac617e564c8d8162671245ecf0b8904 WHIRLPOOL 5ab0df9b566b7fe3193b0a09a0792eb2634d0775a8ee9a9358d13b2aeba4c82816f5ecb5e5d7355ed338d6171259b7a5c9802b4bc8ea2b0de3d4bbbd1aa8050c
 DIST libmtp-1.1.9.tar.gz 760593 SHA256 23f1d3c0b54107388bf2824d56415e9e087c980c86e5d179865652c022b6b189 SHA512 6be9f14602b05830ec01defaeb0f237ac4d021f76f4003d7178eda00d8bf86d7fbbeba0053dc111d2ab9eb32f1603c2dc4f2bc128f4cbe4819228486b9b85513 WHIRLPOOL d357c949907b69f3a40291a79e05cc75790d86abb7fa0ea787c5ef0cd666b7f9888f9441f9893824520345d25799142f70c0ba0b773267fb9b374bb0d8b833e6
diff --git a/media-libs/libmtp/libmtp-1.1.11.ebuild b/media-libs/libmtp/libmtp-1.1.11.ebuild
new file mode 100644
index 000000000000..84c6dd2220f8
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.11.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev user
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="virtual/libusb:1
+	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	DOCS="AUTHORS README TODO"
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm -f ChangeLog
+
+	if [[ ${PV} == 9999* ]]; then
+		local crpthf=config.rpath
+		local crpthd=/usr/share/gettext/${crpthf}
+		if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
+			cp "${crpthd}" .
+		else
+			touch ${crpthf} # This is from upstream autogen.sh
+		fi
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen) \
+		$(use_enable crypt mtpz) \
+		--with-udev="$(get_udevdir)" \
+		--with-udev-group=plugdev \
+		--with-udev-mode=0660
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}
diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
index c4f6fcd4c860..9ceaa9bdd9e4 100644
--- a/media-libs/libsdl2/libsdl2-2.0.4.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.4.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/libvisio/Manifest b/media-libs/libvisio/Manifest
index 88298e9c2a20..dcd05d530579 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,3 +1,4 @@
 DIST libvisio-0.0.30.tar.xz 384508 SHA256 e7be89fdef23483deea53a557fe023c9f6b59e0f7bb5ba4f42b5909c86cc11f9 SHA512 d0261f30ca9065873aa498f7594a638d0a90dadd4df609a91e746579d14b5f1f18aa4e4812d25870b390f2df59ffa8f8a4d76618c6e71539023b7610044c9d21 WHIRLPOOL 1e328569f3e810c6cc1399015b7fb5b4aa206e0127109efaad23163fba8d45a4a74945ff6cca3dcc883dcd1248be69149383a2d9f44fb5be213ebfcd2574a92e
 DIST libvisio-0.1.1.tar.xz 412752 SHA256 4b510168d1465516fdf6e57c01e2f9eae1fc0ae232c74e44e70693bbc49227f1 SHA512 c17c3a94985bd4c6fb10fc27d1b61ac812d5b663d123d2a5a5089f9297d39c53befffd563e6367aa024df7f69c03a1cfa41edef71c824cf03e26e3b01987dd38 WHIRLPOOL 47b81e6f4ad9f6267113d259f3d9514751fd73a731ded9b265dddbaa918bee5be1a1580ced9ceb287822ee8a67841f15ca06e04d300212301ae5549625589cfa
 DIST libvisio-0.1.3.tar.xz 479592 SHA256 943e03b1e6c969af4c2133a6671c9630adf3aaf8d460156744a28f58c9f47cd8 SHA512 aa7ea66d30b54e70acd6684a861923dd5979025e5fda12e1e777c6e7a461f9691f2df1dd67ea4599dbb7e0293df0eee9dc9848f79067c4058afb090717489d35 WHIRLPOOL db483c052f69d1874681d36bac98bb7d65f6fd1cd2e8650fc2be0be1705b51dc43a79ad306eafacf11f4463e2e1a18776c3b5e5b0aefc7f92f5eb718aee50e04
+DIST libvisio-0.1.5.tar.xz 504196 SHA256 430a067903660bb1b97daf4b045e408a1bb75ca45e615cf05fb1a4da65fc5a8c SHA512 094ab546f650840d52fc34c1b105eff139d2f6e4d5cab7c9c99f8387ece0d0c6b02ec1376b3281d56a901bac016c2a024bb708c065b8b5d9404104e6494b5fab WHIRLPOOL ee2c67f357a3cc907b78e3cb8c6001ff1da2529d61f691dbad634f15639ff22a72bbec7deae08166ccaa4acfb730a826d96b9f1567e1c7c830ded1dc130388f3
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch
new file mode 100644
index 000000000000..f7e703552f4d
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch
@@ -0,0 +1,25 @@
+From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 18 Jan 2016 13:53:19 +0100
+Subject: [PATCH] tdf#92396 test must be run in specific time zone
+
+Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402
+---
+ src/test/Makefile.am |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index 59d3419..23049b5 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -29,4 +29,7 @@ EXTRA_DIST = \
+ 	     data/dwg.vsdx \
+ 	     $(test_SOURCES)
+ 
++# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string
++AM_TESTS_ENVIRONMENT = TZ=CET; export TZ;
++
+ TESTS = test
+-- 
+1.7.9.5
+
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
new file mode 100644
index 000000000000..78eb9fe66bc9
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac	2015-07-25 09:29:53.000000000 +0200
++++ b/configure.ac	2016-02-07 00:19:30.534383076 +0100
+@@ -317,6 +317,9 @@
+ )
+ AS_IF([test "x$enable_tests" = "xyes"], [
+     PKG_CHECK_MODULES([CPPUNIT], [cppunit])
++    PKG_CHECK_MODULES([REVENGE_STREAM],[
++        librevenge-stream-0.0
++    ])
+ ], [])
+ AC_SUBST([CPPUNIT_CFLAGS])
+ AC_SUBST([CPPUNIT_LIBS])
diff --git a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
index 0770f0fd1d4a..8c2449a7e3c1 100644
--- a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the visio documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
@@ -33,12 +33,18 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-tests.patch"
+	"${FILESDIR}/${P}-fix-importtest.patch"
+	"${FILESDIR}/${P}-tests-without-tools.patch"
+	"${FILESDIR}/${P}-boost-1.59.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-tests.patch" \
-		"${FILESDIR}/${P}-boost-1.59.patch"
+	epatch "${PATCHES[@]}"
+	epatch_user
 	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/libvisio/libvisio-0.1.3.ebuild b/media-libs/libvisio/libvisio-0.1.3.ebuild
deleted file mode 100644
index 591d1b34eb80..000000000000
--- a/media-libs/libvisio/libvisio-0.1.3.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
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing the visio documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE="doc static-libs test tools"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	dev-util/gperf
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-src_prepare() {
-	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/libvisio/libvisio-0.1.5.ebuild b/media-libs/libvisio/libvisio-0.1.5.ebuild
new file mode 100644
index 000000000000..c2ac25fe1375
--- /dev/null
+++ b/media-libs/libvisio/libvisio-0.1.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
+
+DESCRIPTION="Library parsing the visio documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="doc static-libs test tools"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=dev-libs/boost-1.46
+	dev-util/gperf
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.1.3-tests-without-tools.patch" )
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply_user
+	[[ -d m4 ]] || mkdir "m4"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/libvisio/libvisio-9999.ebuild b/media-libs/libvisio/libvisio-9999.ebuild
index 591d1b34eb80..0adbb1cda8e2 100644
--- a/media-libs/libvisio/libvisio-9999.ebuild
+++ b/media-libs/libvisio/libvisio-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
+inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the visio documents"
@@ -25,6 +25,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	>=dev-libs/boost-1.46
 	dev-util/gperf
 	sys-devel/libtool
@@ -34,8 +35,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 89571485ea31..ffbcc86eb361 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,7 @@
 DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
 DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b
-DIST mesa-11.0.7.tar.xz 7279276 SHA256 e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb SHA512 cf3bae4db0a3af41d075498ad44f1bff994c30e97d58f9f4bdb52d1c6e1244365d68edfa55bf9076f1b4e9f8f4f3de9661f210291a5d8683e280327e1480c7cf WHIRLPOOL b599f605c1022f06953f11462c46525f2906106707e6e9e0e03c166ee6076eacc7ded68f4367f715556275053473532311aa61b11f99d6d81c647f23ffadd554
 DIST mesa-11.0.8.tar.xz 7282812 SHA256 5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75 SHA512 2e883761b115dece05c527d43653e5169e70ef0d8f0f9fe35027986ca543128b17be668d495cacda4ee95564ba66734ea9954d2434aefaeb9c063f4bbedc1d63 WHIRLPOOL 3a637137076d0fc8ef3f37485683be80103ce6c5a92cef796e491d570aa47aa1ca16fca1b7b74ba697a3a816a5e606d695d0b3b524587e14533d9143830a1790
-DIST mesa-11.1.0.tar.xz 7557948 SHA256 9befe03b04223eb1ede177fa8cac001e2850292c8c12a3ec9929106afad9cf1f SHA512 49817dbe599fdeb3e9d69f149283a5414d3101177040e04ec2c07c9bc57c2e86dcd74c0eb9e5784eb74ec5adff01f4fc8fd07fce650ce0afc18c81265e369192 WHIRLPOOL c7553dcb8e4fc57f1551e9ab8b01781f5b27a8ecd2e2bbf34bee9009018dcad3c9363de92ab8ffa1394a9b80cbd40c7ee0d0324812a9ebab5bafa96f92534a0c
-DIST mesa-11.1.1.tar.xz 7561216 SHA256 64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20 SHA512 1d41bb4e58042230a38784477c425a2517ef57b17055413884dfb1b7a635a7d8ec68b9be705cbd5608910d75d73988d7c18467c779c48547c5c533750e722521 WHIRLPOOL 78d1c0b42e08c7149c1e97d9c45216102cba73f96ab96355f8b470faa45532312c3e7c791d98bce4aeaa776cec9a103ca904fb28828b5b172a7de3973809a1d1
+DIST mesa-11.0.9.tar.xz 7282648 SHA256 a1262ff1c66a16ccf341186cf0e57b306b8589eb2cc5ce92ffb6788ab01d2b01 SHA512 8bf9c3bfe61f5d22182b9611d66051d83dfb302cc349921bc1d895acc8681b3e22e77cb360e2f12383fd928793b306f8f98998caa457dc04e3ff4e5561ea78f7 WHIRLPOOL a3477542b5ebfed9b69bd29e7f58a01b02c70d49399afb873744de08e776d712eaca3443f88dbdee25b1d3d35a4eb9dae75a3b9d7d6d652d41cded763836c59a
+DIST mesa-11.1.2.tar.xz 7561920 SHA256 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b SHA512 4037728cbe7c5c492cf1e6d20c61250c0ff4fe82cf89ba1cd6ff029776220160359dce197582d2c3f3f7ba5d76fe6b055515210fc46b59f821fc66f453cb77ae WHIRLPOOL e7a848f542c13eae1a79c89a6bff3fbc0c82041924f1cbecac7eaba6363edebfce568353829c41eb38c0c309e0aa35f36027b0dca262ed54d6627542d74f6bca
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch b/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
new file mode 100644
index 000000000000..87ad498a0eb0
--- /dev/null
+++ b/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
@@ -0,0 +1,47 @@
+From 1c145df858ba5ab539386692d9350909fb8f8c82 Mon Sep 17 00:00:00 2001
+From: Jason Ekstrand <jason.ekstrand@intel.com>
+Date: Wed, 10 Feb 2016 12:07:49 -0800
+Subject: [PATCH] nir/lower_vec_to_movs: Better report channels handled by
+ insert_mov
+
+This fixes two issues.  First, we had a use-after-free in the case where
+the instruction got deleted and we tried to return mov->dest.write_mask.
+Second, in the case where we are doing a self-mov of a register, we delete
+those channels that are moved to themselves from the write-mask.  This
+means that those channels aren't reported as being handled even though they
+are.  We now stash off the write-mask before remove unneeded channels so
+that they still get reported as handled.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94073
+Reviewed-by: Matt Turner <mattst88@gmail.com>
+Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
+(cherry picked from commit 70dff4a55e767de8b9ce10f055b94ebb1f6a9755)
+---
+ src/glsl/nir/nir_lower_vec_to_movs.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/glsl/nir/nir_lower_vec_to_movs.c b/src/glsl/nir/nir_lower_vec_to_movs.c
+index 736a66c..0783596 100644
+--- a/src/glsl/nir/nir_lower_vec_to_movs.c
++++ b/src/glsl/nir/nir_lower_vec_to_movs.c
+@@ -83,6 +83,8 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
+       }
+    }
+ 
++   unsigned channels_handled = mov->dest.write_mask;
++
+    /* In some situations (if the vecN is involved in a phi-web), we can end
+     * up with a mov from a register to itself.  Some of those channels may end
+     * up doing nothing and there's no reason to have them as part of the mov.
+@@ -103,7 +105,7 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
+       ralloc_free(mov);
+    }
+ 
+-   return mov->dest.write_mask;
++   return channels_handled;
+ }
+ 
+ static bool
+-- 
+2.4.10
+
diff --git a/media-libs/mesa/mesa-11.0.7.ebuild b/media-libs/mesa/mesa-11.0.7.ebuild
deleted file mode 100644
index 47caccd19396..000000000000
--- a/media-libs/mesa/mesa-11.0.7.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# 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=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-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 )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( 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}]
-	>=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? ( !kernel_FreeBSD? (
-		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
-				!kernel_FreeBSD? ( || (
-					>=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() {
-	[[ ${PV} == 9999 ]] && 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-read-only-text, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	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.9.ebuild b/media-libs/mesa/mesa-11.0.9.ebuild
new file mode 100644
index 000000000000..bea9a0efedb3
--- /dev/null
+++ b/media-libs/mesa/mesa-11.0.9.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2016 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=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+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 )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( 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}]
+	>=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? ( !kernel_FreeBSD? (
+		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
+				!kernel_FreeBSD? ( || (
+					>=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() {
+	[[ ${PV} == 9999 ]] && 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-read-only-text, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	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.1.0.ebuild b/media-libs/mesa/mesa-11.1.0.ebuild
deleted file mode 100644
index 4dafdf6d0470..000000000000
--- a/media-libs/mesa/mesa-11.1.0.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# 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=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-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 )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( 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}]
-	>=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? ( !kernel_FreeBSD? (
-		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
-				!kernel_FreeBSD? ( || (
-					>=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-1.6.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() {
-	[[ ${PV} == 9999 ]] && 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-read-only-text, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	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.1.1.ebuild b/media-libs/mesa/mesa-11.1.1.ebuild
deleted file mode 100644
index 2f072fbaf227..000000000000
--- a/media-libs/mesa/mesa-11.1.1.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2016 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=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-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 )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( 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}]
-	>=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? ( !kernel_FreeBSD? (
-		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
-				!kernel_FreeBSD? ( || (
-					>=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-1.6.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() {
-	[[ ${PV} == 9999 ]] && 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-read-only-text, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	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.1.2-r1.ebuild b/media-libs/mesa/mesa-11.1.2-r1.ebuild
new file mode 100644
index 000000000000..7dd5cc6f9a82
--- /dev/null
+++ b/media-libs/mesa/mesa-11.1.2-r1.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2016 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=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+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 )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( 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}]
+	>=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? ( !kernel_FreeBSD? (
+		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
+				!kernel_FreeBSD? ( || (
+					>=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-1.6.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() {
+	epatch "${FILESDIR}"/${PN}-11.1.2-i965-fix-use-after-free.patch
+
+	[[ ${PV} == 9999 ]] && 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-read-only-text, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	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/mlt/files/mlt-0.9.8-ffmpeg3.patch b/media-libs/mlt/files/mlt-0.9.8-ffmpeg3.patch
new file mode 100644
index 000000000000..ef89fbb5485a
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.9.8-ffmpeg3.patch
@@ -0,0 +1,500 @@
+commit 97c2dd0de4f578ad40d547eddf78fcb1e4a008a4
+Author: Dan Dennedy <dan@dennedy.org>
+Date:   Sat Sep 5 13:06:21 2015 -0700
+
+    Fix avformat build against FFmpeg and Libav master.
+    
+    This drops support for FFmpeg v1.0; requires at least v1.1. Still works
+    with Libav v9.
+    CPU flags are no longer required/used by libswscale. They are detected
+    at runtime automatically.
+
+diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
+index ef8b153..7947c47 100644
+--- a/src/modules/avformat/consumer_avformat.c
++++ b/src/modules/avformat/consumer_avformat.c
+@@ -439,18 +439,18 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
+ 	}
+ }
+ 
+-static enum PixelFormat pick_pix_fmt( mlt_image_format img_fmt )
++static enum AVPixelFormat pick_pix_fmt( mlt_image_format img_fmt )
+ {
+ 	switch ( img_fmt )
+ 	{
+ 	case mlt_image_rgb24:
+-		return PIX_FMT_RGB24;
++		return AV_PIX_FMT_RGB24;
+ 	case mlt_image_rgb24a:
+-		return PIX_FMT_RGBA;
++		return AV_PIX_FMT_RGBA;
+ 	case mlt_image_yuv420p:
+-		return PIX_FMT_YUV420P;
++		return AV_PIX_FMT_YUV420P;
+ 	default:
+-		return PIX_FMT_YUYV422;
++		return AV_PIX_FMT_YUYV422;
+ 	}
+ }
+ 
+@@ -798,7 +798,7 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A
+ 		st->time_base = c->time_base;
+ 
+ 		// Default to the codec's first pix_fmt if possible.
+-		c->pix_fmt = pix_fmt? av_get_pix_fmt( pix_fmt ) : codec? codec->pix_fmts[0] : PIX_FMT_YUV420P;
++		c->pix_fmt = pix_fmt? av_get_pix_fmt( pix_fmt ) : codec? codec->pix_fmts[0] : AV_PIX_FMT_YUV420P;
+ 		
+ 		switch ( colorspace )
+ 		{
+@@ -1032,7 +1032,7 @@ static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream
+ 
+ 	if( codec && codec->pix_fmts )
+ 	{
+-		const enum PixelFormat *p = codec->pix_fmts;
++		const enum AVPixelFormat *p = codec->pix_fmts;
+ 		for( ; *p!=-1; p++ )
+ 		{
+ 			if( *p == video_enc->pix_fmt )
+@@ -1791,12 +1791,6 @@ static void *consumer_thread( void *arg )
+ 
+ 						// Do the colour space conversion
+ 						int flags = SWS_BICUBIC;
+-#ifdef USE_MMX
+-						flags |= SWS_CPU_CAPS_MMX;
+-#endif
+-#ifdef USE_SSE
+-						flags |= SWS_CPU_CAPS_MMX2;
+-#endif
+ 						struct SwsContext *context = sws_getContext( width, height, pick_pix_fmt( img_fmt ),
+ 							width, height, c->pix_fmt, flags, NULL, NULL, NULL);
+ 						sws_scale( context, (const uint8_t* const*) video_avframe->data, video_avframe->linesize, 0, height,
+@@ -1808,9 +1802,9 @@ static void *consumer_thread( void *arg )
+ 						// Apply the alpha if applicable
+ 						if ( !mlt_properties_get( properties, "mlt_image_format" ) ||
+ 						     strcmp( mlt_properties_get( properties, "mlt_image_format" ), "rgb24a" ) )
+-						if ( c->pix_fmt == PIX_FMT_RGBA ||
+-						     c->pix_fmt == PIX_FMT_ARGB ||
+-						     c->pix_fmt == PIX_FMT_BGRA )
++						if ( c->pix_fmt == AV_PIX_FMT_RGBA ||
++						     c->pix_fmt == AV_PIX_FMT_ARGB ||
++						     c->pix_fmt == AV_PIX_FMT_BGRA )
+ 						{
+ 							uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
+ 							register int n;
+@@ -1844,8 +1838,6 @@ static void *consumer_thread( void *arg )
+ 						av_init_packet(&pkt);
+ 
+ 						// Set frame interlace hints
+-						c->coded_frame->interlaced_frame = !mlt_properties_get_int( frame_properties, "progressive" );
+-						c->coded_frame->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" );
+ 						if ( mlt_properties_get_int( frame_properties, "progressive" ) )
+ 							c->field_order = AV_FIELD_PROGRESSIVE;
+ 						else
+diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
+index f70fd08..910de0c 100644
+--- a/src/modules/avformat/filter_avcolour_space.c
++++ b/src/modules/avformat/filter_avcolour_space.c
+@@ -47,17 +47,17 @@ static int convert_mlt_to_av_cs( mlt_image_format format )
+ 	switch( format )
+ 	{
+ 		case mlt_image_rgb24:
+-			value = PIX_FMT_RGB24;
++			value = AV_PIX_FMT_RGB24;
+ 			break;
+ 		case mlt_image_rgb24a:
+ 		case mlt_image_opengl:
+-			value = PIX_FMT_RGBA;
++			value = AV_PIX_FMT_RGBA;
+ 			break;
+ 		case mlt_image_yuv422:
+-			value = PIX_FMT_YUYV422;
++			value = AV_PIX_FMT_YUYV422;
+ 			break;
+ 		case mlt_image_yuv420p:
+-			value = PIX_FMT_YUV420P;
++			value = AV_PIX_FMT_YUV420P;
+ 			break;
+ 		default:
+ 			mlt_log_error( NULL, "[filter avcolor_space] Invalid format %s\n",
+@@ -123,16 +123,10 @@ static int av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt,
+ 	int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
+ 	int error = -1;
+ 
+-	if ( out_fmt == PIX_FMT_YUYV422 )
++	if ( out_fmt == AV_PIX_FMT_YUYV422 )
+ 		flags |= SWS_FULL_CHR_H_INP;
+ 	else
+ 		flags |= SWS_FULL_CHR_H_INT;
+-#ifdef USE_MMX
+-	flags |= SWS_CPU_CAPS_MMX;
+-#endif
+-#ifdef USE_SSE
+-	flags |= SWS_CPU_CAPS_MMX2;
+-#endif
+ 
+ 	avpicture_fill( &input, in, in_fmt, width, height );
+ 	avpicture_fill( &output, out, out_fmt, width, height );
+@@ -141,7 +135,7 @@ static int av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt,
+ 	if ( context )
+ 	{
+ 		// libswscale wants the RGB colorspace to be SWS_CS_DEFAULT, which is = SWS_CS_ITU601.
+-		if ( out_fmt == PIX_FMT_RGB24 || out_fmt == PIX_FMT_RGBA )
++		if ( out_fmt == AV_PIX_FMT_RGB24 || out_fmt == AV_PIX_FMT_RGBA )
+ 			dst_colorspace = 601;
+ 		error = set_luma_transfer( context, src_colorspace, dst_colorspace, use_full_range );
+ 		sws_scale( context, (const uint8_t* const*) input.data, input.linesize, 0, height,
+@@ -326,7 +320,7 @@ mlt_filter filter_avcolour_space_init( void *arg )
+ 		int *width = (int*) arg;
+ 		if ( *width > 0 )
+ 		{
+-			struct SwsContext *context = sws_getContext( *width, *width, PIX_FMT_RGB32, 64, 64, PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
++			struct SwsContext *context = sws_getContext( *width, *width, AV_PIX_FMT_RGB32, 64, 64, AV_PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
+ 			if ( context )
+ 				sws_freeContext( context );
+ 			else
+diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
+index 9c0189e..91c435c 100644
+--- a/src/modules/avformat/filter_avdeinterlace.c
++++ b/src/modules/avformat/filter_avdeinterlace.c
+@@ -234,28 +234,28 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
+ {
+     int i;
+ 
+-    if (pix_fmt != PIX_FMT_YUV420P &&
+-        pix_fmt != PIX_FMT_YUV422P &&
+-        pix_fmt != PIX_FMT_YUYV422 &&
+-        pix_fmt != PIX_FMT_YUV444P &&
+-	pix_fmt != PIX_FMT_YUV411P)
++    if (pix_fmt != AV_PIX_FMT_YUV420P &&
++        pix_fmt != AV_PIX_FMT_YUV422P &&
++        pix_fmt != AV_PIX_FMT_YUYV422 &&
++        pix_fmt != AV_PIX_FMT_YUV444P &&
++	pix_fmt != AV_PIX_FMT_YUV411P)
+         return -1;
+     if ((width & 3) != 0 || (height & 3) != 0)
+         return -1;
+ 
+-	if ( pix_fmt != PIX_FMT_YUYV422 )
++	if ( pix_fmt != AV_PIX_FMT_YUYV422 )
+ 	{
+       for(i=0;i<3;i++) {
+           if (i == 1) {
+               switch(pix_fmt) {
+-              case PIX_FMT_YUV420P:
++              case AV_PIX_FMT_YUV420P:
+                   width >>= 1;
+                   height >>= 1;
+                   break;
+-              case PIX_FMT_YUV422P:
++              case AV_PIX_FMT_YUV422P:
+                   width >>= 1;
+                   break;
+-              case PIX_FMT_YUV411P:
++              case AV_PIX_FMT_YUV411P:
+                   width >>= 2;
+                   break;
+               default:
+@@ -312,8 +312,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
+ 		AVPicture *output = mlt_pool_alloc( sizeof( AVPicture ) );
+ 
+ 		// Fill the picture
+-		avpicture_fill( output, *image, PIX_FMT_YUYV422, *width, *height );
+-		mlt_avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
++		avpicture_fill( output, *image, AV_PIX_FMT_YUYV422, *width, *height );
++		mlt_avpicture_deinterlace( output, output, AV_PIX_FMT_YUYV422, *width, *height );
+ 
+ 		// Free the picture
+ 		mlt_pool_release( output );
+diff --git a/src/modules/avformat/filter_swscale.c b/src/modules/avformat/filter_swscale.c
+index b8213a3..37c156d 100644
+--- a/src/modules/avformat/filter_swscale.c
++++ b/src/modules/avformat/filter_swscale.c
+@@ -37,17 +37,17 @@ static inline int convert_mlt_to_av_cs( mlt_image_format format )
+ 	switch( format )
+ 	{
+ 		case mlt_image_rgb24:
+-			value = PIX_FMT_RGB24;
++			value = AV_PIX_FMT_RGB24;
+ 			break;
+ 		case mlt_image_rgb24a:
+ 		case mlt_image_opengl:
+-			value = PIX_FMT_RGBA;
++			value = AV_PIX_FMT_RGBA;
+ 			break;
+ 		case mlt_image_yuv422:
+-			value = PIX_FMT_YUYV422;
++			value = AV_PIX_FMT_YUYV422;
+ 			break;
+ 		case mlt_image_yuv420p:
+-			value = PIX_FMT_YUV420P;
++			value = AV_PIX_FMT_YUV420P;
+ 			break;
+ 		default:
+ 			fprintf( stderr, "Invalid format...\n" );
+@@ -108,12 +108,6 @@ static int filter_scale( mlt_frame frame, uint8_t **image, mlt_image_format *for
+ 			// XXX: we only know how to rescale packed formats
+ 			return 1;
+ 	}
+-#ifdef USE_MMX
+-	interp |= SWS_CPU_CAPS_MMX;
+-#endif
+-#ifdef USE_SSE
+-	interp |= SWS_CPU_CAPS_MMX2;
+-#endif
+ 
+ 	// Convert the pixel formats
+ 	int avformat = convert_mlt_to_av_cs( *format );
+@@ -148,7 +142,7 @@ static int filter_scale( mlt_frame frame, uint8_t **image, mlt_image_format *for
+ 			uint8_t *alpha = mlt_frame_get_alpha( frame );
+ 			if ( alpha )
+ 			{
+-				avformat = PIX_FMT_GRAY8;
++				avformat = AV_PIX_FMT_GRAY8;
+ 				struct SwsContext *context = sws_getContext( iwidth, iheight, avformat, owidth, oheight, avformat, interp, NULL, NULL, NULL);
+ 				avpicture_fill( &input, alpha, avformat, iwidth, iheight );
+ 				outbuf = mlt_pool_alloc( owidth * oheight );
+@@ -182,7 +176,7 @@ mlt_filter filter_swscale_init( mlt_profile profile, void *arg )
+ 		int *width = (int*) arg;
+ 		if ( *width > 0 )
+ 		{
+-			struct SwsContext *context = sws_getContext( *width, *width, PIX_FMT_RGB32, 64, 64, PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
++			struct SwsContext *context = sws_getContext( *width, *width, AV_PIX_FMT_RGB32, 64, 64, AV_PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
+ 			if ( context )
+ 				sws_freeContext( context );
+ 			else
+diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
+index 3495e2a..55e326d 100644
+--- a/src/modules/avformat/producer_avformat.c
++++ b/src/modules/avformat/producer_avformat.c
+@@ -33,6 +33,7 @@
+ #include <libavutil/pixdesc.h>
+ #include <libavutil/dict.h>
+ #include <libavutil/opt.h>
++#include <libavutil/channel_layout.h>
+ 
+ #ifdef VDPAU
+ #  include <libavcodec/vdpau.h>
+@@ -504,21 +505,21 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
+ 	return result;
+ }
+ 
+-static enum PixelFormat pick_pix_fmt( enum PixelFormat pix_fmt )
++static enum AVPixelFormat pick_pix_fmt( enum AVPixelFormat pix_fmt )
+ {
+ 	switch ( pix_fmt )
+ 	{
+-	case PIX_FMT_ARGB:
+-	case PIX_FMT_RGBA:
+-	case PIX_FMT_ABGR:
+-	case PIX_FMT_BGRA:
+-		return PIX_FMT_RGBA;
++	case AV_PIX_FMT_ARGB:
++	case AV_PIX_FMT_RGBA:
++	case AV_PIX_FMT_ABGR:
++	case AV_PIX_FMT_BGRA:
++		return AV_PIX_FMT_RGBA;
+ #if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((2<<16)+(5<<8)+102))
+ 	case AV_PIX_FMT_BAYER_RGGB16LE:
+-		return PIX_FMT_RGB24;
++		return AV_PIX_FMT_RGB24;
+ #endif
+ 	default:
+-		return PIX_FMT_YUV422P;
++		return AV_PIX_FMT_YUV422P;
+ 	}
+ }
+ 
+@@ -976,26 +977,26 @@ static int set_luma_transfer( struct SwsContext *context, int src_colorspace,
+ 		brightness, contrast, saturation );
+ }
+ 
+-static mlt_image_format pick_image_format( enum PixelFormat pix_fmt )
++static mlt_image_format pick_image_format( enum AVPixelFormat pix_fmt )
+ {
+ 	switch ( pix_fmt )
+ 	{
+-	case PIX_FMT_ARGB:
+-	case PIX_FMT_RGBA:
+-	case PIX_FMT_ABGR:
+-	case PIX_FMT_BGRA:
++	case AV_PIX_FMT_ARGB:
++	case AV_PIX_FMT_RGBA:
++	case AV_PIX_FMT_ABGR:
++	case AV_PIX_FMT_BGRA:
+ 		return mlt_image_rgb24a;
+-	case PIX_FMT_YUV420P:
+-	case PIX_FMT_YUVJ420P:
+-	case PIX_FMT_YUVA420P:
++	case AV_PIX_FMT_YUV420P:
++	case AV_PIX_FMT_YUVJ420P:
++	case AV_PIX_FMT_YUVA420P:
+ 		return mlt_image_yuv420p;
+-	case PIX_FMT_RGB24:
+-	case PIX_FMT_BGR24:
+-	case PIX_FMT_GRAY8:
+-	case PIX_FMT_MONOWHITE:
+-	case PIX_FMT_MONOBLACK:
+-	case PIX_FMT_RGB8:
+-	case PIX_FMT_BGR8:
++	case AV_PIX_FMT_RGB24:
++	case AV_PIX_FMT_BGR24:
++	case AV_PIX_FMT_GRAY8:
++	case AV_PIX_FMT_MONOWHITE:
++	case AV_PIX_FMT_MONOBLACK:
++	case AV_PIX_FMT_RGB8:
++	case AV_PIX_FMT_BGR8:
+ #if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((2<<16)+(5<<8)+102))
+ 	case AV_PIX_FMT_BAYER_RGGB16LE:
+ 		return mlt_image_rgb24;
+@@ -1071,21 +1072,14 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
+ 	mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( self->parent ) );
+ 	int result = self->yuv_colorspace;
+ 
+-#ifdef USE_MMX
+-	flags |= SWS_CPU_CAPS_MMX;
+-#endif
+-#ifdef USE_SSE
+-	flags |= SWS_CPU_CAPS_MMX2;
+-#endif
+-
+ 	mlt_log_debug( MLT_PRODUCER_SERVICE(self->parent), "%s @ %dx%d space %d->%d\n",
+ 		mlt_image_format_name( *format ),
+ 		width, height, self->yuv_colorspace, profile->colorspace );
+ 
+ 	// extract alpha from planar formats
+-	if ( ( pix_fmt == PIX_FMT_YUVA420P
++	if ( ( pix_fmt == AV_PIX_FMT_YUVA420P
+ #if defined(FFUDIV)
+-			|| pix_fmt == PIX_FMT_YUVA444P
++			|| pix_fmt == AV_PIX_FMT_YUVA444P
+ #endif
+ 			) &&
+ 		*format != mlt_image_rgb24a && *format != mlt_image_opengl &&
+@@ -1110,10 +1104,10 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
+ 		// avformat with no filters and explicitly requested.
+ #if defined(FFUDIV) && (LIBAVFORMAT_VERSION_INT >= ((55<<16)+(48<<8)+100))
+ 		struct SwsContext *context = sws_getContext(width, height, src_pix_fmt,
+-			width, height, PIX_FMT_YUV420P, flags, NULL, NULL, NULL);
++			width, height, AV_PIX_FMT_YUV420P, flags, NULL, NULL, NULL);
+ #else
+ 		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+-					width, height, self->full_luma ? PIX_FMT_YUVJ420P : PIX_FMT_YUV420P,
++					width, height, self->full_luma ? AV_PIX_FMT_YUVJ420P : AV_PIX_FMT_YUV420P,
+ 					flags, NULL, NULL, NULL);
+ #endif
+ 
+@@ -1133,9 +1127,9 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
+ 	else if ( *format == mlt_image_rgb24 )
+ 	{
+ 		struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
+-			width, height, PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
++			width, height, AV_PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
+ 		AVPicture output;
+-		avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
++		avpicture_fill( &output, buffer, AV_PIX_FMT_RGB24, width, height );
+ 		// libswscale wants the RGB colorspace to be SWS_CS_DEFAULT, which is = SWS_CS_ITU601.
+ 		set_luma_transfer( context, self->yuv_colorspace, 601, self->full_luma, 0 );
+ 		sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
+@@ -1145,9 +1139,9 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
+ 	else if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
+ 	{
+ 		struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
+-			width, height, PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
++			width, height, AV_PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
+ 		AVPicture output;
+-		avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
++		avpicture_fill( &output, buffer, AV_PIX_FMT_RGBA, width, height );
+ 		// libswscale wants the RGB colorspace to be SWS_CS_DEFAULT, which is = SWS_CS_ITU601.
+ 		set_luma_transfer( context, self->yuv_colorspace, 601, self->full_luma, 0 );
+ 		sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
+@@ -1158,13 +1152,13 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
+ 	{
+ #if defined(FFUDIV) && (LIBAVFORMAT_VERSION_INT >= ((55<<16)+(48<<8)+100))
+ 		struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
+-			width, height, PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
++			width, height, AV_PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
+ #else
+ 		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+-			width, height, PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
++			width, height, AV_PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
+ #endif
+ 		AVPicture output;
+-		avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
++		avpicture_fill( &output, buffer, AV_PIX_FMT_YUYV422, width, height );
+ 		if ( !set_luma_transfer( context, self->yuv_colorspace, profile->colorspace, self->full_luma, 0 ) )
+ 			result = profile->colorspace;
+ 		sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
+@@ -1297,12 +1291,11 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
+ 	double delay = mlt_properties_get_double( properties, "video_delay" );
+ 
+ 	// Seek if necessary
+-	const char *interp = mlt_properties_get( frame_properties, "rescale.interp" );
+-	int preseek = must_decode
++	int preseek = must_decode && codec_context->has_b_frames;
+ #if defined(FFUDIV)
+-		&& ( interp && strcmp( interp, "nearest" ) )
++	const char *interp = mlt_properties_get( frame_properties, "rescale.interp" );
++	preseek = preseek && interp && strcmp( interp, "nearest" );
+ #endif
+-		&& codec_context->has_b_frames;
+ 	int paused = seek_video( self, position, req_position, preseek );
+ 
+ 	// Seek might have reopened the file
+@@ -1310,10 +1303,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
+ 	stream = context->streams[ self->video_index ];
+ 	codec_context = stream->codec;
+ 	if ( *format == mlt_image_none || *format == mlt_image_glsl ||
+-			codec_context->pix_fmt == PIX_FMT_ARGB ||
+-			codec_context->pix_fmt == PIX_FMT_RGBA ||
+-			codec_context->pix_fmt == PIX_FMT_ABGR ||
+-			codec_context->pix_fmt == PIX_FMT_BGRA )
++			codec_context->pix_fmt == AV_PIX_FMT_ARGB ||
++			codec_context->pix_fmt == AV_PIX_FMT_RGBA ||
++			codec_context->pix_fmt == AV_PIX_FMT_ABGR ||
++			codec_context->pix_fmt == AV_PIX_FMT_BGRA )
+ 		*format = pick_image_format( codec_context->pix_fmt );
+ #if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((2<<16)+(5<<8)+102))
+ 	else if ( codec_context->pix_fmt == AV_PIX_FMT_BAYER_RGGB16LE ) {
+@@ -1346,7 +1339,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
+ 				picture.linesize[1] = codec_context->width / 2;
+ 				picture.linesize[2] = codec_context->width / 2;
+ 				yuv_colorspace = convert_image( self, (AVFrame*) &picture, *buffer,
+-					PIX_FMT_YUV420P, format, *width, *height, &alpha );
++					AV_PIX_FMT_YUV420P, format, *width, *height, &alpha );
+ 			}
+ 			else
+ #endif
+@@ -1539,7 +1532,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
+ 							VdpStatus status = vdp_surface_get_bits( render->surface, dest_format, planes, pitches );
+ 							if ( status == VDP_STATUS_OK )
+ 							{
+-								yuv_colorspace = convert_image( self, self->video_frame, *buffer, PIX_FMT_YUV420P,
++								yuv_colorspace = convert_image( self, self->video_frame, *buffer, AV_PIX_FMT_YUV420P,
+ 									format, *width, *height, &alpha );
+ 								mlt_properties_set_int( frame_properties, "colorspace", yuv_colorspace );
+ 							}
+diff --git a/src/modules/avformat/vdpau.c b/src/modules/avformat/vdpau.c
+index 719db1c..4f2e6b9 100644
+--- a/src/modules/avformat/vdpau.c
++++ b/src/modules/avformat/vdpau.c
+@@ -136,9 +136,9 @@ static int vdpau_init( producer_avformat self )
+ 	return success;
+ }
+ 
+-static enum PixelFormat vdpau_get_format( struct AVCodecContext *s, const enum PixelFormat *fmt )
++static enum AVPixelFormat vdpau_get_format( struct AVCodecContext *s, const enum AVPixelFormat *fmt )
+ {
+-	return PIX_FMT_VDPAU_H264;
++	return AV_PIX_FMT_VDPAU_H264;
+ }
+ 
+ static int vdpau_get_buffer( AVCodecContext *codec_context, AVFrame *frame )
+@@ -240,7 +240,7 @@ static int vdpau_decoder_init( producer_avformat self )
+ 	self->video_codec->release_buffer = vdpau_release_buffer;
+ 	self->video_codec->draw_horiz_band = vdpau_draw_horiz;
+ 	self->video_codec->slice_flags = SLICE_FLAG_CODED_ORDER | SLICE_FLAG_ALLOW_FIELD;
+-	self->video_codec->pix_fmt = PIX_FMT_VDPAU_H264;
++	self->video_codec->pix_fmt = AV_PIX_FMT_VDPAU_H264;
+ 	
+ 	VdpDecoderProfile profile = VDP_DECODER_PROFILE_H264_HIGH;
+ 	uint32_t max_references = self->video_codec->refs;
diff --git a/media-libs/mlt/mlt-0.9.8-r2.ebuild b/media-libs/mlt/mlt-0.9.8-r2.ebuild
index 248d021544e7..8251f54b1b94 100644
--- a/media-libs/mlt/mlt-0.9.8-r2.ebuild
+++ b/media-libs/mlt/mlt-0.9.8-r2.ebuild
@@ -92,7 +92,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.8-ruby-link.patch
+	epatch "${FILESDIR}"/${PN}-0.9.8-ruby-link.patch \
+		"${FILESDIR}/${P}-ffmpeg3.patch"
 
 	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
 	for x in python lua; do
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 86ee2a599465..5804eb029c63 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,4 +3,5 @@ DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956f
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
 DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
 DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
+DIST opencv-3.1.0_contrib.zip 55182211 SHA256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4 SHA512 f0ceb8d9ed85efe948a40071793d164a82391a462c52ca71a6029e8b119afdab8b1453baaed2cd7d540001559849a62ec4b745d41345db225acff0531c76e762 WHIRLPOOL 589294c849a00426f4c52d07ab652e71e8bbc74efd0878fbaea2e089051fd118217b1a04f33258fcef2abe1729147282eb17a98c5463691aa3fd56af264ea6a0
 DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/opencv-3.1.0-r2.ebuild b/media-libs/opencv/opencv-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..310b4dc3050b
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0-r2.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2016 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,3_5} )
+
+inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.org"
+
+SRC_URI="
+	mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
+	https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+	contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${P}_contrib.zip )"
+
+LICENSE="BSD"
+SLOT="0/3.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( qt4 qt5 )
+"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	gtk? ( !qt4 )
+#	opengl? ( || ( gtk qt4 ) )
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gdal? ( sci-libs/gdal )
+	gphoto2? ( media-libs/libgphoto2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	ipp? ( sci-libs/ipp )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+		opengl? ( dev-qt/qtopengl:4 )
+	)
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+		dev-qt/qtconcurrent:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff:0 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+
+	epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
+		"${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
+
+	# remove bundled stuff
+	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(.*3rdparty.*)/ d' \
+		CMakeLists.txt cmake/*cmake || die
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+
+	# please dont sort here, order is the same as in CMakeLists.txt
+	local mycmakeargs=(
+	# the optinal dependency libraries
+		$(cmake-utils_use_with ieee1394 1394)
+		-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_CARBON=OFF # APPLE
+		$(cmake-utils_use_with eigen)
+		$(cmake-utils_use_with ffmpeg)
+		-DWITH_VFW=OFF     # video windows support
+		$(cmake-utils_use_with gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF
+		$(cmake-utils_use_with gtk)
+		-DWITH_GTK_2_X=OFF
+		$(cmake-utils_use_with ipp)
+		$(cmake-utils_use_with java)
+		$(cmake-utils_use_with jpeg2k JASPER)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with webp)
+		$(cmake-utils_use_with opencl)
+		$(cmake-utils_use_with gphoto2)
+		$(cmake-utils_use_with openexr)
+		$(cmake-utils_use_with opengl)
+		$(cmake-utils_use_with openmp)
+		-DWITH_OPENNI=OFF 	#not packaged
+		-DWITH_OPENNI2=OFF	#not packaged
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_build python opencv_python)
+		-DWITH_PVAPI=OFF					# not packaged
+		-DWITH_GIGEAPI=OFF
+		-DWITH_QUICKTIME=OFF
+		-DWITH_WIN32UI=OFF
+		$(cmake-utils_use_with threads TBB)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		$(cmake-utils_use_with tiff)
+		-DWITH_UNICAP=OFF					# not packaged
+		$(cmake-utils_use_with v4l V4L)
+		$(cmake-utils_use_with vtk VTK)
+		-DWITH_LIBV4L=ON
+		-DWITH_DSHOW=ON               # direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_VIDEOINPUT=OFF					# windows only
+		-DWITH_XIMEA=OFF # windows only
+		$(cmake-utils_use_with xine)
+		-DWITH_CLP=OFF
+		$(cmake-utils_use_with opencl)
+		-DWITH_OPENCL_SVM=OFF
+		$(cmake-utils_use_with opencl OPENCLAMDFFT)
+		$(cmake-utils_use_with opencl OPENCLAMDBLAS)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=ON #default
+		$(cmake-utils_use_with vaapi VA)
+		$(cmake-utils_use_with vaapi VA_INTEL)
+		$(cmake-utils_use_with gdal gdal)
+		#
+		# OpenCV build components
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use_build java opencv_java)		#for -java bug #555650
+		-DBUILD_PERF_TESTS=OFF
+		$(cmake-utils_use_build testprograms TESTS)
+	# install examples, tests etc
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use testprograms INSTALL_TESTS)
+	# build options
+		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
+	)
+
+	if use qt4; then
+		mycmakeargs+=( "-DWITH_QT=4" )
+	elif use qt5; then
+		mycmakeargs+=( "-DWITH_QT=5" )
+	else
+		mycmakeargs+=( "-DWITH_QT=OFF" )
+	fi
+
+	if use contrib; then
+		mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-${PV}/modules" )
+	fi
+
+	if use cuda; then
+		mycmakeargs+=( "-DWITH_CUDA=ON" )
+		mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+		mycmakeargs+=( "-DWITH_CUFFT=ON" )
+		mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
+	else
+		mycmakeargs+=( "-DWITH_CUDA=OFF" )
+		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+		mycmakeargs+=( "-DWITH_NVCUVID=OFF" )
+	fi
+
+	if use examples && use python; then
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+	else
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+	fi
+
+	# things we want to be hard off or not yet figured out
+	mycmakeargs+=(
+		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+		"-DBUILD_LATEX_DOCS=OFF"
+		"-DBUILD_PACKAGE=OFF"
+		"-DENABLE_PROFILING=OFF"
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# hardcode cuda paths
+	mycmakeargs+=(
+		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+	)
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 8e367fe6692a..86032b874512 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,4 @@
-DIST gmp-api-Firefox36.tar.gz 15182 SHA256 2cdc1284a939cda0a6fe45a8c798637cc7d959c9d757d5b0c6d2dc650a037624 SHA512 69f367a83cca01c046abf1e6d4fdb2e1587d321ffd5c7795d33ce6b271e9e9ea588e1c363ac84c3e690410e79aa73cdf64b8f12e4726392b1adbe1a1900e4bd8 WHIRLPOOL c218e9e8ae80a84495f495dcaf545eae2e3fa611a43e6dd5b1e21adeda1dd000ac8160d8a1439d523395c36d939a762aadba18db724bd3c02169c47ffc1a1bc9
 DIST gmp-api-Firefox38.tar.gz 16209 SHA256 6b156afe850c0d6faf0492ca5feeff4358e50ddc5ce3022ddcc6905a5bd21c80 SHA512 9aecbc84b1ba2fcfcb10c56680d92a72dd55f7ef7b8a68a3950dbce65fb7eb2c5e6a211149889f618bef2468ba1f3f8c01dc63e86e0a30d9295b019b75657eb8 WHIRLPOOL c12eb175ddf11f0ece400cc34bf9d5e690494fd4630c12667eed3765b66a625a1f9a3b41e20fc5a0c0f614eafbd75b6ddd5bd2a827077cfaac507a3f41990c42
-DIST gmp-openh264-1.2_p20141104.tar.xz 11874976 SHA256 d8359d004116eba6d2444486abd81f82f9cfedf2ab209b9586fc195d199096f8 SHA512 7acd982b54cd32ee2270967131792d869a9c72dca5ba8da796c61517e99b3a40f7c53ab6228c03f72c57f4eb9d3bef536645ee33ccf08a098f0662f97f811856 WHIRLPOOL 5d997bc9349d06f5d485ce654408d5f3cd1314ccdf10c21c25c59933ffe2c4b325ec32444bb74aa754b73fcc381b5b723df9f48989cba3e7137e8a594a47e24c
-DIST openh264-1.3.1.tar.gz 37642592 SHA256 b0a9a61840b4a58fbadd2a0640a81917c0ee84e922d2476c1dbcb9f29b85d7a0 SHA512 e85e300a85cefc89a66fdebebe2f059c2c3262518f614c660535312b3ea441064a1288824bc488b741bcffa076b165eabf998d1b535fb377516695326be625c9 WHIRLPOOL 5acc9645b65c2b75d117bcbff24554e0b9567514427bc8d9dc8e8eda0d45080600bec12cd8d435ab605f8226cfc321d1c371c292cf26d30a29a77fd187db6dc4
+DIST gmp-api-Firefox39.tar.gz 16363 SHA256 ecb461af06f4d8f1c16330e78e73775f5656767ced77ac2b5e4bb9413ca86ec4 SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a WHIRLPOOL fd661b7798970570053789577744bb12ab6354e3bcb70f64e2ac5aa73367f4a958feb3fcef343ef025aa15d6201af40d6f80a0f565e23340e1001f2259e073ce
 DIST openh264-1.4.0.tar.gz 37681189 SHA256 a1b9a7a7f1ee204793c613789a505f0971bc2b03b3dbd8f05d9c4a3f3b900a22 SHA512 8192494698cb5557331be56ecbe2b7b143e0ed95739a69a88bdb34a58f66710ef1cd9234f1e98c9b16432a41a3243634e6ca63c58119315f2f9360cb2959e42b WHIRLPOOL 0d9f1f728fbceef35a5e22a6fe4c9dd42fbf84d41fe14e938194438542af182d3994694ffcd68f58798f14c8096b49b0aecad23f58ec6bdbc02de43b8d783532
+DIST openh264-1.5.0.tar.gz 37851166 SHA256 98077bd5d113c183ce02b678733b0cada2cf36750370579534c4d70f0b6c27b5 SHA512 30599fed5e928af7dfec079d101a22885e52874c1d7db91ff289b989a9a20548b6bbd5d25e4e546efedd4e5aba97cbc42b1e847970b93116d86efc7af394aeaf WHIRLPOOL 038ad081e0702f198ddc519bdaef7d91254179f8f4febdb2b453ab20c40e47cd759a7b5c881065ac0523d78fc95564aa132e9a4f4b565951613aeb2a46ce74ef
diff --git a/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch
new file mode 100644
index 000000000000..a39823aeee77
--- /dev/null
+++ b/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch
@@ -0,0 +1,40 @@
+--- a/Makefile	2015-10-19 21:49:05.000000000 -0400
++++ b/Makefile	2016-02-17 12:16:06.102945631 -0500
+@@ -27,6 +27,7 @@
+ DESTDIR=
+ LIBDIR_NAME=lib
+ SHAREDLIB_DIR=$(PREFIX)/lib
++INCLUDES_DIR=$(PREFIX)/include
+ PROJECT_NAME=openh264
+ MODULE_NAME=gmpopenh264
+ GMP_API_BRANCH=Firefox39
+@@ -244,14 +245,14 @@
+ endif
+ 
+ $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
+-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
+ 
+ $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
+-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
+ 
+ install-headers:
+-	mkdir -p $(DESTDIR)$(PREFIX)/include/wels
+-	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
++	mkdir -p $(DESTDIR)/$(INCLUDES_DIR)/wels
++	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)/$(INCLUDES_DIR)/wels
+ 
+ install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
+ 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
+--- a/openh264.pc.in	2015-10-19 21:49:05.000000000 -0400
++++ b/openh264.pc.in	2016-02-17 12:17:03.792768147 -0500
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+-libdir=${prefix}/lib
+-includedir=${prefix}/include
++libdir=@sharedlibdir@
++includedir=@includesdir@
+ 
+ Name: OpenH264
+ Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/openh264/openh264-1.2_p20141104.ebuild b/media-libs/openh264/openh264-1.2_p20141104.ebuild
deleted file mode 100644
index c35098068582..000000000000
--- a/media-libs/openh264/openh264-1.2_p20141104.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 nsplugins
-
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for mozilla packages"
-HOMEPAGE="http://www.openh264.org/"
-SRC_URI="https://dev.gentoo.org/~axs/distfiles/gmp-${P}.tar.xz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugin"
-
-RESTRICT="bindist"
-
-RDEPEND=""
-DEPEND="dev-lang/nasm"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-S=${WORKDIR}/gmp-${P}
-
-src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-	emake V=Yes ${mybits}
-	use plugin && emake V=Yes ${mybits} plugin
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" LIBPREFIX="${ED}usr/$(get_libdir)/" \
-		install-headers
-
-	dolib libopenh264.so
-
-	if use plugin; then
-		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
-		insinto "/${plugpath}"
-		doins libgmpopenh264.so gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-1.3.1.ebuild b/media-libs/openh264/openh264-1.3.1.ebuild
deleted file mode 100644
index cd3c1cb4af3f..000000000000
--- a/media-libs/openh264/openh264-1.3.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit nsplugins
-
-MOZVER=36
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for mozilla packages"
-HOMEPAGE="http://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugin"
-
-RESTRICT="bindist"
-
-RDEPEND="!<www-client/firefox-${MOZVER}"
-DEPEND="dev-lang/nasm"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-src_prepare() {
-	ln -s ../gmp-api-Firefox${MOZVER} gmp-api
-}
-
-src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-	emake V=Yes ${mybits}
-	use plugin && emake V=Yes ${mybits} plugin
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" LIBPREFIX="${ED}usr/$(get_libdir)/" \
-		install-headers
-
-	dolib libopenh264.so
-
-	if use plugin; then
-		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
-		insinto "/${plugpath}"
-		doins libgmpopenh264.so gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-1.4.0-r1.ebuild b/media-libs/openh264/openh264-1.4.0-r1.ebuild
index b52a6fd2f719..2b381fe8afe1 100644
--- a/media-libs/openh264/openh264-1.4.0-r1.ebuild
+++ b/media-libs/openh264/openh264-1.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugin utils"
 
 RESTRICT="bindist"
diff --git a/media-libs/openh264/openh264-1.4.0.ebuild b/media-libs/openh264/openh264-1.4.0.ebuild
deleted file mode 100644
index 61108ffe47c4..000000000000
--- a/media-libs/openh264/openh264-1.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit nsplugins multilib-minimal
-
-MOZVER=38
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="http://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugin utils"
-
-RESTRICT="bindist"
-
-RDEPEND="!<www-client/firefox-${MOZVER}"
-DEPEND="dev-lang/nasm"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/pkgconfig-pathfix.patch
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		$@
-}
-
-multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-
-	emakecmd ${mybits} ${tgt}
-	use plugin && emakecmd ${mybits} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	use utils && dobin h264{enc,dec}
-
-	if use plugin; then
-		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
-		insinto "/${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-1.5.0.ebuild b/media-libs/openh264/openh264-1.5.0.ebuild
new file mode 100644
index 000000000000..335507477729
--- /dev/null
+++ b/media-libs/openh264/openh264-1.5.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit nsplugins multilib-minimal
+
+MOZVER=39
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
+HOMEPAGE="http://www.openh264.org/"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugin utils"
+
+RESTRICT="bindist"
+
+RDEPEND="!<www-client/firefox-${MOZVER}"
+DEPEND="dev-lang/nasm"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pkgconfig-pathfix.patch
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
+}
+
+emakecmd() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR_NAME="$(get_libdir)" \
+		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
+		$@
+}
+
+multilib_src_compile() {
+	local mybits="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+	esac
+
+	emakecmd ${mybits} ${tgt}
+	use plugin && emakecmd ${mybits} plugin
+}
+
+multilib_src_install() {
+	emakecmd DESTDIR="${D}" install-shared
+
+	use utils && dobin h264{enc,dec}
+
+	if use plugin; then
+		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
+		insinto "/${plugpath}"
+		doins libgmpopenh264.so* gmpopenh264.info
+		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
+		doenvd "${T}"/98-moz-gmp-${PN}
+
+		cat <<PREFEOF >"${T}"/${P}.js
+pref("media.gmp-gmp${PN}.autoupdate", false);
+pref("media.gmp-gmp${PN}.version", "system-installed");
+PREFEOF
+
+		insinto /usr/$(get_libdir)/firefox/defaults/pref
+		doins "${T}"/${P}.js
+
+		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+		doins "${T}"/${P}.js
+	fi
+}
+
+pkg_postinst() {
+	if use plugin; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			elog "Please restart your login session, in order for the session's environment"
+			elog "to include the new MOZ_GMP_PATH variable."
+			elog ""
+		fi
+		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
+		elog "however even if it is not successful in doing so the profile-installed plugin"
+		elog "will not be used unless this package is removed.  This package will take precedence"
+		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
+		elog ""
+	fi
+}
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
new file mode 100644
index 000000000000..bacb97efe086
--- /dev/null
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -0,0 +1 @@
+DIST raspberrypi-firmware-1.20160209.tar.gz 114792438 SHA256 ca6a88db72e90ef821b8ca7755bbee9c1d5bdb9a621a45eb029af195d2d29751 SHA512 281092c11d422d821e5e2b0479c3b8f891f8df66cfbf931992902d759c99ed40cbb2d9fada1f944372e5bcd8af69784739e79e9912db3482892b10bf668611f2 WHIRLPOOL 81974a53562ee91544d7a01dc9f4f4173a6e882891f8cf744b700162ddd8f8607b1cfcbbde04cafe2bcea47489f9ea4fd8840adf776e806bef0dba574448e76e
diff --git a/media-libs/raspberrypi-userland-bin/files/04raspberrypi-userland-bin b/media-libs/raspberrypi-userland-bin/files/04raspberrypi-userland-bin
new file mode 100644
index 000000000000..d4d8fad4cc83
--- /dev/null
+++ b/media-libs/raspberrypi-userland-bin/files/04raspberrypi-userland-bin
@@ -0,0 +1 @@
+LDPATH='/opt/vc/lib'
diff --git a/media-libs/raspberrypi-userland-bin/metadata.xml b/media-libs/raspberrypi-userland-bin/metadata.xml
new file mode 100644
index 000000000000..971c92f4f96f
--- /dev/null
+++ b/media-libs/raspberrypi-userland-bin/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 type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="hardfp">Use armv6 hardfp ABI</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20160209.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20160209.ebuild
new file mode 100644
index 000000000000..b7b3c7b90cf9
--- /dev/null
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20160209.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib vcs-snapshot
+
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+MY_P="raspberrypi-firmware-${PV}"
+SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+KEYWORDS="~arm -*"
+IUSE="+hardfp examples"
+
+RDEPEND="!media-libs/raspberrypi-userland"
+DEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="binchecks"
+
+src_prepare() {
+	rm {,hardfp/}opt/vc/LICENCE || die
+}
+
+src_install() {
+	cd $(usex hardfp hardfp/ "")opt/vc || die
+
+	insinto /opt/vc
+	doins -r include
+	into /opt
+	dobin bin/*
+	dobin sbin/*
+	insopts -m 0755
+	insinto "/opt/vc/$(get_libdir)"
+	doins -r lib/*
+
+	doenvd "${FILESDIR}"/04${PN}
+
+	if use examples ; then
+		insopts -m 0644
+		insinto /usr/share/doc/${PF}/examples
+		doins -r src/hello_pi
+	fi
+}
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 146403bb8947..3fe572f69cac 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,2 +1 @@
-DIST SDL2_image-2.0.0.tar.gz 8398016 SHA256 b29815c73b17633baca9f07113e8ac476ae66412dec0d29a5045825c27a47234 SHA512 300ff078c4c9a74ccc143692630e9c97e25a223bf80661cd5e7d684a25c6ad7760b20778d492d6cc41521dcd2a00e4a76947cf6dffc679fdbd54f430b3906ea6 WHIRLPOOL d2b89f0bcb25eeda168a6a4622777f3d9bd6343dc1f87f50aec69afb85fef71dc28e56ed29e30d906ff999f291cf3ec887d20f471bd870eb734f273fd68b4303
 DIST SDL2_image-2.0.1.tar.gz 7797848 SHA256 3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64 SHA512 99ed5f7b69966cea5fcf9173e7270167c24b55ab459774f10dbf90f26dcb9d5f118971ffd4e583a83148976f44ca166474669398a561169d24ffba80f852306f WHIRLPOOL ba4a78ae19ba1921b0d11208f93390cc0ec31aed86f302c2b8d4ac8c55a8e783c29a3180d8557309b2874d74a081734256e9cb0d8215b369090abddf64bd0a7c
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.0-r1.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.0-r1.ebuild
deleted file mode 100644
index 973dce66ba17..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.0-r1.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 multilib-minimal
-
-MY_P=SDL2_image-${PV}
-DESCRIPTION="Image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--disable-sdltest \
-		--enable-bmp \
-		$(use_enable gif) \
-		$(use_enable jpeg jpg) \
-		--disable-jpg-shared \
-		--enable-lbm \
-		--enable-pcx \
-		$(use_enable png) \
-		--disable-png-shared \
-		--enable-pnm \
-		--enable-tga \
-		$(use_enable tiff tif) \
-		--disable-tif-shared \
-		--enable-xcf \
-		--enable-xpm \
-		--enable-xv \
-		$(use_enable webp) \
-		--disable-webp-shared
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage showimage2
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	use static-libs || prune_libtool_files
-}
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
index 2a051c2ab7f6..672b85d50164 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index d765ce3a67fc..da4e2fab677a 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,2 +1 @@
-DIST SDL2_mixer-2.0.0.tar.gz 10119589 SHA256 a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b SHA512 e04594abc13c2b6527cd92a94a8d3e18436e9e6aaee21bab83e288e259a2fb20aae8433765d07feeb3b5bf253951323d67054239091e79720846770beb30be4d WHIRLPOOL 58385d7bdb3382af4f9d3aa9904b40083fe1139af0c938fa807904d70d4561180f65314bb2ab56f3b67a35140252e72802753ed723bca2536a4745fad43cb905
 DIST SDL2_mixer-2.0.1.tar.gz 10213891 SHA256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f SHA512 bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d WHIRLPOOL b9ebeaad35ed92e8de111872d17ceefdc996ebbbb91f3b35fa9ab62573fae972e1a1626cc86141260c69af87a53a0880230ec399fe06fa3c5a98b20d82be8515
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch
deleted file mode 100644
index 786931dc6363..000000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru SDL2_mixer-2.0.0.orig/dynamic_modplug.h SDL2_mixer-2.0.0/dynamic_modplug.h
---- SDL2_mixer-2.0.0.orig/dynamic_modplug.h	2013-08-10 13:39:55.000000000 -0400
-+++ SDL2_mixer-2.0.0/dynamic_modplug.h	2014-11-29 03:00:38.288969276 -0500
-@@ -21,7 +21,7 @@
- 
- #ifdef MODPLUG_MUSIC
- 
--#include "modplug.h"
-+#include "libmodplug/modplug.h"
- 
- typedef struct {
-     int loaded;
-diff -ru SDL2_mixer-2.0.0.orig/music_modplug.h SDL2_mixer-2.0.0/music_modplug.h
---- SDL2_mixer-2.0.0.orig/music_modplug.h	2013-08-10 13:39:58.000000000 -0400
-+++ SDL2_mixer-2.0.0/music_modplug.h	2014-11-29 03:00:05.346347058 -0500
-@@ -21,7 +21,7 @@
- 
- #ifdef MODPLUG_MUSIC
- 
--#include "modplug.h"
-+#include "libmodplug/modplug.h"
- #include "SDL_rwops.h"
- #include "SDL_audio.h"
- #include "SDL_mixer.h"
-Only in SDL2_mixer-2.0.0: music_modplug.h.orig
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
deleted file mode 100644
index b223c4bb5f01..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-MY_P=SDL2_mixer-${PV}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mp3? ( || ( smpeg mad ) )
-	smpeg? ( mp3 )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-	tremor? ( vorbis )
-	"
-
-RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
-	)
-	mod? (
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-	)
-	vorbis? (
-		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-		!tremor? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	)"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--disable-sdltest \
-		--enable-music-cmd \
-		$(use_enable wav music-wave) \
-		$(use_enable mod music-mod) \
-		$(use_enable modplug music-mod-modplug) \
-		--disable-music-mod-modplug-shared \
-		$(use_enable mikmod music-mod-mikmod) \
-		--disable-music-mod-mikmod-shared \
-		$(use_enable midi music-midi) \
-		$(use_enable timidity music-midi-timidity) \
-		$(use_enable fluidsynth music-midi-fluidsynth) \
-		--disable-music-fluidsynth-shared \
-		$(use_enable vorbis music-ogg) \
-		$(use_enable tremor music-ogg-tremor) \
-		--disable-music-ogg-shared \
-		$(use_enable flac music-flac) \
-		--disable-music-flac-shared \
-		$(use_enable mp3 music-mp3) \
-		$(use_enable smpeg music-mp3-smpeg) \
-		--disable-music-mp3-smpeg-shared \
-		--disable-smpegtest \
-		$(use_enable mad music-mp3-mad-gpl) \
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	use static-libs || prune_libtool_files
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi ; then
-		if use fluidsynth; then
-			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-			ewarn "environment variable to the location of a SoundFont file"
-			ewarn "unless the game or application happens to do this for you."
-
-			if use timidity; then
-				ewarn "Failing to do so will result in Timidity being used instead."
-			else
-				ewarn "Failing to do so will result in silence."
-			fi
-		fi
-	fi
-}
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
index e7097262efcd..a10e59264b39 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 9e54def39bd7..193fe250ca84 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1,2 +1 @@
-DIST SDL2_net-2.0.0.tar.gz 345724 SHA256 d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab SHA512 bf91f18bb1c62f00cccc3aa459c18c120afc3d8e16ee92c01762ef890f620b5346b1b62ca48ae0b848a062b49656e5f7a4c27d74788a8788357b5e36c1a767a2 WHIRLPOOL 7c5fc3f1df0a1467ca7869eb1a26028f84a44c35fe308a36b08bce938230ed9532f4d105683fb3752de59ca739025261cdaf3f9e795fe6027db6e063b6bd620d
 DIST SDL2_net-2.0.1.tar.gz 347436 SHA256 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a WHIRLPOOL bd704fe9b3bae9ca0c4da474b57a6f944a9bc75f7054c91eff279d6039ead5f41cf9bf5dc3092bdc84494d2ac092aa7877df88368fc4b51c0adbc06b9c24f27e
diff --git a/media-libs/sdl2-net/sdl2-net-2.0.0-r1.ebuild b/media-libs/sdl2-net/sdl2-net-2.0.0-r1.ebuild
deleted file mode 100644
index 19eb400f70a8..000000000000
--- a/media-libs/sdl2-net/sdl2-net-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-MY_P=SDL2_net-${PV}
-DESCRIPTION="Simple Direct Media Layer Network Support Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_net/index.html"
-SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-gui \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	use static-libs || prune_libtool_files
-}
diff --git a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
index 34445471254c..fe089ca5168c 100644
--- a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
+++ b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index dbb37ef62588..7863eddf69e3 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,2 +1 @@
-DIST SDL2_ttf-2.0.12.tar.gz 5517665 SHA256 8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e SHA512 2dfd7d9a87d86b0446e52c78dcf4c45dba747256ff9cb4cc010818eac725410f5a1a781e6695ca0bcead756c70519d8d5b4df6c1b2935085e0356d9b4d7844fa WHIRLPOOL 7b3457925237f741bdcb1b6b00aa0463f33bde4c8886f03de4cc20885bffadfe3759fb31852dfee1ced06e0e494ec639f0a6a0f415520d9998683b81d010836b
 DIST SDL2_ttf-2.0.13.tar.gz 4152978 SHA256 25ddad0302e7d74ce16a770974930cefbdcf67499ca7d40ce7a6bd7de6022fdf SHA512 24f7d77c7d46be3c8236d6edde42f40c97c778e2fdb5d7923f1ec473ce19039c382843afe6de79f04c014d3f854cdf912cdfe1e0cf803a2fd246fd4c65360c6b WHIRLPOOL 52cc6db07d049c6b35f5f68cbc9ed9e3622052a014e1b86ccc0a4b7daa1058a9b8e0f1ca5a42e7ddace0acc4978c4277133611571b1f3a543f048714a615f949
diff --git a/media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch b/media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch
deleted file mode 100644
index 88a7e7fdabfd..000000000000
--- a/media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Sep  2 20:29:16 UTC 2013
-Subject: fix linking with newer glibc
-
-https://bugzilla.libsdl.org/show_bug.cgi?id=1401
-
---- SDL2_ttf-2.0.12/Makefile.am
-+++ SDL2_ttf-2.0.12/Makefile.am
-@@ -35,6 +35,7 @@
- 	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- endif
-+libSDL2_ttf_la_LIBADD = @MATHLIB@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = SDL2_ttf.pc
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.12-r1.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.12-r1.ebuild
deleted file mode 100644
index 8a1f83e3a986..000000000000
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.12-r1.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 autotools eutils multilib-minimal
-
-MY_P=SDL2_ttf-${PV}
-DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
-SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs X"
-
-RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-linking.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-	rm -r external || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_with X x)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	use static-libs || prune_libtool_files
-}
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild
index 51c169e91336..38dfb0f898c1 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs X"
 
 RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-segfault.patch b/media-libs/svgalib/files/svgalib-1.9.25-fix_buffer.patch
index da7c1c21c646..da7c1c21c646 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-segfault.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-fix_buffer.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.28.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.28.patch
index 7742110da429..7742110da429 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.28.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.28.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36-r1.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
index ad8d94cb8702..ad8d94cb8702 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36-r1.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
index 20ab1fe1ed16..20ab1fe1ed16 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
index 5e2d1e527cbb..5e2d1e527cbb 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
new file mode 100644
index 000000000000..be10e394707a
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
@@ -0,0 +1,27 @@
+--- svgalib-1.9.25/kernel/svgalib_helper/main.c.orig	2016-02-22 11:10:25.000000000 +0300
++++ svgalib-1.9.25/kernel/svgalib_helper/main.c	2016-02-22 11:17:16.223529679 +0300
+@@ -170,8 +170,12 @@
+ #else
+ static int svgalib_helper_ioctl(struct file *filp, 
+                           unsigned int cmd, unsigned long arg) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) 
++    struct inode *inode=file_inode(filp);
++#else
+     struct inode *inode=filp->f_dentry->d_inode;
+ #endif
++#endif
+ 
+     io_t iov, *user_iov=(io_t *)arg;
+     pcic_t pciv, *user_pciv=(pcic_t *)arg;
+@@ -586,7 +590,11 @@
+ static int svgalib_helper_mmap(struct file *filp, struct vm_area_struct *vma) {
+    unsigned long start=vma->vm_start;
+    unsigned long end=vma->vm_end;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) 
++   unsigned long minor = my_minor(file_inode(filp)->i_rdev);
++#else
+    unsigned long minor = my_minor(filp->f_dentry->d_inode->i_rdev);
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+    unsigned long ofs=vma->vm_pgoff*PAGE_SIZE;
+ #else
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-qa.patch b/media-libs/svgalib/files/svgalib-1.9.25-missing_include.patch
index 5f6f5a2c3aa7..5f6f5a2c3aa7 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-qa.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-missing_include.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-build2.patch b/media-libs/svgalib/files/svgalib-1.9.25-vga_reset.patch
index a367363f044a..a367363f044a 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-build2.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-vga_reset.patch
diff --git a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
index 2f7f0b82733f..0f64c9a1527e 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,16 +27,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
 	epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
 	epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
 	epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.36-r1.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-segfault.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-build2.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-qa.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-kernel3.4.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-missing_include.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch #557052
 	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
 }
 
diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
new file mode 100644
index 000000000000..ca709273a98a
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="A library for running svga graphics on the console"
+HOMEPAGE="http://www.svgalib.org/"
+SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="build +kernel-helper"
+
+MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
+BUILD_TARGETS="default"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
+	"${FILESDIR}"/${PN}-1.9.19-pic.patch
+	"${FILESDIR}"/${PN}-1.9.25-build.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
+	"${FILESDIR}"/${PN}-1.9.25-glibc210.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
+	"${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
+	"${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
+	"${FILESDIR}"/${PN}-1.9.25-missing_include.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
+)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+}
+
+src_prepare() {
+	default
+	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
+}
+
+src_compile() {
+	use kernel-helper || export NO_HELPER=y
+
+	export CC=$(tc-getCC)
+
+	# First build static
+	emake OPTIMIZE="${CFLAGS}" static
+	# Then build shared ...
+	emake OPTIMIZE="${CFLAGS}" shared
+	# Missing in some cases ...
+	ln -s libvga.so.${PV} sharedlib/libvga.so
+	# Build lrmi and tools ...
+	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
+		textutils lrmi utils
+	# Build the gl stuff tpp
+	emake OPTIMIZE="${CFLAGS}" -C gl
+	emake OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
+	# Missing in some cases ...
+	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
+	emake OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV}
+	cp -pPR src/libvga.so.${PV} sharedlib/
+	# Build threeDKit ...
+	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
+		-C threeDKit lib3dkit.a
+	# Build demo's ...
+	emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
+		demoprogs
+
+	! use build && use kernel-helper && linux-mod_src_compile
+}
+
+src_install() {
+	local x
+
+	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
+
+	emake \
+		TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
+		install
+	! use build && use kernel-helper && linux-mod_src_install
+
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a staticlib/libvga.a
+	dolib.a gl/libvgagl.a
+	dolib.a threeDKit/lib3dkit.a
+	dolib.so gl/libvgagl.so.${PV}
+	local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
+	for x in lib3dkit libvga libvgagl ; do
+		dosym ${x}.so.${PV} /usr/lib/${x}.so
+		dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
+	done
+
+	insinto /usr/include
+	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
+	doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
+
+	insinto /lib/udev/rules.d
+	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
+
+	exeinto /usr/lib/svgalib/demos
+	for x in "${S}"/demos/* ; do
+		[[ -x ${x} ]] && doexe ${x}
+	done
+
+	cd "${S}"/threeDKit
+	exeinto /usr/lib/svgalib/threeDKit
+	local THREED_PROGS="plane wrapdemo"
+	doexe ${THREED_PROGS}
+
+	cd "${S}"
+	dodoc 0-README
+	cd "${S}"/doc
+	dodoc CHANGES DESIGN TODO
+	docinto txt
+	dodoc Driver-programming-HOWTO add_driver svgalib.lsm \
+		README.{joystick,keymap,multi-monitor,patching,vesa}
+	# avoid installation of a broken symlink
+	newdoc ../lrmi-0.6m/README README.lrmi
+}
+
+pkg_postinst() {
+	! use build && use kernel-helper && linux-mod_pkg_postinst
+}
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
index 3143c3d26d64..fab411af0d35 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/1514/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="media-libs/libsndfile"
diff --git a/media-libs/virglrenderer/virglrenderer-9999.ebuild b/media-libs/virglrenderer/virglrenderer-9999.ebuild
index c3ca5408fc70..d463a1076c2e 100644
--- a/media-libs/virglrenderer/virglrenderer-9999.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-9999.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 inherit autotools
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://people.freedesktop.org/~airlied/virglrenderer"
+	EGIT_REPO_URI="git://anongit.freedesktop.org/virglrenderer"
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
index fc4405b56cfd..0a12e0103998 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
@@ -96,9 +96,9 @@ src_configure() {
 	mp3_warning
 	if use qt5 ;then
 		notify="--disable-notify"
-        elif use libnotify ;then
+	elif use libnotify ;then
 		notify="--enable-notify"
-        fi
+	fi
 
 	if use gtk ;then
 		gtk="--enable-gtk"
diff --git a/media-plugins/emotion_generic_players/Manifest b/media-plugins/emotion_generic_players/Manifest
index 1c2c4562f1be..192505ff944e 100644
--- a/media-plugins/emotion_generic_players/Manifest
+++ b/media-plugins/emotion_generic_players/Manifest
@@ -1,2 +1,3 @@
 DIST emotion_generic_players-1.15.0.tar.xz 100080 SHA256 9f6d5e9041ac7c014d663dac56d1b39ac42a45abe954d09d0edbf6e759e55f5f SHA512 e0dbebadf9fa3b8b6af4f6828e13a7445731508f219258d2c12c6c0a27e140571dc7abf657fe34fba4295a4c5f6a370950e29c9b3c5dad38ab746e20ccaa4ea3 WHIRLPOOL 1ad44ce27f975244420a4ccd376240d125a93f6894e785faf2ad6f620e35975dbba2d481273c81347dd5e1816c579c47a99d2291e5448964e949be9650bd077b
 DIST emotion_generic_players-1.16.0.tar.xz 100072 SHA256 d5cbfdb31678cd9f6cf70077afe03f07f9076cef7a9faa424da437c38cf06a98 SHA512 5c1d2d074549cec12746670c06ded87378870569ebaba7ccecaec66442a0760a8a08951f2b3e608449e2faae5a756d5148d51aa8fcd162cdb44566f1beb0f7d1 WHIRLPOOL 28bbcc17491b1bd201add975384fa03279bd196495ed59cbb7ebd441475ebbf49c17b5128cf836462b1d1f405a4aa769becde1c5c74d21f8c40fe69cb30dc427
+DIST emotion_generic_players-1.17.0.tar.xz 103208 SHA256 e7de008b4ceea3df0fc2e82248fbf96f645a6989858d0d8a2c0ccc5a12c56a0e SHA512 589fa088fc3dc8a0d2578eabca1b8560bec1352732991d1d0df5e1c7d471b6309f6e8b0ec9e9985ec556d77cf5cb1605df71d0192bf28f34780ac30d1919acdd WHIRLPOOL f59a9e2f49d7cea8fd647b6129be4a3b97aa9a4258672124afb0bbec31a53ebbcd6c047bf2d7d5ad3a9ffb71f1f8c2e1a68a588854ff826866dab88cf1c4ef54
diff --git a/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild b/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild
new file mode 100644
index 000000000000..f0a638866b7a
--- /dev/null
+++ b/media-plugins/emotion_generic_players/emotion_generic_players-1.17.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"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Provides external applications as generic loaders for Evas"
+HOMEPAGE="https://www.enlightenment.org/"
+
+LICENSE="GPL-2"
+# The -arch need to keyword vlc first.
+KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	media-video/vlc"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/media-plugins/evas_generic_loaders/Manifest b/media-plugins/evas_generic_loaders/Manifest
index 606bfed2ed1a..f663b3c87606 100644
--- a/media-plugins/evas_generic_loaders/Manifest
+++ b/media-plugins/evas_generic_loaders/Manifest
@@ -1,3 +1,4 @@
 DIST evas_generic_loaders-1.12.0.tar.bz2 215245 SHA256 981a6b70cfcc99c95936c835c9992735fcb004a99579e461ae64d2e28ea14f20 SHA512 9752fad43843c4fe2a86d8fcab00176f2dcb27888b84f57632add70a47daa4ab5775c0dcbd785e4a8b20b4ce09f4fd6f361128f166cd1f4753ac86afeb8443d5 WHIRLPOOL 4657ef9113d6e0255c26f65bceda87f29defccfbf7cdb803d722d9dbff1ff45721dd4287bc98dd79a06c3072756e062df9391bb5828657c950cbe0c3baf6a77c
 DIST evas_generic_loaders-1.15.0.tar.xz 186976 SHA256 1e539e4d4d4e1590345caeb7fdd84f47ec7cd63bb76b6b7107a87420a401fd7f SHA512 629f2d264b7904dbe4d057878c96ad78257bb73e1304ce441d7f14d4c1d5638793331e0b7bd376b9debe8761a62d96e5342ce642a7b1aa164aee595e327a6b08 WHIRLPOOL b5112d1833f274a90fc2087ece41e4c26057abbdc1ee7b2f73ce960ff4f533ea321e805f732538a4546a2a0305141d775ec0b4ea4f4040e0025bccaf63263611
 DIST evas_generic_loaders-1.16.0.tar.xz 186976 SHA256 d5799c212c36286b954c111bbd2d87950b0c96c5ad0ace8ebcad9918f38883c6 SHA512 37318399348c9944a36cb1809b072fa63cf2868dcb7b728daf1fd569fd5bd45cc65e6c948857784cb9a5ab1870bbddb6b30bd454c085febf46ca4fd58d3b5479 WHIRLPOOL 4caffeb22d6a44cbab81d011e84c7b447c62787759e20bf01c9cdd51f0d8dcb80cc189bf2ac7ec23b7fbc10308f0c904d3117d51b4ca1a8b4ae91148cef8ccd3
+DIST evas_generic_loaders-1.17.0.tar.xz 197860 SHA256 c2f5193a9326532d3ab3ff76f547b9d17b33ae7221ce4d6e0aefb905ba0dd87a SHA512 af1deb9f4b19d500b7633d252acf7a8cf94353b19a8944b8787d564a7b60ac1640d691b37e330edf3a0dce20be83c3199ec757cd38b8d59009e55cc31039c551 WHIRLPOOL 17436e1b54c180a556c25db10f805ccd9876f210fe7d75686774e84394cfb0fab4c09839356005d07c34ecadb651074f80e708474ced80c2c6545ff601cfeba8
diff --git a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild
new file mode 100644
index 000000000000..91e5a0120525
--- /dev/null
+++ b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.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"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Provides external applications as generic loaders for Evas"
+HOMEPAGE="https://www.enlightenment.org/"
+
+LICENSE="GPL-2"
+IUSE="gstreamer pdf postscript raw svg"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pdf? ( app-text/poppler )
+	postscript? ( app-text/libspectre )
+	raw? ( media-libs/libraw )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	E_ECONF=(
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable pdf poppler)
+		$(use_enable postscript spectre)
+		$(use_enable raw libraw)
+		$(use_enable svg)
+
+		--disable-gstreamer
+	)
+
+	enlightenment_src_configure
+}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
index 8fa3fd2dd98e..7895d1b32eff 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="daap +dvd flickr freebox gnome-online-accounts lua subtitles thetvdb tracker upnp-av +vimeo +youtube"
 
 # Bump gom requirement to avoid segfaults
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
index 6effc27dca19..b23a6da5460e 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
index 3ce5f6335a9b..e3cc0192ab55 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
index bd630f6a4c3f..bddd7da45f09 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for ASS/SSA rendering with effects support"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
index 27276ed75e2c..7f4037e6f9c1 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Bluetooth plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
index d358742294d3..7c0e5e5bc428 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-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=""
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
index dfb90e346c3d..ba686f129497 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
index 4da3cddcefe9..e45d96cfc6f4 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
@@ -9,7 +9,7 @@ inherit gstreamer
 
 DESCRIPTION="MPEG-DASH plugin"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
index d55f6e5d7668..335282e50466 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTLS plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
index d7a45be89a97..5e82c19683eb 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
index 3fb50bb26d97..3df701516526 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to demux and decode DV"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
index b22796b01369..5f59dd94b659 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="GStreamer plugin to allow capture from dvb devices"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
index 33c1a6106f32..e93897a9c93e 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
index 5479e49bccc5..44aacdb852aa 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
index 8bd48ebf45f5..34b6a8625dcb 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
index 6d88455ee2a4..64abfb71c708 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE="gst-plugins-good"
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
index 9629ce40e830..c079e9ef0b3d 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="GdkPixbuf-based image decoder, overlay and sink"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
index bcffd235ebd2..c4f5b5814d8b 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP live streaming plugin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # FIXME: automagic fallback from nettle to libgcrypt to openssl
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
index 69984a99790b..168c37dae4f0 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="GStreamer source/sink to transfer audio data with JACK ports"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
index 0f5a9efc9da0..02355d8aeb72 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder for JPEG format"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
index 94f2af2b6417..c0ff0c52e17b 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-bitrate.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-bitrate.patch
new file mode 100644
index 000000000000..4c0510aa3f1e
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-bitrate.patch
@@ -0,0 +1,49 @@
+commit 46fb2e9f11820190f2e173f4ebd83f0d15adea40
+Author: Sebastian Dröge <sebastian@centricular.com>
+Date:   Sat Jan 16 16:40:52 2016 +0200
+
+    libav: Bitrate field changed from int to int64_t, fix compiler warnings
+    
+    Cast it to a gint64 for now though, as otherwise we will fail compilation
+    with ffmpeg 2.8.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=757498
+
+diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c
+index 64d7011..9a8e690 100644
+--- a/ext/libav/gstavaudenc.c
++++ b/ext/libav/gstavaudenc.c
+@@ -269,8 +269,9 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
+     ffmpegaudenc->context->bit_rate = ffmpegaudenc->bitrate;
+     ffmpegaudenc->context->bit_rate_tolerance = ffmpegaudenc->bitrate;
+   } else {
+-    GST_INFO_OBJECT (ffmpegaudenc, "Using avcontext default bitrate %d",
+-        ffmpegaudenc->context->bit_rate);
++    GST_INFO_OBJECT (ffmpegaudenc,
++        "Using avcontext default bitrate %" G_GINT64_FORMAT,
++        (gint64) ffmpegaudenc->context->bit_rate);
+   }
+ 
+   /* RTP payload used for GOB production (for Asterisk) */
+diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
+index 2f8dc8a..966c9b8 100644
+--- a/ext/libav/gstavcodecmap.c
++++ b/ext/libav/gstavcodecmap.c
+@@ -2357,6 +2357,7 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
+   GstStructure *structure;
+   const gchar *fmt;
+   GstAudioFormat format = GST_AUDIO_FORMAT_UNKNOWN;
++  gint bitrate;
+ 
+   g_return_if_fail (gst_caps_get_size (caps) == 1);
+ 
+@@ -2365,7 +2366,8 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
+   gst_structure_get_int (structure, "channels", &context->channels);
+   gst_structure_get_int (structure, "rate", &context->sample_rate);
+   gst_structure_get_int (structure, "block_align", &context->block_align);
+-  gst_structure_get_int (structure, "bitrate", &context->bit_rate);
++  gst_structure_get_int (structure, "bitrate", &bitrate);
++  context->bit_rate = bitrate;
+ 
+   if (!raw)
+     return;
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-chain-dispose.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-chain-dispose.patch
new file mode 100644
index 000000000000..de8947a305fd
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-chain-dispose.patch
@@ -0,0 +1,23 @@
+commit e04bcf0601286990d0fa2dd9999fcfcff1b5784b
+Author: Sebastian Dröge <sebastian@centricular.com>
+Date:   Sat Jan 16 16:43:16 2016 +0200
+
+    avdeinterlace: Chain up to parent class' dispose()
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=757498
+
+diff --git a/ext/libav/gstavdeinterlace.c b/ext/libav/gstavdeinterlace.c
+index fe2d60d..6bdc605 100644
+--- a/ext/libav/gstavdeinterlace.c
++++ b/ext/libav/gstavdeinterlace.c
+@@ -310,7 +310,10 @@ static void
+ gst_ffmpegdeinterlace_dispose (GObject * obj)
+ {
+   GstFFMpegDeinterlace *deinterlace = GST_FFMPEGDEINTERLACE (obj);
++
+   delete_filter_graph (deinterlace);
++
++  G_OBJECT_CLASS (gst_ffmpegdeinterlace_parent_class)->dispose (obj);
+ }
+ 
+ static int
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-deinterlace-lavf.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-deinterlace-lavf.patch
new file mode 100644
index 000000000000..f53c8547b003
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-deinterlace-lavf.patch
@@ -0,0 +1,199 @@
+commit ddec3a2c78dd317efc1e9bc3ec0b2c49bf31ae77
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Date:   Wed Nov 4 21:16:18 2015 +0100
+
+    avdeinterlace: Port non-deprecated AVFilter API
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=757498
+
+diff --git a/configure.ac b/configure.ac
+index 19fa183..4d6fe94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,7 +280,7 @@ AC_ARG_WITH(system-libav,
+             [AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])
+ 
+ if test "x$with_system_libav" = "xyes"; then
+-  PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavutil)
++  PKG_CHECK_MODULES(LIBAV, libavfilter libavformat libavcodec libavutil)
+   PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
+   saved_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"
+@@ -313,6 +313,7 @@ else
+ 
+   LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
+               \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
++              \$(top_builddir)/gst-libs/ext/libav/libavfilter/libavfilter.a \
+               \$(top_builddir)/gst-libs/ext/libav/libswresample/libswresample.a \
+               \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
+   if test "x$enable_static_plugins" = xyes; then
+@@ -357,7 +358,7 @@ else
+   # Enable pic and static so that we get .a files, but with PIC code.
+   emblibav_configure_args="$emblibav_configure_args \
+         --enable-static --enable-pic \
+-        --disable-avdevice --disable-postproc --disable-avfilter \
++        --disable-avdevice --disable-postproc \
+         --disable-programs --disable-ffserver --disable-ffplay --disable-ffprobe --disable-ffmpeg \
+         --disable-encoder=flac --disable-protocols --disable-devices \
+         --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau \
+diff --git a/ext/libav/gstavdeinterlace.c b/ext/libav/gstavdeinterlace.c
+index 2d142a6..6906059 100644
+--- a/ext/libav/gstavdeinterlace.c
++++ b/ext/libav/gstavdeinterlace.c
+@@ -25,6 +25,9 @@
+ #endif
+ 
+ #include <libavcodec/avcodec.h>
++#include <libavfilter/avfilter.h>
++#include <libavfilter/buffersrc.h>
++#include <libavfilter/buffersink.h>
+ 
+ #include <gst/gst.h>
+ #include <gst/video/video.h>
+@@ -93,6 +96,14 @@ typedef struct _GstFFMpegDeinterlace
+ 
+   enum PixelFormat pixfmt;
+   AVPicture from_frame, to_frame;
++
++  AVFilterContext *buffersink_ctx;
++  AVFilterContext *buffersrc_ctx;
++  AVFilterGraph *filter_graph;
++  AVFrame *filter_frame;
++  int last_width, last_height;
++  enum AVPixelFormat last_pixfmt;
++
+ } GstFFMpegDeinterlace;
+ 
+ typedef struct _GstFFMpegDeinterlaceClass
+@@ -135,6 +146,8 @@ G_DEFINE_TYPE (GstFFMpegDeinterlace, gst_ffmpegdeinterlace, GST_TYPE_ELEMENT);
+ static GstFlowReturn gst_ffmpegdeinterlace_chain (GstPad * pad,
+     GstObject * parent, GstBuffer * inbuf);
+ 
++static void gst_ffmpegdeinterlace_dispose (GObject * obj);
++
+ static void
+ gst_ffmpegdeinterlace_class_init (GstFFMpegDeinterlaceClass * klass)
+ {
+@@ -167,6 +180,8 @@ gst_ffmpegdeinterlace_class_init (GstFFMpegDeinterlaceClass * klass)
+   gst_element_class_set_static_metadata (element_class,
+       "libav Deinterlace element", "Filter/Effect/Video/Deinterlace",
+       "Deinterlace video", "Luca Ognibene <luogni@tin.it>");
++
++  gobject_class->dispose = gst_ffmpegdeinterlace_dispose;
+ }
+ 
+ static void
+@@ -277,6 +292,101 @@ gst_ffmpegdeinterlace_init (GstFFMpegDeinterlace * deinterlace)
+   deinterlace->reconfigure = FALSE;
+   deinterlace->mode = DEFAULT_MODE;
+   deinterlace->new_mode = -1;
++  deinterlace->last_width = -1;
++  deinterlace->last_height = -1;
++  deinterlace->last_pixfmt = AV_PIX_FMT_NONE;
++}
++
++static void
++delete_filter_graph (GstFFMpegDeinterlace * deinterlace)
++{
++  if (deinterlace->filter_graph) {
++    av_frame_free (&deinterlace->filter_frame);
++    avfilter_graph_free (&deinterlace->filter_graph);
++  }
++}
++
++static void
++gst_ffmpegdeinterlace_dispose (GObject * obj)
++{
++  GstFFMpegDeinterlace *deinterlace = GST_FFMPEGDEINTERLACE (obj);
++  delete_filter_graph (deinterlace);
++}
++
++static int
++init_filter_graph (GstFFMpegDeinterlace * deinterlace,
++    enum AVPixelFormat pixfmt, int width, int height)
++{
++  AVFilterInOut *inputs = NULL, *outputs = NULL;
++  char args[512];
++  int res;
++
++  delete_filter_graph (deinterlace);
++  deinterlace->filter_graph = avfilter_graph_alloc ();
++  snprintf (args, sizeof (args),
++      "buffer=video_size=%dx%d:pix_fmt=%d:time_base=1/1:pixel_aspect=0/1[in];"
++      "[in]yadif[out];" "[out]buffersink", width, height, pixfmt);
++  res =
++      avfilter_graph_parse2 (deinterlace->filter_graph, args, &inputs,
++      &outputs);
++  if (res < 0)
++    return res;
++  if (inputs || outputs)
++    return -1;
++  res = avfilter_graph_config (deinterlace->filter_graph, NULL);
++  if (res < 0)
++    return res;
++
++  deinterlace->buffersrc_ctx =
++      avfilter_graph_get_filter (deinterlace->filter_graph, "Parsed_buffer_0");
++  deinterlace->buffersink_ctx =
++      avfilter_graph_get_filter (deinterlace->filter_graph,
++      "Parsed_buffersink_2");
++  if (!deinterlace->buffersrc_ctx || !deinterlace->buffersink_ctx)
++    return -1;
++  deinterlace->filter_frame = av_frame_alloc ();
++  deinterlace->last_width = width;
++  deinterlace->last_height = height;
++  deinterlace->last_pixfmt = pixfmt;
++
++  return 0;
++}
++
++static int
++process_filter_graph (GstFFMpegDeinterlace * deinterlace, AVPicture * dst,
++    const AVPicture * src, enum AVPixelFormat pixfmt, int width, int height)
++{
++  int res;
++
++  if (!deinterlace->filter_graph || width != deinterlace->last_width ||
++      height != deinterlace->last_height
++      || pixfmt != deinterlace->last_pixfmt) {
++    res = init_filter_graph (deinterlace, pixfmt, width, height);
++    if (res < 0)
++      return res;
++  }
++
++  memcpy (deinterlace->filter_frame->data, src->data, sizeof (src->data));
++  memcpy (deinterlace->filter_frame->linesize, src->linesize,
++      sizeof (src->linesize));
++  deinterlace->filter_frame->width = width;
++  deinterlace->filter_frame->height = height;
++  deinterlace->filter_frame->format = pixfmt;
++  res =
++      av_buffersrc_add_frame (deinterlace->buffersrc_ctx,
++      deinterlace->filter_frame);
++  if (res < 0)
++    return res;
++  res =
++      av_buffersink_get_frame (deinterlace->buffersink_ctx,
++      deinterlace->filter_frame);
++  if (res < 0)
++    return res;
++  av_picture_copy (dst, (const AVPicture *) deinterlace->filter_frame, pixfmt,
++      width, height);
++  av_frame_unref (deinterlace->filter_frame);
++
++  return 0;
+ }
+ 
+ static GstFlowReturn
+@@ -320,8 +430,9 @@ gst_ffmpegdeinterlace_chain (GstPad * pad, GstObject * parent,
+   gst_ffmpeg_avpicture_fill (&deinterlace->to_frame, to_map.data,
+       deinterlace->pixfmt, deinterlace->width, deinterlace->height);
+ 
+-  avpicture_deinterlace (&deinterlace->to_frame, &deinterlace->from_frame,
+-      deinterlace->pixfmt, deinterlace->width, deinterlace->height);
++  process_filter_graph (deinterlace, &deinterlace->to_frame,
++      &deinterlace->from_frame, deinterlace->pixfmt, deinterlace->width,
++      deinterlace->height);
+   gst_buffer_unmap (outbuf, &to_map);
+   gst_buffer_unmap (inbuf, &from_map);
+ 
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-compat.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-compat.patch
new file mode 100644
index 000000000000..70b2e0a29cbb
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-compat.patch
@@ -0,0 +1,22 @@
+Preserve compatibility with ffmpeg 2.8 for rc-min-rate option.
+
+Index: gst-libav-1.6.3/ext/libav/gstavcfg.c
+===================================================================
+--- gst-libav-1.6.3.orig/ext/libav/gstavcfg.c
++++ gst-libav-1.6.3/ext/libav/gstavcfg.c
+@@ -524,9 +524,15 @@ gst_ffmpeg_cfg_init (void)
+ #endif
+   gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL);
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (57, 3, 0)
++  pspec = g_param_spec_int ("rc-min-rate", "Ratecontrol Minimum Bitrate",
++      "Ratecontrol Minimum Bitrate", 0, G_MAXINT, 0,
++      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
++#else
+   pspec = g_param_spec_int64 ("rc-min-rate", "Ratecontrol Minimum Bitrate",
+       "Ratecontrol Minimum Bitrate", 0, G_MAXINT64, 0,
+       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
++#endif
+   gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL);
+ 
+   pspec =
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-maxr.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-maxr.patch
new file mode 100644
index 000000000000..a3b4a9147c79
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-maxr.patch
@@ -0,0 +1,74 @@
+commit e3cf542215519f882b7570a4b59aad75a8d2d27a
+Author: Edward Hervey <edward@centricular.com>
+Date:   Tue Feb 16 16:32:38 2016 +0100
+
+    avcfg: rc-min-rate and rc-max-rate are now 64bit integers
+    
+    Switch the gobject properties and internal handling to support that
+
+diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c
+index d38cce1..a361994 100644
+--- a/ext/libav/gstavcfg.c
++++ b/ext/libav/gstavcfg.c
+@@ -513,13 +513,19 @@ gst_ffmpeg_cfg_init (void)
+   gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg,
+       NULL);
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (57, 3, 0)
+   pspec = g_param_spec_int ("rc-max-rate", "Ratecontrol Maximum Bitrate",
+       "Ratecontrol Maximum Bitrate", 0, G_MAXINT, 0,
+       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
++#else
++  pspec = g_param_spec_int64 ("rc-max-rate", "Ratecontrol Maximum Bitrate",
++      "Ratecontrol Maximum Bitrate", 0, G_MAXINT64, 0,
++      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
++#endif
+   gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL);
+ 
+-  pspec = g_param_spec_int ("rc-min-rate", "Ratecontrol Minimum Bitrate",
+-      "Ratecontrol Minimum Bitrate", 0, G_MAXINT, 0,
++  pspec = g_param_spec_int64 ("rc-min-rate", "Ratecontrol Minimum Bitrate",
++      "Ratecontrol Minimum Bitrate", 0, G_MAXINT64, 0,
+       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+   gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL);
+ 
+@@ -770,6 +776,15 @@ gst_ffmpeg_cfg_install_property (GstFFMpegVidEncClass * klass, guint base)
+               : pint->default_value, pspec->flags);
+           break;
+         }
++        case G_TYPE_INT64:{
++          GParamSpecInt64 *pint = G_PARAM_SPEC_INT64 (pspec);
++
++          pspec = g_param_spec_int64 (name, nick, blurb,
++              pint->minimum, pint->maximum,
++              lavc_default ? G_STRUCT_MEMBER (gint64, ctx, ctx_offset)
++              : pint->default_value, pspec->flags);
++          break;
++        }
+         case G_TYPE_UINT:{
+           GParamSpecUInt *puint = G_PARAM_SPEC_UINT (pspec);
+ 
+@@ -862,6 +877,11 @@ gst_ffmpeg_cfg_set_property (GObject * object,
+       G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset) =
+           g_value_get_int (value);
+       break;
++    case G_TYPE_INT64:
++      g_return_val_if_fail (qdata->size == sizeof (gint64), TRUE);
++      G_STRUCT_MEMBER (gint64, ffmpegenc, qdata->offset) =
++          g_value_get_int64 (value);
++      break;
+     case G_TYPE_FLOAT:
+       g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE);
+       G_STRUCT_MEMBER (gfloat, ffmpegenc, qdata->offset) =
+@@ -924,6 +944,11 @@ gst_ffmpeg_cfg_get_property (GObject * object,
+       g_return_val_if_fail (qdata->size == sizeof (gint), TRUE);
+       g_value_set_int (value, G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset));
+       break;
++    case G_TYPE_INT64:
++      g_return_val_if_fail (qdata->size == sizeof (gint64), TRUE);
++      g_value_set_int64 (value, G_STRUCT_MEMBER (gint64, ffmpegenc,
++              qdata->offset));
++      break;
+     case G_TYPE_FLOAT:
+       g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE);
+       g_value_set_float (value,
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-no-deprecated.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-no-deprecated.patch
new file mode 100644
index 000000000000..578853399f1e
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-no-deprecated.patch
@@ -0,0 +1,356 @@
+commit 6235a04ef356f8d7e2f933758ddba359fa95a5ec
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Date:   Wed Nov 4 21:18:56 2015 +0100
+
+    libav: Remove usage of deprecated API
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=757498
+
+diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c
+index a85f547..d38cce1 100644
+--- a/ext/libav/gstavcfg.c
++++ b/ext/libav/gstavcfg.c
+@@ -173,13 +173,10 @@ gst_ffmpeg_idct_algo_get_type (void)
+       {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"},
+       {FF_IDCT_ARM, "ARM", "arm"},
+       {FF_IDCT_ALTIVEC, "Altivec", "altivec"},
+-      {FF_IDCT_SH4, "SH4", "sh4"},
+       {FF_IDCT_SIMPLEARM, "Simple ARM", "simplearm"},
+-      {FF_IDCT_IPP, "IPP", "ipp"},
+       {FF_IDCT_XVID, "XVID", "xvid"},
+       {FF_IDCT_SIMPLEARMV5TE, "Simple ARMV5TE", "simplearmv5te"},
+       {FF_IDCT_SIMPLEARMV6, "Simple ARMV6", "simplearmv6"},
+-      {FF_IDCT_SIMPLEVIS, "Simple Vis", "simplevis"},
+       {FF_IDCT_FAAN, "FAAN", "faan"},
+       {FF_IDCT_SIMPLENEON, "Simple NEON", "simpleneon"},
+       {0, NULL, NULL},
+@@ -665,7 +662,7 @@ gst_ffmpeg_cfg_init (void)
+   gst_ffmpeg_add_pspec (pspec, interlaced, FALSE, mpeg, NULL);
+ 
+   pspec = g_param_spec_int ("max-bframes", "Max B-Frames",
+-      "Maximum B-frames in a row", 0, FF_MAX_B_FRAMES, 0,
++      "Maximum B-frames in a row", 0, INT_MAX, 0,
+       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+   gst_ffmpeg_add_pspec (pspec, config.max_b_frames, FALSE, mpeg, NULL);
+ 
+diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
+index 11a9ed2..2f8dc8a 100644
+--- a/ext/libav/gstavcodecmap.c
++++ b/ext/libav/gstavcodecmap.c
+@@ -770,10 +770,6 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
+       }
+       break;
+ 
+-    case AV_CODEC_ID_MPEG2VIDEO_XVMC:
+-      /* this is a special ID - don't need it in GStreamer, I think */
+-      break;
+-
+     case AV_CODEC_ID_H263:
+       if (encode) {
+         caps =
+@@ -2202,7 +2198,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
+  */
+ 
+ static GstCaps *
+-gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context,
++gst_ffmpeg_pixfmt_to_caps (enum AVPixelFormat pix_fmt, AVCodecContext * context,
+     enum AVCodecID codec_id)
+ {
+   GstCaps *caps = NULL;
+@@ -2533,7 +2529,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
+ typedef struct
+ {
+   GstVideoFormat format;
+-  enum PixelFormat pixfmt;
++  enum AVPixelFormat pixfmt;
+ } PixToFmt;
+ 
+ /* FIXME : FILLME */
+@@ -2625,7 +2621,7 @@ static const PixToFmt pixtofmttable[] = {
+ };
+ 
+ GstVideoFormat
+-gst_ffmpeg_pixfmt_to_videoformat (enum PixelFormat pixfmt)
++gst_ffmpeg_pixfmt_to_videoformat (enum AVPixelFormat pixfmt)
+ {
+   guint i;
+ 
+@@ -2637,7 +2633,7 @@ gst_ffmpeg_pixfmt_to_videoformat (enum PixelFormat pixfmt)
+   return GST_VIDEO_FORMAT_UNKNOWN;
+ }
+ 
+-static enum PixelFormat
++static enum AVPixelFormat
+ gst_ffmpeg_videoformat_to_pixfmt_for_codec (GstVideoFormat format,
+     const AVCodec * codec)
+ {
+@@ -2661,7 +2657,7 @@ gst_ffmpeg_videoformat_to_pixfmt_for_codec (GstVideoFormat format,
+   return AV_PIX_FMT_NONE;
+ }
+ 
+-enum PixelFormat
++enum AVPixelFormat
+ gst_ffmpeg_videoformat_to_pixfmt (GstVideoFormat format)
+ {
+   return gst_ffmpeg_videoformat_to_pixfmt_for_codec (format, NULL);
+diff --git a/ext/libav/gstavcodecmap.h b/ext/libav/gstavcodecmap.h
+index 40f46c3..486a0d5 100644
+--- a/ext/libav/gstavcodecmap.h
++++ b/ext/libav/gstavcodecmap.h
+@@ -132,8 +132,8 @@ void
+ gst_ffmpeg_audioinfo_to_context (GstAudioInfo *info,
+ 				 AVCodecContext *context);
+ 
+-GstVideoFormat gst_ffmpeg_pixfmt_to_videoformat (enum PixelFormat pixfmt);
+-enum PixelFormat gst_ffmpeg_videoformat_to_pixfmt (GstVideoFormat format);
++GstVideoFormat gst_ffmpeg_pixfmt_to_videoformat (enum AVPixelFormat pixfmt);
++enum AVPixelFormat gst_ffmpeg_videoformat_to_pixfmt (GstVideoFormat format);
+ 
+ GstAudioFormat gst_ffmpeg_smpfmt_to_audioformat (enum AVSampleFormat sample_fmt);
+ 
+diff --git a/ext/libav/gstavdeinterlace.c b/ext/libav/gstavdeinterlace.c
+index 6906059..fe2d60d 100644
+--- a/ext/libav/gstavdeinterlace.c
++++ b/ext/libav/gstavdeinterlace.c
+@@ -94,7 +94,7 @@ typedef struct _GstFFMpegDeinterlace
+   gboolean reconfigure;
+   GstFFMpegDeinterlaceMode new_mode;
+ 
+-  enum PixelFormat pixfmt;
++  enum AVPixelFormat pixfmt;
+   AVPicture from_frame, to_frame;
+ 
+   AVFilterContext *buffersink_ctx;
+diff --git a/ext/libav/gstavutils.c b/ext/libav/gstavutils.c
+index c434202..5d1567b 100644
+--- a/ext/libav/gstavutils.c
++++ b/ext/libav/gstavutils.c
+@@ -279,7 +279,7 @@ gst_ffmpeg_avpicture_get_size (int pix_fmt, int width, int height)
+ 
+ int
+ gst_ffmpeg_avpicture_fill (AVPicture * picture,
+-    uint8_t * ptr, enum PixelFormat pix_fmt, int width, int height)
++    uint8_t * ptr, enum AVPixelFormat pix_fmt, int width, int height)
+ {
+   int size, w2, h2, size2;
+   int stride, stride2;
+diff --git a/ext/libav/gstavutils.h b/ext/libav/gstavutils.h
+index 6d111a2..f4d90ef 100644
+--- a/ext/libav/gstavutils.h
++++ b/ext/libav/gstavutils.h
+@@ -42,7 +42,7 @@ gst_ffmpeg_avpicture_get_size (int pix_fmt, int width, int height);
+ int
+ gst_ffmpeg_avpicture_fill (AVPicture * picture,
+                            uint8_t *   ptr,
+-                           enum PixelFormat pix_fmt,
++                           enum AVPixelFormat pix_fmt,
+                            int         width,
+                            int         height);
+ 
+diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
+index da9acf6..cc0cf03 100644
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -444,9 +444,6 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
+ 
+   /* set buffer functions */
+   ffmpegdec->context->get_buffer2 = gst_ffmpegviddec_get_buffer2;
+-  ffmpegdec->context->get_buffer = NULL;
+-  ffmpegdec->context->reget_buffer = NULL;
+-  ffmpegdec->context->release_buffer = NULL;
+   ffmpegdec->context->draw_horiz_band = NULL;
+ 
+   /* reset coded_width/_height to prevent it being reused from last time when
+@@ -825,10 +822,6 @@ gst_ffmpegviddec_get_buffer2 (AVCodecContext * context, AVFrame * picture,
+ 
+   picture->buf[0] = av_buffer_create (NULL, 0, dummy_free_buffer, dframe, 0);
+ 
+-  /* tell ffmpeg we own this buffer, transfer the ref we have on the buffer to
+-   * the opaque data. */
+-  picture->type = FF_BUFFER_TYPE_USER;
+-
+   GST_LOG_OBJECT (ffmpegdec, "returned frame %p", dframe->buffer);
+ 
+   return 0;
+@@ -1355,8 +1348,6 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
+       (guint64) ffmpegdec->picture->pts);
+   GST_DEBUG_OBJECT (ffmpegdec, "picture: num %d",
+       ffmpegdec->picture->coded_picture_number);
+-  GST_DEBUG_OBJECT (ffmpegdec, "picture: ref %d",
+-      ffmpegdec->picture->reference);
+   GST_DEBUG_OBJECT (ffmpegdec, "picture: display %d",
+       ffmpegdec->picture->display_picture_number);
+   GST_DEBUG_OBJECT (ffmpegdec, "picture: opaque %p",
+diff --git a/ext/libav/gstavviddec.h b/ext/libav/gstavviddec.h
+index f152ba8..a9965b7 100644
+--- a/ext/libav/gstavviddec.h
++++ b/ext/libav/gstavviddec.h
+@@ -41,7 +41,7 @@ struct _GstFFMpegVidDec
+   gboolean opened;
+ 
+   /* current output pictures */
+-  enum PixelFormat pic_pix_fmt;
++  enum AVPixelFormat pic_pix_fmt;
+   gint pic_width;
+   gint pic_height;
+   gint pic_par_n;
+@@ -70,7 +70,7 @@ struct _GstFFMpegVidDec
+   GstBufferPool *internal_pool;
+   gint pool_width;
+   gint pool_height;
+-  enum PixelFormat pool_format;
++  enum AVPixelFormat pool_format;
+   GstVideoInfo pool_info;
+ };
+ 
+diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
+index 1df1699..94aca49 100644
+--- a/ext/libav/gstavvidenc.c
++++ b/ext/libav/gstavvidenc.c
+@@ -290,7 +290,7 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder,
+   GstCaps *allowed_caps;
+   GstCaps *icaps;
+   GstVideoCodecState *output_format;
+-  enum PixelFormat pix_fmt;
++  enum AVPixelFormat pix_fmt;
+   GstFFMpegVidEnc *ffmpegenc = (GstFFMpegVidEnc *) encoder;
+   GstFFMpegVidEncClass *oclass =
+       (GstFFMpegVidEncClass *) G_OBJECT_GET_CLASS (ffmpegenc);
+diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c
+index f34259b..62343d0 100644
+--- a/ext/libswscale/gstffmpegscale.c
++++ b/ext/libswscale/gstffmpegscale.c
+@@ -45,7 +45,7 @@ typedef struct _GstFFMpegScale
+   /* state */
+   GstVideoInfo in_info, out_info;
+ 
+-  enum PixelFormat in_pixfmt, out_pixfmt;
++  enum AVPixelFormat in_pixfmt, out_pixfmt;
+   struct SwsContext *ctx;
+ 
+   /* property */
+@@ -214,8 +214,8 @@ gst_ffmpegscale_init (GstFFMpegScale * scale)
+ {
+   scale->method = DEFAULT_PROP_METHOD;
+   scale->ctx = NULL;
+-  scale->in_pixfmt = PIX_FMT_NONE;
+-  scale->out_pixfmt = PIX_FMT_NONE;
++  scale->in_pixfmt = AV_PIX_FMT_NONE;
++  scale->out_pixfmt = AV_PIX_FMT_NONE;
+ }
+ 
+ static void
+@@ -226,8 +226,8 @@ gst_ffmpegscale_reset (GstFFMpegScale * scale)
+     scale->ctx = NULL;
+   }
+ 
+-  scale->in_pixfmt = PIX_FMT_NONE;
+-  scale->out_pixfmt = PIX_FMT_NONE;
++  scale->in_pixfmt = AV_PIX_FMT_NONE;
++  scale->out_pixfmt = AV_PIX_FMT_NONE;
+ }
+ 
+ static void
+@@ -442,11 +442,11 @@ gst_ffmpegscale_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
+ 
+ /* Convert a GstCaps (video/raw) to a FFMPEG PixFmt
+  */
+-static enum PixelFormat
++static enum AVPixelFormat
+ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps)
+ {
+   GstVideoInfo info;
+-  enum PixelFormat pix_fmt;
++  enum AVPixelFormat pix_fmt;
+ 
+   GST_DEBUG ("converting caps %" GST_PTR_FORMAT, caps);
+ 
+@@ -455,52 +455,52 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps)
+ 
+   switch (GST_VIDEO_INFO_FORMAT (&info)) {
+     case GST_VIDEO_FORMAT_YUY2:
+-      pix_fmt = PIX_FMT_YUYV422;
++      pix_fmt = AV_PIX_FMT_YUYV422;
+       break;
+     case GST_VIDEO_FORMAT_UYVY:
+-      pix_fmt = PIX_FMT_UYVY422;
++      pix_fmt = AV_PIX_FMT_UYVY422;
+       break;
+     case GST_VIDEO_FORMAT_I420:
+-      pix_fmt = PIX_FMT_YUV420P;
++      pix_fmt = AV_PIX_FMT_YUV420P;
+       break;
+     case GST_VIDEO_FORMAT_Y41B:
+-      pix_fmt = PIX_FMT_YUV411P;
++      pix_fmt = AV_PIX_FMT_YUV411P;
+       break;
+     case GST_VIDEO_FORMAT_Y42B:
+-      pix_fmt = PIX_FMT_YUV422P;
++      pix_fmt = AV_PIX_FMT_YUV422P;
+       break;
+     case GST_VIDEO_FORMAT_YUV9:
+-      pix_fmt = PIX_FMT_YUV410P;
++      pix_fmt = AV_PIX_FMT_YUV410P;
+       break;
+     case GST_VIDEO_FORMAT_ARGB:
+-      pix_fmt = PIX_FMT_ARGB;
++      pix_fmt = AV_PIX_FMT_ARGB;
+       break;
+     case GST_VIDEO_FORMAT_RGBA:
+-      pix_fmt = PIX_FMT_RGBA;
++      pix_fmt = AV_PIX_FMT_RGBA;
+       break;
+     case GST_VIDEO_FORMAT_BGRA:
+-      pix_fmt = PIX_FMT_BGRA;
++      pix_fmt = AV_PIX_FMT_BGRA;
+       break;
+     case GST_VIDEO_FORMAT_ABGR:
+-      pix_fmt = PIX_FMT_ABGR;
++      pix_fmt = AV_PIX_FMT_ABGR;
+       break;
+     case GST_VIDEO_FORMAT_BGR:
+-      pix_fmt = PIX_FMT_BGR24;
++      pix_fmt = AV_PIX_FMT_BGR24;
+       break;
+     case GST_VIDEO_FORMAT_RGB:
+-      pix_fmt = PIX_FMT_RGB24;
++      pix_fmt = AV_PIX_FMT_RGB24;
+       break;
+     case GST_VIDEO_FORMAT_RGB16:
+-      pix_fmt = PIX_FMT_RGB565;
++      pix_fmt = AV_PIX_FMT_RGB565;
+       break;
+     case GST_VIDEO_FORMAT_RGB15:
+-      pix_fmt = PIX_FMT_RGB555;
++      pix_fmt = AV_PIX_FMT_RGB555;
+       break;
+     case GST_VIDEO_FORMAT_RGB8P:
+-      pix_fmt = PIX_FMT_PAL8;
++      pix_fmt = AV_PIX_FMT_PAL8;
+       break;
+     default:
+-      pix_fmt = PIX_FMT_NONE;
++      pix_fmt = AV_PIX_FMT_NONE;
+       break;
+   }
+   return pix_fmt;
+@@ -508,7 +508,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps)
+   /* ERROR */
+ invalid_caps:
+   {
+-    return PIX_FMT_NONE;
++    return AV_PIX_FMT_NONE;
+   }
+ }
+ 
+@@ -537,8 +537,8 @@ gst_ffmpegscale_set_caps (GstBaseTransform * trans, GstCaps * incaps,
+   scale->in_pixfmt = gst_ffmpeg_caps_to_pixfmt (incaps);
+   scale->out_pixfmt = gst_ffmpeg_caps_to_pixfmt (outcaps);
+ 
+-  if (!ok || scale->in_pixfmt == PIX_FMT_NONE ||
+-      scale->out_pixfmt == PIX_FMT_NONE ||
++  if (!ok || scale->in_pixfmt == AV_PIX_FMT_NONE ||
++      scale->out_pixfmt == AV_PIX_FMT_NONE ||
+       GST_VIDEO_INFO_FORMAT (&scale->in_info) == GST_VIDEO_FORMAT_UNKNOWN ||
+       GST_VIDEO_INFO_FORMAT (&scale->out_info) == GST_VIDEO_FORMAT_UNKNOWN)
+     goto refuse_caps;
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
index 320ac6e9e9e1..6d4818b7607c 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-inherit eutils multilib-minimal
+inherit eutils multilib-minimal autotools
 
 MY_PN="gst-libav"
 DESCRIPTION="FFmpeg based gstreamer plugin"
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libav +orc"
 
 # XXX: bzip2/lzma are automagic
@@ -31,6 +31,17 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.6.3-deinterlace-lavf.patch" \
+		"${FILESDIR}/${PN}-1.6.3-no-deprecated.patch" \
+		"${FILESDIR}/${PN}-1.6.3-bitrate.patch" \
+		"${FILESDIR}/${PN}-1.6.3-chain-dispose.patch" \
+		"${FILESDIR}/${PN}-1.6.3-minr-maxr.patch" \
+		"${FILESDIR}/${PN}-1.6.3-minr-compat.patch"
+	eautoreconf
+}
+
 multilib_src_configure() {
 	GST_PLUGINS_BUILD=""
 	# Upstream dropped support for system libav and won't work
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
index 4d9c5cdd8bd8..60d1cba392c2 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.265 decoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
index da21a5918ecf..a6ba75a15b05 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
index dd13ddef484d..c5617e495905 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder for PNG images"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
index 0607a8352af9..de9387ad20ef 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
index 4786a7a0c2bd..2ed0ea4b949e 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
index c8732196949a..2b01f6da901c 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-mimic/Manifest b/media-plugins/gst-plugins-mimic/Manifest
deleted file mode 100644
index 66695b5b1230..000000000000
--- a/media-plugins/gst-plugins-mimic/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
-DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
-DIST gst-plugins-bad-1.6.3.tar.xz 4216940 SHA256 971b29101d6a9c5e3fe94d99d977a227f58f0b2d29b6ca2c7f292052542b3a61 SHA512 0a3a1d3617f167e69c20db3fccf7af0c4983b8012136093dcc3d08c059d0d8687cf921309c91f94afb250e0c3b9f9ff397a98ff548ca83dc12ae762119ffc915 WHIRLPOOL eb1f1376ee9b36da09f93b14d587169a007578f7cfdce3981ae905638c28f32b85a2f2667fc347f0b9ff4aaa51512f9726377c9ab3c73040886eab9a09833612
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild
deleted file mode 100644
index c98b365085e5..000000000000
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for the MIMIC codec"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.4.5.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.4.5.ebuild
deleted file mode 100644
index 1ffbb185ba20..000000000000
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.4.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for the MIMIC codec"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.1.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.1.ebuild
deleted file mode 100644
index bc8ad062e69b..000000000000
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for the MIMIC codec"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.2.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.2.ebuild
deleted file mode 100644
index bc8ad062e69b..000000000000
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for the MIMIC codec"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.3.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.3.ebuild
deleted file mode 100644
index 1e032ed580fb..000000000000
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for the MIMIC codec"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mimic/metadata.xml b/media-plugins/gst-plugins-mimic/metadata.xml
deleted file mode 100644
index fb1ea7216a80..000000000000
--- a/media-plugins/gst-plugins-mimic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gstreamer@gentoo.org</email>
-	<name>GStreamer package maintainers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
index 602582f875bb..8f4c6d5b3990 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
index 720eed63fa5c..69a870e3ae63 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
index 2f8af815174a..f39726e7afb9 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
index 48deb78b2c7d..cd0f2dd808e4 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
index 4e9483af5669..aaaf64a743a5 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
index 7334a7290a27..f319c911335e 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild
index ce6c0d1bc944..c912e6713997 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
index 06a5fc4fc2da..a104a5815b11 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for Opus audio codec support"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
index 027fc65e5e3b..09e003e742a4 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
index 7f8a389bfc62..bb54b1b20ab2 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-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/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
index 9cbac1d668c2..655cfd3269e0 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild
index e746624cea3e..84ce5fe23a4c 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to capture firewire video"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
index fe73f0c7f619..72df8c715fc9 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild
index 8ef6dc6308e1..7068b19b24ec 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for supporting RTMP sources"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild
index 6e3ed9a2cc5d..8e5f4aa300b7 100644
--- a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild
index 94a37f1b37d0..f3c2303d9ea6 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to send data to an icecast server"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild
index ac688b575bf0..5259095e9ccf 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild
index 83b89c561a12..d854455d9c0a 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Smooth Streaming plugin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild
index df0a6b754f1d..e537ca5124c4 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer elements for beats-per-minute detection and pitch controlling"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild
index 3d22296caf90..dd8a27b4f0eb 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils gstreamer
 
 DESCRIPTION="GStreamer plugin for HTTP client sources"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.44.2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
index ae54c13c034c..32084b86f1f9 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for HTTP client source/sink"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 # Depend on >=net-libs/libsoup-2.47.0 once it is stable (see LIBSOUP_DOES_NOT_STEAL_OUR_CONTEXT in ext/soup)
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild
index 5308adb61f34..90b3fa541ba4 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to allow encoding and decoding of speex"
-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=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
index 6214058b962a..84340c000ce0 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer taglib based tag handler"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild
index a64875fb7571..cfc43e10d3ee 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild
index a085804ca223..a426951984fe 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
index 3e3ec774d68a..377966340b5a 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="plugin to allow capture from video4linux2 devices"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
index c2d0d53f2f8b..e318f528dada 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+drm opengl wayland +X"
 REQUIRED_USE="|| ( drm opengl wayland X )"
 
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild
index e443778561ab..d9bc93eb87c0 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for encoding AAC"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild
index d7b75bcb738c..cb25235f52ec 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for encoding AMR-WB"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
index 7f4c591e8b9c..1a35afa88a88 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer decoder for vpx video format"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 # VP9 is under experimental, do not enable it now
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
index 241f9b48ca83..c67c7aa77f5f 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder for wavpack audio format"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
index 8fa2ffe0ee68..51e5e623003f 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild
index 1d8202fe5624..89821d743fa6 100644
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.265 encoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
index 810762692891..77d6809a25ab 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild
index 83eb9214db39..f19fe5438203 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for X11 video capture stream"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index ac91c9937e6f..413b1b6f0fce 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,5 +1,3 @@
-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.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 1364 SHA256 8b7abe67562767478f583fe36704570612425f82a05b9288cc82e3015bf2fc16 SHA512 2fe3a317ecdffc06d9e9b554cf8bfb54a324b7f1441038d51e9f77d13b53693ed6d2721282b239967c6d539947e1b119f579e49b42ba62f7dafd0144c0d28622 WHIRLPOOL 5fc5222364fbb11312f92f8adaef3adff46e89251afcdeea48d1466625072d068ebdb66f9426140765da6f4fc02a117b086033a319f148700cc164bad6fbc0f1
 DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
diff --git a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
deleted file mode 100644
index ac217b1644de..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
+++ /dev/null
@@ -1,129 +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="9fd7c6102b2cd1a3760337663803b110446c6ea7"
-MY_P=${P%_p*}
-
-inherit eutils python
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
-	${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]
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		dev-python/pillow:=
-		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:=
-		media-sound/lame
-		virtual/opengl
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-		fftw? ( sci-libs/fftw:= )
-	)
-	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/ImageSize
-		dev-perl/JSON
-		dev-perl/SOAP-Lite
-		dev-perl/XML-Simple
-		dev-perl/XML-Parser
-		dev-perl/XML-SAX
-		dev-perl/XML-XPath
-	)"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	cdda? ( mythmusic )
-	cdr? ( mythmusic cdda )
-	exif? ( mythgallery )
-	fftw? ( mythmusic )
-	mythnews? ( mythbrowser )
-	raw? ( mythgallery )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/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
deleted file mode 100644
index 740b4872f5a3..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
+++ /dev/null
@@ -1,170 +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="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
-		dev-python/pillow:=
-		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"
-
-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-r2.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
deleted file mode 100644
index 8305e574ea3f..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 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-0.27:=[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
-		dev-python/pillow:=
-		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"
-
-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-r4.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild
new file mode 100644
index 000000000000..a82d7ebb25ae
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 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-0.27:=[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
+		dev-python/pillow:=
+		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/Image-Size
+		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"
+
+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_p20140321-r1.ebuild b/media-plugins/mythplugins/mythplugins-0.27_p20140321-r1.ebuild
new file mode 100644
index 000000000000..f888c76cafde
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-0.27_p20140321-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_DEPEND="2:2.6"
+BACKPORTS="583395f5a376637efcd408a102fa64d0f188c12f"
+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.tar.gz -> mythtv-0.27.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]
+	mytharchive? (
+		app-cdr/dvd+rw-tools
+		dev-python/pillow:=
+		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:=
+		media-sound/lame
+		virtual/opengl
+		cdda? (
+			dev-libs/libcdio:=
+			cdr? ( virtual/cdrtools )
+		)
+		fftw? ( sci-libs/fftw:= )
+	)
+	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/Image-Size
+		dev-perl/JSON
+		dev-perl/SOAP-Lite
+		dev-perl/XML-Simple
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-XPath
+	)"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	cdda? ( mythmusic )
+	cdr? ( mythmusic cdda )
+	exif? ( mythgallery )
+	fftw? ( mythmusic )
+	mythnews? ( mythbrowser )
+	raw? ( mythgallery )"
+
+S="${WORKDIR}/mythtv-0.27/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_p20140321.ebuild b/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
deleted file mode 100644
index d0311739a21a..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27_p20140321.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_DEPEND="2:2.6"
-BACKPORTS="583395f5a376637efcd408a102fa64d0f188c12f"
-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.tar.gz -> mythtv-0.27.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]
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		dev-python/pillow:=
-		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:=
-		media-sound/lame
-		virtual/opengl
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-		fftw? ( sci-libs/fftw:= )
-	)
-	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
-	)"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	cdda? ( mythmusic )
-	cdr? ( mythmusic cdda )
-	exif? ( mythgallery )
-	fftw? ( mythmusic )
-	mythnews? ( mythbrowser )
-	raw? ( mythgallery )"
-
-S="${WORKDIR}/mythtv-0.27/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/Manifest b/media-plugins/quodlibet-plugins/Manifest
deleted file mode 100644
index 965527c5574e..000000000000
--- a/media-plugins/quodlibet-plugins/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST quodlibet-plugins-2.6.3.tar.gz 108398 SHA256 6cf953f69e65e6bcdcaa5843edfb7c5fcd4d1cbb5a637aa1d4a829d9604660e7 SHA512 3d51bd965c22ab2a5a1200ac9c24c27ce0f104dea8bfb5c77688de80f953621cae99043051d679df6741cd1c0450e745fbf594c86ab2cda8a9b4f2d9cd82ccc3 WHIRLPOOL 1c4b943a13a0c38ce1b24549ed335852cc17f6fe3fbf0f7b4dc92a082713963f039684f908e667395134ce2e3cfea0388b35231d2f4c67b89e87b54706b40cb4
-DIST quodlibet-plugins-3.1.2.tar.gz 114026 SHA256 af9952f510048d724543387f9e3e228152c6633aac1c2c348d2d5ee696720240 SHA512 7fe2d96fb825660d9d97525872ffe345df5c0cdfca76fa3fddc2337a406822c4926291ad6ac7de304b711b8dfcdbe3a97831c7a276c06ce75110bf67ed5c09b1 WHIRLPOOL 4872dae4a7346de892fa0fb6e04b6cf7d09dffe49169be834ea577a7aebf9442d63ec1d7280f14b3b78609a42cb3a22234fe383dd1fb93db3c7827403d1194cd
diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
deleted file mode 100644
index 8724dea74afe..000000000000
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">quodlibet/quodlibet</remote-id>
-		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-plugins/quodlibet-plugins/quodlibet-plugins-2.6.3.ebuild b/media-plugins/quodlibet-plugins/quodlibet-plugins-2.6.3.ebuild
deleted file mode 100644
index 36371a710342..000000000000
--- a/media-plugins/quodlibet-plugins/quodlibet-plugins-2.6.3.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
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1
-
-DESCRIPTION="Plugins for Quod Libet and Ex Falso"
-HOMEPAGE="https://github.com/quodlibet/quodlibet/"
-SRC_URI="https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="~media-sound/quodlibet-${PV}"
-DEPEND=""
-
-src_prepare() {
-	rm -f README || die
-}
-
-src_install() {
-	local python_moduleroot=quodlibet/plugins
-	python_foreach_impl python_domodule .
-}
diff --git a/media-plugins/quodlibet-plugins/quodlibet-plugins-3.1.2.ebuild b/media-plugins/quodlibet-plugins/quodlibet-plugins-3.1.2.ebuild
deleted file mode 100644
index a6c8e347856d..000000000000
--- a/media-plugins/quodlibet-plugins/quodlibet-plugins-3.1.2.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
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1
-
-DESCRIPTION="Plugins for Quod Libet and Ex Falso"
-HOMEPAGE="https://github.com/quodlibet/quodlibet/"
-SRC_URI="https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-sound/quodlibet-${PV}"
-DEPEND=""
-
-src_prepare() {
-	rm -f README || die
-}
-
-src_install() {
-	local python_moduleroot=quodlibet/plugins
-	python_foreach_impl python_domodule .
-}
diff --git a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
index 66c3329fb05d..a5b99a6f0a17 100644
--- a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
+++ b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=media-radio/unixcw-3.3.1"
diff --git a/media-radio/fldigi/fldigi-3.23.06.ebuild b/media-radio/fldigi/fldigi-3.23.06.ebuild
index 1310de5682d7..7f1851f1b4fe 100644
--- a/media-radio/fldigi/fldigi-3.23.06.ebuild
+++ b/media-radio/fldigi/fldigi-3.23.06.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="hamlib nls portaudio pulseaudio sndfile"
 
 RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-radio/grig/grig-0.8.1.ebuild b/media-radio/grig/grig-0.8.1.ebuild
index f431d7a52958..8c6135b97b0a 100644
--- a/media-radio/grig/grig-0.8.1.ebuild
+++ b/media-radio/grig/grig-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/groundstation/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-radio/unixcw/unixcw-3.5.0.ebuild b/media-radio/unixcw/unixcw-3.5.0.ebuild
index 633619b7d7b7..dc894a363472 100644
--- a/media-radio/unixcw/unixcw-3.5.0.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ~ppc x86"
 IUSE="alsa ncurses pulseaudio suid qt5"
 
 RDEPEND="ncurses? ( sys-libs/ncurses:= )
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index c1b475c21b73..eec0bea4bfe4 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,3 +1,3 @@
 DIST abcde-2.5.4.tar.gz 104229 SHA256 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791 WHIRLPOOL ae5ea868c7d66f8bd367f0a9724546721524b84ae0478fb9bd2ae64b1c1b358a24bfd8d0303ce3012c2bcce40d3b97a1cbcedcb13f8d4dea2ae6cd988d6c0921
-DIST abcde-2.6.tar.gz 105609 SHA256 683ea7e215142784a28afcda4a18d9a2b8f7ef7bcd9c2881ee110a3b86784c78 SHA512 cbd50b4991e80a47e9d98b7681c3dc85266969854b5e5b8d4e622f5abf4384271d40a827903fdc0e477906863b769d6f574bfdd9744a898e425818c53de70514 WHIRLPOOL fd8ca79f76a20be994f4d28f14583836dfb1bc285d7c3c44d0941388d44befe1bc833af56a51e482d3ac0c0bbbbb90535565f8e30a537c2a5ee73a096f516c47
+DIST abcde-2.7.1.tar.gz 144302 SHA256 3401e39785b20edee843d4d875b47d2b559f764681c482c4491a8c8ba605f250 SHA512 55d0d6e01af7a492367889f948b1beb3d08ecf2204d6384a93f9b3ed4b8f34fad2c1e517f56a87c2d3041bf116fe6aaa7d1ae98705e4f5f89283288588c8b48e WHIRLPOOL fdd6a9961e47e3dc6447dd4d42048dc02dabaca4283fffc8adf9789b1ca8c19ee636c16c6234d954ea5c73448926efe66e5e77574a030421689381ea6fb74ad2
 DIST abcde-2.7.tar.gz 140039 SHA256 0148698a09fedcbae37ee9da295afe411a1190cf8ae224b7814d31b5bf737746 SHA512 0e5c931cddf283cb4444136e4ad43c996d8f69c990a76ed032ad9863c8de54ad9a9896a2de1a500184690b72ffb35ab2e2f859f12a19f15f093ef016ff69c61e WHIRLPOOL da88cef66740720dffc5175e2777a5da7cf014a64eefcf582ee734949edf19df858e3d9a7ab49295e0d2e2cc7017eb6ccb5345fa123be780c30744be5cf6a171
diff --git a/media-sound/abcde/abcde-2.6.ebuild b/media-sound/abcde/abcde-2.6.ebuild
deleted file mode 100644
index f89360b4acd4..000000000000
--- a/media-sound/abcde/abcde-2.6.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
-
-DESCRIPTION="A command line CD encoder"
-HOMEPAGE="http://abcde.einval.com/"
-SRC_URI="http://abcde.einval.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-# Enable MP3 related flags by default
-IUSE="aac cdparanoia cdr flac +id3tag +lame musepack musicbrainz normalize opus replaygain speex vorbis"
-
-# See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
-RDEPEND="media-sound/cd-discid
-	net-misc/wget
-	virtual/eject
-	aac? (
-		|| ( media-libs/faac media-sound/neroaac )
-		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
-		)
-	cdparanoia? (
-		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
-		)
-	cdr? ( virtual/cdrtools )
-	flac? ( media-libs/flac )
-	id3tag? (
-		dev-python/eyeD3:0.7
-		>=media-sound/id3-0.12
-		media-sound/id3v2
-		)
-	lame? ( media-sound/lame )
-	musepack? ( media-sound/musepack-tools )
-	musicbrainz? (
-		dev-perl/MusicBrainz-DiscID
-		dev-perl/WebService-MusicBrainz
-		virtual/perl-Digest-SHA
-		virtual/perl-Getopt-Long
-		)
-	normalize? ( >=media-sound/normalize-0.7.4 )
-	opus? ( media-sound/opus-tools )
-	replaygain? (
-		vorbis? ( media-sound/vorbisgain )
-		lame? ( media-sound/mp3gain )
-		)
-	speex? ( media-libs/speex )
-	vorbis? ( media-sound/vorbis-tools )"
-
-src_prepare() {
-	sed -i -e 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" etcdir="${D}"etc/abcde install
-
-	dodoc changelog FAQ README TODO USEPIPES
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/media-sound/abcde/abcde-2.7.1.ebuild b/media-sound/abcde/abcde-2.7.1.ebuild
new file mode 100644
index 000000000000..4cb3bc9bb35d
--- /dev/null
+++ b/media-sound/abcde/abcde-2.7.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A command line CD encoder"
+HOMEPAGE="http://abcde.einval.com/"
+SRC_URI="http://abcde.einval.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+# Enable MP3 related flags by default
+IUSE="aac cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
+
+# See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
+RDEPEND="media-sound/cd-discid
+	net-misc/wget
+	virtual/eject
+	aac? (
+		|| ( media-libs/faac media-sound/neroaac )
+		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
+		)
+	cdparanoia? (
+		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
+		)
+	cdr? ( virtual/cdrtools )
+	flac? ( media-libs/flac )
+	id3tag? (
+		dev-python/eyeD3:0.7
+		>=media-sound/id3-0.12
+		media-sound/id3v2
+		)
+	lame? ( media-sound/lame )
+	mac? (
+		media-sound/apetag
+		media-sound/mac
+		)
+	musepack? ( media-sound/musepack-tools )
+	musicbrainz? (
+		dev-perl/MusicBrainz-DiscID
+		dev-perl/WebService-MusicBrainz
+		virtual/perl-Digest-SHA
+		virtual/perl-Getopt-Long
+		)
+	normalize? ( >=media-sound/normalize-0.7.4 )
+	opus? ( media-sound/opus-tools )
+	replaygain? (
+		vorbis? ( media-sound/vorbisgain )
+		lame? ( media-sound/mp3gain )
+		)
+	speex? ( media-libs/speex )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )
+"
+
+src_prepare() {
+	sed -i 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
+	sed -i -e '/^prefix/s/=/?=/' -e '/^sysconfdir/s/=/?=/' Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" sysconfdir="/etc/abcde" install
+
+	dodoc changelog FAQ README
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/media-sound/apulse/apulse-0.1.6-r1.ebuild b/media-sound/apulse/apulse-0.1.6-r1.ebuild
index 5311f441e861..8c57628df6b0 100644
--- a/media-sound/apulse/apulse-0.1.6-r1.ebuild
+++ b/media-sound/apulse/apulse-0.1.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
 	media-libs/alsa-lib[${MULTILIB_USEDEP}]"
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ceb6b7e829b8..a31aa3d1f213 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -9,3 +9,4 @@ DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43edda
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
 DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
 DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a WHIRLPOOL 0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72
+DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
diff --git a/media-sound/ardour/ardour-4.7.ebuild b/media-sound/ardour/ardour-4.7.ebuild
new file mode 100644
index 000000000000..6ef94c0916bc
--- /dev/null
+++ b/media-sound/ardour/ardour-4.7.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
+	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+}
diff --git a/media-sound/banshee/banshee-2.6.2.ebuild b/media-sound/banshee/banshee-2.6.2.ebuild
index c56ae35549c2..c830b9908f6e 100644
--- a/media-sound/banshee/banshee-2.6.2.ebuild
+++ b/media-sound/banshee/banshee-2.6.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://banshee.fm/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+aac +cdda +bpm daap doc +encode ipod karma mtp test udev +web youtube"
 
 RDEPEND="
diff --git a/media-sound/dcadec/Manifest b/media-sound/dcadec/Manifest
new file mode 100644
index 000000000000..d1c9fddf6b5a
--- /dev/null
+++ b/media-sound/dcadec/Manifest
@@ -0,0 +1 @@
+DIST dcadec-0.2.0.tar.gz 225305 SHA256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 SHA512 94edcc0b4449882ebeb08f8b39fe44a5302731df2dad3a3e0b0f787fd7c2c3e3992fed95e6f594af516e982cec34b057aab30e6457c098df61f495a487125acb WHIRLPOOL 33aa735fed95dcb5cb97fec767971bc151c7925f40589beb9c10fca57e0871da66b800fc9a23613a14e8ffbec2758a5e516debf3bb600e2c2c9f1fcad14b66e4
diff --git a/media-sound/dcadec/dcadec-0.2.0.ebuild b/media-sound/dcadec/dcadec-0.2.0.ebuild
new file mode 100644
index 000000000000..dbd688612d1a
--- /dev/null
+++ b/media-sound/dcadec/dcadec-0.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs multilib multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/foo86/dcadec.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/foo86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="DTS Coherent Acoustics decoder with support for HD extensions"
+HOMEPAGE="https://github.com/foo86/dcadec"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/s:-O3::' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# Build shared libs
+	echo 'CONFIG_SHARED=1' >> .config
+
+	local target=all
+	multilib_is_native_abi || target=lib
+	tc-export AR CC
+	PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		emake -f "${S}/Makefile" ${target}
+}
+
+multilib_src_install() {
+	local target=install
+	multilib_is_native_abi || target=install-lib
+	PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		emake -f "${S}/Makefile" DESTDIR="${D}" ${target}
+}
+
+multilib_src_install_all() {
+	# Rename the executable since it conflicts with libdca.
+	mv "${ED}"/usr/bin/dcadec{,-new} || die
+
+	einstalldocs
+}
diff --git a/media-sound/dcadec/metadata.xml b/media-sound/dcadec/metadata.xml
new file mode 100644
index 000000000000..7294e2a4987a
--- /dev/null
+++ b/media-sound/dcadec/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+</maintainer>
+<upstream>
+	<remote-id type="github">foo86/dcadec</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/media-sound/freewheeling/Manifest b/media-sound/freewheeling/Manifest
deleted file mode 100644
index 3bb3e764e76f..000000000000
--- a/media-sound/freewheeling/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fweelin-0.6-src.tar.bz2 474220 SHA256 6aead7b32866d174c5b49a2215a5f864f3e1d9042623670fae2b6ec9dfbcc6ab SHA512 2bcb4d75a772305d8993af550838082275d07735bbc9f7a8228ec51134525c1290af7c573e78f3bf3d6d992e619bbb1934298a820bd1fc5318385037260d477a WHIRLPOOL 54a77bff8de4269b6953e277adb8e6ee9cc621059ed9fdb06ba7c4d4f0186f9669e2d1a1b45fe4ccc5fc83e790f6297c899614ed0fb26b290b043d72544cec91
diff --git a/media-sound/freewheeling/freewheeling-0.6.ebuild b/media-sound/freewheeling/freewheeling-0.6.ebuild
deleted file mode 100644
index 5287b1cce2f3..000000000000
--- a/media-sound/freewheeling/freewheeling-0.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit autotools multilib
-
-MY_P=fweelin-${PV/_}
-
-DESCRIPTION="A live looping instrument using SDL and jack"
-HOMEPAGE="http://freewheeling.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="fluidsynth"
-
-RDEPEND="dev-libs/libxml2
-	media-libs/alsa-lib
-	media-libs/freetype:2
-	media-libs/libvorbis
-	media-libs/libsdl[sound,video,joystick]
-	media-libs/libsndfile
-	media-libs/sdl-gfx
-	media-libs/sdl-ttf
-	media-sound/jack-audio-connection-kit
-	net-libs/gnutls
-	x11-libs/libX11
-	fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e 's:-L/usr/X11R6/lib::' configure.ac || die
-
-	sed -i \
-		-e '/CFLAGS/s:-g::' \
-		-e '/CFLAGS/s:-funroll-loops.*::' \
-		-e "s:local/lib/jack:$(get_libdir)/jack:" \
-		src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fluidsynth) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TUNING
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/media-sound/freewheeling/metadata.xml b/media-sound/freewheeling/metadata.xml
deleted file mode 100644
index 101e43ae94e6..000000000000
--- a/media-sound/freewheeling/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<use>
-		<flag name="fluidsynth">compile with support for fluidsynth</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freewheeling</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/giada/Manifest b/media-sound/giada/Manifest
deleted file mode 100644
index 8c778981d6a5..000000000000
--- a/media-sound/giada/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST giada-0.7.0.tar.gz 200738 SHA256 493b9d7d8055ac617ef08816a44ba584c1dd429c3c01ca52877cc8163e9f3c15 SHA512 72bea7b2cced2a2ce7fe5705e0c3eea912fa58c561be8e3ae92dafb08ef7d4cedefea268ce4c71dfca1140c7e70a9bd6f5dd12b2991a8a8321d76e44bc9192d2 WHIRLPOOL 7d2aa21bb157eb9f8d1fc46b21fa02982ca6a0415b083cce2907c05fccc8e0a787ca401dcf1a3b3f3ab4624512eb622d15635566a62dbb4c62f4a444e61c58dc
diff --git a/media-sound/giada/files/giada-0.5.4-flags.patch b/media-sound/giada/files/giada-0.5.4-flags.patch
deleted file mode 100644
index 17e013ccd2fe..000000000000
--- a/media-sound/giada/files/giada-0.5.4-flags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- giada-0.5.4/src/Makefile.am
-+++ giada-0.5.4/src/Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = foreign
- 
--AM_CXXFLAGS = -Wall -pedantic -Werror
-+AM_CXXFLAGS = -Wall -pedantic
- 
- # aeffect.h (header from VST SDK) uses 'long long' which is not supported
- # in ISO C++ 1998 and -Werror flag breaks the compilation.
diff --git a/media-sound/giada/files/giada-0.5.8-configure.patch b/media-sound/giada/files/giada-0.5.8-configure.patch
deleted file mode 100644
index c92ce0a1cc1b..000000000000
--- a/media-sound/giada/files/giada-0.5.8-configure.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- giada-0.5.8/configure.ac
-+++ giada-0.5.8/configure.ac
-@@ -52,6 +52,27 @@
-   [AC_DEFINE(WITH_VST)]
- )
- 
-+AC_ARG_ENABLE(
-+	alsa,
-+	AS_HELP_STRING([--disable-alsa], [disable alsa support]),
-+  [AC_DEFINE(WITH_ALSA)]
-+)
-+AM_CONDITIONAL(ALSA, test "x$enable_alsa" = "xtrue")
-+
-+AC_ARG_ENABLE(
-+	jack,
-+	AS_HELP_STRING([--enable-jack], [enable jack support]),
-+  [AC_DEFINE(WITH_JACK)]
-+)
-+AM_CONDITIONAL(JACK, test "x$enable_jack" = "xtrue")
-+
-+AC_ARG_ENABLE(
-+	pulse,
-+	AS_HELP_STRING([--enable-pulse], [enable pulseaudio support]),
-+  [AC_DEFINE(WITH_PULSE)]
-+)
-+AM_CONDITIONAL(PULSE, test "x$enable_pulse" = "xtrue")
-+
- # ----------------------------------------------------------------------
- 
- # Checks for programs.
---- giada-0.5.8/src/Makefile.am
-+++ giada-0.5.8/src/Makefile.am
-@@ -39,7 +39,16 @@
- # inside configure.ac
- if LINUX
- giada_LDADD = -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -lrtaudio  \
--						  -ljack -lasound -lpthread -ldl -lpulse-simple -lsamplerate
-+						  -lpthread -ldl -lsamplerate
-+if ALSA
-+giada_LDADD += -lasound
-+endif
-+if JACK
-+giada_LDADD += -ljack
-+endif
-+if PULSE
-+giada_LDADD += -lpulse-simple
-+endif
- endif
- if WINDOWS
- giada_LDADD   = -lole32 -lrtaudio -ldsound -lwinmm -lwsock32 -lm       \
diff --git a/media-sound/giada/giada-0.7.0.ebuild b/media-sound/giada/giada-0.7.0.ebuild
deleted file mode 100644
index 867557fb1a41..000000000000
--- a/media-sound/giada/giada-0.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="A free, minimal, hardcore audio tool for DJs and live performers"
-HOMEPAGE="http://www.giadamusic.com/"
-SRC_URI="http://www.giadamusic.com/download-action.php?os=source&version=${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa jack pulseaudio"
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-RDEPEND="media-libs/libsndfile
-	>=media-libs/libsamplerate-0.1.8
-	media-libs/rtaudio[alsa?,jack?,pulseaudio?]
-	x11-libs/fltk:1
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.4-flags.patch
-	epatch "${FILESDIR}"/${PN}-0.5.8-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $(fltk-config --cflags)
-	append-ldflags $(fltk-config --ldflags)
-
-	econf \
-		--target=linux \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable pulseaudio pulse)
-}
diff --git a/media-sound/giada/metadata.xml b/media-sound/giada/metadata.xml
deleted file mode 100644
index f79bb67acbd9..000000000000
--- a/media-sound/giada/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest
index 33e5f42b19cc..6f7d1a8589bd 100644
--- a/media-sound/gmtp/Manifest
+++ b/media-sound/gmtp/Manifest
@@ -1,2 +1 @@
-DIST gmtp-1.3.5.tar.gz 1613492 SHA256 ae6950d7157e6b90a46f0f850085c5e2fba628e9e58ba493ba164eb3405f55d3 SHA512 5e6f4b4f5dff0d9d5a2b477a8b174958d660bca046b8904b019540b9fc975be974e3dd261c4ee00ea00a023227a9f641911b46bb94dd7b00ff5354bbb5bdae6a WHIRLPOOL 2fa7747418d1e8a7ba0d8bb661d100e8e9953ec938d4af7e70c82d6dd94c0c714403d5e0cfa3d0b956aa8f940d7991d24e30e99bdafe5b6ff7238425fe0e792b
-DIST gmtp-1.3.9.tar.gz 489612 SHA256 5bff5385db66f5c3e82d89edb7ca4a8ccb8c8954faf7341438080f2741dcbd2d SHA512 e5fc652105d23719cb366bb9292c1520cc0a0e4c10179fec6108145c32725ea2a8e47b10c0bee415327718b3d9e2c2f84e0fda6225e57b472d9eabe4fcb615e0 WHIRLPOOL ca95a0b1a194a6c40bd20916614a75b77f6bf525179fb81bdb8c4788edc0127b0552427e82e335d119907864822f58917be6c07463225f5a17a0ce7c0b001ae0
+DIST gmtp-1.3.10.tar.gz 496912 SHA256 b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b SHA512 e2f5b8231e409d9ef6e512cb37199ce7771b87f61cb5bf29a86be0e3fdda22688005ae5b22f004f91a69df2f682c9eb0f1b7613e4f1a8dd3cc6fb0edb6e29fcd WHIRLPOOL 2a1e0af4656873ff777af85640d1797af2bb2b49ce4d17ad29644323994235d55273abb481a1af416929b7235a432026bbfd4123219b72cee9355f39576def2a
diff --git a/media-sound/gmtp/gmtp-1.3.9.ebuild b/media-sound/gmtp/gmtp-1.3.10.ebuild
index 0cd14c7fb2fd..0cd14c7fb2fd 100644
--- a/media-sound/gmtp/gmtp-1.3.9.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.10.ebuild
diff --git a/media-sound/gmtp/gmtp-1.3.5.ebuild b/media-sound/gmtp/gmtp-1.3.5.ebuild
deleted file mode 100644
index 8e04c0967efc..000000000000
--- a/media-sound/gmtp/gmtp-1.3.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit gnome2-utils
-
-DESCRIPTION="A simple MTP client for MP3 players"
-HOMEPAGE="http://gmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libmtp
-	media-libs/libvorbis
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --with-gtk3
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-3.18.2.ebuild b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
index 601462fb00a3..5f321560acd7 100644
--- a/media-sound/gnome-music/gnome-music-3.18.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
index 45af29fc7813..7d0295b7603f 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # For the list of plugins, see src/audioProfile.js
diff --git a/media-sound/gnomoradio/Manifest b/media-sound/gnomoradio/Manifest
deleted file mode 100644
index 4062650f089e..000000000000
--- a/media-sound/gnomoradio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnomoradio-0.15.1.tar.bz2 351723 SHA256 02b6c256fe6877da3831c5e67c1564b16cc9d5ff33ca410baf5dbdb41922e40a SHA512 7e9fc70054e3966e1bd6af9451c4c6eb0cd1018e422f767589ca2e86b08e2f74c520b9a9a4bd09a12ce76f4d7b7e545ac61601472ffa1818209182b026f9f882 WHIRLPOOL 7d070ee0ceac35a0432f4b690353ab5d91da37b3202e203fea7f37e55e1ae383a4c4c3415f00633677121d7974cfaf11bdbfbdaa5c7b740c608103313510c73b
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch
deleted file mode 100644
index 0efc60fb868f..000000000000
--- a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur gnomoradio-0.15.1.orig/roboradio/audio/prober.h gnomoradio-0.15.1/roboradio/audio/prober.h
---- gnomoradio-0.15.1.orig/roboradio/audio/prober.h	2004-10-17 04:40:36.000000000 +0300
-+++ gnomoradio-0.15.1/roboradio/audio/prober.h	2008-06-29 14:48:13.000000000 +0300
-@@ -27,6 +27,7 @@
- {
- 	namespace Audio
- 	{
-+		gboolean probe (gpointer s);
- 		class Prober : public Audio
- 		{
- 		public:
-diff -ur gnomoradio-0.15.1.orig/roboradio/state.cc gnomoradio-0.15.1/roboradio/state.cc
---- gnomoradio-0.15.1.orig/roboradio/state.cc	2004-10-24 03:24:34.000000000 +0300
-+++ gnomoradio-0.15.1/roboradio/state.cc	2008-06-29 14:48:13.000000000 +0300
-@@ -28,6 +28,7 @@
- #include <sys/stat.h>
- #include <dirent.h>
- #include <iostream>
-+#include <cstring>
- 
- #include <map>
- #include <set>
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch
deleted file mode 100644
index b5f30edfa395..000000000000
--- a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: gnomoradio-0.15.1/rainbow/license.cc
-===================================================================
---- gnomoradio-0.15.1.orig/rainbow/license.cc
-+++ gnomoradio-0.15.1/rainbow/license.cc
-@@ -54,7 +54,7 @@ void Rainbow::License::get_and_do (const
- 	}
- 	
- 	if (done) {
--		signal<void,ref_ptr<License> > sig;
-+		sigc::signal<void,ref_ptr<License> > sig;
- 		sig.connect(slot);
- 		sig(license);
- 	} else {
-Index: gnomoradio-0.15.1/rainbow/rdf-resource.cc
-===================================================================
---- gnomoradio-0.15.1.orig/rainbow/rdf-resource.cc
-+++ gnomoradio-0.15.1/rainbow/rdf-resource.cc
-@@ -35,7 +35,7 @@ void Rainbow::RdfResource::get_and_do (c
- 		resource = ref_ptr<RdfResource>(p->second);
- 		if (resource->downloaded) { // already downloaded
- 			map<Glib::ustring,xmlpp::Element*>::iterator el = resource->id_map.find(id);
--			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
-+			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
- 			sig.connect(slot);
- 			sig(el != resource->id_map.end() ? el->second : 0, resource);
- 			return;
-@@ -47,7 +47,7 @@ void Rainbow::RdfResource::get_and_do (c
- 		Glib::ustring host, file;
- 		unsigned short port;
- 		if (!HttpClient::parse_url(uri, host, port, file)) {
--			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
-+			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
- 			sig.connect(slot);
- 			sig(0, resource);
- 			return;
-@@ -55,14 +55,14 @@ void Rainbow::RdfResource::get_and_do (c
- 	}
- 
- 	// connect mem_fun to appropriate signal
--	map<Glib::ustring,signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
-+	map<Glib::ustring,sigc::signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
- 	sig = resource->signal_map.find(id);
- 	if (sig != resource->signal_map.end()) {
- 		// found existing signal for id
- 		sig->second->connect(slot);
- 	} else {
- 		// need to create new signal to handle id
--		signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
-+		sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
- 		signal_->connect(slot);
- 		resource->signal_map.insert(make_pair(id, signal_));
- 	}
-@@ -190,7 +190,7 @@ void Rainbow::RdfResource::on_downloaded
- 
-  error:
- 	// call all signals
--	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
-+	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
- 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) {
- 		map<Glib::ustring,xmlpp::Element*>::iterator el = id_map.find(signal->first);
- 		signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr<RdfResource>(this));
-@@ -204,7 +204,7 @@ void Rainbow::RdfResource::on_downloaded
- 
- void Rainbow::RdfResource::clear_signal_map ()
- {
--	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
-+	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
- 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
- 		delete signal->second;
- 	signal_map.clear();
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch
deleted file mode 100644
index 168872e57cae..000000000000
--- a/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: gnomoradio-0.15.1/roboradio/mp3/common.c
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/common.c
-+++ gnomoradio-0.15.1/roboradio/mp3/common.c
-@@ -19,7 +19,7 @@
- #include "id3.h"
- #include "id3_header.h"
- 
--#include <glib/gmem.h>
-+#include <glib.h>
- 
- /* max = 1728 */
- #define MAXFRAMESIZE 1792
-Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.c
-+++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
-@@ -2,8 +2,7 @@
- #include <config.h>
- #include "esd-audio.h"
- 
--#include <glib/gmem.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <pthread.h>
- #include <stdlib.h>
- #include <string.h>
-Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.h
-+++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
-@@ -1,7 +1,7 @@
- #ifndef ESD_AUDIO_H
- #define ESD_AUDIO_H
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #define N_(string) string
- 
-Index: gnomoradio-0.15.1/roboradio/mp3/id3.h
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/id3.h
-+++ gnomoradio-0.15.1/roboradio/mp3/id3.h
-@@ -28,7 +28,7 @@
- #ifndef ID3_H
- #define ID3_H
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- /*
-  * Option flags to id3_open_*().
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-lm.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-lm.patch
deleted file mode 100644
index 68104e752237..000000000000
--- a/media-sound/gnomoradio/files/gnomoradio-0.15.1-lm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnomoradio-0.15.1.orig/roboradio/mp3/Makefile.am gnomoradio-0.15.1/roboradio/mp3/Makefile.am
---- gnomoradio-0.15.1.orig/roboradio/mp3/Makefile.am	2004-06-15 08:45:35.000000000 +0300
-+++ gnomoradio-0.15.1/roboradio/mp3/Makefile.am	2009-07-18 13:35:08.000000000 +0300
-@@ -44,7 +44,7 @@
- 	mpg123.h				\
- 	tabinit.c				\
- 	$(optimized_source)
--libroboradio_mp3_la_LIBADD = -lpthread \
-+libroboradio_mp3_la_LIBADD = -lm -lpthread \
- 			     $(ROBORADIO_LIBS) \
- 			     $(AO_LIBS)
- 
diff --git a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
deleted file mode 100644
index a468d69a8471..000000000000
--- a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Finds, fetches, shares, and plays freely licensed music"
-HOMEPAGE="http://gnomoradio.org"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="vorbis"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	dev-cpp/glibmm:2
-	>=dev-cpp/gconfmm-2.6
-	dev-cpp/libxmlpp:2.6
-	dev-libs/libsigc++:2
-	media-libs/libao
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc42.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-lm.patch \
-		"${FILESDIR}"/${P}-glib-single-include.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable vorbis)
-}
diff --git a/media-sound/gnomoradio/metadata.xml b/media-sound/gnomoradio/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/gnomoradio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/gqmpeg/Manifest b/media-sound/gqmpeg/Manifest
deleted file mode 100644
index e1dcf4568b93..000000000000
--- a/media-sound/gqmpeg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gqmpeg-0.91.1.tar.gz 1078478 SHA256 78502bf9b9119c9d4495a640e7467c67aa992b30d8b5b2a51c1db86ada045df5 SHA512 48bddd4a32a80b4a811ebb049c4b8d41bf8bf25bf4faf200558b9c259c3e781250872ccfe3981cf1bc21571418afdccc31f8f77f02b10f02717272c474431b54 WHIRLPOOL e89332930095fc015a96f5d594108ae81094c7a171808ee167fd7d435de8399c7c716773b6ac8ef312a5910363de116f0cec1a7613d0f67a561a4729312485d7
diff --git a/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch b/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch
deleted file mode 100644
index f89565b30e10..000000000000
--- a/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui_pixbuf_save.c
-+++ src/ui_pixbuf_save.c
-@@ -86,7 +86,7 @@ gboolean pixbuf_to_file_as_png (GdkPixbu
- 	    	return FALSE;
- 		}
- 
--	if (setjmp (png_ptr->jmpbuf))
-+	if (setjmp (png_jmpbuf(png_ptr)))
- 		{
- 		png_destroy_write_struct (&png_ptr, &info_ptr);
- 		fclose (handle);
diff --git a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
deleted file mode 100644
index d8dd5d11ebd6..000000000000
--- a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="front end to various audio players, including mpg123"
-HOMEPAGE="http://gqmpeg.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:2
-	media-sound/vorbis-tools
-	media-sound/mpg123
-	>=media-libs/libpng-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog FAQ NEWS README SKIN-SPECS* TODO
-}
diff --git a/media-sound/gqmpeg/metadata.xml b/media-sound/gqmpeg/metadata.xml
deleted file mode 100644
index 6a93394c2459..000000000000
--- a/media-sound/gqmpeg/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 type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gqmpeg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index dfe1183ee2fc..b01bff8f965e 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -8,6 +8,6 @@
   <use>
     <flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
     <flag name="cpudetection">Enables runtime cpudetection</flag>
-	<flag name="pam">Add basic realime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+	<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
new file mode 100644
index 000000000000..bd1b071a2e23
--- /dev/null
+++ b/media-sound/jack2/Manifest
@@ -0,0 +1 @@
+DIST jack2-1.9.10.tar.gz 6415555 SHA256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d SHA512 0bee815356e9e572224e7cc484c402f38797d70257c4bc79a47552ae30a25a4600c61f712a73cbbede52cd8cb8dc144c9334e28c10e23354a11b7223ee0bb0ca WHIRLPOOL a7b4e14fb1e0490955a363fe0680558d89f80c3cdf18a840991b636518ecf55d872d91d9024770874b5d28494e2cbadc0f21ce4b73ee7873f62842fb0339b0c5
diff --git a/media-sound/jack2/jack2-1.9.10.ebuild b/media-sound/jack2/jack2-1.9.10.ebuild
new file mode 100644
index 000000000000..981061fb750a
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.10.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+[[ "${PV}" = "2.9999" ]] && inherit git-r3
+inherit eutils python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+RESTRICT="mirror"
+if [[ "${PV}" = "2.9999" ]]; then
+	EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/jackaudio/jack2/archive/v${PV}.tar.gz -> jack2-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa celt dbus doc opus pam"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: automagic deps: readline, samplerate, sndfile, celt, opus
+# FIXME: even though sndfile is just used for binaries, the check is flawed
+#	making the build fail if multilib libsndfile is not found.
+CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	media-libs/libsndfile[${MULTILIB_USEDEP}]
+	sys-libs/readline:0
+	${PYTHON_DEPS}
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="!media-sound/jack-audio-connection-kit:0
+	${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )"
+
+[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack2-${PV}"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_unpack() {
+	if [[ "${PV}" = "2.9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		$(usex alsa --alsa "")
+		$(usex dbus --dbus --classic)
+	)
+
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		doxygen || die "doxygen failed"
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && \
+		HTML_DOCS=( "${BUILD_DIR}"/html/ )
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
new file mode 100644
index 000000000000..818c8e22b3e5
--- /dev/null
+++ b/media-sound/jack2/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>suhr@i2pmail.org</email>
+    <name>Сухарик</name>
+    <description>Proxied maintainer</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <use>
+    <flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+    <flag name="celt">Support CELT low delay audio codec (<pkg>media-libs/celt</pkg>)</flag>
+    <flag name="opus">Support <pkg>media-libs/opus</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
index 0f7be280ee0b..e82a832c7779 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,2 +1,2 @@
 DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8
-DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984
+DIST karlyriceditor-2.1.tar.gz 276784 SHA256 1f9ec6717491fac6dda1883dfdbc53d32d6031092b1afa78aa2077a36c54fb97 SHA512 3b07abb9151c745f126c3a8215e94e0d0a00fbf3732c30de7bf47b7013174dfd2d087a4ec2c23bcecf28cd0ba3f5513dd9cb5729ffd486df0bb804a250c24af6 WHIRLPOOL b68389ec853244a00884f3f304c3931cf3c1b97ca80731a4ec5a282ef4065551d14f9e312e47e4196972cbf7357bd8680b8783b887075106cf014be82d0b1d93
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch
new file mode 100644
index 000000000000..ebb9d5623396
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.1-ffmpeg3.patch
@@ -0,0 +1,54 @@
+Index: karlyriceditor-2.1/src/ffmpegvideodecoder.cpp
+===================================================================
+--- karlyriceditor-2.1.orig/src/ffmpegvideodecoder.cpp
++++ karlyriceditor-2.1/src/ffmpegvideodecoder.cpp
+@@ -151,12 +151,12 @@ bool FFMpegVideoDecoder::openFile( const
+ 	}
+ 
+ 	// Determine required buffer size and allocate buffer
+-	int numBytes = avpicture_get_size( PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
++	int numBytes = avpicture_get_size( AV_PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
+ 	d->m_buffer.resize( numBytes );
+ 
+ 	// Assign appropriate parts of buffer to image planes in pFrameRGB
+ 	avpicture_fill( (AVPicture *) d->pFrameRGB, (uint8_t*) d->m_buffer.data(),
+-					PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
++					AV_PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
+ 
+ 	d->skipFrames = seekto;
+ 	return true;
+@@ -215,7 +215,7 @@ bool FFMpegVideoDecoderPriv::readFrame(
+ 					int w = pCodecCtx->width;
+ 					int h = pCodecCtx->height;
+ 
+-					img_convert_ctx = sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
++					img_convert_ctx = sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+ 
+ 					if ( img_convert_ctx == NULL )
+ 					{
+Index: karlyriceditor-2.1/src/ffmpegvideoencoder.cpp
+===================================================================
+--- karlyriceditor-2.1.orig/src/ffmpegvideoencoder.cpp
++++ karlyriceditor-2.1/src/ffmpegvideoencoder.cpp
+@@ -333,7 +333,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ 	videoCodecCtx->time_base.num = m_videoformat->frame_rate_num;
+ 	videoCodecCtx->time_base.den = m_videoformat->frame_rate_den;
+ 	videoCodecCtx->gop_size = (m_videoformat->frame_rate_den / m_videoformat->frame_rate_num) / 2;	// GOP size is framerate / 2
+-	videoCodecCtx->pix_fmt = PIX_FMT_YUV420P;
++	videoCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P;
+ 	videoCodecCtx->bit_rate = m_videobitrate;
+ 	videoCodecCtx->bit_rate_tolerance = m_videobitrate * av_q2d(videoCodecCtx->time_base);
+ 
+@@ -865,10 +865,10 @@ bool FFMpegVideoEncoderPriv::convertImag
+ 	videoConvertCtx = sws_getCachedContext( videoConvertCtx,
+ 										   m_videoformat->width,
+ 										   m_videoformat->height,
+-										   PIX_FMT_BGRA,
++										   AV_PIX_FMT_BGRA,
+ 										   m_videoformat->width,
+ 										   m_videoformat->height,
+-										   PIX_FMT_YUV420P,
++										   AV_PIX_FMT_YUV420P,
+ 										   SWS_BICUBIC,
+ 										   NULL,
+ 										   NULL,
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch
new file mode 100644
index 000000000000..7cdc88ae2aa1
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch
@@ -0,0 +1,12 @@
+Fix build with Qt 5.5
+
+--- a/src/videoencodingprofiles.h
++++ b/src/videoencodingprofiles.h
+@@ -21,6 +21,7 @@
+ #define VIDEOENCODINGPROFILES_H
+ 
+ #include <QMap>
++#include <QObject>
+ #include <QString>
+ #include <QStringList>
+ 
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild
deleted file mode 100644
index b564adff9553..000000000000
--- a/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
-HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl:0
-	media-libs/libsdl
-	>=virtual/ffmpeg-0.10
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-		"${FILESDIR}/${PN}-1.3-libav.patch"
-		"${FILESDIR}/${PN}-1.4-ffmpeg_compat.patch"
-		"${FILESDIR}/${PN}-1.4-qmin.patch"
-		)
-
-src_install() {
-	dodoc Changelog
-	dobin bin/${PN}
-	doicon packages/${PN}.png
-	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
-}
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild
new file mode 100644
index 000000000000..631f6958c41a
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
+HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav qt5"
+
+RDEPEND="
+	dev-libs/openssl:0
+	media-libs/libsdl[sound]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11-libav.patch"
+	"${FILESDIR}/${PN}-2.1-ffmpeg3.patch"
+	"${FILESDIR}/${PN}-2.1-qt55.patch"
+)
+
+src_configure() {
+	if use qt5; then
+		eqmake5 "${PN}.pro"
+	else
+		eqmake4 "${PN}.pro"
+	fi
+}
+
+src_install() {
+	dodoc Changelog
+	dobin bin/${PN}
+	doicon packages/${PN}.png
+	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
+}
diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild
index 490e597ae57a..72692e094227 100644
--- a/media-sound/lame/lame-3.99.5-r1.ebuild
+++ b/media-sound/lame/lame-3.99.5-r1.ebuild
@@ -14,13 +14,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug cpu_flags_x86_mmx mp3rtp sndfile static-libs"
+IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
 # libmp3lame for multilib and these deps apply to the lame frontend executable.
 RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-	sndfile? ( >=media-libs/libsndfile-1.0.2 )
+	frontend? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		sndfile? ( >=media-libs/libsndfile-1.0.2 )
+	)
 	abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -49,7 +51,7 @@ multilib_src_configure() {
 
 	# Only build the frontend for the default ABI.
 	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
-		myconf+=" $(use_enable mp3rtp)"
+		myconf+=" $(use_enable mp3rtp) $(use_enable frontend)"
 		use sndfile && myconf+=" --with-fileio=sndfile"
 	else
 		myconf+=" --disable-frontend --disable-mp3rtp"
diff --git a/media-sound/lame/metadata.xml b/media-sound/lame/metadata.xml
index 60f21f1ade8b..433fd3db8ae4 100644
--- a/media-sound/lame/metadata.xml
+++ b/media-sound/lame/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Sound project</name>
   </maintainer>
   <use>
+    <flag name="frontend">Build and install the 'lame' executable frontend to lame libraries.</flag>
     <flag name="mp3rtp">Build the mp3-to-RTP streaming utility. **UNSUPPORTED**</flag>
   </use>
   <upstream>
diff --git a/media-sound/mimd/Manifest b/media-sound/mimd/Manifest
deleted file mode 100644
index 79e04b9612c3..000000000000
--- a/media-sound/mimd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mimd-0.30.1.tar.bz2 16853 SHA256 c1ee0c19163b412dede0cf7d302050931498f2d34fe2e1e9c580d609c8c91924 SHA512 7a166e4672ca0619fed49f7505e232b15e94092d0371b477ec60b13c1202e334aade297f915784cf0ff742e44cf9eb1b47d641d8c18b4e4474a4c739b0b9568a WHIRLPOOL 78b009367dec3e90c14b840bb8f80eba563cae0df3b2784dae7ea903d706d5424b6a5e1e1c13263477ee13b9f1a15072e55590d30660432f6d56e35bdd04fb19
diff --git a/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch b/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch
deleted file mode 100644
index 96b94095e349..000000000000
--- a/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: mimd-0.30.1/Makefile.in
-===================================================================
---- mimd-0.30.1.orig/Makefile.in
-+++ mimd-0.30.1/Makefile.in
-@@ -1,10 +1,12 @@
- LIVEDIR=@LIVEDIR@
--XERCESDIR=@XERCESDIR@
-+#XERCESDIR=@XERCESDIR@
-+XERCESDIR=/usr
- PREFIX=@PREFIX@
- 
--CXXFLAGS += -I$(LIVEDIR)/BasicUsageEnvironment/include -I$(LIVEDIR)/groupsock/include -I$(LIVEDIR)/liveMedia/include -I$(LIVEDIR)/UsageEnvironment/include -I$(XERCESDIR)/include -Isrc/include -DVERSION="0301"
-+#CXXFLAGS += -I$(LIVEDIR)/BasicUsageEnvironment/include -I$(LIVEDIR)/groupsock/include -I$(LIVEDIR)/liveMedia/include -I$(LIVEDIR)/UsageEnvironment/include -I$(XERCESDIR)/include -Isrc/include -DVERSION="0301"
-+CPPFLAGS += -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -Isrc/include -DVERSION="0301"
- 
--LDFLAGS=-L$(LIVEDIR)/BasicUsageEnvironment -L$(LIVEDIR)/groupsock -L$(LIVEDIR)/liveMedia -L$(LIVEDIR)/UsageEnvironment -L$(XERCESDIR)/lib
-+#LDFLAGS=-L$(LIVEDIR)/BasicUsageEnvironment -L$(LIVEDIR)/groupsock -L$(LIVEDIR)/liveMedia -L$(LIVEDIR)/UsageEnvironment -L$(XERCESDIR)/lib
- 
- LDLIBS=-lxerces-c -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock -lliveMedia -lpthread
- 
-@@ -32,7 +34,7 @@ OBJS= src/MediaStreamer.o\
-       src/parser.o
- 
- mimd: $(OBJS)
--	g++ -o mimd $(LDFLAGS) $(OBJS) $(LDLIBS)
-+	$(CXX) -o mimd $(LDFLAGS) $(OBJS) $(LDLIBS)
- 
- install: mimd
- 	mkdir -p $(PREFIX)/doc $(PREFIX)/etc $(PREFIX)/bin $(PREFIX)/man/man1 > /dev/null
diff --git a/media-sound/mimd/files/mimd-0.30.1-fortify_sources.patch b/media-sound/mimd/files/mimd-0.30.1-fortify_sources.patch
deleted file mode 100644
index 74a1e76560b1..000000000000
--- a/media-sound/mimd/files/mimd-0.30.1-fortify_sources.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mimd-0.30.1.orig/src/parser.cpp mimd-0.30.1/src/parser.cpp
---- mimd-0.30.1.orig/src/parser.cpp	2003-07-10 21:35:52.000000000 +0300
-+++ mimd-0.30.1/src/parser.cpp	2009-06-06 19:49:56.000000000 +0300
-@@ -37,7 +37,7 @@
-       int fd;
- 
-       // Check to see if we can make a scratch file in the directory
--      if((fd=open(tf.c_str(), O_RDWR|O_CREAT|O_TRUNC)) == -1) 
-+      if((fd=open(tf.c_str(), O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR)) == -1) 
-          return false;
- 
-       // Close and delete the test file
diff --git a/media-sound/mimd/metadata.xml b/media-sound/mimd/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/mimd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/mimd/mimd-0.30.1.ebuild b/media-sound/mimd/mimd-0.30.1.ebuild
deleted file mode 100644
index ca7a3efe069b..000000000000
--- a/media-sound/mimd/mimd-0.30.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Multicast streaming server for MPEG1/2 and MP3 files"
-HOMEPAGE="http://darkwing.uoregon.edu/~tkay/mim.html"
-SRC_URI="http://darkwing.uoregon.edu/~tkay/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-RDEPEND=">=media-plugins/live-2006.12.08
-	dev-libs/xerces-c"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}+live-2006.12.08.patch \
-		"${FILESDIR}"/${P}-fortify_sources.patch
-	cp -f Makefile.in Makefile
-}
-
-src_configure() { :; }
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin mimd || die "dobin failed"
-	dodoc doc/mimd.pod
-
-	if [ -x /usr/bin/pod2html ]; then
-		pod2html < doc/mimd.pod > doc/mimd.html
-		dohtml doc/mimd.html
-	fi
-
-	if [ -x /usr/bin/pod2man ]; then
-		pod2man < doc/mimd.pod > doc/mimd.1
-		doman doc/mimd.1
-	fi
-
-	insinto /usr/share/mimd
-	doins etc/mimd.dtd etc/sample.xml
-}
-
-pkg_postinst() {
-	elog "Please read the documentation (mimd.html or man mimd) for "
-	elog "instructions on configuring mimd. The DTD for the configuration "
-	elog "files is in /usr/share/mimd/mimd.dtd, along with a sample "
-	elog "configuration file (/usr/share/mimd/sample.xml)."
-	ewarn "NOTE: You must have ip multicasting enabled in the kernel for this"
-	ewarn "daemon to work properly."
-}
diff --git a/media-sound/miniaudicle/Manifest b/media-sound/miniaudicle/Manifest
deleted file mode 100644
index 955f93152e70..000000000000
--- a/media-sound/miniaudicle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST miniAudicle-0.1.3.8.tgz 2253821 SHA256 adfbd244a7963e646c466f70111fee4ecf32eee500c4c9a33ca9b52387631cd6 SHA512 6d2b9596174f1f6aa2f246cf880b920f9855b93e57b437e355acc880cd2980b8aa21fa2ce870230c9e0ca7403bd43ce865f79b7fa188e8fea906aac24ce3e16d WHIRLPOOL ff3d7a3ad66fa31339e10637ae96b1c7fbe378cfbe07a2e1572a738c2d22298e88913c7a0a383d90d209817a53422a21100bfca72f18e0c2f53981d22ddd7d2a
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
deleted file mode 100644
index 7b1bc9c06d3e..000000000000
--- a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff -ur miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp
---- miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp	2009-06-27 21:15:00.000000000 -0400
-@@ -47,6 +47,7 @@
- #else
-   #include <unistd.h>
-   #include <pthread.h>
-+  #include <algorithm>
- #endif
- 
- 
-diff -ur miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp
---- miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp	2009-06-27 21:15:00.000000000 -0400
-@@ -50,6 +50,7 @@
- #include "chuck_errmsg.h"
- #include "digiio_rtaudio.h"
- #include <stdio.h>
-+#include <climits>
- // old
- // #include "RtAudio.h"
- // #include <iostream>
-diff -ur miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp
---- miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp	2009-06-27 21:15:00.000000000 -0400
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <time.h>
- #include <float.h>
-+#include <climits>
- 
- 
- 
-diff -ur miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp
---- miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp	2009-06-27 21:11:20.000000000 -0400
-+++ miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp	2009-06-27 21:15:31.000000000 -0400
-@@ -2587,7 +2587,7 @@
-         // open it
-         SF_INFO info;
-         info.format = 0;
--        char * format = strrchr( filename, '.');
-+        const char * format = strrchr( filename, '.');
-         if( format && strcmp( format, ".raw" ) == 0 )
-         { 
-             fprintf( stderr, "[chuck](via SndBuf) %s :: type is '.raw'...\n    assuming 16 bit signed mono (PCM)\n", filename );
-diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp miniAudicle-0.1.3.8/chuck/src/util_hid.cpp
---- miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/chuck/src/util_hid.cpp	2009-06-27 21:15:00.000000000 -0400
-@@ -37,6 +37,7 @@
- 
- #include <vector>
- #include <map>
-+#include <climits>
- 
- using namespace std;
- 
-diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp
---- miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp	2009-06-27 21:15:00.000000000 -0400
-@@ -56,6 +56,7 @@
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <algorithm>
- #endif
- 
- #if defined(__MACOSX_CORE__)
-diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_string.h miniAudicle-0.1.3.8/chuck/src/util_string.h
---- miniAudicle-0.1.3.8-orig/chuck/src/util_string.h	2009-06-27 21:11:20.000000000 -0400
-+++ miniAudicle-0.1.3.8/chuck/src/util_string.h	2009-06-27 21:16:12.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "chuck_def.h"
- #include <string>
- #include <vector>
-+#include <cstdio>
- 
- 
- // itoa
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm miniAudicle-0.1.3.8/wxw/icons/add.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/add.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * add_xpm[] = {
-+static const char * add_xpm[] = {
- "32 32 47 1",
- " 	c None",
- ".	c #C3F8BE",
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * led_blue_xpm[] = {
-+static const char * led_blue_xpm[] = {
- "28 28 431 2",
- "  	c None",
- ". 	c #949394",
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm miniAudicle-0.1.3.8/wxw/icons/led-green.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/led-green.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * led_green_xpm[] = {
-+static const char * led_green_xpm[] = {
- "28 28 443 2",
- "  	c None",
- ". 	c #959696",
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm miniAudicle-0.1.3.8/wxw/icons/led-off.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/led-off.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * led_off_xpm[] = {
-+static const char * led_off_xpm[] = {
- "28 28 143 2",
- "  	c None",
- ". 	c #959595",
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm miniAudicle-0.1.3.8/wxw/icons/led-red.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/led-red.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * led_red_xpm[] = {
-+static const char * led_red_xpm[] = {
- "28 28 434 2",
- "  	c None",
- ". 	c #959594",
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * miniAudicle_xpm[] = {
-+static const char * miniAudicle_xpm[] = {
- "128 128 1543 2",
- "  	c None",
- ". 	c #FF9D20",
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm miniAudicle-0.1.3.8/wxw/icons/remove.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/remove.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * remove_xpm[] = {
-+static const char * remove_xpm[] = {
- "32 32 177 2",
- "  	c None",
- ". 	c #FFB6B5",
-diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm miniAudicle-0.1.3.8/wxw/icons/replace.xpm
---- miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm	2009-06-27 21:15:03.000000000 -0400
-+++ miniAudicle-0.1.3.8/wxw/icons/replace.xpm	2009-06-27 21:15:00.000000000 -0400
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * replace_xpm[] = {
-+static const char * replace_xpm[] = {
- "32 32 114 2",
- "  	c None",
- ". 	c #5764FF",
-
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-hid-smc.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-hid-smc.patch
deleted file mode 100644
index de1265511a0b..000000000000
--- a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-hid-smc.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -ru miniAudicle-0.1.3.8~/chuck-1.2.1.1/src/util_hid.cpp miniAudicle-0.1.3.8/chuck-1.2.1.1/src/util_hid.cpp
---- miniAudicle-0.1.3.8~/chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:46:07.000000000 +0100
-+++ miniAudicle-0.1.3.8/chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:46:36.000000000 +0100
-@@ -7175,14 +7175,139 @@
- int WiiRemote_send( const HidMsg * msg ){ return -1; }
- const char * WiiRemote_name( int wr ){ return NULL; }
- 
-+#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
-+#define TILTSENSOR_BUF_LEN 32
-+
-+static struct t_TiltSensor_data
-+{
-+	union
-+	{
-+		struct t_macbook
-+		{
-+			int x;
-+			int y;
-+			int z;
-+		} macbook;
-+	} data;
-+	int dataType;
-+	int detected;
-+	int refcount;
-+
-+	t_TiltSensor_data()
-+	{
-+		refcount = 0;
-+		dataType = -1;
-+		detected = 0;
-+	}
-+
-+} TiltSensor_data;
-+enum
-+{
-+	linuxAppleSMCMacBookDataType
-+};
-+static int TiltSensor_detect()
-+{
-+	int fd;
-+
-+	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+	if (fd > 0)
-+	{
-+		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
-+		TiltSensor_data.detected = 1;
-+		close(fd);
-+		return 1;
-+	}
-+
-+	TiltSensor_data.detected = -1;
-+
-+	return 0;
-+}
-+
-+static int TiltSensor_do_read()
-+{
-+
-+	switch(TiltSensor_data.dataType)
-+	{
-+		case linuxAppleSMCMacBookDataType:
-+			char buf[TILTSENSOR_BUF_LEN];
-+			int ret, fd;
-+			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+			if (fd < 0) {
-+				return -1;
-+			}
-+			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
-+			if (ret < 0) {
-+				close(fd);
-+				return -1;
-+			}
-+			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
-+				close(fd);
-+				return -1;
-+			}
-+			close(fd);
-+			break;
-+		default:
-+			return 0;
-+	}
-+	return 1;
-+}
- void TiltSensor_init(){}
- void TiltSensor_quit(){}
- void TiltSensor_probe(){}
--int TiltSensor_count(){ return 0; }
--int TiltSensor_open( int ts ){ return -1; }
--int TiltSensor_close( int ts ){ return -1; }
--int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
--const char * TiltSensor_name( int ts ){ return NULL; }
-+int TiltSensor_count()
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return 0;
-+	else if(TiltSensor_data.detected == 1)
-+		return 1;
-+
-+	return 0;
-+}
-+int TiltSensor_open( int ts )
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	TiltSensor_data.refcount++;
-+
-+	return 0;
-+}
-+int TiltSensor_close( int ts )
-+{
-+	TiltSensor_data.refcount--;
-+
-+	return 0;
-+}
-+int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
-+{
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	if(!TiltSensor_do_read())
-+		return -1;
-+
-+	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
-+	{
-+		msg->idata[0] = TiltSensor_data.data.macbook.x;
-+		msg->idata[1] = TiltSensor_data.data.macbook.y;
-+		msg->idata[2] = TiltSensor_data.data.macbook.z;
-+	}
-+
-+	return 0;
-+}
-+const char * TiltSensor_name( int ts )
-+{
-+	return "Apple Sudden Motion Sensor";
-+}
- 
- 
- #endif
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch
deleted file mode 100644
index 926788c6f20c..000000000000
--- a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: miniAudicle-0.1.3.8/wxw/mAPreferencesWindow.cpp
-===================================================================
---- miniAudicle-0.1.3.8.orig/wxw/mAPreferencesWindow.cpp
-+++ miniAudicle-0.1.3.8/wxw/mAPreferencesWindow.cpp
-@@ -828,7 +828,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
-     selected_item = audio_output->GetSelection();
-     if( selected_item != wxNOT_FOUND )
-     {
--        int dac = ( int ) audio_output->GetClientData( selected_item );
-+        int dac = ( intptr_t ) audio_output->GetClientData( selected_item );
-         config->Write( mAPreferencesAudioOutput, dac );
-         ma->set_dac( dac );
-     }
-@@ -837,7 +837,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
-     selected_item = audio_input->GetSelection();
-     if( selected_item != wxNOT_FOUND )
-     {
--        int adc = ( int ) audio_input->GetClientData( selected_item );
-+        int adc = ( intptr_t ) audio_input->GetClientData( selected_item );
-         config->Write( mAPreferencesAudioInput, adc );
-         ma->set_adc( adc );
-     }
-@@ -846,7 +846,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
-     selected_item = output_channels->GetSelection();
-     if( selected_item != wxNOT_FOUND )
-     {
--        int num_outputs = ( int ) output_channels->GetClientData( selected_item );
-+        int num_outputs = ( intptr_t ) output_channels->GetClientData( selected_item );
-         config->Write( mAPreferencesOutputChannels, num_outputs );
-         ma->set_num_outputs( num_outputs );
-     }
-@@ -855,7 +855,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
-     selected_item = input_channels->GetSelection();
-     if( selected_item != wxNOT_FOUND )
-     {
--        int num_inputs = ( int ) input_channels->GetClientData( selected_item );
-+        int num_inputs = ( intptr_t ) input_channels->GetClientData( selected_item );
-         config->Write( mAPreferencesInputChannels, num_inputs );
-         ma->set_num_inputs( num_inputs );
-     }
-@@ -864,7 +864,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
-     selected_item = sample_rate->GetSelection();
-     if( selected_item != wxNOT_FOUND )
-     {
--        int _sample_rate = ( int ) sample_rate->GetClientData( selected_item );
-+        int _sample_rate = ( intptr_t ) sample_rate->GetClientData( selected_item );
-         config->Write( mAPreferencesSampleRate, _sample_rate );
-         ma->set_sample_rate( _sample_rate );
-     }
-@@ -873,7 +873,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
-     selected_item = buffer_size->GetSelection();
-     if( selected_item != wxNOT_FOUND )
-     {
--        int _buffer_size = ( int ) buffer_size->GetClientData( selected_item );
-+        int _buffer_size = ( intptr_t ) buffer_size->GetClientData( selected_item );
-         config->Write( mAPreferencesBufferSize, _buffer_size );
-         ma->set_buffer_size( _buffer_size );
-     }
diff --git a/media-sound/miniaudicle/metadata.xml b/media-sound/miniaudicle/metadata.xml
deleted file mode 100644
index 9655fb865866..000000000000
--- a/media-sound/miniaudicle/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-		a light-weight integrated development environment for the ChucK digital
-		audio programming language
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild
deleted file mode 100644
index fc561c4adb02..000000000000
--- a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER=2.8
-inherit eutils toolchain-funcs flag-o-matic wxwidgets
-
-MY_P="${P/a/A}"
-
-DESCRIPTION="integrated development + performance environment for chuck"
-HOMEPAGE="http://audicle.cs.princeton.edu/mini/"
-SRC_URI="http://audicle.cs.princeton.edu/mini/release/files/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack oss"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile
-	>=x11-libs/gtk+-2.10:2
-	x11-libs/wxGTK:2.8[X]
-	app-eselect/eselect-miniaudicle"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="|| ( alsa jack oss )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-hid-smc.patch" \
-		"${FILESDIR}/${P}-gcc44.patch" \
-		"${FILESDIR}/${P}-void-to-int-cast.patch"
-
-	sed -i -e 's/make -C/#make -C/' \
-		-e 's/g++/$(CXX)/' \
-		-e 's/-O3 -c/-c $(CFLAGS)/' \
-		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		makefile.* || die "sed failed"
-
-	# Respect LDFLAGS in bundled media-sound/chuck
-	# prevent underlinking with pthreads library
-	sed -i -e 's/$(LIBS)/$(LDFLAGS) $(LIBS) -lpthread/' \
-		chuck/src/makefile.* || die "sed failed"
-
-	epatch_user
-}
-
-compile_backend() {
-	local backend="$1"
-	einfo "Compiling against ${backend}"
-	cd "${S}/chuck/src"
-	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)"
-	cd "${S}"
-	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)"
-	mv wxw/miniAudicle{,-${backend}}
-	emake -f "makefile.${backend}" clean
-	cd "${S}/chuck/src"
-	emake -f "makefile.${backend}" clean
-}
-
-src_compile() {
-	# when compiled with -march=athlon or -march=athlon-xp
-	# miniaudicle crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-	use oss && compile_backend oss
-}
-
-src_install() {
-	use jack && dobin wxw/miniAudicle-jack
-	use alsa && dobin wxw/miniAudicle-alsa
-	use oss && dobin wxw/miniAudicle-oss
-	dodoc BUGS README.linux VERSIONS
-}
-
-pkg_postinst() {
-	elog "miniAudicle now can use many audio engines, so you can specify audio engine"
-	elog "with miniAudicle-{jack,alsa,oss}"
-	elog "Or you can use 'eselect miniaudicle' to set the audio engine"
-
-	einfo "Calling eselect miniaudicle update..."
-	eselect miniaudicle update --if-unset
-}
diff --git a/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
new file mode 100644
index 000000000000..9ade09033976
--- /dev/null
+++ b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
@@ -0,0 +1,20 @@
+Patch for building with latest FFmpeg 3.0
+https://bugs.gentoo.org/show_bug.cgi?id=575328
+
+Inspired by
+https://raw.githubusercontent.com/Homebrew/patches/1282e60/moc/moc-2.5.0.diff
+
+We can unconditionally depend on the existence of 'channel_layout.h',
+as even the oldest version in the Gentoo tree contains this header.
+
+--- moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -66,7 +66,7 @@
+ GCC_DIAG_ON(deprecated-declarations)
+ #include <libavutil/mathematics.h>
+ #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ #endif
+ 
+ /* FFmpeg also likes common names, without that, our common.h and log.h
diff --git a/media-sound/moc/moc-2.6_alpha1-r1.ebuild b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
index a5b24cdb1e7a..3901a156b09d 100644
--- a/media-sound/moc/moc-2.6_alpha1-r1.ebuild
+++ b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-ncurses-underlinking.patch"
+	"${FILESDIR}/${P}-audioconvert.h.patch"
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/media-sound/mp3diags/Manifest b/media-sound/mp3diags/Manifest
index 3cea368e94d6..02b913ad13f1 100644
--- a/media-sound/mp3diags/Manifest
+++ b/media-sound/mp3diags/Manifest
@@ -1,3 +1 @@
-DIST MP3Diags-1.0.12.079.tar.gz 959757 SHA256 ab06936658d857b55be473544094c6d6dbd8a8ca9593af90ad48e8f59163fe0f SHA512 fc4b9d23aeb3379bdc65fcdb44c8d9f4ff666270e5cb060980bd1db9a180eca4997fdb8f5d5f8df257e02e6e4fdeeef345f701f38637b7c1fa2680a9acb6f054 WHIRLPOOL 6ed36be2b5d083ffe92f9c80171d68ebd5a996b7b15ad78ffd0d06ab1023c9d22622f13f5f31338ded030f0c3ecfa468bf3dfd454fd5e1ffe2b510ffe8e5ada7
-DIST MP3Diags-1.2.01.tar.gz 1221991 SHA256 ffec777929dfa6c0f42094349438b02babc1a1b5fe3eb6da7362e795315272a1 SHA512 59f86d01ec8a8686a709d683e72f1f36a42da1b43a6bbd55dc4e4814cdcf96b228987d69175d324e4f2aaf6010be5dced67b08cc8013a1f087dd1b43e96fe6eb WHIRLPOOL 5939cb46f2ee53aefb09343d6a7c836285ada870e98641ee61e22645ae123ccb6e84ab9413231948d83d0b701306c0aa4ca085cc2acaf876cc213698b7a53962
 DIST MP3Diags-1.2.02.tar.gz 1220039 SHA256 17c4dc2b40a855f39ef8dbac41dacc5c309d46043c969dcf6319d76103341fcd SHA512 51498646ad3c9a19aeb0bcbf8cd280de75a24eb252790cc71d1eba433b986bbc58d4198d8bdfc0339dd6845ddfd966dd482f991b976e2da8f49e9d4e4f0464d0 WHIRLPOOL f7a8fd855de147bfd26076e3dc1242b5c7d5819621626b8efe42dcb19b3b86042deb53439fec598fe20be29e35dc0c33ef5a251a4ed55478cda1f8f3ed915140
diff --git a/media-sound/mp3diags/mp3diags-1.0.12.079.ebuild b/media-sound/mp3diags/mp3diags-1.0.12.079.ebuild
deleted file mode 100644
index 376bebcd53cb..000000000000
--- a/media-sound/mp3diags/mp3diags-1.0.12.079.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-MY_PN=${PN/mp3d/MP3D}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
-HOMEPAGE="http://mp3diags.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.37
-	sys-libs/zlib
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:4"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dobin bin/${MY_PN}
-	dodoc changelog.txt
-
-	local size
-	for size in 16 22 24 32 36 40 48; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins desktop/${MY_PN}${size}.png ${MY_PN}.png
-	done
-	domenu desktop/${MY_PN}.desktop
-}
diff --git a/media-sound/mp3diags/mp3diags-1.2.01.ebuild b/media-sound/mp3diags/mp3diags-1.2.01.ebuild
deleted file mode 100644
index ef846b2eec2a..000000000000
--- a/media-sound/mp3diags/mp3diags-1.2.01.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 eutils qt4-r2
-
-MY_PN=MP3Diags
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
-HOMEPAGE="http://mp3diags.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/boost-1.37
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:4
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dobin bin/${MY_PN}
-	dodoc changelog.txt
-
-	local size
-	for size in 16 22 24 32 36 40 48; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins desktop/${MY_PN}${size}.png ${MY_PN}.png
-	done
-	domenu desktop/${MY_PN}.desktop
-}
diff --git a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
index 3228509d61d7..573a5fe53a9d 100644
--- a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
+++ b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/mp3diags/mp3diags-1.2.02.ebuild b/media-sound/mp3diags/mp3diags-1.2.02.ebuild
deleted file mode 100644
index 04e663fbe268..000000000000
--- a/media-sound/mp3diags/mp3diags-1.2.02.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 eutils qt4-r2
-
-MY_PN=MP3Diags
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
-HOMEPAGE="http://mp3diags.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/boost-1.37
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:4
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dobin bin/${MY_PN}
-	dodoc changelog.txt
-
-	local size
-	for size in 16 22 24 32 36 40 48; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins desktop/${MY_PN}${size}.png ${MY_PN}.png
-	done
-	domenu desktop/${MY_PN}.desktop
-}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 5c9b596553e2..6ce69d2bdb26 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,4 @@
 DIST mpg123-1.18.1.tar.bz2 853423 SHA256 bc6d384f7e038f2458cb05a4d175325e5cb25e0aed441d7b02960e8ec186652d SHA512 973af5e9de67c489dd609d18234ba4118a635d63bb6f1b919f9b89f57adc4bddca9a5bf41a47f1da588f14c84ed130d8ac8e674a081f06d35f5ace85924a70b5 WHIRLPOOL 4959edd4002f021092fffb4c84d864c612b2692b8d9bfa5dd3c16ae7bcdbcf179c20f3af6609260646cb71305fe9831c7f080678783aed1af187251a1d13970c
-DIST mpg123-1.22.2.tar.bz2 870063 SHA256 6d1e2487777114ba8a73c543f355cacfa2055646724000fc195ac9e64c843744 SHA512 503fb42ec6cf69ded895adfb81fd0e05d02f34b5e4e35a0eeaa041c5bc855d26c02a9c7103735e00ab2155b201128c4e0b1e1efed87a183c6e66b66b5a887236 WHIRLPOOL 590076210ef7459a57d1d075dfc525f11e7409ae96f953b97a001969b2ab5afd36ad55c18199a61623a93108b9890f27d232b1de850981b199c155701705147a
 DIST mpg123-1.22.4.tar.bz2 870889 SHA256 5069e02e50138600f10cc5f7674e44e9bf6f1930af81d0e1d2f869b3c0ee40d2 SHA512 d8552b3522fa58647cee7c43227737993851452a15dc6d3ae6948c6c62d4a8f6064e2b284f170413aa3f805a3f3e1a6f1faac7d19daddd25c6790863e4925212 WHIRLPOOL 079ac4dacbee6bbfb915a84c1f2c5738f1edff69b75a7d1c1e6bc9b323c2e1d574985c91339c5ecab8cc0de93d72fc95c8c278676a92511da0c23d210d64a0dd
+DIST mpg123-1.23.1.tar.bz2 890474 SHA256 e26b20ba0801edcd12da0d5120caa7b47c0dedd2804b648d87c1bf24155e5506 SHA512 d4bac68f52a86b8e2aa72e34b09fe2de8c776676cf67e61cca678c136808a12b28ee1b468874f86860290f643d32140818d0bfda926e66b02207cae837e674b1 WHIRLPOOL a588a029f9bf0bcae203078dd28164f519aff133ac4661d742a58e85cce09260d5fbcc8696baff2207f38c88b1fdf294472c08922b5bebc461ffad6255059e42
+DIST mpg123-1.23.2.tar.bz2 891247 SHA256 b5678bfe0cd1c6d2e29561d50bbef6bbc14ed055404453d18b6f4044c7b0a7ae SHA512 a5d9f6c7d89d4141583cd4dec08dee20eed805167e19dbaa36fa201e294440f50f1042a3a13374b75fc42913d3df0b73885da76acda2396a7c23185684b1b5f2 WHIRLPOOL ea5e6f8446e5b3769abe89605c4a195b06aca4b14e7aa4e8b1d914016be24b68b726f3cbcbee0d126cfdce158f8b82b9fe815656c067eead21d0ec0fbaee0dd1
diff --git a/media-sound/mpg123/mpg123-1.22.2.ebuild b/media-sound/mpg123/mpg123-1.22.2.ebuild
deleted file mode 100644
index 930d58607203..000000000000
--- a/media-sound/mpg123/mpg123-1.22.2.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
-inherit eutils toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="http://www.mpg123.org/"
-SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="app-eselect/eselect-mpg123
-	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio="${_audio} ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	elif use x86-macos ; then
-		# ASM doesn't work quite as expected with the Darwin linker
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=""
-	multilib_is_native_abi || myconf="${myconf} --disable-modules"
-
-	ECONF_SOURCE="${S}" econf \
-		--with-optimization=0 \
-		--with-audio="${_audio}" \
-		--with-default-audio=${_output} \
-		--with-cpu=${_cpu} \
-		--enable-network \
-		$(use_enable ipv6) \
-		--enable-int-quality=$(usex int-quality) \
-		${myconf}
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.23.1.ebuild b/media-sound/mpg123/mpg123-1.23.1.ebuild
new file mode 100644
index 000000000000..253e153e7f84
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.23.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-eselect/eselect-mpg123
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mpg123/mpg123-1.23.2.ebuild b/media-sound/mpg123/mpg123-1.23.2.ebuild
new file mode 100644
index 000000000000..253e153e7f84
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.23.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-eselect/eselect-mpg123
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
deleted file mode 100644
index 97fefffcc38c..000000000000
--- a/media-sound/muine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST muine-0.8.11.tar.bz2 647177 SHA256 fac70bd9ab8a3c7c48c1f48d10f06080f6b5a42ce32cce21a6ab472cb178ecd4 SHA512 13063c1057cc4a5fb9c2cfca6249e3014415cbfa735a89f1ae411705412e379f1252789787aaca5e11f844fcd8c31a319c408c73539ffe173bc03985b3606d79 WHIRLPOOL c1bbe48293d23f922bd34a3b613942d96ae33d419ee7220b9c2dfe33bf769b59f5fe8984ac6549e9c9a5a16c53460c06db3366fabbd2df9e3e4a7996cb161da0
diff --git a/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch b/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch
deleted file mode 100644
index fa4b6d8ca2d8..000000000000
--- a/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 86e885f1f17db2ec3caa31b0ff7955dfe2b4e543 Mon Sep 17 00:00:00 2001
-From: daniel g. siegel <dgsiegel@gnome.org>
-Date: Tue, 27 Apr 2010 18:22:57 +0000
-Subject: replace some deprecated gtk functions
-
-use gtk_widget_has_focus instead of GTK_WIDGET_HAS_FOCUS and
-gtk_widget_get_state instead of GTK_WIDGET_STATE
----
-diff --git a/libmuine/rb-cell-renderer-pixbuf.c b/libmuine/rb-cell-renderer-pixbuf.c
-index 42cff41..abf6958 100644
---- a/libmuine/rb-cell-renderer-pixbuf.c
-+++ b/libmuine/rb-cell-renderer-pixbuf.c
-@@ -295,14 +295,14 @@ rb_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
- 
-   if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
-     {
--      if (GTK_WIDGET_HAS_FOCUS (widget))
-+      if (gtk_widget_has_focus (widget))
-         state = GTK_STATE_SELECTED;
-       else
-         state = GTK_STATE_ACTIVE;
-     }
-   else
-     {
--      if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
-+      if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
-         state = GTK_STATE_INSENSITIVE;
-       else
-         state = GTK_STATE_NORMAL;
---
-cgit v0.8.3.1
diff --git a/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch b/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch
deleted file mode 100644
index 5bce0ca765c0..000000000000
--- a/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d4dd66d73885db1b2aea2a267197413559bed5bc Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Wed, 16 Sep 2009 21:30:06 +0000
-Subject: Fix multimedia key support for >=Gnome-2.22
-
----
-diff --git a/src/GnomeMMKeys.cs b/src/GnomeMMKeys.cs
-index dd99718..af5419a 100644
---- a/src/GnomeMMKeys.cs
-+++ b/src/GnomeMMKeys.cs
-@@ -37,11 +37,11 @@ namespace Muine
-     public class GnomeMMKeys : IDisposable
-     {
-         private const string BusName = "org.gnome.SettingsDaemon";
--        private const string ObjectPath = "/org/gnome/SettingsDaemon";
-+        private const string ObjectPath = "/org/gnome/SettingsDaemon/MediaKeys";
-         
-         private delegate void MediaPlayerKeyPressedHandler(string application, string key);
-         
--        [Interface("org.gnome.SettingsDaemon")]
-+        [Interface("org.gnome.SettingsDaemon.MediaKeys")]
-         private interface ISettingsDaemon
-         {
-             void GrabMediaPlayerKeys(string application, uint time);
---
-cgit v0.8.3.1
diff --git a/media-sound/muine/metadata.xml b/media-sound/muine/metadata.xml
deleted file mode 100644
index 084c4e396f06..000000000000
--- a/media-sound/muine/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-<maintainer type="project">
-		<email>gstreamer@gentoo.org</email>
-		<name>GStreamer package maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-sound/muine/muine-0.8.11-r3.ebuild b/media-sound/muine/muine-0.8.11-r3.ebuild
deleted file mode 100644
index f26d8faff348..000000000000
--- a/media-sound/muine/muine-0.8.11-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit gnome2 mono-env eutils multilib
-
-DESCRIPTION="A music player for GNOME"
-HOMEPAGE="http://muine.gooeylinux.org/"
-SRC_URI="mirror://gnome/sources/muine/0.8/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="flac mad vorbis"
-
-RDEPEND="
-	x11-themes/gnome-icon-theme
-	>=dev-lang/mono-2
-	>=x11-libs/gtk+-2.6:2
-	>=dev-dotnet/gtk-sharp-2.12.9:2
-	>=dev-dotnet/glade-sharp-2.12.6:2
-	>=dev-dotnet/gnome-sharp-2.6:2
-	>=dev-dotnet/gconf-sharp-2.6:2
-	>=dev-dotnet/gnomevfs-sharp-2.6:2
-	>=dev-dotnet/ndesk-dbus-0.4
-	>=dev-dotnet/ndesk-dbus-glib-0.3
-	>=dev-dotnet/taglib-sharp-2.0.3
-	sys-libs/gdbm
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-good:0.10
-	media-plugins/gst-plugins-gconf:0.10
-	media-plugins/gst-plugins-gnomevfs:0.10
-	flac? ( media-plugins/gst-plugins-flac:0.10 )
-	mad? ( media-plugins/gst-plugins-mad:0.10 )
-	vorbis? (
-		media-plugins/gst-plugins-ogg:0.10
-		media-plugins/gst-plugins-vorbis:0.10
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/scrollkeeper
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.29
-"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS PLUGINS README TODO"
-
-	# Fix multimedia key support for >=Gnome-2.22
-	epatch "${FILESDIR}/${P}-multimedia-keys.patch"
-
-	# Replace some deprecated gtk functions
-	epatch "${FILESDIR}/${P}-drop-deprecated.patch"
-
-	# Update icons, upstream bug #623480
-	sed "s:stock_timer:list-add:g" -i src/AddWindow.cs src/StockIcons.cs || die
-	sed "s:stock_music-library:folder-music:g" -i data/glade/PlaylistWindow.glade \
-		src/Actions.cs src/StockIcons.cs || die
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_install() {
-	gnome2_src_install
-	insinto /usr/$(get_libdir)/${PN}/plugins
-	doins "${S}"/plugins/TrayIcon.dll
-}
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index 971fe7e25bbf..32a8c95ecdfb 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,2 +1 @@
-DIST musique-1.3.tar.gz 399750 SHA256 401643ad9c750270a89d431806044c626dee3fe7ebc14d0ac72917197cdd0592 SHA512 eb197c315b77d4053960c8c18d012635f957eb9ae89bb8b576f938013db43f78ab0d5a0fe0d46fb32cc9f398f9d7f96a37cf975b2f192a6cbc3dd294c4cad279 WHIRLPOOL b4a48d2e8d57d3cfb6cb3d705b4cccbbaf9ae642f16864bb9c61ece02e658b941472a2767d82218c5bf36031af52354fd2868014d8af0a4b2bb71abdf96f3e6e
 DIST musique-1.4.tar.gz 390031 SHA256 08dfb4201aa0edc4b3fe4ef7788e618f754c3921f3a7c1cdce40ef3999760670 SHA512 0ecc7cf1038880fc302602967cd7563641310cbe19fe2394e8ce2c03562f5e336bfc76e1ea18b026c2602b11cfe278a106bc9b3b2dd625d7e70db0da57985a68 WHIRLPOOL 8185dcbe0559b34d3f8e7b93498312c375412faa83eed01acccc1faaabfb979672cb78969d2965251aa63bd2e38477654575e52d8a760fe186e39398efc08e36
diff --git a/media-sound/musique/files/musique-1.1-gcc47.patch b/media-sound/musique/files/musique-1.1-gcc47.patch
deleted file mode 100644
index 6350578103bb..000000000000
--- a/media-sound/musique/files/musique-1.1-gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=422665
-Index: musique/src/qtsingleapplication/qtlocalpeer.cpp
-===================================================================
---- musique.orig/src/qtsingleapplication/qtlocalpeer.cpp
-+++ musique/src/qtsingleapplication/qtlocalpeer.cpp
-@@ -57,6 +57,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionI
- static PProcessIdToSessionId pProcessIdToSessionId = 0;
- #endif
- #if defined(Q_OS_UNIX)
-+#include <unistd.h>
- #include <time.h>
- #endif
- 
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
index 32fe1293e9a9..17237689dcfd 100644
--- a/media-sound/musique/metadata.xml
+++ b/media-sound/musique/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>qt@gentoo.org</email>
-	<name>Gentoo Qt Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/musique/musique-1.3.ebuild b/media-sound/musique/musique-1.3.ebuild
deleted file mode 100644
index 5cf7db1db5b7..000000000000
--- a/media-sound/musique/musique-1.3.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"
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Qt4 music player"
-HOMEPAGE="http://flavio.tordini.org/musique"
-# Same tarball for every release. We repackage it
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4[gtkstyle]
-	dev-qt/qtsql:4[sqlite]
-	|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
-	media-libs/taglib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-DOCS="CHANGES TODO"
-
-src_prepare () {
-	# bug 422665. Upstream only cares about ubuntu
-	# so this bug will be fixed once ubuntu moves
-	# to gcc-4.7. No, I will not send this patch upstream
-	# *again*
-	epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX="/usr"
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon data/${PN}.svg
-}
diff --git a/media-sound/phasex/Manifest b/media-sound/phasex/Manifest
deleted file mode 100644
index 6d97922008ee..000000000000
--- a/media-sound/phasex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST phasex-0.12.0beta3.tar.gz 1009615 SHA256 0af0b8b4560649b8fa3ebad6cc1627838747919dbe01116cf7f1205da5199d66 SHA512 77001b90b0adbe1e7e9e106401c78184bef145d6d58025174938de95e697017a220e1037460ac93fd00dd1f24efaeee2c3049d68df7e0d1904344a105584df91 WHIRLPOOL 1640b64ea969ad72183f4cbd2ccaf926fec7fdb697647dfe68829c3bacb6aa49a0c8365c56ab6dfb92410887792b2d1b3e43dccf8aa9ea58fd8dce04500feea7
diff --git a/media-sound/phasex/metadata.xml b/media-sound/phasex/metadata.xml
deleted file mode 100644
index f79bb67acbd9..000000000000
--- a/media-sound/phasex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/phasex/phasex-0.12.0_beta3.ebuild b/media-sound/phasex/phasex-0.12.0_beta3.ebuild
deleted file mode 100644
index 689b9ad5cede..000000000000
--- a/media-sound/phasex/phasex-0.12.0_beta3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-DESCRIPTION="Software synthesizer (Phase Harmonic Advanced Synthesis EXperiment)"
-HOMEPAGE="http://sysex.net/phasex/"
-SRC_URI="http://sysex.net/phasex/beta/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	media-sound/jack-audio-connection-kit
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_beta3}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO doc/ROADMAP
-}
diff --git a/media-sound/puddletag/puddletag-1.1.1.ebuild b/media-sound/puddletag/puddletag-1.1.1.ebuild
index a53a4d017533..23ae59b6ab4a 100644
--- a/media-sound/puddletag/puddletag-1.1.1.ebuild
+++ b/media-sound/puddletag/puddletag-1.1.1.ebuild
@@ -30,5 +30,3 @@ RDEPEND=">=dev-python/PyQt4-4.9.6-r2[${PYTHON_USEDEP},svg]
 	>=dev-python/lxml-3.0.1[${PYTHON_USEDEP}]"
 
 DOCS=(changelog HACKING NEWS README THANKS TODO)
-
-PATCHES=("${FILESDIR}/${P}-pyqt4.11.4.patch")
diff --git a/media-sound/pulseaudio/pulseaudio-8.0.ebuild b/media-sound/pulseaudio/pulseaudio-8.0.ebuild
index ef090e542b40..ba399b312c9a 100644
--- a/media-sound/pulseaudio/pulseaudio-8.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
index 799ed6754c0f..bdf982eb7a03 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1,2 +1 @@
-DIST qastools_0.17.2.tar.xz 202152 SHA256 a5f6a765f1c192b150c5a9fdc2d3490575f7a11a2a53245b731ee513cf22b05a SHA512 81911a93a65e0276460610c6ea96d1c19b5f2965dbabd5650ba03a714832538f9ce0af87abfa1d0c6192d8f25c040028fa325c2a877d47830153bd069719d9b8 WHIRLPOOL 1016d769d1d0617bb4f012b52a0be38cd35f6087eb2f55432b586fc74cce7beda52b8855b24b514cfb9a0d8c0b9ffbf18164ebdb05af0e326884374f1ab4b6dc
 DIST qastools_0.18.1.tar.xz 207752 SHA256 ef94bd3ab8660ff169f2b9a0425b3a415a62e2c5c34427b9ec7af2299dde2dc6 SHA512 011d45bae593514647b6f7af3135467f1a3a203fa85a76d72eb26f766701318131500dd44e00765fcd80addd096fa71e49d1e9a0d00e7bf618ec1037207d584c WHIRLPOOL 294364384a5b9f39b829897aa7932605d61717582538c7893453313911717961943cb0bc340766f9fa6f83e16117bd1378d8bceffd39484b5cd76d6b746872b7
diff --git a/media-sound/qastools/qastools-0.17.2.ebuild b/media-sound/qastools/qastools-0.17.2.ebuild
deleted file mode 100644
index 9e12fecead94..000000000000
--- a/media-sound/qastools/qastools-0.17.2.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 cmake-utils
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Qt4 GUI ALSA tools: mixer, configuration browser"
-HOMEPAGE="http://xwmw.org/qastools/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LANGS="cs de es ru"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="media-libs/alsa-lib
-	>=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4
-	>=dev-qt/qtsvg-4.6:4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	local lang
-	for lang in ${LANGS} ; do
-		if ! use linguas_${lang} ; then
-			rm i18n/ts/app_${lang}.ts
-		fi
-	done
-}
diff --git a/media-sound/quodlibet/quodlibet-3.5.1.ebuild b/media-sound/quodlibet/quodlibet-3.5.1.ebuild
index 2f90e18d2b90..c9f59a074e9c 100644
--- a/media-sound/quodlibet/quodlibet-3.5.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+dbus gstreamer ipod +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/rhythmbox/rhythmbox-3.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.3.ebuild
index 75852d9cf8e5..8bda694a5356 100644
--- a/media-sound/rhythmbox/rhythmbox-3.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.3.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 "
 #	webkit? ( python )
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Tests failing for years without upstream caring at all
 # upstream bug #688745
diff --git a/media-sound/shell-fm/Manifest b/media-sound/shell-fm/Manifest
deleted file mode 100644
index 5d88dcf3dbf8..000000000000
--- a/media-sound/shell-fm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shell-fm-0.8.tar.gz 54303 SHA256 b6d5b754c6ea0285c060f4989de730101dd6a172bb075a2a04b4649be33a06a3 SHA512 135fa6630d3cda0dbdcd502772fbafa1a0f81048dffeaa8299abe75d009108f3f139af712a5be911314628c2f108e6eb094e078d2429bf231cbb28c15b271501 WHIRLPOOL d2e7ce88ff39696d8d3931e9a3b2a7a175368466ebc13c4e04ed4e9e194fe87d7ec35cbb0534d57743d7ed7c69a85652d511ed779147991bf86250512e9f1596
diff --git a/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch b/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
deleted file mode 100644
index 5054ee1ad024..000000000000
--- a/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix double free crash: http://bugs.gentoo.org/392413
-
---- source/sckif.c
-+++ source/sckif.c
-@@ -39,6 +39,8 @@
- 
- #include "split.h"
- 
-+#include "ropen.h" /* fshutdown */
-+
- struct hash track;
- 
- static int stcpsck = -1, sunixsck = -1;
-@@ -191,9 +193,7 @@
- 
- 	if(disconnect) {
- 		debug("removing client\n");
--		shutdown(SHUT_RDWR, client_socket);
--		close(client_socket);
--		fclose(fd);
-+		fshutdown(& fd);
- 
- 		remove_handle(client_socket);
- 	}
diff --git a/media-sound/shell-fm/metadata.xml b/media-sound/shell-fm/metadata.xml
deleted file mode 100644
index 33f8eac16592..000000000000
--- a/media-sound/shell-fm/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Shell.FM is a lightweight console based player for Last.FM radio
-		streams. It's written mainly for Linux, but should be able to run on any
-		UNIX based system (even Mac OS X) with some minor tweaks.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jkramer/shell-fm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/shell-fm/shell-fm-0.8-r1.ebuild b/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
deleted file mode 100644
index 76cd0962ebeb..000000000000
--- a/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="A lightweight console based player for Last.FM radio streams"
-HOMEPAGE="http://nex.scrapping.cc/shell-fm/"
-SRC_URI="https://github.com/jkramer/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-libs/libao
-	media-libs/libmad
-	media-libs/taglib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-doublefree.patch #392413
-
-	sed -i -e 's:-Os::' source/Makefile || die
-
-	tc-export CC AR
-	use ppc && append-flags -DWORDS_BIGENDIAN=1
-}
-
-src_install() {
-	dobin source/${PN}
-	doman manual/${PN}.1
-	exeinto /usr/share/${PN}/scripts
-	doexe scripts/{*.sh,*.pl,zcontrol}
-}
diff --git a/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
index 4ef2e3b3d353..d0ca56598b58 100644
--- a/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.18.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 e6c0c748ff05..e2d7a6d1552d 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1 +1,2 @@
 DIST soundconverter-2.1.5.tar.xz 195380 SHA256 cace2109b967744325e4ce8938d286b78b86f0615d4f145966f42decc7a74e06 SHA512 6d42bd2cfa200e7af8c69ce94580a4f96bdb0354623207e5d1c3beadee89920363b5b8cee4cdcfa6fcbd036860d50f739b05e34e9a34608fe3d6243876936c6a WHIRLPOOL e3f9ea4bbe012aa8b977321ee85601c69d67324b35654b494ffe6792af8043a21af7d7d429929cea28fe7273e08e11f93da9b00cb4f99c88f22266e6b0c3419d
+DIST soundconverter-2.1.6.tar.xz 195864 SHA256 2ffb6718d8e43a67be4d99e5a9c7b5cd82fce15d30b4861608b7d1666884a690 SHA512 d607d4c260f0b8d810f7251f9bbcd02359984dd2a8bf3340be14602e3392362b9a6bc54a9f0c20f16bfee2f971f784a4093f535307dfb2d6087fb4492511a9ba WHIRLPOOL cfabdedc4cda2ec36537ec95443d0735905c13c369a6916842959a831fcceb322f3a2dfc47d3be0897b3a982cc10797dd89145a51550e9e4ef0d809c01b246ef
diff --git a/media-sound/soundconverter/soundconverter-2.1.5.ebuild b/media-sound/soundconverter/soundconverter-2.1.5.ebuild
deleted file mode 100644
index 73854e1407dd..000000000000
--- a/media-sound/soundconverter/soundconverter-2.1.5.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.6.ebuild b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
new file mode 100644
index 000000000000..230ed9acf179
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
@@ -0,0 +1,57 @@
+# 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() {
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 9dfbe0e3dc65..b35de9448154 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,3 +1,4 @@
-DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495
 DIST spotify-client_1.0.19.106.gb8a7150f_amd64.deb 68109944 SHA256 be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be SHA512 f5d8b5ae860a5e429e14f4541cd9e12e8f7edf864d2a41c2d6acb19af7c00c3f6a813f3666e9bd73f3e0bf1619f63cc03ab9f520d7f0713a036b5cee6a409fea WHIRLPOOL 7d19213e40b85aaf11722a09b8021cdae4ce4a5c8f91e9b5aa5c6a50c1b2862d5bc41c031d486b08141543e2ff4c16b684575e81e8cd6f1cc12b64633aef74ce
 DIST spotify-client_1.0.19.106.gb8a7150f_i386.deb 73060616 SHA256 128b5d04dda8a052802fb9e664a996250569696fac359e94ea35043472f5dbcb SHA512 adb5816ceba1e1976429b1985569e1bfaa03fe015904bb3c66676b384205bbe24c3851a9cfcd366124a11470549574086cf289106c0b68e3f124f594b80ff04c WHIRLPOOL ae57091f18c54c2c61252e1bbbffa3228e7621df6dc185bd6821112deec6b78f9a7c269b01d2dd1f595c5751549b8c804732119d8dfd115ddcaee38c977fb4cd
+DIST spotify-client_1.0.23.93.gd6cfae15-30_amd64.deb 75341892 SHA256 99961ccd0b3d01ec28a96e158b4375fed6bb449913d34f6e03429b2d43f9db58 SHA512 746b1324282ab0aa76d8c35519ce4291f05fd061aa6daf6ce5193f3e56566f0dcc3c207016980f4b780e71a55ebd59fb88df2566f538210795278f99b46d80f8 WHIRLPOOL 20e6b8372fdd75adbf95d203e3676c646b8c041de9fa03f8a0fa9b104d5971bef917f764467f148c5dda7e508436bdc7fa35ef158f968e83e7a7c570cd16899a
+DIST spotify-client_1.0.23.93.gd6cfae15-5_i386.deb 78429394 SHA256 e4e8ab10a2a4875632283870155068f7d140b23b5bbb9927f32b53b4002aa6fe SHA512 54b87dcbba33119a9a3c9a01fb899b805096131fd83fcf220148b2064f04ec0d31174b812f2ca53b0e6eacb97440816eb11c8627de44f5b758fbc85aa731c980 WHIRLPOOL dade70b3621db925e54f9f3cc97e621e4338959d86ab218e17e26093f6014fea3346dc57edae3deaeec2f6d162d5fea8b9b60d03f7f5dbeb2a6cfb4e484f22b2
diff --git a/media-sound/spotify/spotify-0.9.17.1-r1.ebuild b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
deleted file mode 100644
index c5fbd308ec07..000000000000
--- a/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/download/previews/"
-MY_PV="${PV}.g9b85d43.7-1"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
-SRC_URI="
-	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
-	"
-#	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
-LICENSE="Spotify"
-SLOT="0"
-#amd64 and x86 keywords removed due to security concerns, see bug 474010
-KEYWORDS="~amd64"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-libs/libxcb
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXdmcp
-		x11-libs/libXScrnSaver
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		dev-qt/qtcore:4[glib]
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[glib]
-		dev-qt/qtwebkit:4
-		x11-misc/xdg-utils
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/freetype
-		dev-libs/openssl:0
-		dev-libs/glib:2
-		|| ( dev-libs/libgcrypt:11/11 dev-libs/libgcrypt:0/11 )
-		media-libs/libpng:0
-		dev-db/sqlite:3
-		sys-libs/zlib
-		app-arch/bzip2
-		sys-apps/dbus[X]
-		x11-libs/pango[X]
-		sys-apps/util-linux
-		dev-libs/expat
-		>=dev-libs/nspr-4.9
-		gnome-base/gconf:2
-		x11-libs/gtk+:2
-		dev-libs/nss
-		dev-libs/glib:2
-		net-print/cups
-		virtual/udev
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-		gnome? ( gnome-extra/gnome-integration-spotify )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/spotify/spotify-client/spotify
-			/opt/spotify/spotify-client/Data/SpotifyHelper
-			/opt/spotify/spotify-client/Data/libcef.so"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
-	if use gnome ; then
-	sed -i \
-		-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-	fi
-	#and fix other stuff in the desktop file as well
-	sed -i \
-		-e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
-		-e 's/AudioVideo$/AudioVideo\;/g' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-}
-
-src_install() {
-	dodoc opt/spotify/spotify-client/changelog
-	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-	dodoc usr/share/doc/spotify-client/copyright
-
-	insinto /usr/share/pixmaps
-	doins opt/spotify/spotify-client/Icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r opt/spotify/spotify-client/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-	fperms +x ${SPOTIFY_HOME}/Data/SpotifyHelper
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	# revdep-rebuild produces a false positive because of symbol versioning
-	dodir /etc/revdep-rebuild
-	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
-		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
-	EOF
-
-	for size in 16 22 24 32 48 64 128 256; do
-		newicon -s ${size} "${S}${SPOTIFY_HOME}/Icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_HOME}/spotify.desktop"
-
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark C "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-
-	#TODO fix for x86
-	dosym /usr/lib/libudev.so "${SPOTIFY_HOME}/Data/libudev.so.0"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "you need to use the ld.bfd linker with openssl"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.0.19.106-r1.ebuild b/media-sound/spotify/spotify-1.0.19.106-r1.ebuild
index ddf9290d680b..55b45f07ca28 100644
--- a/media-sound/spotify/spotify-1.0.19.106-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.19.106-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
 	x86? ( ${SRC_BASE}${MY_P}_i386.deb )"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
diff --git a/media-sound/spotify/spotify-1.0.23.93.ebuild b/media-sound/spotify/spotify-1.0.23.93.ebuild
new file mode 100644
index 000000000000..5df0c9051df1
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.23.93.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+MY_PV="${PV}.gd6cfae15"
+MY_P="${PN}-client_${MY_PV}"
+SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${MY_P}-30_amd64.deb )
+	x86? ( ${SRC_BASE}${MY_P}-5_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+# zenety needed for filepicker
+RDEPEND="
+	${DEPEND}
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl
+	net-print/cups[ssl]
+	sys-libs/glibc
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	pulseaudio? ( media-sound/pulseaudio )
+	gnome? ( gnome-extra/gnome-integration-spotify )"
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
+	if use gnome ; then
+	sed -i \
+		-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+		usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/sweep/Manifest b/media-sound/sweep/Manifest
deleted file mode 100644
index 818c27eb9232..000000000000
--- a/media-sound/sweep/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sweep-0.9.3.tar.gz 1248948 SHA256 be65f19e9d63c74d47d79acfc4fbb6fd4b93dfa794417c7b7a3379e217ecd4fc SHA512 e1e2018ae46cb77cc3aa8faf8f83fc50e937600e6103c9ebb1bfee5a43c30aa1710fd8876c1f59285356a9d0517607deda8c03463ad7a6dcfe72bbff486b6a46 WHIRLPOOL a1740a8cb8ad4852f18b501aa4d2ed4015d785e9d3feccaee7d20cbf807206c5f747189df4c400ac7ad7fefd99172e2d69e42d96ac667962681fa3fcfbebb9f1
diff --git a/media-sound/sweep/files/sweep-0.9.3-configure.patch b/media-sound/sweep/files/sweep-0.9.3-configure.patch
deleted file mode 100644
index 38c8717c4cdd..000000000000
--- a/media-sound/sweep/files/sweep-0.9.3-configure.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- sweep-0.9.3/configure.ac.orig
-+++ sweep-0.9.3/configure.ac
-@@ -137,13 +137,13 @@
- 
- ac_enable_oggvorbis=yes
- AC_ARG_ENABLE(oggvorbis,
--     [  --disable-oggvorbis     disable Ogg Vorbis support],
--     [ ac_enable_oggvorbis=no ], [ ac_enable_oggvorbis=yes ])
-+     [  --enable-oggvorbis     enable Ogg Vorbis support],
-+     [ ac_enable_oggvorbis=yes ], [ ac_enable_oggvorbis=no ])
- 
- ac_enable_speex=yes
- AC_ARG_ENABLE(speex,
--     [  --disable-speex         disable Speex support],
--     [ ac_enable_speex=no ], [ ac_enable_speex=yes ])
-+     [  --enable-speex         enable Speex support],
-+     [ ac_enable_speex=yes ], [ ac_enable_speex=no ])
- 
- dnl Both Vorbis and Speex require Ogg, so check for it first either way
- if test "x${ac_enable_oggvorbis}" != xno ||
-@@ -274,8 +274,8 @@
- 
- ac_enable_mad=yes
- AC_ARG_ENABLE(mad,
--     [  --disable-mad           disable libmad (MPEG audio loading) support],
--     [ ac_enable_mad=no ], [ ac_enable_mad=yes ])
-+     [  --enable-mad           enable libmad (MPEG audio loading) support],
-+     [ ac_enable_mad=yes ], [ ac_enable_mad=no ])
- 
- if test "x${ac_enable_mad}" != xno ; then
-   AC_CHECK_LIB(mad, mad_decoder_init, HAVE_MAD="maybe")
-@@ -301,8 +301,8 @@
- 
- ac_enable_src=yes
- AC_ARG_ENABLE(src,
--     [  --disable-src            enable secret rabbit code (libsamplerate)],
--     [ ac_enable_src=no ], [ ac_enable_src=yes])
-+     [  --enable-src            enable secret rabbit code (libsamplerate)],
-+     [ ac_enable_src=yes ], [ ac_enable_src=no])
- 
- if test "x${ac_enable_src}" != xno ; then
-   PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.9,
-@@ -324,8 +324,8 @@
- 
- ac_enable_alsa=yes
- AC_ARG_ENABLE(alsa,
--     [  --disable-alsa           Disable ALSA, and enable use of OSS],
--     [ ac_enable_alsa=no ])
-+     [  --enable-alsa           enable ALSA support],
-+     [ ac_enable_alsa=yes ], [ ac_enable_alsa=no ])
- 
- if test "x${ac_enable_alsa}" != xno ; then
- 
diff --git a/media-sound/sweep/metadata.xml b/media-sound/sweep/metadata.xml
deleted file mode 100644
index bf2265c326f8..000000000000
--- a/media-sound/sweep/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 type="project">
-		<email>proaudio@gentoo.org</email>
-		<name>Gentoo ProAudio Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sweep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/sweep/sweep-0.9.3-r1.ebuild b/media-sound/sweep/sweep-0.9.3-r1.ebuild
deleted file mode 100644
index a47e36c1fd9b..000000000000
--- a/media-sound/sweep/sweep-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Audio editor and live playback tool"
-HOMEPAGE="http://www.metadecks.org/software/sweep/"
-SRC_URI="mirror://sourceforge/sweep/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="alsa ladspa vorbis mp3 libsamplerate speex"
-
-RDEPEND=">=media-libs/libsndfile-1.0
-	>=x11-libs/gtk+-2.4.0:2
-	>=dev-libs/glib-2.2.0:2
-	alsa? ( media-libs/alsa-lib )
-	libsamplerate? ( media-libs/libsamplerate )
-	speex? ( media-libs/speex )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	mp3? ( media-libs/libmad )
-	ladspa? ( media-libs/ladspa-sdk )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog NEWS README TODO)
-
-LANGS="de el es_ES fr hu it ja pl ru"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable mp3 mad) \
-		$(use_enable speex) \
-		$(use_enable libsamplerate src) \
-		$(use_enable alsa)
-}
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 20c0187489bd..30575a0bf4fa 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a
 DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506
-DIST kodi-15.1-generated-addons.tar.xz 73988 SHA256 97f0236542044a909d982cbf9a031f76395a59a1d4a79187c1102845579ed8f2 SHA512 559c188471c84503840b8b2010b73f15cf083367a1e1d0d5cfe7c144e36821a07c6fff1ff379ad8e8b254bc0cc2555c0a17ae998003adf86b051febde97bf2f1 WHIRLPOOL 01b76391d6aa7c624ad23329c962416cdf4662b96e99724bb566d7ed20b08b1525acd4f12671eef04ac10e5255d097f7c2452d2bfd87f7dfd3f4c1cd621fe2a6
-DIST kodi-15.1.tar.gz 61477835 SHA256 72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705 SHA512 b597253aa51d3d446ecb85ffe163362b5e55717d6fee16eab81725b9cdf0a5a9e4a2291aa526b9e63fbb34ef206100df30c9368684e2ddedc49e35f140d604f0 WHIRLPOOL 3596c00f9d25193e1e84cdfbf7fe5a6e6bdcce37caa710b8dd2b0b7aaa043164410459009dc793991373886abed8755298ee8803edf7b90227509d0c3578b8b9
 DIST kodi-15.2-generated-addons.tar.xz 73912 SHA256 8c604be6188e03569209632dca96a9e333fa898e41651ac81f7fad2a45163610 SHA512 094ac1373a80d08371daad8fb1ee4422b8c16f77430fcd4a2b78ed0dc1883027086081e5788e07333c345121a20fda89b0bd5bcb2c8922b79573aca6e4726b9a WHIRLPOOL 560b8de1fa506ea1a73b5a0c539563649159dbb83b9996dc550e706037c5ff15dc657f382e55b2812797c1eee596b2b3b84a0061b6c74b2a5179a126a1841583
 DIST kodi-15.2.tar.gz 61484128 SHA256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 SHA512 870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67 WHIRLPOOL 5d484ff8eb8b48de643bf6dbff0ca824d528143d2f6f78f124bae19a0f67db72271c865786520672ef716cedba4ad4ad11c59fe857c8b34ec9331724f09046c2
+DIST kodi-16.0-generated-addons.tar.xz 76876 SHA256 fb164bf2aaf54d0c4a6da60b768b40f47c61456ac9bfd5c859593e37c56080c4 SHA512 7b06e3dc7c7cad4b4bb43dafadb756e3b6064452d289b81097a5a340f33a0fd6b7da82954578039f980dd6338de4b6e0105ed69678c01548b4e79f072a120800 WHIRLPOOL bcff75cdc21cebff305052d985de9f88a3043d4a0aa81509c8daff3ace28fd18ca625f3394bd1b109ec242c3310a4934b4f4837355f39de47be6ff6031a1d13f
+DIST kodi-16.0.tar.gz 52093964 SHA256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 SHA512 b187f57601dfadc2119622f19558dbaca6ba7c708f5c24d65b876ee32888251940ffa8caadf978ee1afbd7c8da5007771e013d639819b998c345e968149995ac WHIRLPOOL ca19325b52c4c7de72a8d18cc9d68a83203274d3a432bcd83188904a9a2ba4e69372144c40ada3b3cd89ed12d740a1dceec75c5511b706b922374784bf817b3f
diff --git a/media-tv/kodi/files/kodi-16-ffmpeg3.patch b/media-tv/kodi/files/kodi-16-ffmpeg3.patch
new file mode 100644
index 000000000000..755af69f8f43
--- /dev/null
+++ b/media-tv/kodi/files/kodi-16-ffmpeg3.patch
@@ -0,0 +1,641 @@
+
+Changes from original commit are only in file paths & quilt refresh.
+
+commit c31b7d374062f87c7512d9872cbceac920465913
+Author: Philip Langdale <philipl@overt.org>
+Date:   Mon Sep 21 19:49:36 2015 -0700
+
+    ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master
+    
+    The deprecated PixelFormat and PIX_FMT_* names have been removed in
+    ffmpeg master.
+
+Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h
++++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
+@@ -24,7 +24,6 @@
+ #include "utils/CPUInfo.h"
+ 
+ extern "C" {
+-#include "libswscale/swscale.h"
+ #include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
+ #include "libavutil/avutil.h"
+@@ -33,23 +32,6 @@ extern "C" {
+ #include "libpostproc/postprocess.h"
+ }
+ 
+-inline int SwScaleCPUFlags()
+-{
+-  unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
+-  int flags = 0;
+-
+-  if (cpuFeatures & CPU_FEATURE_MMX)
+-    flags |= SWS_CPU_CAPS_MMX;
+-  if (cpuFeatures & CPU_FEATURE_MMX2)
+-    flags |= SWS_CPU_CAPS_MMX2;
+-  if (cpuFeatures & CPU_FEATURE_3DNOW)
+-    flags |= SWS_CPU_CAPS_3DNOW;
+-  if (cpuFeatures & CPU_FEATURE_ALTIVEC)
+-    flags |= SWS_CPU_CAPS_ALTIVEC;
+-
+-  return flags;
+-}
+-
+ inline int PPCPUFlags()
+ {
+   unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
+@@ -39,7 +39,7 @@ extern "C" {
+ #include "libswscale/swscale.h"
+ }
+ 
+-// allocate a new picture (PIX_FMT_YUV420P)
++// allocate a new picture (AV_PIX_FMT_YUV420P)
+ DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight)
+ {
+   DVDVideoPicture* pPicture = new DVDVideoPicture;
+@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert
+ 
+         int dstformat;
+         if (format == RENDER_FMT_UYVY422)
+-          dstformat = PIX_FMT_UYVY422;
++          dstformat = AV_PIX_FMT_UYVY422;
+         else
+-          dstformat = PIX_FMT_YUYV422;
++          dstformat = AV_PIX_FMT_YUYV422;
+ 
+-        struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P,
++        struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P,
+                                                            pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat,
+-                                                           SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++                                                           SWS_BILINEAR, NULL, NULL, NULL);
+         sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride);
+         sws_freeContext(ctx);
+       }
+@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur
+ }
+ 
+ struct EFormatMap {
+-  PixelFormat   pix_fmt;
++  AVPixelFormat   pix_fmt;
+   ERenderFormat format;
+ };
+ 
+ static const EFormatMap g_format_map[] = {
+-   { PIX_FMT_YUV420P,     RENDER_FMT_YUV420P    }
+-,  { PIX_FMT_YUVJ420P,    RENDER_FMT_YUV420P    }
+-,  { PIX_FMT_YUV420P10,   RENDER_FMT_YUV420P10  }
+-,  { PIX_FMT_YUV420P16,   RENDER_FMT_YUV420P16  }
+-,  { PIX_FMT_UYVY422,     RENDER_FMT_UYVY422    }
+-,  { PIX_FMT_YUYV422,     RENDER_FMT_YUYV422    }
+-,  { PIX_FMT_VAAPI_VLD,   RENDER_FMT_VAAPI      }
+-,  { PIX_FMT_DXVA2_VLD,   RENDER_FMT_DXVA       }
+-,  { PIX_FMT_NONE     ,   RENDER_FMT_NONE       }
++   { AV_PIX_FMT_YUV420P,     RENDER_FMT_YUV420P    }
++,  { AV_PIX_FMT_YUVJ420P,    RENDER_FMT_YUV420P    }
++,  { AV_PIX_FMT_YUV420P10,   RENDER_FMT_YUV420P10  }
++,  { AV_PIX_FMT_YUV420P16,   RENDER_FMT_YUV420P16  }
++,  { AV_PIX_FMT_UYVY422,     RENDER_FMT_UYVY422    }
++,  { AV_PIX_FMT_YUYV422,     RENDER_FMT_YUYV422    }
++,  { AV_PIX_FMT_VAAPI_VLD,   RENDER_FMT_VAAPI      }
++,  { AV_PIX_FMT_DXVA2_VLD,   RENDER_FMT_DXVA       }
++,  { AV_PIX_FMT_NONE     ,   RENDER_FMT_NONE       }
+ };
+ 
+ ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt)
+ {
+-  for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
++  for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
+   {
+     if(p->pix_fmt == fmt)
+       return p->format;
+@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro
+ 
+ int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt)
+ {
+-  for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
++  for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
+   {
+     if(p->format == fmt)
+       return p->pix_fmt;
+   }
+-  return PIX_FMT_NONE;
++  return AV_PIX_FMT_NONE;
+ }
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+@@ -77,8 +77,8 @@ enum DecoderState
+   STATE_SW_MULTI
+ };
+ 
+-enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
+-                                                , const PixelFormat * fmt )
++enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
++                                                , const AVPixelFormat * fmt )
+ {
+   CDVDVideoCodecFFmpeg* ctx  = (CDVDVideoCodecFFmpeg*)avctx->opaque;
+ 
+@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
+     avctx->hwaccel_context = 0;
+   }
+ 
+-  const PixelFormat * cur = fmt;
+-  while(*cur != PIX_FMT_NONE)
++  const AVPixelFormat * cur = fmt;
++  while(*cur != AV_PIX_FMT_NONE)
+   {
+ #ifdef HAVE_LIBVDPAU
+     if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))
+@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
+ #endif
+ #ifdef HAVE_LIBVA
+     // mpeg4 vaapi decoding is disabled
+-    if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
++    if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
+     {
+       VAAPI::CDecoder* dec = new VAAPI::CDecoder();
+       if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true)
+@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre
+ 
+   for(std::vector<ERenderFormat>::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it)
+   {
+-    m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
++    m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
+     if(*it == RENDER_FMT_YUV420P)
+-      m_formats.push_back(PIX_FMT_YUVJ420P);
++      m_formats.push_back(AV_PIX_FMT_YUVJ420P);
+   }
+-  m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
++  m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
+ 
+   pCodec = avcodec_find_decoder(hints.codec);
+ 
+@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom
+   pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc;
+   pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace;
+   if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG
+-  || m_pCodecContext->pix_fmt     == PIX_FMT_YUVJ420P)
++  || m_pCodecContext->pix_fmt     == AV_PIX_FMT_YUVJ420P)
+     pDvdVideoPicture->color_range = 1;
+   else
+     pDvdVideoPicture->color_range = 0;
+@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV
+   pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED;
+   pDvdVideoPicture->extended_format = 0;
+ 
+-  PixelFormat pix_fmt;
+-  pix_fmt = (PixelFormat)m_pFrame->format;
++  AVPixelFormat pix_fmt;
++  pix_fmt = (AVPixelFormat)m_pFrame->format;
+ 
+   pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt);
+   return true;
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
+@@ -46,7 +46,7 @@ public:
+     public:
+              IHardwareDecoder() {}
+     virtual ~IHardwareDecoder() {};
+-    virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0;
++    virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0;
+     virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame) = 0;
+     virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0;
+     virtual int  Check     (AVCodecContext* avctx) = 0;
+@@ -77,7 +77,7 @@ public:
+   void               SetHardware(IHardwareDecoder* hardware);
+ 
+ protected:
+-  static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt);
++  static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt);
+ 
+   int  FilterOpen(const std::string& filters, bool scale);
+   void FilterClose();
+@@ -119,7 +119,7 @@ protected:
+   int m_iLastKeyframe;
+   double m_dts;
+   bool   m_started;
+-  std::vector<PixelFormat> m_formats;
++  std::vector<AVPixelFormat> m_formats;
+   double m_decoderPts;
+   int    m_skippedDeint;
+   bool   m_requestSkipDeint;
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
+@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop(
+ 
+ void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture)
+ {
+-  // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P.
++  // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P.
+   struct SwsContext *swcontext = sws_getContext(
+-    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422, 
+-    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, 
+-    SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422,
++    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
++    SWS_FAST_BILINEAR, NULL, NULL, NULL);
+   if (swcontext)
+   {
+     uint8_t  *src[] = { yuv422_ptr, 0, 0, 0 };
+@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42
+ 
+ void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture)
+ {
+-  // convert PIX_FMT_BGRA to PIX_FMT_YUV420P.
++  // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P.
+   struct SwsContext *swcontext = sws_getContext(
+-    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA, 
+-    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, 
+-    SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA,
++    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
++    SWS_FAST_BILINEAR, NULL, NULL, NULL);
+   if (swcontext)
+   {
+     uint8_t  *src[] = { bgra_ptr, 0, 0, 0 };
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
+@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo
+   return true;
+ }
+ 
+-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
+ {
+   if (!CheckCompatibility(avctx))
+     return false;
+@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder()
+   return true;
+ }
+ 
+-bool CDecoder::Supports(enum PixelFormat fmt)
++bool CDecoder::Supports(enum AVPixelFormat fmt)
+ {
+-  if(fmt == PIX_FMT_DXVA2_VLD)
++  if(fmt == AV_PIX_FMT_DXVA2_VLD)
+     return true;
+   return false;
+ }
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
+@@ -141,7 +141,7 @@ class CDecoder
+ public:
+   CDecoder();
+  ~CDecoder();
+-  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces);
++  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces);
+   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
+   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
+   virtual int  Check     (AVCodecContext* avctx);
+@@ -154,7 +154,7 @@ public:
+   int   GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
+   void  RelBuffer(uint8_t *data);
+ 
+-  static bool      Supports(enum PixelFormat fmt);
++  static bool      Supports(enum AVPixelFormat fmt);
+ 
+   void CloseDXVADecoder();
+ 
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+@@ -479,7 +479,7 @@ CDecoder::~CDecoder()
+   Close();
+ }
+ 
+-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
+ {
+   // don't support broken wrappers by default
+   // nvidia cards with a vaapi to vdpau wrapper
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
+@@ -406,7 +406,7 @@ public:
+   CDecoder();
+   virtual ~CDecoder();
+ 
+-  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
++  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
+   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
+   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
+   virtual void Reset();
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
+@@ -186,7 +186,7 @@ void CDecoder::Close()
+   m_bitstream = NULL;
+ }
+ 
+-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
+ {
+   Close();
+ 
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
+@@ -35,7 +35,7 @@ class CDecoder
+ public:
+   CDecoder();
+  ~CDecoder();
+-  virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
++  virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
+   virtual int Decode(AVCodecContext* avctx, AVFrame* frame);
+   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
+   virtual int Check(AVCodecContext* avctx);
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_
+   m_vdpauConfig.context = 0;
+ }
+ 
+-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
+ {
+   // check if user wants to decode this format with VDPAU
+   std::string gpuvendor = g_Windowing.GetRenderVendor();
+@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct
+   return 0;
+ }
+ 
+-bool CDecoder::IsVDPAUFormat(PixelFormat format)
++bool CDecoder::IsVDPAUFormat(AVPixelFormat format)
+ {
+   if (format == AV_PIX_FMT_VDPAU)
+     return true;
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
+@@ -556,7 +556,7 @@ public:
+   CDecoder();
+   virtual ~CDecoder();
+ 
+-  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
++  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
+   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
+   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
+   virtual void Reset();
+@@ -571,7 +571,7 @@ public:
+   bool Supports(VdpVideoMixerFeature feature);
+   bool Supports(EINTERLACEMETHOD method);
+   EINTERLACEMETHOD AutoInterlaceMethod();
+-  static bool IsVDPAUFormat(PixelFormat fmt);
++  static bool IsVDPAUFormat(AVPixelFormat fmt);
+ 
+   static void FFReleaseBuffer(void *opaque, uint8_t *data);
+   static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack
+ 
+   // for video we need a decoder to get desired information into codec context
+   if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata &&
+-      (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
++      (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE))
+   {
+     // open a decoder, it will be cleared down by ffmpeg on closing the stream
+     if (!st->codec->codec)
+@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
+       st = m_pFormatContext->streams[idx];
+       if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+       {
+-        if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
++        if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
+           return true;
+         hasVideo = true;
+       }
+@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
+       st = m_pFormatContext->streams[i];
+       if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+       {
+-        if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
++        if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
+           return true;
+         hasVideo = true;
+       }
+Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
+@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st
+ 
+             uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4];
+             struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight,
+-                  PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++                  AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ 
+             if (context)
+             {
+Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
+   }
+   else if (m_format == RENDER_FMT_NV12)
+   {
+-    srcFormat = PIX_FMT_NV12;
++    srcFormat = AV_PIX_FMT_NV12;
+     for (int i = 0; i < 2; i++)
+     {
+       src[i]       = im->plane[i];
+@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
+   }
+   else if (m_format == RENDER_FMT_YUYV422)
+   {
+-    srcFormat    = PIX_FMT_YUYV422;
++    srcFormat    = AV_PIX_FMT_YUYV422;
+     src[0]       = im->plane[0];
+     srcStride[0] = im->stride[0];
+   }
+   else if (m_format == RENDER_FMT_UYVY422)
+   {
+-    srcFormat    = PIX_FMT_UYVY422;
++    srcFormat    = AV_PIX_FMT_UYVY422;
+     src[0]       = im->plane[0];
+     srcStride[0] = im->stride[0];
+   }
+@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
+ 
+   m_context = sws_getCachedContext(m_context,
+                                                  im->width, im->height, (AVPixelFormat)srcFormat,
+-                                                 im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA,
+-                                                 SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++                                                 im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA,
++                                                 SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ 
+   uint8_t *dst[]       = { m_rgbBuffer, 0, 0, 0 };
+   int      dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
+@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+ 
+   if (m_format == RENDER_FMT_YUV420P)
+   {
+-    srcFormat = PIX_FMT_YUV420P;
++    srcFormat = AV_PIX_FMT_YUV420P;
+     for (int i = 0; i < 3; i++)
+     {
+       srcTop[i]       = im->plane[i];
+@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+   }
+   else if (m_format == RENDER_FMT_NV12)
+   {
+-    srcFormat = PIX_FMT_NV12;
++    srcFormat = AV_PIX_FMT_NV12;
+     for (int i = 0; i < 2; i++)
+     {
+       srcTop[i]       = im->plane[i];
+@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+   }
+   else if (m_format == RENDER_FMT_YUYV422)
+   {
+-    srcFormat       = PIX_FMT_YUYV422;
++    srcFormat       = AV_PIX_FMT_YUYV422;
+     srcTop[0]       = im->plane[0];
+     srcStrideTop[0] = im->stride[0] * 2;
+     srcBot[0]       = im->plane[0] + im->stride[0];
+@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+   }
+   else if (m_format == RENDER_FMT_UYVY422)
+   {
+-    srcFormat       = PIX_FMT_UYVY422;
++    srcFormat       = AV_PIX_FMT_UYVY422;
+     srcTop[0]       = im->plane[0];
+     srcStrideTop[0] = im->stride[0] * 2;
+     srcBot[0]       = im->plane[0] + im->stride[0];
+@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+ 
+   m_context = sws_getCachedContext(m_context,
+                                                  im->width, im->height >> 1, (AVPixelFormat)srcFormat,
+-                                                 im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA,
+-                                                 SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++                                                 im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA,
++                                                 SWS_FAST_BILINEAR, NULL, NULL, NULL);
+   uint8_t *dstTop[]    = { m_rgbBuffer, 0, 0, 0 };
+   uint8_t *dstBot[]    = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 };
+   int      dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
+Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
+@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu
+ #endif
+     {
+       m_sw_context = sws_getCachedContext(m_sw_context,
+-        im->width, im->height, PIX_FMT_YUV420P,
+-        im->width, im->height, PIX_FMT_RGBA,
++        im->width, im->height, AV_PIX_FMT_YUV420P,
++        im->width, im->height, AV_PIX_FMT_RGBA,
+         SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ 
+       uint8_t *src[]  = { im->plane[0], im->plane[1], im->plane[2], 0 };
+Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp
++++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
+@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer()
+   UnInit();
+ }
+ 
+-static enum PixelFormat PixelFormatFromFormat(ERenderFormat format)
++static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format)
+ {
+-  if (format == RENDER_FMT_DXVA)      return PIX_FMT_NV12;
+-  if (format == RENDER_FMT_YUV420P)   return PIX_FMT_YUV420P;
+-  if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10;
+-  if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16;
+-  if (format == RENDER_FMT_NV12)      return PIX_FMT_NV12;
+-  if (format == RENDER_FMT_UYVY422)   return PIX_FMT_UYVY422;
+-  if (format == RENDER_FMT_YUYV422)   return PIX_FMT_YUYV422;
+-  return PIX_FMT_NONE;
++  if (format == RENDER_FMT_DXVA)      return AV_PIX_FMT_NV12;
++  if (format == RENDER_FMT_YUV420P)   return AV_PIX_FMT_YUV420P;
++  if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10;
++  if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16;
++  if (format == RENDER_FMT_NV12)      return AV_PIX_FMT_NV12;
++  if (format == RENDER_FMT_UYVY422)   return AV_PIX_FMT_UYVY422;
++  if (format == RENDER_FMT_YUYV422)   return AV_PIX_FMT_YUYV422;
++  return AV_PIX_FMT_NONE;
+ }
+ 
+ void CWinRenderer::ManageTextures()
+@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags)
+ 
+ void CWinRenderer::RenderSW()
+ {
+-  enum PixelFormat format = PixelFormatFromFormat(m_format);
++  enum AVPixelFormat format = PixelFormatFromFormat(m_format);
+ 
+   // 1. convert yuv to rgb
+   m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx,
+                                         m_sourceWidth, m_sourceHeight, format,
+-                                        m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA,
+-                                        SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++                                        m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA,
++                                        SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ 
+   YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer];
+ 
+Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp
++++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
+@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi
+                           uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch,
+                           CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */)
+ {
+-  struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA,
+-                                                         out_width, out_height, PIX_FMT_BGRA,
+-                                                         CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL);
++  struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA,
++                                                         out_width, out_height, AV_PIX_FMT_BGRA,
++                                                         CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL);
+ 
+   uint8_t *src[] = { in_pixels, 0, 0, 0 };
+   int     srcStride[] = { (int)in_pitch, 0, 0, 0 };
+Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
+===================================================================
+--- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp
++++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
+@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
+       return false;
+ 
+     // Due to a bug in swsscale we need to allocate one extra line of data
+-    if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
++    if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
+       return false;
+   }
+ 
+@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
+ 
+   // We got the video frame, render it into the picture buffer
+   struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt,
+-                           m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
++                           m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
+ 
+   sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height,
+                                                                      m_pFrameRGB->data, m_pFrameRGB->linesize );
diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index f911458c92b8..04ff776c265d 100644
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -34,7 +34,10 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sdl sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306
 REQUIRED_USE="
+	gles? ( !vaapi )
+	vaapi? ( !gles )
 	pvr? ( mysql )
 	rsxs? ( X )
 	xrandr? ( X )
diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
deleted file mode 100644
index 198691d55e44..000000000000
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
-
-CODENAME="Isengard"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	;;
-*|*_p*)
-	MY_PV=${PV/_p/_r}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
-		https://github.com/xbmc/xbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
-		!java? ( http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-
-	S=${WORKDIR}/xbmc-${PV}-${CODENAME}
-	;;
-esac
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-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"
-REQUIRED_USE="
-	rsxs? ( X )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-3.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-fonts/corefonts
-	media-fonts/roboto
-	alsa? ( media-libs/alsa-lib )
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	joystick? ( media-libs/libsdl2 )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	>=media-video/ffmpeg-2.6:=[encode]
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	bluetooth? ( net-wireless/bluez )
-	dbus? ( sys-apps/dbus )
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		>=media-libs/glew-1.5.6
-	)
-	gles? (
-		media-libs/mesa[gles2]
-	)
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		media-video/ffmpeg[vdpau]
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	texturepacker? ( media-libs/giflib )
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )
-	test? ( dev-cpp/gtest )"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package.  #488118
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	epatch "${FILESDIR}"/${P}-texturepacker.patch
-	epatch "${FILESDIR}"/${P}-gcc-5.patch #544760
-	epatch_user #293109
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d dirs=(
-		tools/depends/native/TexturePacker/src/configure
-		$(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f)
-	)
-	for d in "${dirs[@]}" ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	if [[ ${PV} == "9999" ]] || use java ; then #558798
-		tc-env_build emake -f codegenerator.mk
-	fi
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	# Fix the final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -exec touch -r configure {} +
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--with-ffmpeg=shared \
-		$(use_enable alsa) \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable fishbmc) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sftp ssh) \
-		$(use_enable spectrum) \
-		$(use_enable usb libusb) \
-		$(use_enable test gtest) \
-		$(use_enable texturepacker) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable waveform) \
-		$(use_enable webserver) \
-		$(use_enable X x11)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/kodi.desktop
-	newicon media/icon48x48.png kodi.png
-
-	# Remove optional addons (platform specific).
-	local disabled_addons=(
-		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
-		visualization.dxspectrum
-		visualization.vortex
-	)
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
-
-	# Remove fonconfig settings that are used only on MacOSX.
-	# Can't be patched upstream because they just find all files and install
-	# them into same structure like they have in git.
-	rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
-
-	# Replace bundled fonts with system ones
-	# teletext.ttf: unknown
-	# bold-caps.ttf: unknown
-	# roboto: roboto-bold, roboto-regular
-	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-*
-	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
-		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
-	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
-		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-15.2.ebuild b/media-tv/kodi/kodi-15.2.ebuild
index bd1626871b46..e67e14660177 100644
--- a/media-tv/kodi/kodi-15.2.ebuild
+++ b/media-tv/kodi/kodi-15.2.ebuild
@@ -35,7 +35,10 @@ 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"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306
 REQUIRED_USE="
+	gles? ( !vaapi )
+	vaapi? ( !gles )
 	rsxs? ( X )
 	udisks? ( dbus )
 	upower? ( dbus )
diff --git a/media-tv/kodi/kodi-16.0.ebuild b/media-tv/kodi/kodi-16.0.ebuild
new file mode 100644
index 000000000000..55ded82c138a
--- /dev/null
+++ b/media-tv/kodi/kodi-16.0.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
+
+CODENAME="Jarvis"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	;;
+*|*_p*)
+	MY_PV=${PV/_p/_r}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
+		https://github.com/xbmc/xbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
+		!java? ( http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/xbmc-${PV}-${CODENAME}
+	;;
+esac
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306
+REQUIRED_USE="
+	gles? ( !vaapi )
+	vaapi? ( !gles )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	airplay? ( app-pda/libplist )
+	dev-libs/boost
+	dev-libs/expat
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	cec? ( >=dev-libs/libcec-3.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-libs/yajl
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	media-fonts/corefonts
+	media-fonts/roboto
+	alsa? ( media-libs/alsa-lib )
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jasper
+	media-libs/jbigkit
+	>=media-libs/libass-0.9.7
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmodplug
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsamplerate
+	joystick? ( media-libs/libsdl2 )
+	>=media-libs/taglib-1.8
+	media-libs/libvorbis
+	media-libs/tiff:0=
+	media-sound/dcadec
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	>=media-video/ffmpeg-2.6:=[encode]
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	nfs? ( net-fs/libnfs:= )
+	webserver? ( net-libs/libmicrohttpd[messages] )
+	sftp? ( net-libs/libssh[sftp] )
+	net-misc/curl
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	bluetooth? ( net-wireless/bluez )
+	dbus? ( sys-apps/dbus )
+	caps? ( sys-libs/libcap )
+	sys-libs/zlib
+	virtual/jpeg:0=
+	usb? ( virtual/libusb:1 )
+	mysql? ( virtual/mysql )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		>=media-libs/glew-1.5.6
+	)
+	gles? (
+		media-libs/mesa[gles2]
+	)
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		media-video/ffmpeg[vdpau]
+	)
+	X? (
+		x11-apps/xdpyinfo
+		x11-apps/mesa-progs
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)"
+RDEPEND="${COMMON_DEPEND}
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/gperf
+	texturepacker? ( media-libs/giflib )
+	X? ( x11-proto/xineramaproto )
+	dev-util/cmake
+	x86? ( dev-lang/nasm )
+	java? ( virtual/jre )
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig"
+# Force java for latest git version to avoid having to hand maintain the
+# generated addons package.  #488118
+[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	epatch "${FILESDIR}"/${PN}-9999-texturepacker.patch
+	epatch "${FILESDIR}"/${PN}-16-ffmpeg3.patch
+	epatch_user #293109
+
+	# some dirs ship generated autotools, some dont
+	multijob_init
+	local d dirs=(
+		tools/depends/native/TexturePacker/src/configure
+		$(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f)
+	)
+	for d in "${dirs[@]}" ; do
+		[[ -e ${d} ]] && continue
+		pushd ${d/%configure/.} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+		multijob_child_init eautoreconf
+		popd >/dev/null
+	done
+	multijob_finish
+	elibtoolize
+
+	if [[ ${PV} == "9999" ]] || use java ; then #558798
+		tc-env_build emake -f codegenerator.mk
+	fi
+
+	# Disable internal func checks as our USE/DEPEND
+	# stuff handles this just fine already #408395
+	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
+	# Fix the final version string showing as "exported"
+	# instead of the SVN revision number.
+	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Tweak autotool timestamps to avoid regeneration
+	find . -type f -exec touch -r configure {} +
+}
+
+src_configure() {
+	# Disable documentation generation
+	export ac_cv_path_LATEX=no
+	# Avoid help2man
+	export HELP2MAN=$(type -P help2man || echo true)
+	# No configure flage for this #403561
+	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
+	# Requiring java is asine #434662
+	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-ccache \
+		--disable-optimizations \
+		--with-ffmpeg=shared \
+		$(use_enable alsa) \
+		$(use_enable airplay) \
+		$(use_enable avahi) \
+		$(use_enable bluray libbluray) \
+		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
+		$(use_enable css dvdcss) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable gles) \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable mysql) \
+		$(use_enable nfs) \
+		$(use_enable opengl gl) \
+		$(use_enable profile profiling) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rtmp) \
+		$(use_enable samba) \
+		$(use_enable sftp ssh) \
+		$(use_enable usb libusb) \
+		$(use_enable test gtest) \
+		$(use_enable texturepacker) \
+		$(use_enable upnp) \
+		$(use_enable vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable webserver) \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	domenu tools/Linux/kodi.desktop
+	newicon media/icon48x48.png kodi.png
+
+	# Remove fonconfig settings that are used only on MacOSX.
+	# Can't be patched upstream because they just find all files and install
+	# them into same structure like they have in git.
+	rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
+
+	# Replace bundled fonts with system ones.
+	rm "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die
+	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
+		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
+	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
+		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index ae769d2b5c4b..01e249728c40 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 # Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
 inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
 
-CODENAME="Isengard"
+CODENAME="Krypton"
 case ${PV} in
 9999)
 	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
@@ -34,9 +33,11 @@ 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 gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306
 REQUIRED_USE="
-	rsxs? ( X )
+	gles? ( !vaapi )
+	vaapi? ( !gles )
 	udisks? ( dbus )
 	upower? ( dbus )
 "
@@ -47,7 +48,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/zip
 	app-i18n/enca
 	airplay? ( app-pda/libplist )
-	dev-libs/boost
 	dev-libs/expat
 	dev-libs/fribidi
 	dev-libs/libcdio[-minimal]
@@ -65,22 +65,19 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/flac
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/jasper
 	media-libs/jbigkit
 	>=media-libs/libass-0.9.7
 	bluray? ( >=media-libs/libbluray-0.7.0 )
 	css? ( media-libs/libdvdcss )
 	media-libs/libmad
 	media-libs/libmodplug
-	media-libs/libmpeg2
 	media-libs/libogg
 	media-libs/libpng:0=
-	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
 	joystick? ( media-libs/libsdl2 )
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
-	media-libs/tiff:0=
+	media-sound/dcadec
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
 	>=media-video/ffmpeg-2.6:=[encode]
@@ -95,13 +92,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dbus? ( sys-apps/dbus )
 	caps? ( sys-libs/libcap )
 	sys-libs/zlib
-	virtual/jpeg:0=
 	usb? ( virtual/libusb:1 )
 	mysql? ( virtual/mysql )
 	opengl? (
 		virtual/glu
 		virtual/opengl
-		>=media-libs/glew-1.5.6
 	)
 	gles? (
 		media-libs/mesa[gles2]
@@ -132,7 +127,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cmake
 	x86? ( dev-lang/nasm )
 	java? ( virtual/jre )
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig"
 # Force java for latest git version to avoid having to hand maintain the
 # generated addons package.  #488118
 [[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
@@ -218,29 +214,23 @@ src_configure() {
 		$(use_enable css dvdcss) \
 		$(use_enable dbus) \
 		$(use_enable debug) \
-		$(use_enable fishbmc) \
 		$(use_enable gles) \
-		$(use_enable goom) \
 		$(use_enable joystick) \
 		$(use_enable midi mid) \
 		$(use_enable mysql) \
 		$(use_enable nfs) \
 		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
-		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \
 		$(use_enable sftp ssh) \
-		$(use_enable spectrum) \
 		$(use_enable usb libusb) \
 		$(use_enable test gtest) \
 		$(use_enable texturepacker) \
 		$(use_enable upnp) \
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \
-		$(use_enable waveform) \
 		$(use_enable webserver) \
 		$(use_enable X x11)
 }
@@ -251,30 +241,18 @@ src_compile() {
 
 src_install() {
 	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
 
 	domenu tools/Linux/kodi.desktop
 	newicon media/icon48x48.png kodi.png
 
-	# Remove optional addons (platform specific).
-	local disabled_addons=(
-		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
-		visualization.dxspectrum
-		visualization.vortex
-	)
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
-
 	# Remove fonconfig settings that are used only on MacOSX.
 	# Can't be patched upstream because they just find all files and install
 	# them into same structure like they have in git.
 	rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
 
-	# Replace bundled fonts with system ones
-	# teletext.ttf: unknown
-	# bold-caps.ttf: unknown
-	# roboto: roboto-bold, roboto-regular
-	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-*
+	# Replace bundled fonts with system ones.
+	rm "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die
 	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
 		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
 	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index a631699ee113..2af75cc8a5a7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,8 +1,4 @@
-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.5-32fd3968acea905d71d9769996487eff280233ea.tar.xz 12292 SHA256 482aadc121a7e770da6d10b5014947ec9ff1350ccc7f672bdc4650ef13e68cca SHA512 8e84cf76541b775143b94da156fdcde1f24d964b58a9423323de730e23142b57c9c44ef01c2202bbb7126058d41153f77f524eebed70f65210c2b9427255ee3a WHIRLPOOL 7375659815ee6170edab81411232bcf73b54575dbb8e69cb5c9c7ff0f13105eddeb01c4026e78ef8c9e7e9d1782880e41a628697c8dd697778cbb4711b3cb820
 DIST mythtv-0.27.5-68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d.tar.xz 28096 SHA256 f51bd541cccb0f5b5f20441774d9ee5e10c7a44abba5e6b9795d3c5ce21d0bf0 SHA512 585bcfa6c3fc4ecc384665b40e50362ecd083f2fa22ce9adea8167d4e38a7cbfc7519eee3813f76d7327d093c29d5ca97d9026eb5d180ff4cb7d9af91d7bc428 WHIRLPOOL d2ca6b3c7a6ecc94c4a21dee6a7ad38bdd72b880c00df1e8ac529382cd0aa7618ddfa2b5ba9721a2b99f828c9eaa6ca8ce1b1ac5e23bfff85c28327dfb862884
-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/libdir.patch b/media-tv/mythtv/files/libdir.patch
deleted file mode 100644
index 90fc36272532..000000000000
--- a/media-tv/mythtv/files/libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- external/Makefile	2012-10-06 14:30:40.453248737 -0400
-+++ external/Makefile	2012-10-06 14:32:43.283277751 -0400
-@@ -25,7 +25,7 @@
- zeromq/Makefile:	zeromq/configure
- 	(cd zeromq ; \
- 	 ./configure --without-documentation --prefix=${PREFIX} \
--	             --includedir=${PREFIX}/include/mythtv/zeromq)
-+	             --includedir=${PREFIX}/include/mythtv/zeromq --libdir=${LIBDIR})
- 
- zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
- 	${MAKE} -C zeromq ${@:zeromq-%=%} DESTDIR=${INSTALL_ROOT}
diff --git a/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild b/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild
deleted file mode 100644
index 5179d2247b35..000000000000
--- a/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild
+++ /dev/null
@@ -1,347 +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="9fd7c6102b2cd1a3760337663803b110446c6ea7"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python user
-
-MYTHTV_VERSION="v0.26.0"
-MYTHTV_BRANCH="fixes/0.26"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
-	${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-1.5.0:=
-		>=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:= )
-	vaapi? ( x11-libs/libva:= )
-	vdpau? ( x11-libs/libvdpau:= )
-	vorbis? ( >=media-libs/libvorbis-1.0:= )
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	xvid? ( >=media-libs/xvid-1.1.0:= )
-	!media-tv/mythtv-bindings
-	!x11-themes/mythtv-themes
-	"
-
-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_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.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=profile"
-		#myconf="${myconf} --enable-debug" does nothing per sphery
-		#myconf="${myconf} --disable-stripping" does nothing per sphery
-	fi
-
-	# Video
-	use vdpau && myconf="${myconf} --enable-vdpau"
-	use vaapi && myconf="${myconf} --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
-
-	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"
-}
-
-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_p20150627.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
deleted file mode 100644
index 0cca4c54f963..000000000000
--- a/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
+++ /dev/null
@@ -1,359 +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="9498257571e8158926b60a0eefc74568c4436823"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python 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/~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 +wrapper +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-1.5.0:=
-		>=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 "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"
-	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
-	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_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-r1.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild
deleted file mode 100644
index bd36fa04286e..000000000000
--- a/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild
+++ /dev/null
@@ -1,363 +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 )
-
-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-1.5.0:=
-		>=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() {
-	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-r2 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-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild
deleted file mode 100644
index 73dd97066bf7..000000000000
--- a/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild
+++ /dev/null
@@ -1,363 +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 )
-
-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/${PV}"
-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-1.5.0:=
-		>=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() {
-	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-r2 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-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
deleted file mode 100644
index c8b6365a9664..000000000000
--- a/media-tv/xawtv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tv-fonts-1.1.tar.bz2 80177 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6 SHA512 669e3c13ede19f62d69d099a57ca39fd3326608b5b794221d29b3abcc29b1098fd30e0dcde1d1420c9aec55f6ae16d0a262b606ab598f5b3ee522f8b5540c3e9 WHIRLPOOL 3503a868d558151657ddfbd2fba5768ef6377a08a9c16eb5e0bb4d6c0862c4af66fc36271a13093a5b5558980d46f3e83baaa034c763febd6b17199deaac5532
-DIST xawtv-3.95.tar.gz 555731 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f SHA512 9c793ee7fa233aafb12decbd9289f09cbad5aa828db1f4dd89a9999e71bebe5faacc4c361cd41cf928931f32310bdb0c24e52c2c7c8d5595c286c163727faa01 WHIRLPOOL a55089b733d34fa144e9e56f6ff856c3401206294d42d348a05b1128421884269cfb890d16718ac3f3cd70159d7d683b4b9375f92fa936ebeeb22b84d9fd1257
-DIST xawtv-patches-4.tar.bz2 3258 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e SHA512 4f7bf2ac7be1d487daaccaaf853e3ed6a388784d15e87413cbefa4fb2e04c324f5cdce498636d4bf83d70a698b343df877e1f3df9acd615932f361b4292f6dd5 WHIRLPOOL 8b8b72e7815c04470f430e2ba3c1e252782813af56cb9875b647b70e5379f2ce13d1fb5667a6274e472e6dbe1402069b20c36933e24312ab96fef4eb1847f09a
diff --git a/media-tv/xawtv/files/webcamrc b/media-tv/xawtv/files/webcamrc
deleted file mode 100644
index 6773a673cb4c..000000000000
--- a/media-tv/xawtv/files/webcamrc
+++ /dev/null
@@ -1,30 +0,0 @@
-       [ftp]
-       host = www
-       user = webcam
-       pass = xxxxxx
-       dir  = public_html/images
-       file = webcam.jpeg
-       tmp  = uploading.jpeg
-       passive = 1
-       debug = 0
-       auto = 0
-       local = 0
-       ssh = 0
-
-       [grab]
-       device = /dev/video0
-       text = "webcam %Y-%m-%d %H:%M:%S"
-       infofile = filename
-       width = 320
-       height = 240
-       delay = 3
-       input = composite1
-       norm = pal
-       rotate = 0
-       top = 0
-       left = 0
-       bottom = -1
-       right = -1
-       quality = 75
-       trigger = 0
-       once = 0
diff --git a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
deleted file mode 100644
index 20219853d526..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/288158
-http://bugs.gentoo.org/479848
-
---- libng/plugins/conv-mjpeg.c
-+++ libng/plugins/conv-mjpeg.c
-@@ -229,6 +229,9 @@
-     jpeg_set_quality(&h->mjpg_cinfo, ng_jpeg_quality, TRUE);
- 
-     h->mjpg_cinfo.raw_data_in = TRUE;
-+    #if JPEG_LIB_VERSION >= 70
-+    h->mjpg_cinfo.do_fancy_downsampling = FALSE;
-+    #endif
-     jpeg_set_colorspace(&h->mjpg_cinfo,JCS_YCbCr);
- 
-     h->mjpg_ptrs[0] = malloc(h->fmt.height*sizeof(char*));
-@@ -453,6 +456,9 @@
-     h->buf = in;
-     jpeg_read_header(&h->mjpg_cinfo,1);
-     h->mjpg_cinfo.raw_data_out = 1;
-+    #if JPEG_LIB_VERSION >= 70
-+    h->mjpg_cinfo.do_fancy_upsampling = FALSE;
-+    #endif
- 
-     if (ng_debug > 1)
- 	fprintf(stderr,"yuv: %dx%d  -  %d %d / %d %d / %d %d\n",
diff --git a/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch b/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch
deleted file mode 100644
index a86c48d83b4e..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xawtv-3.95/libng/plugins/write-qt.c.old	2006-10-16 20:50:45.000000000 +0200
-+++ xawtv-3.95/libng/plugins/write-qt.c	2006-10-17 19:36:09.000000000 +0200
-@@ -348,10 +348,10 @@
- 		    info[i]->name,info[i]->long_name);
- 	    for (j = 0; j < info[i]->num_fourccs; j++)
- 		fprintf(stderr,"   fcc   : %s\n",info[i]->fourccs[j]);
--	    for (j = 0; j < info[i]->num_encoding_colormodels; j++)
-+	    for (j = 0; j < lqt_num_colormodels(); j++)
- 		fprintf(stderr,"   cmodel: %d [%s]\n",
--			info[i]->encoding_colormodels[j],
--			lqt_get_colormodel_string(info[i]->encoding_colormodels[j]));
-+			lqt_get_colormodel(j),
-+			lqt_get_colormodel_string(j));
- 	}
- 
- 	/* sanity checks */
-@@ -378,8 +378,8 @@
- 	/* pick colormodel */
- 	fmtid  = VIDEO_NONE;
- 	cmodel = 0;
--	for (j = 0; j < info[i]->num_encoding_colormodels; j++) {
--	    cmodel = info[i]->encoding_colormodels[j];
-+	for (j = 0; j < lqt_num_colormodels(); j++) {
-+	    cmodel = lqt_get_colormodel(j);
- 	    if (cmodel>= sizeof(cmodels)/sizeof(int))
- 		continue;
- 	    if (!cmodels[cmodel])
diff --git a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
deleted file mode 100644
index 7a1ff5e71f02..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch from Andreas Jochens
-http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html
-
---- a/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
-+++ b/console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
-@@ -21,8 +21,6 @@
- #include <linux/vt.h>
- #include <linux/fb.h>
- 
--#include <asm/page.h>
--
- #include "fbtools.h"
- 
- /* -------------------------------------------------------------------- */
-@@ -424,7 +422,7 @@
- 	goto err;
-     }
- #endif
--    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);
-+    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1);
-     fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
- 		  PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
-     if (-1L == (long)fb_mem) {
---- a/console/matrox.c	2005-02-03 10:40:41.000000000 +0000
-+++ b/console/matrox.c	2006-08-23 11:09:51.000000000 +0000
-@@ -9,7 +9,6 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- 
--#include <asm/page.h> /* PAGE_SIZE */
- #include <linux/fb.h>
- 
- #include "byteswap.h"
-@@ -226,7 +225,7 @@
- 	return -1;
-     }
-     off = (unsigned long)fb_fix.mmio_start -
--	((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1));
-+	((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1));
-     bmmio += off;
-     mmio = (uint32_t*)bmmio;
-     return 0;
diff --git a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch b/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
deleted file mode 100644
index b93bb11c8644..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- x11/blit.c
-+++ x11/blit.c
-@@ -13,6 +13,7 @@
- #include <pthread.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
-+#include <stdbool.h>
- 
- #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
diff --git a/media-tv/xawtv/metadata.xml b/media-tv/xawtv/metadata.xml
deleted file mode 100644
index 8c450e10da82..000000000000
--- a/media-tv/xawtv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="xext">Enable use of XFree extensions (DGA,VidMode,DPMS)</flag>
-    <flag name="zvbi">Enable VBI Decoding Library for Zapping</flag>
-  </use>
-</pkgmetadata>
diff --git a/media-tv/xawtv/xawtv-3.95-r3.ebuild b/media-tv/xawtv/xawtv-3.95-r3.ebuild
deleted file mode 100644
index 429f21fa1914..000000000000
--- a/media-tv/xawtv/xawtv-3.95-r3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils font autotools flag-o-matic
-
-PATCHLEVEL="4"
-
-IUSE="aalib alsa dv lirc cpu_flags_x86_mmx motif nls opengl quicktime X xv zvbi xext"
-
-MY_FONT=tv-fonts-1.1
-DESCRIPTION="Small suite of video4linux related software"
-HOMEPAGE="http://bytesex.org/xawtv/"
-SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz
-	X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	virtual/jpeg:0
-	X? (
-		x11-libs/libFS
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXrender
-		xext? (
-			x11-libs/libXinerama
-			x11-libs/libXxf86dga
-			x11-libs/libXrandr
-			x11-libs/libXxf86vm
-		)
-		x11-apps/xset
-		xv? ( x11-libs/libXv )
-	)
-	motif? ( >=x11-libs/motif-2.3:0
-		app-text/recode )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	dv? ( media-libs/libdv )
-	lirc? ( app-misc/lirc )
-	opengl? ( virtual/opengl )
-	quicktime? ( media-libs/libquicktime )
-	zvbi? ( media-libs/zvbi
-		media-libs/libpng:0 )"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-apps/xset
-		x11-apps/bdftopcf
-		x11-proto/videoproto
-		xext? ( x11-proto/xineramaproto )
-	)"
-
-pkg_setup() {
-	if use X; then
-		font_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if use X; then
-		cd "${WORKDIR}/${MY_FONT}"
-		epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch"
-	fi
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
-	epatch "${FILESDIR}/${P}-pagemask-fix.patch"
-	epatch "${FILESDIR}/${P}-jpeg-7.patch"
-	epatch "${FILESDIR}/${P}-stdbool.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# It tries to include FSlib.h directly, but this seems to have moved.
-	use X && has_version x11-libs/libFS && append-flags -I/usr/include/X11/fonts
-
-	econf \
-		$(use_with X x) \
-		$(use_enable xext xfree-ext) \
-		$(use_enable xv xvideo) \
-		$(use_enable dv)  \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable motif) \
-		$(use_enable quicktime) \
-		$(use_enable alsa) \
-		$(use_enable lirc) \
-		$(use_enable opengl gl) \
-		$(use_enable zvbi) \
-		$(use_enable aalib aa)
-}
-
-src_compile() {
-	emake verbose=yes
-
-	if use X; then
-		cd "${WORKDIR}/${MY_FONT}"
-		emake -j1 DISPLAY=
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" resdir="${D}"/usr/share/X11 || die
-
-	# v4lctl is only installed automatically if the X USE flag is enabled
-	use X || \
-		dobin x11/v4lctl
-
-	dodoc Changes README* TODO "${FILESDIR}"/webcamrc
-	docinto cgi-bin
-	dodoc scripts/webcam.cgi
-
-	use X || \
-		rm -f "${D}"/usr/share/man/man1/{pia,propwatch}.1 \
-			"${D}"/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \
-			"${D}"/usr/share/{man,man/es}/man1/rootv.1
-
-	use motif || \
-		rm -f "${D}"/usr/share/man/man1/{motv,mtt}.1
-
-	use zvbi || \
-		rm -f "${D}"/usr/share/man/man1/{alevtd,mtt}.1 \
-			"${D}"/usr/share/{man,man/es}/man1/scantv.1
-
-	use nls || \
-		rm -f "${D}"/usr/share/man/fr \
-			"${D}"/usr/share/man/es
-
-	# The makefile seems to be fubar'd for some data
-	dodir /usr/share/${PN}
-	mv "${D}"/usr/share/*.list "${D}"/usr/share/${PN}
-	mv "${D}"/usr/share/Index* "${D}"/usr/share/${PN}
-
-	if use X; then
-		cd "${WORKDIR}/${MY_FONT}"
-		insinto /usr/share/fonts/xawtv
-		doins *.gz fonts.alias
-
-		font_xfont_config
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
-		cd /usr/share/fonts/xawtv
-		mkfontdir
-		eend
-	fi
-}
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
deleted file mode 100644
index 21fe5e7dd153..000000000000
--- a/media-tv/xbmc/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
-DIST xbmc-12-libav.tar.xz 6080 SHA256 84ba05dc66a476d2cb940c10355a22a04c5ef3b4fd6bd96a87a1fb2ffa7ccc0c SHA512 cde76dd435fb449ec843aaaa41a46f0fb4efeeb753669f9e4d052c06f00fe512be9fe994d5dd56794f47ce2f49146a2782f2da72dd78a1f66e5f54ca15723f13 WHIRLPOOL 07ba9e3fb3a4ba6d2c52055bcbe52009a87363bc8e0b21ebc90965bd3562196eee728103028fe8baaad250def5c6f76616a19731f825955648df9ff01c905e6b
-DIST xbmc-12.1.tar.gz 67430677 SHA256 29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3 SHA512 a8b5194766e32e09fa65c0e3656ff180c15761ce2348dc8a1fff0c65247b47e644db4fc91a829e73907b6a52c8e1bdebf624640b9dd06cea2c46bda1d2b3b4a5 WHIRLPOOL 13dbaf040faaaef1b04da892949e9684d7a958cec286b3a5f8cb449ec0fea6b5f96c2a473ece840b86103eb03dd1f39dd66411e5b0526785256d2cc92e1e95e8
-DIST xbmc-12.2.tar.gz 67663000 SHA256 b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6c7ca27a7dc749df0bcea1c SHA512 d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39 WHIRLPOOL c3fc97e5f45a38a259bca06af0b171630ac16832034410e45174d900358b1d16b72940b29475dcad72a2198d8722859a229152379ab7784a7d61f961eb261ddb
-DIST xbmc-12.3-generated-addons.tar.xz 52228 SHA256 477f789dea36969149fe118ecac1c4f3d8c3414772cc6c569be4aefb7e3f221e SHA512 2107271445c0cdcc14b348d011e12ffaaee75bbec506496798f64218256ab9e86cc0ada5edc1e70e509ac1ab366695fae4c15e90bd47fa57ccfe723d7e406b85 WHIRLPOOL 3963577539dee04f33dc4b988944f906688d77864d5e6a6b403e4578c9a91f2b77c256e6b4ed234a9722524c1c3acc626a28ff44c6376c09d93f24008abf54cd
-DIST xbmc-12.3.tar.gz 64615159 SHA256 3e15c960d034efdea5f92a7b74716cb48094842d077b076025fd8640754ede73 SHA512 abe5333f940460a2d40b04a4821f932b44c7605e0d4954e48781317aa25ee04e102b051165842094c5804024c637ca30506773dc3319aba7ab6dbfbe1973ccaa WHIRLPOOL 035cf5792c3c9785eb0a5227406c66298591bafc1251889d4e4a2742ffd715c374c0b6e092f5705db181412de9cae6d1eb3e9c370f3390858b4651f4c135fda1
-DIST xbmc-13.0_r2-generated-addons.tar.xz 312524 SHA256 82e2c219a09a758c5cc7a29c4e719c48255523ee79e2ac9fe72d39b45730e32e SHA512 1399b922711424844756d4f56696ea4be34b3ffbeedfc23bb832cb8e0ee9d6831f1c31ebc41d49f20c262f0cbb52601786e33550d5aca5de4de520fcee0f53ec WHIRLPOOL 67f184b241e90c369cee7ceaf3f714c002093a5b4e82614cd1413af35e7c3aef1adb2460d9286c54a40e5a74de37864eff86d5631e0a0ea33a69e3b29082e477
-DIST xbmc-13.0_r2.tar.gz 65616107 SHA256 663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903 SHA512 c56d11959797f4c6c3b1831afeab03332913fe6cc00f2542c45af725fe932ba3b997c2af997a602665734a6bcc061c40b8e876144894fdeab91b56df98958433 WHIRLPOOL 394b76c9d20dd90a0d04306d301d4bb656fe99afab6e7392d6274bd3eb8c9a3083bfe192f3850f6ea7123ed537baa64f658a48b14eee68b8226b4e620a76d199
-DIST xbmc-13.1-generated-addons.tar.xz 54968 SHA256 fb0c265640e8d468ed094d83be5089274b7effc1ad1946c42ce21d831442d00e SHA512 7081e25621141eaf76d552fe648fcf9ff4697fc76991b2081806ae829af6094012194cfab93b0c836242197ded00ff88458b89ed6008532b38552d3114d2a776 WHIRLPOOL d83a4290af3e9a2a88dccf074d73692e34a9877d2ff7ff6a946a601b0c8e9d01105eb04bf1d28f62bf648d7221df787b42e52b416f2e924bfa5208342b3ef51a
-DIST xbmc-13.1.tar.gz 65758346 SHA256 344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678 SHA512 918126a85a8194dd49d5c82a5a56d2006b811ff5fca535e95bcc5ef4ab135c5907d01595c2ceb4accdc69aef5afc621adae249a1fef85425945560a646e970b0 WHIRLPOOL d429dd9a03974aedd5cd256f0cf1409dcf7434ec1bafeaa0fcdaaa0d8bb08442183143d514d33b1de4934a5e800b03a8f64df5abdd7203d8a0557638e124b53a
-DIST xbmc-13.2-generated-addons.tar.xz 55008 SHA256 26d72e282f0458acb48b283edc27f7b71fc3f285344b8d4df6835a2520ae5650 SHA512 7b77bc22e0c665b74d90276cfa8b827222b22930f4d3bf335191dd5a8123f8bd74367de123199e124b02c7075aa81536058ace38926f4c03d0449ea55fd83254 WHIRLPOOL 449fe73e5ca7f5d973fb1d49e4e84f47955bced804bfea93a5bda67481af096dfa10581435fd84a26d59cb30f4b0eedd7096c905d5b1749286f85b042f90b626
-DIST xbmc-13.2.tar.gz 65900491 SHA256 acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585 SHA512 83a514410748b05da4c626caff34fec7b6b26a8bdea9f158e1c75721d3a47d36eb1f97ed4c162f6c2472a97f658e3b5285c1e0b144bfb4f654932586eee4d1c8 WHIRLPOOL 54e8551fa8393b9fd1076572e87b4d5a7e1b52acaa0443d14cfc8ed08e69a2efb86e3bb2cbe97d8894989ad7f892f512649165089e3d1035307f8cc820772e6f
-DIST xbmc_backports-12-1.tar.bz2 5010 SHA256 a222c32f5a4a0a8690b1544674cfbfeddf81943e85b6ea716768b83c9eba5fa8 SHA512 19b29808f7a3a7b0642f8463bdd229041588d2f42952fe55a17ab69b5b259cde249eb763598893463218d0ab6c747bf3c81e045bdbf5655f9f5f2d2067cb35d2 WHIRLPOOL cc6870dabca8b53a1a6055a4218a8f9bbb2c031ab3b928040325fb121ea75ae6db431542660d28c3bc6900a904e2c0949d69651b2f63faffe8bc7f670d519f06
diff --git a/media-tv/xbmc/files/generate.sh b/media-tv/xbmc/files/generate.sh
deleted file mode 100755
index 68d1082bcae5..000000000000
--- a/media-tv/xbmc/files/generate.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-PV=$1
-PN=xbmc
-P="${PN}-${PV}"
-DISTDIR="/usr/portage/distfiles"
-GITDIR="/usr/local/src/xbmc/git"
-
-if [[ ${PV} != "9999" ]] ; then
-	rm -rf ${PN}-*/
-	tar xf ${DISTDIR}/${P}.tar.gz
-	d=$(echo ${PN}-*/)
-else
-	stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d)
-	P+="-${stamp}"
-	cd ${GITDIR}
-	d=.
-fi
-make -C ${d} -j -f codegenerator.mk
-tar="${DISTDIR}/${P}-generated-addons.tar.xz"
-tar cf - ${d}/xbmc/interfaces/python/generated/*.cpp | xz > "${tar}"
-if [[ ${PV} != "9999" ]] ; then
-	rm -rf ${PN}-*/
-fi
-
-du -b "${tar}"
diff --git a/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch b/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch
deleted file mode 100644
index b6a2d731dc13..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4d74bd14c0fa158c5a2bcf18192f418fafc3a053 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Fri, 23 Mar 2012 11:59:02 +0100
-Subject: [PATCH 1/2] Add support for new ffmpeg-10/11 api.
-
----
- configure.in    |    3 +++
- lib/DllAvUtil.h |    3 +++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index bca9239..bea66ac 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1225,6 +1225,9 @@ if test "$use_external_ffmpeg" = "yes"; then
-   # old FFmpeg have this in libavcodec/opt.h instead:
-   AC_CHECK_HEADERS([libavutil/opt.h])
- 
-+  # new FFmpeg have math headers
-+  AC_CHECK_HEADERS([libavutil/mathematics.h],,)
-+
-   # We'll support the use of rgb2rgb.h if it exists.
-   AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
-   AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
-diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h
-index e882cac..e3b8a02 100644
---- a/lib/DllAvUtil.h
-+++ b/lib/DllAvUtil.h
-@@ -59,6 +59,9 @@ extern "C" {
-   #else
-     #include <ffmpeg/mem.h>
-   #endif
-+  #if (defined HAVE_LIBAVUTIL_MATHEMATICS_H)
-+    #include <libavutil/mathematics.h>
-+  #endif
- #else
-   #include "libavutil/avutil.h"
-   #include "libavutil/crc.h"
--- 
-1.7.3.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch b/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch
deleted file mode 100644
index 51372fdc1db9..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/406215
-
-From 97212837ec81c3869ba60e0690f26c09b9428747 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Fri, 30 Mar 2012 10:00:46 +0200
-Subject: [PATCH] Ensure we include proper header on ffmpeg.
-
----
- configure.in      |    3 +++
- lib/DllAvFilter.h |    6 +++++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index bca9239..d209f80 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1229,6 +1229,9 @@ if test "$use_external_ffmpeg" = "yes"; then
-   AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
-   AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
- 
-+  # check for avcodec header as it is not present on libav
-+  AC_CHECK_HEADERS([libavfilter/avcodec.h],,)
-+
-   # Check if AVFilterBufferRefVideoProps AVRational member is named
-   # 'pixel_aspect' or 'sample_aspect_ratio'.
-   AC_CHECK_MEMBER([AVFilterBufferRefVideoProps.sample_aspect_ratio],
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 827746e..d47623b 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -48,7 +48,11 @@ extern "C" {
-   #endif
-   /* for av_vsrc_buffer_add_frame */
-   #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
--    #include <libavfilter/vsrc_buffer.h>
-+    #if defined(HAVE_LIBAVFILTER_AVCODEC_H)
-+      #include <libavfilter/avcodec.h>
-+    #else
-+      #include <libavfilter/vsrc_buffer.h>
-+    #endif
-   #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-     int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
-                                  AVFrame *frame);
--- 
-1.7.3.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-libav.patch b/media-tv/xbmc/files/xbmc-11.0-libav.patch
deleted file mode 100644
index 0aaa1ce41849..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-libav.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://bugs.gentoo.org/406215
-
-From c74abc298e2075f431d9fa700fcfc5e1bbbddf22 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Fri, 23 Mar 2012 12:08:53 +0100
-Subject: [PATCH 2/2] Add support for libav api as it sligthly differ.
-
-The libav use micro version as 0
-The ffmpeg use the micro version as 100+
-
-Simply check if the variable is defined then it is not libav.
----
- lib/DllAvFilter.h                                  |   10 +++++++++-
- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp        |    4 ++++
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 302e35c..827746e 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -48,7 +48,7 @@ extern "C" {
-   #endif
-   /* for av_vsrc_buffer_add_frame */
-   #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
--    #include <libavfilter/avcodec.h>
-+    #include <libavfilter/vsrc_buffer.h>
-   #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-     int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
-                                  AVFrame *frame);
-@@ -83,7 +83,11 @@ public:
-   virtual int avfilter_poll_frame(AVFilterLink *link)=0;
-   virtual int avfilter_request_frame(AVFilterLink *link)=0;
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
-+#else
-+  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect)=0;
-+#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame)=0;
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
-@@ -172,7 +176,11 @@ public:
-   virtual int avfilter_poll_frame(AVFilterLink *link) { return ::avfilter_poll_frame(link); }
-   virtual int avfilter_request_frame(AVFilterLink *link) { return ::avfilter_request_frame(link); }
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
-+#else
-+  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, pts, pixel_aspect); }
-+#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame); }
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-index b4e1451..4e5eedf 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -814,7 +814,11 @@ int CDVDVideoCodecFFmpeg::FilterProcess(AVFrame* frame)
-   if (frame)
-   {
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
-     result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0);
-+#else
-+    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, frame->pts, m_pCodecContext->sample_aspect_ratio);
-+#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-     result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame);
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
--- 
-1.7.3.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch b/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch
deleted file mode 100644
index ebee2d063181..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/445174
-
-fix from upstream
-
-From 6ffd1cb4e2cba40888c24ff84afd04a5a07a22e9 Mon Sep 17 00:00:00 2001
-From: Torsten Kurbad <github@tk-webart.de>
-Date: Wed, 28 Nov 2012 21:29:29 +0100
-Subject: [PATCH] NFSDirectory.cpp must include limits.h
-
----
- xbmc/filesystem/NFSDirectory.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
-index 4dc0f31..d306331 100644
---- a/xbmc/filesystem/NFSDirectory.cpp
-+++ b/xbmc/filesystem/NFSDirectory.cpp
-@@ -35,6 +35,7 @@
- #include "threads/SingleLock.h"
- using namespace XFILE;
- using namespace std;
-+#include <limits.h>
- #include <nfsc/libnfs-raw-mount.h>
- #include <nfsc/libnfs-raw-nfs.h>
- 
--- 
-1.8.0
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch b/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch
deleted file mode 100644
index 179697a8f5ce..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/400617
-
-do not force any particular ABI or FPU or SIMD compiler flags for arm
-targets.  let the toolchain and user CFLAGS control that.
-
---- a/configure.in
-+++ b/configure.in
-@@ -571,7 +571,7 @@
-     LIBS="$LIBS -framework DiskArbitration"
-     LIBS="$LIBS -framework ApplicationServices"
-   fi
--elif test "$use_arch" = "arm"; then
-+elif false; then
-   CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
-   CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
-   FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp"
diff --git a/media-tv/xbmc/files/xbmc-11.0-no-exec-stack.patch b/media-tv/xbmc/files/xbmc-11.0-no-exec-stack.patch
deleted file mode 100644
index 35ff747d4f8b..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-no-exec-stack.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://trac.xbmc.org/ticket/12735
-
-merged upstream already
-
-From f0e33eefa4b5d46f26811db2f5e943dcd7f2870e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 1 Mar 2012 00:04:49 -0500
-Subject: [PATCH] mark stack as non-executable
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- xbmc/utils/fastmemcpy-arm.S |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/xbmc/utils/fastmemcpy-arm.S b/xbmc/utils/fastmemcpy-arm.S
-index 0e810a7..3d77c68 100644
---- a/xbmc/utils/fastmemcpy-arm.S
-+++ b/xbmc/utils/fastmemcpy-arm.S
-@@ -527,3 +527,8 @@ copy_last_3_and_return:
- 
- #endif    /* __ARM_ARCH__ < 7 */
- #endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+/* we don't need an executable stack */
-+.section .note.GNU-stack,"",%progbits
-+#endif
--- 
-1.7.8.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-nomythtv.patch b/media-tv/xbmc/files/xbmc-11.0-nomythtv.patch
deleted file mode 100644
index 09286dba0a87..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-nomythtv.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-http://trac.xbmc.org/ticket/11775
-
-make mysql/mythtv support optional
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -127,13 +127,17 @@ endif
- LIB_DIRS=\
- 	lib/cximage-6.0 \
- 	lib/libexif \
--	lib/cmyth \
- 	lib/libhdhomerun \
- 	lib/libid3tag \
- 	lib/libapetag \
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
-+ifeq (@BUILD_MYTHTV@,1)
-+LIB_DIRS+=\
-+	lib/cmyth
-+endif
-+
- SS_DIRS=
- ifeq (@USE_OPENGL@,1)
- SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
-@@ -418,7 +422,10 @@ imagelib: dllloader
- 	$(MAKE) -C lib/cximage-6.0
- 
- codecs: papcodecs dvdpcodecs
--libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
-+libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
-+ifeq (@BUILD_MYTHTV@,1)
-+libs: cmyth
-+endif
- externals: codecs libs visualizations screensavers
- 
- xcode_depends: \
---- a/configure.in
-+++ b/configure.in
-@@ -68,6 +68,9 @@ goom_enabled="== GOOM enabled. =="
- goom_disabled="== GOOM disabled. =="
- pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
- pulse_disabled="== PulseAudio support manually disabled. =="
-+mysql_not_found="Could not find libmysqlclient. MySQL (and MythTV) support disabled. =="
-+mysql_disabled="== MySQL support disabled. =="
-+mythtv_disabled="== MythTV support disabled. =="
- dvdcss_enabled="== DVDCSS support enabled. =="
- dvdcss_disabled="== DVDCSS support disabled. =="
- hal_not_found="== Could not find hal. HAL support disabled. =="
-@@ -238,6 +241,18 @@ AC_ARG_ENABLE([ffmpeg_libvorbis],
-   [use_ffmpeg_libvorbis=$enableval],
-   [use_ffmpeg_libvorbis=no])
- 
-+AC_ARG_ENABLE([mysql],
-+  [AS_HELP_STRING([--enable-mysql],
-+  [enable MySQL support (default is auto)])],
-+  [use_mysql=$enableval],
-+  [use_mysql=auto])
-+
-+AC_ARG_ENABLE([mythtv],
-+  [AS_HELP_STRING([--enable-mythtv],
-+  [enable MythTV support (default is auto)])],
-+  [use_mythtv=$enableval],
-+  [use_mythtv=auto])
-+
- AC_ARG_ENABLE([dvdcss],
-   [AS_HELP_STRING([--enable-dvdcss],
-   [enable DVDCSS support (default is yes)])],
-@@ -563,14 +578,31 @@ else
- fi
- 
- # platform common libraries
--AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
--if test $MYSQL_CONFIG = "yes"; then
--  INCLUDES="$INCLUDES `mysql_config --include`"
--  MYSQL_LIBS=`mysql_config --libs`
--  LIBS="$LIBS $MYSQL_LIBS"
--  AC_SUBST(MYSQL_LIBS)
--else
--  AC_MSG_ERROR($missing_program)
-+have_mysql=no
-+if test "$use_mysql" != "no"; then
-+  AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
-+  if test $MYSQL_CONFIG = "yes"; then
-+    INCLUDES="$INCLUDES `mysql_config --include`"
-+    MYSQL_LIBS=`mysql_config --libs`
-+    LIBS="$LIBS $MYSQL_LIBS"
-+    AC_SUBST(MYSQL_LIBS)
-+    AC_CHECK_LIB([mysqlclient], [main], have_mysql=yes)
-+  fi
-+fi
-+if test "$have_mysql" = "yes"; then
-+  BUILD_MYTHTV=1
-+  AC_DEFINE([BUILD_MYSQL], [1], [Define to 1 to build MySQL.])
-+  if test "$use_mysql" != "no"; then
-+    AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.])
-+  fi
-+elif test "$use_mysql" = "yes" || test "$use_mythtv" = "yes"; then
-+  AC_MSG_ERROR([$mysql_not_found])
-+else
-+  BUILD_MYTHTV=0
-+  use_mysql=no
-+  AC_MSG_NOTICE($mysql_disabled)
-+  use_mythtv=no
-+  AC_MSG_NOTICE($mythtv_disabled)
- fi
- AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
-@@ -594,7 +625,6 @@ AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
--AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssh],         [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
- AC_CHECK_LIB([smbclient],   [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([bluetooth],   [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
-@@ -1319,6 +1349,18 @@ else
-   final_message="$final_message\n  HAL Support:\tNo"
- fi
- 
-+if test "$use_mysql" = "yes"; then
-+  final_message="$final_message\n  MySQL:\tYes"
-+else
-+  final_message="$final_message\n  MySQL:\tNo"
-+fi
-+
-+if test "$use_mythtv" = "yes"; then
-+  final_message="$final_message\n  MythTV:\tYes"
-+else
-+  final_message="$final_message\n  MythTV:\tNo"
-+fi
-+
- # DVDCSS
- if test "$use_dvdcss" = "yes"; then
-   AC_MSG_NOTICE($dvdcss_enabled)
-@@ -1490,6 +1532,8 @@ AC_SUBST(USE_EXTERNAL_FFMPEG)
- AC_SUBST(PYTHON_VERSION)
- AC_SUBST(OUTPUT_FILES)
- AC_SUBST(HAVE_XBMC_NONFREE)
-+AC_SUBST(BUILD_MYSQL)
-+AC_SUBST(BUILD_MYTHTV)
- AC_SUBST(USE_ASAP_CODEC)
- AC_SUBST(LIBCURL_BASENAME)
- AC_SUBST(LIBFLAC_BASENAME)
---- a/xbmc/dbwrappers/Database.cpp
-+++ b/xbmc/dbwrappers/Database.cpp
-@@ -29,7 +29,9 @@
- #include "utils/AutoPtrHandle.h"
- #include "utils/log.h"
- #include "utils/URIUtils.h"
-+#ifdef BUILD_MYSQL
- #include "mysqldataset.h"
-+#endif /* BUILD_MYSQL */
- #include "sqlitedataset.h"
- 
- 
-@@ -266,6 +268,7 @@
- 
-   m_sqlite = true;
- 
-+#ifdef BUILD_MYSQL
-   if ( dbSettings.type.Equals("mysql") )
-   {
-     // check we have all information before we cancel the fallback
-@@ -276,7 +279,8 @@
-       CLog::Log(LOGINFO, "Essential mysql database information is missing. Require at least host, user and pass defined.");
-   }
-   else
-+#endif /* BUILD_MYSQL */
-   {
-     dbSettings.type = "sqlite3";
-     dbSettings.host = _P(g_settings.GetDatabaseFolder());
-     dbSettings.name = GetBaseDBName();
-@@ -369,10 +373,12 @@
-   {
-     m_pDB.reset( new SqliteDatabase() ) ;
-   }
-+#ifdef BUILD_MYSQL
-   else if (dbSettings.type.Equals("mysql"))
-   {
-     m_pDB.reset( new MysqlDatabase() ) ;
-   }
-+#endif /* BUILD_MYSQL */
-   else
-   {
-     CLog::Log(LOGERROR, "Unable to determine database type: %s", dbSettings.type.c_str());
---- a/xbmc/dbwrappers/mysqldataset.cpp
-+++ b/xbmc/dbwrappers/mysqldataset.cpp
-@@ -23,9 +23,11 @@
- #include <string>
- #include <set>
- 
-+#include "system.h" // for GetLastError()
-+#ifdef BUILD_MYSQL
-+
- #include "mysqldataset.h"
- #include "utils/log.h"
--#include "system.h" // for GetLastError()
- #include "mysql/errmsg.h"
- #ifdef _WIN32
- #pragma comment(lib, "mysqlclient.lib")
-@@ -1562,3 +1564,4 @@
- 
- }//namespace
- 
-+#endif /* BUILD_MYSQL */
diff --git a/media-tv/xbmc/files/xbmc-12.1-nomythtv.patch b/media-tv/xbmc/files/xbmc-12.1-nomythtv.patch
deleted file mode 100644
index f793ba34dcf0..000000000000
--- a/media-tv/xbmc/files/xbmc-12.1-nomythtv.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-http://trac.xbmc.org/ticket/11775
-
-make mythtv support optional
-
-diff --git a/Makefile.in b/Makefile.in
-index 9ffae7e..17cc525 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -147,7 +147,7 @@ LIB_DIRS=\
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
--ifeq (@USE_MYSQL@,1)
-+ifeq (@USE_MYTHTV@,1)
- LIB_DIRS += lib/cmyth
- CMYTH=cmyth
- endif
-diff --git a/configure.in b/configure.in
-index d44825f..629d7b4 100755
---- a/configure.in
-+++ b/configure.in
-@@ -387,6 +387,12 @@ AC_ARG_ENABLE([mysql],
-   [use_mysql=$enableval],
-   [use_mysql=yes])
- 
-+AC_ARG_ENABLE([mythtv],
-+  [AS_HELP_STRING([--disable-mythtv],
-+  [disable mythtv])],
-+  [use_mythtv=$enableval],
-+  [use_mythtv=yes])
-+
- AC_ARG_ENABLE([webserver],
-   [AS_HELP_STRING([--disable-webserver],
-   [disable webserver])],
-@@ -748,6 +754,9 @@ if test "$use_mysql" = "yes"; then
-   else
-     AC_MSG_ERROR($missing_program)
-   fi
-+  if test "$use_mythtv" = "yes"; then
-+    AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"])
-+  fi
- fi
- AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
-@@ -1895,6 +1904,15 @@ else
-   final_message="$final_message\n  MySQL:\tNo"
-   USE_MYSQL=0
- fi
-+
-+if test "$use_mythtv" = "yes"; then
-+  final_message="$final_message\n  MythTV:\tYes"
-+  USE_MYTHTV=1
-+else
-+  final_message="$final_message\n  MythTV:\tNo"
-+  USE_MYTHTV=0
-+fi
-+
- if test "$use_webserver" = "yes"; then
-   final_message="$final_message\n  Webserver:\tYes"
-   USE_WEB_SERVER=1
-@@ -2123,6 +2141,7 @@ AC_SUBST(USE_LIBUDEV)
- AC_SUBST(USE_LIBUSB)
- AC_SUBST(USE_LIBCEC)
- AC_SUBST(USE_MYSQL)
-+AC_SUBST(USE_MYTHTV)
- AC_SUBST(USE_WEB_SERVER)
- 
- 
diff --git a/media-tv/xbmc/files/xbmc-12.3-no-sse2.patch b/media-tv/xbmc/files/xbmc-12.3-no-sse2.patch
deleted file mode 100644
index a0f787c03864..000000000000
--- a/media-tv/xbmc/files/xbmc-12.3-no-sse2.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-https://bugs.gentoo.org/475266
-
-From 07ccc514dc688f0dd53f603d206894023e65ab20 Mon Sep 17 00:00:00 2001
-From: Jose Quinteiro <gentoo@quinteiro.org>
-Date: Sat, 27 Apr 2013 11:29:51 -0700
-Subject: [PATCH] Detect SSE2 support
-
-Compilation on an older 32-bit Athlon XP chip fails with the error
-"./Utils/AEUtil.h:50:12: error: '__m128i' does not name a type"
-This is because the __m128i type is only available on SSE2 platforms.
-Modify the preprocessor logic to detect SSE and SSE2 support separately.
-
-The "emmintrin.h" header should only be included on SSE2 platforms as
-well.
----
- xbmc/cores/AudioEngine/Utils/AEConvert.cpp | 25 ++++++++++---------------
- xbmc/cores/AudioEngine/Utils/AEUtil.cpp    |  4 ++--
- xbmc/cores/AudioEngine/Utils/AEUtil.h      |  9 ++++++++-
- 3 files changed, 20 insertions(+), 18 deletions(-)
-
-diff --git a/xbmc/cores/AudioEngine/Utils/AEConvert.cpp b/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
-index 0b0b646..7cfde5e 100644
---- a/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
-+++ b/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
-@@ -33,11 +33,6 @@
- #include <math.h>
- #include <string.h>
- 
--#ifdef __SSE__
--#include <xmmintrin.h>
--#include <emmintrin.h>
--#endif
--
- #ifdef __ARM_NEON__
- #include <arm_neon.h>
- #endif
-@@ -517,7 +512,7 @@ unsigned int CAEConvert::Float_S8(float *data, const unsigned int samples, uint8
- unsigned int CAEConvert::Float_S16LE(float *data, const unsigned int samples, uint8_t *dest)
- {
-   int16_t *dst = (int16_t*)dest;
--  #ifdef __SSE__
-+  #ifdef __SSE2__
- 
-   unsigned int count     = samples;
-   unsigned int unaligned = (0x10 - ((uintptr_t)data & 0xF)) >> 2;
-@@ -623,7 +618,7 @@ unsigned int CAEConvert::Float_S16LE(float *data, const unsigned int samples, ui
-   /* cleanup */
-   _mm_empty();
- 
--  #else /* no SSE */
-+  #else /* no SSE2 */
- 
-   uint32_t i    = 0;
-   uint32_t even = samples & ~0x3;
-@@ -651,7 +646,7 @@ unsigned int CAEConvert::Float_S16LE(float *data, const unsigned int samples, ui
- unsigned int CAEConvert::Float_S16BE(float *data, const unsigned int samples, uint8_t *dest)
- {
-   int16_t *dst = (int16_t*)dest;
--  #ifdef __SSE__
-+  #ifdef __SSE2__
- 
-   unsigned int count     = samples;
-   unsigned int unaligned = (0x10 - ((uintptr_t)data & 0xF)) >> 2;
-@@ -757,7 +752,7 @@ unsigned int CAEConvert::Float_S16BE(float *data, const unsigned int samples, ui
-   /* cleanup */
-   _mm_empty();
- 
--  #else /* no SSE */
-+  #else /* no SSE2 */
- 
-   uint32_t i    = 0;
-   uint32_t even = samples & ~0x3;
-@@ -785,7 +780,7 @@ unsigned int CAEConvert::Float_S16BE(float *data, const unsigned int samples, ui
- unsigned int CAEConvert::Float_S24NE4(float *data, const unsigned int samples, uint8_t *dest)
- {
-   int32_t *dst = (int32_t*)dest;
--  #ifdef __SSE__
-+  #ifdef __SSE2__
- 
-   const __m128 mul = _mm_set_ps1((float)INT24_MAX+.5f);
-   unsigned int count = samples;
-@@ -835,7 +830,7 @@ unsigned int CAEConvert::Float_S24NE4(float *data, const unsigned int samples, u
-     }
-   }
-   _mm_empty();
--  #else /* no SSE */
-+  #else /* no SSE2 */
-   for (uint32_t i = 0; i < samples; ++i)
-     *dst++ = (safeRound(*data++ * ((float)INT24_MAX+.5f)) & 0xFFFFFF) << 8;
-   #endif
-@@ -929,7 +924,7 @@ unsigned int CAEConvert::Float_S24NE3(float *data, const unsigned int samples, u
- unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, uint8_t *dest)
- {
-   int32_t *dst = (int32_t*)dest;
--  #ifdef __SSE__
-+  #ifdef __SSE2__
-   const __m128 mul = _mm_set_ps1(MUL32);
-   unsigned int count = samples;
- 
-@@ -989,7 +984,7 @@ unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, ui
-   _mm_empty();
-   #else
- 
--  /* no SIMD */
-+  /* no SSE2 */
-   for (uint32_t i = 0; i < samples; ++i, ++data, ++dst)
-   {
-     dst[0] = safeRound(data[0] * MUL32);
-@@ -1038,7 +1033,7 @@ unsigned int CAEConvert::Float_S32LE_Neon(float *data, const unsigned int sample
- unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, uint8_t *dest)
- {
-   int32_t *dst = (int32_t*)dest;
--  #ifdef __SSE__
-+  #ifdef __SSE2__
-   const __m128 mul = _mm_set_ps1(MUL32);
-   unsigned int count = samples;
- 
-@@ -1097,7 +1092,7 @@ unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, ui
-   }
-   _mm_empty();
-   #else
--  /* no SIMD */
-+  /* no SSE2 */
-   for (uint32_t i = 0; i < samples; ++i, ++data, ++dst)
-   {
-     dst[0] = safeRound(data[0] * MUL32);
-diff --git a/xbmc/cores/AudioEngine/Utils/AEUtil.cpp b/xbmc/cores/AudioEngine/Utils/AEUtil.cpp
-index 6de84dc..2b6e0cd 100644
---- a/xbmc/cores/AudioEngine/Utils/AEUtil.cpp
-+++ b/xbmc/cores/AudioEngine/Utils/AEUtil.cpp
-@@ -30,7 +30,7 @@ using namespace std;
- 
- /* declare the rng seed and initialize it */
- unsigned int CAEUtil::m_seed = (unsigned int)(CurrentHostCounter() / 1000.0f);
--#ifdef __SSE__
-+#ifdef __SSE2__
-   /* declare the SSE seed and initialize it */
-   MEMALIGN(16, __m128i CAEUtil::m_sseSeed) = _mm_set_epi32(CAEUtil::m_seed, CAEUtil::m_seed+1, CAEUtil::m_seed, CAEUtil::m_seed+1);
- #endif
-@@ -386,7 +386,7 @@ float CAEUtil::FloatRand1(const float min, const float max)
- 
- void CAEUtil::FloatRand4(const float min, const float max, float result[4], __m128 *sseresult/* = NULL */)
- {
--  #ifdef __SSE__
-+  #ifdef __SSE2__
-     /*
-       this method may be called from other SSE code, we need
-       to calculate the delta & factor using SSE as the FPU
-diff --git a/xbmc/cores/AudioEngine/Utils/AEUtil.h b/xbmc/cores/AudioEngine/Utils/AEUtil.h
-index 48cbc3b..6fdb7f2 100644
---- a/xbmc/cores/AudioEngine/Utils/AEUtil.h
-+++ b/xbmc/cores/AudioEngine/Utils/AEUtil.h
-@@ -27,6 +27,9 @@
- #ifdef TARGET_WINDOWS
- #if _M_IX86_FP>0 && !defined(__SSE__)
- #define __SSE__
-+#if _M_IX86_FP>1 && !defined(__SSE2__)
-+#define __SSE2__
-+#endif
- #endif
- #endif
- 
-@@ -36,6 +39,10 @@
- #define __m128 void
- #endif
- 
-+#ifdef __SSE2__
-+#include <emmintrin.h>
-+#endif
-+
- #ifdef __GNUC__
-   #define MEMALIGN(b, x) x __attribute__((aligned(b)))
- #else
-@@ -63,7 +70,7 @@ class CAEUtil
- {
- private:
-   static unsigned int m_seed;
--  #ifdef __SSE__
-+  #ifdef __SSE2__
-     static __m128i m_sseSeed;
-   #endif
- 
--- 
-1.8.4.3
-
diff --git a/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch b/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch
deleted file mode 100644
index 82a738356ff8..000000000000
--- a/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/400617
-
-do not force any particular ABI or FPU or SIMD compiler flags for arm
-targets.  let the toolchain and user CFLAGS control that.
-
---- a/configure.in
-+++ b/configure.in
-@@ -571,7 +571,7 @@
- elif test "$target_platform" = "target_raspberry_pi"; then
-   ARCH="arm"
-   use_arch="arm"
--elif test "$use_arch" = "arm"; then
-+elif false; then
-   CFLAGS="$CFLAGS -mno-apcs-stack-check"
-   CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
-   FFMPEG_EXTRACFLAGS=""
diff --git a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
deleted file mode 100644
index 40ab23b98d1c..000000000000
--- a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-http://trac.xbmc.org/ticket/11775
-
-make mythtv support optional
-
-diff --git a/Makefile.in b/Makefile.in
-index 9ffae7e..17cc525 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -209,7 +209,7 @@ LIB_DIRS=\
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
--ifeq (@USE_MYSQL@,1)
-+ifeq (@USE_MYTHTV@,1)
- LIB_DIRS += lib/cmyth
- CMYTH=cmyth
- endif
-diff --git a/configure.in b/configure.in
-index d44825f..629d7b4 100755
---- a/configure.in
-+++ b/configure.in
-@@ -479,6 +479,12 @@ AC_ARG_ENABLE([mysql],
-   [AS_HELP_STRING([--disable-mysql],
-   [disable mysql])],
- 
-+AC_ARG_ENABLE([mythtv],
-+  [AS_HELP_STRING([--disable-mythtv],
-+  [disable mythtv])],
-+  [use_mythtv=$enableval],
-+  [use_mythtv=yes])
-+
- AC_ARG_ENABLE([webserver],
-   [AS_HELP_STRING([--disable-webserver],
-   [disable webserver])],
-@@ -1080,6 +1086,9 @@ if test "$use_mysql" = "yes"; then
-   else
-     AC_MSG_ERROR($missing_program)
-   fi
-+  if test "$use_mythtv" = "yes"; then
-+    AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"])
-+  fi
- fi
- AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
-@@ -2372,6 +2381,15 @@ else
-   final_message="$final_message\n  MySQL:\tNo"
-   USE_MYSQL=0
- fi
-+
-+if test "$use_mythtv" = "yes"; then
-+  final_message="$final_message\n  MythTV:\tYes"
-+  USE_MYTHTV=1
-+else
-+  final_message="$final_message\n  MythTV:\tNo"
-+  USE_MYTHTV=0
-+fi
-+
- if test "$use_webserver" = "yes"; then
-   final_message="$final_message\n  Webserver:\tYes"
-   USE_WEB_SERVER=1
-@@ -2675,6 +2693,7 @@ AC_SUBST(USE_LIBUDEV)
- AC_SUBST(USE_LIBUSB)
- AC_SUBST(USE_LIBCEC)
- AC_SUBST(USE_MYSQL)
-+AC_SUBST(USE_MYTHTV)
- AC_SUBST(USE_WAYLAND)
-
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
deleted file mode 100644
index 42978c85f6c2..000000000000
--- a/media-tv/xbmc/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
-</maintainer>
-<use>
- <flag name="airplay">enable AirPlay support</flag>
- <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
- <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
- <flag name="fishbmc">Enable fishBMC visualization plugin</flag>
- <flag name="gles">Enable support for GLES</flag>
- <flag name="goom">Enable GOOM visualization plugin</flag>
- <flag name="midi">Support MIDI files</flag>
- <flag name="nfs">Enable NFS client support</flag>
- <flag name="projectm">Enable projectM visualization plugin</flag>
- <flag name="pvr">Enable MythTV support</flag>
- <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
- <flag name="rsxs">Enable really slick X screensavers</flag>
- <flag name="sftp">Support browsing files over SFTP</flag>
- <flag name="webserver">Enable internal webserver</flag>
- <flag name="xrandr">Support X randr extension</flag>
-</use>
-<upstream>
- <bugs-to>http://trac.kodi.tv/</bugs-to>
- <remote-id type="github">xbmc/xbmc</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/media-tv/xbmc/xbmc-11.0.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild
deleted file mode 100644
index 978781f50f1a..000000000000
--- a/media-tv/xbmc/xbmc-11.0.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH=sqlite
-
-inherit eutils python
-
-EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2 autotools
-else
-	inherit autotools
-	MY_P=${P/_/-*_}
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom joystick midi mysql profile +projectm pulseaudio pvr +rsxs rtmp +samba cpu_flags_x86_sse cpu_flags_x86_sse2 udisks upower vaapi vdpau webserver +xrandr"
-REQUIRED_USE="pvr? ( mysql )"
-
-COMMON_DEPEND="virtual/glu
-	virtual/opengl
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	>=dev-lang/python-2.4
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( dev-libs/libcec )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/yajl
-	dev-python/simplejson
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	virtual/jpeg
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	media-libs/libsdl[sound,opengl,video,X]
-	alsa? ( media-libs/libsdl[alsa] )
-	media-libs/libvorbis
-	media-libs/sdl-gfx
-	>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-	media-libs/sdl-mixer
-	media-libs/sdl-sound
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg:0 )
-	>=virtual/ffmpeg-0.6[encode]
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	webserver? ( net-libs/libmicrohttpd )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	sys-libs/zlib
-	mysql? ( virtual/mysql )
-	x11-apps/xdpyinfo
-	x11-apps/mesa-progs
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		virtual/ffmpeg[vdpau]
-	)
-	x11-libs/libXinerama
-	xrandr? ( x11-libs/libXrandr )
-	x11-libs/libXrender"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	x11-proto/xineramaproto
-	dev-util/cmake
-	x86? ( dev-lang/nasm )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-		cd "${S}"
-		rm -f configure
-	else
-		unpack ${A}
-		cd "${S}"
-	fi
-
-	# Fix case sensitivity
-	mv media/Fonts/{a,A}rial.ttf || die
-	mv media/{S,s}plash.png || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11.0-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-11.0-no-arm-flags.patch #400617
-	epatch "${FILESDIR}"/${PN}-11.0-no-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg-0.10.2.patch #406215
-	epatch "${FILESDIR}"/${PN}-11.0-libav.patch #406215
-	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg.patch #406215
-	epatch "${FILESDIR}"/${P}-nfs-limits.patch #445174
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	local d
-	for d in \
-		. \
-		lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} \
-		xbmc/screensavers/rsxs-* \
-		xbmc/visualizations/Goom/goom2k4-0
-	do
-		[[ -e ${d}/configure ]] && continue
-		pushd ${d} >/dev/null
-		eautoreconf
-		popd >/dev/null
-	done
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# Avoid lsb-release dependency
-	sed -i \
-		-e 's:lsb_release -d:cat /etc/gentoo-release:' \
-		xbmc/utils/SystemInfo.cpp || die
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		--enable-gl \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon tools/Linux/xbmc-48x48.png xbmc.png
-
-	insinto "$(python_get_sitedir)" #309885
-	doins tools/EventClients/lib/python/xbmcclient.py || die
-	newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-12.1-r1.ebuild b/media-tv/xbmc/xbmc-12.1-r1.ebuild
deleted file mode 100644
index d02d76c6ea18..000000000000
--- a/media-tv/xbmc/xbmc-12.1-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
-	SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="Frodo_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	;;
-*)
-	MY_P=${P/_/-*_}
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	;;
-esac
-
-# libav patchset
-SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/xbmc-12-libav.tar.xz"
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	X? ( sdl )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	sdl? ( media-libs/libsdl[sound,opengl,video,X] )
-	alsa? ( media-libs/libsdl[alsa] )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	sdl? (
-		media-libs/sdl-gfx
-		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-		media-libs/sdl-mixer
-		media-libs/sdl-sound
-	)
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	|| ( media-libs/libpostproc media-video/ffmpeg:0 )
-	>=virtual/ffmpeg-9[encode]
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? ( virtual/opengl )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		virtual/ffmpeg[vdpau]
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-12.1-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# libav patchset
-	EPATCH_FORCE="yes" \
-	EPATCH_SOURCE="${WORKDIR}" \
-	EPATCH_SUFFIX="patch" \
-	epatch
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable neon) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		--with-projectm-presets-dir="${EPREFIX}/usr/share/projectM/presets/" \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sdl) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon tools/Linux/xbmc-48x48.png xbmc.png
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-12.2-r1.ebuild b/media-tv/xbmc/xbmc-12.2-r1.ebuild
deleted file mode 100644
index a5d2a1fc203c..000000000000
--- a/media-tv/xbmc/xbmc-12.2-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-BACKPORTS_VERSION=1
-
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
-	SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="Frodo_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="amd64 x86"
-	;;
-*)
-	MY_P=${P/_/-*_}
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
-		mirror://gentoo/${PN}_backports-12-${BACKPORTS_VERSION}.tar.bz2"
-	KEYWORDS="amd64 x86"
-	;;
-esac
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	X? ( sdl )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	sdl? ( media-libs/libsdl[sound,opengl,video,X] )
-	alsa? ( media-libs/libsdl[alsa] )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	sdl? (
-		media-libs/sdl-gfx
-		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-		media-libs/sdl-mixer
-		media-libs/sdl-sound
-	)
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	|| ( media-libs/libpostproc media-video/ffmpeg:0 )
-	>=virtual/ffmpeg-0.6[encode]
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? ( virtual/opengl )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		virtual/ffmpeg[vdpau]
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-12.1-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	# Backported fixes
-	EPATCH_MULTI_MSG="Applying patches backported from master..." \
-		EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/${PN}_backports"
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable neon) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sdl) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon tools/Linux/xbmc-48x48.png xbmc.png
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-12.3.ebuild b/media-tv/xbmc/xbmc-12.3.ebuild
deleted file mode 100644
index 3ecead50c017..000000000000
--- a/media-tv/xbmc/xbmc-12.3.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-BACKPORTS_VERSION=1
-
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
-	SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="Frodo_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	;;
-*)
-	MY_P=${P/_/-*_}
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
-		mirror://gentoo/${PN}_backports-12-${BACKPORTS_VERSION}.tar.bz2
-		mirror://gentoo/${P}-generated-addons.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	;;
-esac
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	X? ( sdl )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	sdl? ( media-libs/libsdl[sound,opengl,video,X] )
-	alsa? ( media-libs/libsdl[alsa] )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	sdl? (
-		media-libs/sdl-gfx
-		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-		media-libs/sdl-mixer
-		media-libs/sdl-sound
-	)
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	|| ( media-libs/libpostproc media-video/ffmpeg:0 )
-	>=virtual/ffmpeg-0.6[encode]
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		virtual/ffmpeg[vdpau]
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
-
-S=${WORKDIR}/${MY_P}-Frodo
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-12.1-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	epatch "${FILESDIR}"/${PN}-12.3-no-sse2.patch #475266
-	# Backported fixes
-	EPATCH_MULTI_MSG="Applying patches backported from master..." \
-		EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/${PN}_backports"
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -exec touch -r configure {} +
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable neon) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sdl) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon tools/Linux/xbmc-48x48.png xbmc.png
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-13.0_p2.ebuild b/media-tv/xbmc/xbmc-13.0_p2.ebuild
deleted file mode 100644
index 765b6b0df6a3..000000000000
--- a/media-tv/xbmc/xbmc-13.0_p2.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-CODENAME="Gotham"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
-	#SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="${CODENAME}_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P}
-	;;
-*|*_p*)
-	MY_PV=${PV/_p/_r}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
-		http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-
-	S=${WORKDIR}/${PN}-
-	[[ ${PV} == *_p* ]] \
-		&& S+=${PV/_p/-${CODENAME}_r} \
-		|| S+=${MY_PV}
-	;;
-esac
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	X? ( sdl )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-fonts/corefonts
-	media-fonts/roboto
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	sdl? ( media-libs/libsdl[sound,opengl,video,X] )
-	alsa? ( media-libs/libsdl[alsa] )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	sdl? (
-		media-libs/sdl-gfx
-		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-		media-libs/sdl-mixer
-		media-libs/sdl-sound
-	)
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	|| ( >=media-video/ffmpeg-1.2.1:0=[encode] ( media-libs/libpostproc >=media-video/libav-10_alpha:=[encode] ) )
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		|| ( >=media-video/ffmpeg-1.2.1:0=[vdpau] >=media-video/libav-10_alpha:=[vdpau] )
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package.  #488118
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Building ${PN} against media-video/libav is not supported upstream."
-		ewarn "It requires building a (small) wrapper library with some code"
-		ewarn "from media-video/ffmpeg."
-		ewarn "If you experience issues, please try with media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	[[ ${PV} == "9999" ]] && emake -f codegenerator.mk
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -exec touch -r configure {} +
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		$(has_version 'media-video/libav' && echo "--enable-libav-compat") \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable fishbmc) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sdl) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon media/icon48x48.png xbmc.png
-
-	# Remove optional addons (platform specific and disabled by USE flag).
-	local disabled_addons=(
-		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
-		visualization.dxspectrum
-	)
-	use fishbmc  || disabled_addons+=( visualization.fishbmc )
-	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
-	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/xbmc/addons/}"
-
-	# Punt simplejson bundle, we use the system one anyway.
-	rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib
-	# Remove fonconfig settings that are used only on MacOSX.
-	# Can't be patched upstream because they just find all files and install
-	# them into same structure like they have in git.
-	rm -rf "${ED}"/usr/share/xbmc/system/players/dvdplayer/etc
-
-	# Replace bundled fonts with system ones
-	# teletext.ttf: unknown
-	# bold-caps.ttf: unknown
-	# roboto: roboto-bold, roboto-regular
-	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-*
-	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
-	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-13.1.ebuild b/media-tv/xbmc/xbmc-13.1.ebuild
deleted file mode 100644
index 51885841091b..000000000000
--- a/media-tv/xbmc/xbmc-13.1.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-CODENAME="Gotham"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
-	#SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="${CODENAME}_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P}
-	;;
-*|*_p*)
-	MY_PV=${PV/_p/_r}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
-		http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-
-	S=${WORKDIR}/${MY_P}-${CODENAME}
-	;;
-esac
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	X? ( sdl )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-fonts/corefonts
-	media-fonts/roboto
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	sdl? ( media-libs/libsdl[sound,opengl,video,X] )
-	alsa? ( media-libs/libsdl[alsa] )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	sdl? (
-		media-libs/sdl-gfx
-		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-		media-libs/sdl-mixer
-		media-libs/sdl-sound
-	)
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	|| ( >=media-video/ffmpeg-1.2.1:0=[encode] ( media-libs/libpostproc >=media-video/libav-10_alpha:=[encode] ) )
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		|| ( >=media-video/ffmpeg-1.2.1:0=[vdpau] >=media-video/libav-10_alpha:=[vdpau] )
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package.  #488118
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Building ${PN} against media-video/libav is not supported upstream."
-		ewarn "It requires building a (small) wrapper library with some code"
-		ewarn "from media-video/ffmpeg."
-		ewarn "If you experience issues, please try with media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	[[ ${PV} == "9999" ]] && emake -f codegenerator.mk
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -exec touch -r configure {} +
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		$(has_version 'media-video/libav' && echo "--enable-libav-compat") \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable fishbmc) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sdl) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon media/icon48x48.png xbmc.png
-
-	# Remove optional addons (platform specific and disabled by USE flag).
-	local disabled_addons=(
-		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
-		visualization.dxspectrum
-	)
-	use fishbmc  || disabled_addons+=( visualization.fishbmc )
-	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
-	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/xbmc/addons/}"
-
-	# Punt simplejson bundle, we use the system one anyway.
-	rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib
-	# Remove fonconfig settings that are used only on MacOSX.
-	# Can't be patched upstream because they just find all files and install
-	# them into same structure like they have in git.
-	rm -rf "${ED}"/usr/share/xbmc/system/players/dvdplayer/etc
-
-	# Replace bundled fonts with system ones
-	# teletext.ttf: unknown
-	# bold-caps.ttf: unknown
-	# roboto: roboto-bold, roboto-regular
-	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-*
-	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
-	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-13.2-r1.ebuild b/media-tv/xbmc/xbmc-13.2-r1.ebuild
deleted file mode 100644
index d86dc7e43a1a..000000000000
--- a/media-tv/xbmc/xbmc-13.2-r1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-CODENAME="Gotham"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
-	#SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="${CODENAME}_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P}
-	;;
-*|*_p*)
-	MY_PV=${PV/_p/_r}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
-		http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-
-	S=${WORKDIR}/${MY_P}-${CODENAME}
-	;;
-esac
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	X? ( sdl )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-fonts/corefonts
-	media-fonts/roboto
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	sdl? ( media-libs/libsdl[sound,opengl,video,X] )
-	alsa? ( media-libs/libsdl[alsa] )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	sdl? (
-		media-libs/sdl-gfx
-		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-		media-libs/sdl-mixer
-		media-libs/sdl-sound
-	)
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	!libav? ( >=media-video/ffmpeg-1.2.1:0=[encode] )
-	libav? ( media-libs/libpostproc:0=
-		>=media-video/libav-10_alpha:0=[encode] )
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		!libav? ( >=media-video/ffmpeg-1.2.1:0=[vdpau] )
-		libav? ( >=media-video/libav-10_alpha:0=[vdpau] )
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package.  #488118
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use libav ; then
-		ewarn "Building ${PN} against media-video/libav is not supported upstream."
-		ewarn "It requires building a (small) wrapper library with some code"
-		ewarn "from media-video/ffmpeg."
-		ewarn "If you experience issues, please try with media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	[[ ${PV} == "9999" ]] && emake -f codegenerator.mk
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -exec touch -r configure {} +
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		$(usex libav "--enable-libav-compat" "") \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable fishbmc) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sdl) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon media/icon48x48.png xbmc.png
-
-	# Remove optional addons (platform specific and disabled by USE flag).
-	local disabled_addons=(
-		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
-		visualization.dxspectrum
-	)
-	use fishbmc  || disabled_addons+=( visualization.fishbmc )
-	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
-	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/xbmc/addons/}"
-
-	# Punt simplejson bundle, we use the system one anyway.
-	rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib
-	# Remove fonconfig settings that are used only on MacOSX.
-	# Can't be patched upstream because they just find all files and install
-	# them into same structure like they have in git.
-	rm -rf "${ED}"/usr/share/xbmc/system/players/dvdplayer/etc
-
-	# Replace bundled fonts with system ones
-	# teletext.ttf: unknown
-	# bold-caps.ttf: unknown
-	# roboto: roboto-bold, roboto-regular
-	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-*
-	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
-	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-13.2.ebuild b/media-tv/xbmc/xbmc-13.2.ebuild
deleted file mode 100644
index 6dce54c7514d..000000000000
--- a/media-tv/xbmc/xbmc-13.2.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-CODENAME="Gotham"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
-	#SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="${CODENAME}_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="amd64 x86"
-	S=${WORKDIR}/${MY_P}
-	;;
-*|*_p*)
-	MY_PV=${PV/_p/_r}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
-		http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"
-	KEYWORDS="amd64 x86"
-
-	S=${WORKDIR}/${MY_P}-${CODENAME}
-	;;
-esac
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	X? ( sdl )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-fonts/corefonts
-	media-fonts/roboto
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	sdl? ( media-libs/libsdl[sound,opengl,video,X] )
-	alsa? ( media-libs/libsdl[alsa] )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	sdl? (
-		media-libs/sdl-gfx
-		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-		media-libs/sdl-mixer
-		media-libs/sdl-sound
-	)
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	|| ( >=media-video/ffmpeg-1.2.1:0=[encode] ( media-libs/libpostproc >=media-video/libav-10_alpha:=[encode] ) )
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		|| ( >=media-video/ffmpeg-1.2.1:0=[vdpau] >=media-video/libav-10_alpha:=[vdpau] )
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package.  #488118
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Building ${PN} against media-video/libav is not supported upstream."
-		ewarn "It requires building a (small) wrapper library with some code"
-		ewarn "from media-video/ffmpeg."
-		ewarn "If you experience issues, please try with media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	[[ ${PV} == "9999" ]] && emake -f codegenerator.mk
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use cpu_flags_x86_sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -exec touch -r configure {} +
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		$(has_version 'media-video/libav' && echo "--enable-libav-compat") \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable fishbmc) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sdl) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/xbmc.desktop
-	newicon media/icon48x48.png xbmc.png
-
-	# Remove optional addons (platform specific and disabled by USE flag).
-	local disabled_addons=(
-		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
-		visualization.dxspectrum
-	)
-	use fishbmc  || disabled_addons+=( visualization.fishbmc )
-	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
-	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/xbmc/addons/}"
-
-	# Punt simplejson bundle, we use the system one anyway.
-	rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib
-	# Remove fonconfig settings that are used only on MacOSX.
-	# Can't be patched upstream because they just find all files and install
-	# them into same structure like they have in git.
-	rm -rf "${ED}"/usr/share/xbmc/system/players/dvdplayer/etc
-
-	# Replace bundled fonts with system ones
-	# teletext.ttf: unknown
-	# bold-caps.ttf: unknown
-	# roboto: roboto-bold, roboto-regular
-	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-*
-	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
-	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
deleted file mode 100644
index 7a9f08e0df34..000000000000
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="Stub ebuild to migrate people to media-tv/kodi"
-HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="metapackage"
-SLOT="0"
-
-RDEPEND="media-tv/kodi"
diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest
deleted file mode 100644
index f167ac5b3b5c..000000000000
--- a/media-video/bombono-dvd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bombono-dvd-1.2.2.tar.bz2 4406764 SHA256 3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b SHA512 66982f014b6d45a9fa5a8a748dc3ed0ad79ae2d1c9e5afdf22d8db89e0f91c29fcd5639ca27ac50e50916ad37a80e536ea186e079d07efca7547fe49ab8f7d6b WHIRLPOOL 797c495a480c7b12f112809bc73e2032e846dbb57db8f3d2989d7063aa6686c3cdc8f07813bb34f0d076c6e53188931fe4b01e461d5c76bcb95557783c21cfe4
diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild
deleted file mode 100644
index cadc08043082..000000000000
--- a/media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-SCONS_MIN_VERSION="0.96.1"
-
-inherit base scons-utils toolchain-funcs flag-o-matic virtualx
-
-DESCRIPTION="GUI DVD authoring program"
-HOMEPAGE="http://www.bombono.org/"
-SRC_URI="mirror://sourceforge/bombono/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE="gnome"
-
-COMMONDEPEND="
-	app-i18n/enca
-	app-cdr/dvd+rw-tools
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.51
-	media-libs/libdvdread
-	media-sound/twolame
-	media-video/dvdauthor
-	virtual/cdrtools
-	>=virtual/ffmpeg-9
-	>=media-video/mjpegtools-1.8.0
-	x11-libs/gtk+:2
-"
-RDEPEND="${COMMONDEPEND}
-	gnome?	( gnome-base/gvfs )
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-"
-
-RESTRICT=test
-# bug 419655
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.1-cflags.patch"
-	"${FILESDIR}/${PN}-1.2.0-cdrtools.patch"
-	"${FILESDIR}/${PN}-1.2.2-ffmpeg2.patch"
-	"${FILESDIR}/${PN}-1.2.2-ffmpeg26.patch"
-)
-
-src_configure() {
-	append-cppflags -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3
-	myesconsargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		DESTDIR="${D}"
-		LDFLAGS="${LDFLAGS}"
-		USE_EXT_BOOST=1
-		PREFIX="${EPREFIX}/usr"
-	)
-}
-
-src_compile() {
-	nonfatal escons \
-		|| die "Please add ${S}/config.opts when filing bugs reports!"
-}
-
-src_test() {
-	VIRTUALX_COMMAND="escons TEST=1" virtualmake
-}
-
-src_install() {
-	nonfatal escons install || die "Please add ${S}/config.opts when filing bugs reports!"
-}
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.0.1-cflags.patch b/media-video/bombono-dvd/files/bombono-dvd-1.0.1-cflags.patch
deleted file mode 100644
index adea485ff404..000000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-1.0.1-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN bombono-dvd-1.0.1.orig/SConstruct bombono-dvd-1.0.1/SConstruct
---- bombono-dvd-1.0.1.orig/SConstruct	2011-02-12 14:47:56.000000000 +0100
-+++ bombono-dvd-1.0.1/SConstruct	2011-04-24 16:59:04.149229947 +0200
-@@ -56,7 +56,7 @@
- common_warn_flags = []
- cxx_warn_flags    = []
- debug_flags   = ['-g', '-O0']
--release_flags = ['-O2']
-+release_flags = []
- defines       = []
- 
- def CalcCommonFlags():
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch
deleted file mode 100644
index 10ab179ffe85..000000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/mgui/author/script.h b/src/mgui/author/script.h
-index fe80307..a96fb54 100644
---- a/src/mgui/author/script.h
-+++ b/src/mgui/author/script.h
-@@ -115,9 +115,14 @@ ExitData AsyncOFCall(const std::string& cmd, const std::string& out_dir, OutputF
- // POSIX-народ бесповоротно ушел на cdrkit (genisoimage), но с Win32
- // у cdrkit хреново (только cygwin, нет собранного с growisofs с cdrkit под Win32) => потому - "вилка"
- #ifdef _WIN32
--#define MK_ISO_CMD "mkisofs"
-+    #define MK_ISO_CMD "mkisofs"
- #else
--#define MK_ISO_CMD "genisoimage"
-+    #define USE_CDRTOOLS
-+    #ifdef USE_CDRTOOLS
-+        #define MK_ISO_CMD "mkisofs"
-+    #else // !USE_CDRTOOLS
-+        #define MK_ISO_CMD "genisoimage"
-+    #endif // !USE_CDRTOOLS
- #endif
- 
- #endif // #ifndef __MGUI_AUTHOR_SCRIPT_H__
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.1-glib.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.1-glib.patch
deleted file mode 100644
index 9627bfd66051..000000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-1.2.1-glib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -aur src/mgui/author/gb_devices.c src/mgui/author/gb_devices.c
---- src/mgui/author/gb_devices.c	2012-02-08 13:19:21.000000000 +0100
-+++ src/mgui/author/gb_devices.c	2012-04-26 14:32:30.059001909 +0200
-@@ -28,9 +28,6 @@
- 
- #include "gb_devices.h"
- 
--#include <glib/gthread.h>
--#include <glib/gmessages.h>
--#include <glib/ghash.h>
- /* 
- #include <glib/gfileutils.h> 
- */ 
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.1-libav9.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.1-libav9.patch
deleted file mode 100644
index 2c8f4a3c48ed..000000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-1.2.1-libav9.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/mgui/ffviewer.cpp.ORIG	2012-02-08 13:19:21.000000000 +0100
-+++ src/mgui/ffviewer.cpp	2013-02-24 18:11:07.565711375 +0100
-@@ -36,7 +36,13 @@
- #define AVFORMAT_54
- #endif
- 
--#ifdef AVFORMAT_54
-+// разрабы libav считают себя самыми умными и потому решили
-+// закрыть простым смертным доступ к ffurl_register_protocol() 
-+// (бывшая av_register_protocol2()),- https://bugzilla.libav.org/show_bug.cgi?id=224
-+// 
-+// Поэтому: пользователи Linux остаются без предпросмотра содержимого DVD,
-+// пользователи же Windows не страдают из-за подобного политгемора
-+#if defined(AVFORMAT_54) && defined(_WIN32)
- C_LINKAGE_BEGIN
- #include <libavformat/url.h> // ffurl_register_protocol()
- C_LINKAGE_END
-@@ -1125,6 +1131,8 @@
- 
- namespace DVD {
- 
-+#if !defined(AVFORMAT_54) || defined(_WIN32)
-+
- struct VobCtx
- {
-    int64_t  curPos;
-@@ -1266,6 +1274,17 @@
-     BmdDVD = 0;
-     return res;
- }
-+    
-+#else    
-+    
-+bool OpenVob(FFViewer&, VobPtr, dvd_reader_t*, std::string& err_str)
-+{
-+    err_str = "Libav: no soup for Linux users^W^W^W^W^W see https://bugzilla.libav.org/show_bug.cgi?id=224";
-+    return false;
-+}
-+    
-+#endif
-+    
- 
- } // namespace DVD
- 
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg2.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg2.patch
deleted file mode 100644
index 245b93705b48..000000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/mgui/ffviewer.cpp.ORIG	2013-08-01 11:05:12.962407787 +0200
-+++ src/mgui/ffviewer.cpp	2013-08-01 11:08:26.907409685 +0200
-@@ -62,7 +62,7 @@
- 
- typedef struct AVCodecTag {
- #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00)
--    enum CodecID id;
-+    enum AVCodecID id;
- #else
-     int id;
- #endif
-@@ -70,14 +70,14 @@
- } AVCodecTag;
- 
- #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00)
--static uint FFCodecID2Tag(CodecID codec_id) 
-+static uint FFCodecID2Tag(AVCodecID codec_id) 
- {
-     unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id);
-     extern const AVCodecTag ff_codec_bmp_tags[];
-     return ff_codec_get_tag(ff_codec_bmp_tags, codec_id);
- }
- #else
--static uint FFCodecID2Tag(CodecID codec_id) 
-+static uint FFCodecID2Tag(AVCodecID codec_id) 
- {
-     unsigned int codec_get_tag(const AVCodecTag *tags, int id);
-     extern const AVCodecTag codec_bmp_tags[];
-@@ -388,7 +388,7 @@
-     return (tag>>bit_begin) & 0xFF;
- }
- 
--static std::string CodecID2Str(CodecID codec_id)
-+static std::string CodecID2Str(AVCodecID codec_id)
- {
- #ifdef _MSC_VER
-     std::string tag_str = boost::format("%1%") % codec_id % bf::stop;
-@@ -406,7 +406,7 @@
- 
- #else // CALC_FF_TAG
- 
--static std::string CodecID2Str(CodecID codec_id)
-+static std::string CodecID2Str(AVCodecID codec_id)
- {
-     return Int2Str(codec_id);
- }
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg26.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg26.patch
deleted file mode 100644
index b511a9d4ebd3..000000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg26.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: bombono-dvd-1.2.2/src/mgui/ffviewer.cpp
-===================================================================
---- bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp
-+++ bombono-dvd-1.2.2/src/mgui/ffviewer.cpp
-@@ -1120,7 +1120,7 @@ static bool SeekSetTime(FFViewer& ffv, d
-         bool seek_ok = TimeSeek(ffv, start_time, time);
-         if( !seek_ok && CanByteSeek(ffv.iCtx) )
-             // тогда переходим в начало файла
--            seek_ok = DoSeek(ffv, ffv.iCtx->data_offset, true);
-+            seek_ok = DoSeek(ffv, 0, true);
- 
-         // некоторое видео глючит в начале (Hellboy), из-за чего
-         // последовательный доступ выполняется с перескоками -
diff --git a/media-video/bombono-dvd/files/bombono-dvd-boost-1.51.0-fix.patch b/media-video/bombono-dvd/files/bombono-dvd-boost-1.51.0-fix.patch
deleted file mode 100644
index 8d5020df3455..000000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-boost-1.51.0-fix.patch
+++ /dev/null
@@ -1,537 +0,0 @@
-From a144c07915e82607bbc76791251e8e576e17149e Mon Sep 17 00:00:00 2001
-From: Slava Dubrovskiy <dubrsl@altlinux.ru>
-Date: Thu, 6 Sep 2012 20:18:45 +0300
-Subject: [PATCH 2/2] Fix build with boost 1.51.0
-
----
- libs/boost-lib/boost/filesystem/v2/fstream.hpp     | 26 +++++++++++-----------
- libs/boost-lib/boost/filesystem/v2/operations.hpp  |  2 +-
- libs/boost-lib/boost/filesystem/v2/path.hpp        | 24 ++++++++++----------
- libs/boost-lib/boost/filesystem/v3/path.hpp        |  6 ++---
- libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp  |  4 ++--
- .../boost/logging/writer/on_dedicated_thread.hpp   |  2 +-
- .../samples/scenarios/ded_loger_one_filter.cpp     |  2 +-
- .../samples/scenarios/ts_loger_one_filter.cpp      |  2 +-
- .../logging/samples/scenarios/your_scenario.cpp    |  2 +-
- .../tests/test_simple_tss/test_simple_tss.cpp      |  2 +-
- .../test_ts_resource.cpp                           |  4 ++--
- .../logging/tests/test_tss/test_tss_objects.cpp    |  2 +-
- src/mbase/project/table.cpp                        |  2 +-
- src/mgui/author/script.cpp                         |  2 +-
- src/mgui/editor/toolbar.cpp                        |  2 +-
- src/mgui/mux.cpp                                   |  2 +-
- src/mgui/project/add.cpp                           |  6 ++---
- src/mgui/project/mconstructor.cpp                  |  2 +-
- src/mgui/project/serialize.cpp                     |  2 +-
- src/mgui/win_utils.cpp                             |  2 +-
- src/mlib/filesystem.cpp                            | 15 ++-----------
- 21 files changed, 51 insertions(+), 62 deletions(-)
-
-diff --git a/libs/boost-lib/boost/filesystem/v2/fstream.hpp b/libs/boost-lib/boost/filesystem/v2/fstream.hpp
-index bdcd485..101ed30 100644
---- a/libs/boost-lib/boost/filesystem/v2/fstream.hpp
-+++ b/libs/boost-lib/boost/filesystem/v2/fstream.hpp
-@@ -488,27 +488,27 @@ namespace boost
-       std::ios_base::openmode mode )
-     {
-       return std::basic_filebuf<charT,traits>::open(
--        file_ph.file_string().c_str(), mode ) == 0 ? 0 : this;
-+        file_ph.string().c_str(), mode ) == 0 ? 0 : this;
-     }
- #  endif
- 
-     template <class charT, class traits>
-     basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph )
-       : std::basic_ifstream<charT,traits>(
--          file_ph.file_string().c_str(), std::ios_base::in ) {}
-+          file_ph.string().c_str(), std::ios_base::in ) {}
- 
-     template <class charT, class traits>
-     basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph,
-       std::ios_base::openmode mode )
-       : std::basic_ifstream<charT,traits>(
--          file_ph.file_string().c_str(), mode ) {}
-+          file_ph.string().c_str(), mode ) {}
-     
- #   if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
-     template <class charT, class traits>
-     void basic_ifstream<charT,traits>::open( const path & file_ph )
-     {
-       std::basic_ifstream<charT,traits>::open(
--        file_ph.file_string().c_str(), std::ios_base::in );
-+        file_ph.string().c_str(), std::ios_base::in );
-     }
-     
-     template <class charT, class traits>
-@@ -516,27 +516,27 @@ namespace boost
-       std::ios_base::openmode mode )
-     {
-       std::basic_ifstream<charT,traits>::open(
--        file_ph.file_string().c_str(), mode );
-+        file_ph.string().c_str(), mode );
-     }
- #   endif
- 
-     template <class charT, class traits>
-     basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph )
-       : std::basic_ofstream<charT,traits>(
--          file_ph.file_string().c_str(), std::ios_base::out ) {}
-+          file_ph.string().c_str(), std::ios_base::out ) {}
- 
-     template <class charT, class traits>
-     basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph,
-       std::ios_base::openmode mode )
-       : std::basic_ofstream<charT,traits>(
--          file_ph.file_string().c_str(), mode ) {}
-+          file_ph.string().c_str(), mode ) {}
-     
- #   if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
-     template <class charT, class traits>
-     void basic_ofstream<charT,traits>::open( const path & file_ph )
-     {
-       std::basic_ofstream<charT,traits>::open(
--        file_ph.file_string().c_str(), std::ios_base::out );
-+        file_ph.string().c_str(), std::ios_base::out );
-     }
-     
-     template <class charT, class traits>
-@@ -544,14 +544,14 @@ namespace boost
-       std::ios_base::openmode mode )
-     {
-       std::basic_ofstream<charT,traits>::open(
--        file_ph.file_string().c_str(), mode );
-+        file_ph.string().c_str(), mode );
-     }
- #   endif
- 
-     template <class charT, class traits>
-     basic_fstream<charT,traits>::basic_fstream( const path & file_ph )
-       : std::basic_fstream<charT,traits>(
--          file_ph.file_string().c_str(),
-+          file_ph.string().c_str(),
-           std::ios_base::in|std::ios_base::out ) {}
- 
- 
-@@ -559,14 +559,14 @@ namespace boost
-     basic_fstream<charT,traits>::basic_fstream( const path & file_ph,
-       std::ios_base::openmode mode )
-       : std::basic_fstream<charT,traits>(
--          file_ph.file_string().c_str(), mode ) {}
-+          file_ph.string().c_str(), mode ) {}
- 
- #   if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
-     template <class charT, class traits>
-     void basic_fstream<charT,traits>::open( const path & file_ph )
-     {
-       std::basic_fstream<charT,traits>::open(
--        file_ph.file_string().c_str(), std::ios_base::in|std::ios_base::out );
-+        file_ph.string().c_str(), std::ios_base::in|std::ios_base::out );
-     }
- 
-     template <class charT, class traits>
-@@ -574,7 +574,7 @@ namespace boost
-       std::ios_base::openmode mode )
-     {
-       std::basic_fstream<charT,traits>::open(
--        file_ph.file_string().c_str(), mode );
-+        file_ph.string().c_str(), mode );
-     }
- #   endif
-   } // namespace filesystem2
-diff --git a/libs/boost-lib/boost/filesystem/v2/operations.hpp b/libs/boost-lib/boost/filesystem/v2/operations.hpp
-index 9bd35cd..ad08cc3 100644
---- a/libs/boost-lib/boost/filesystem/v2/operations.hpp
-+++ b/libs/boost-lib/boost/filesystem/v2/operations.hpp
-@@ -1081,7 +1081,7 @@ namespace boost
-       {
-         return path().filename();
-       }
--      typename Path::string_type leaf() const
-+      typename Path::string_type filename().string() const
-       {
-         return path().filename();
-       }
-diff --git a/libs/boost-lib/boost/filesystem/v2/path.hpp b/libs/boost-lib/boost/filesystem/v2/path.hpp
-index d159c37..580b635 100644
---- a/libs/boost-lib/boost/filesystem/v2/path.hpp
-+++ b/libs/boost-lib/boost/filesystem/v2/path.hpp
-@@ -232,11 +232,11 @@ namespace boost
- 
-       // observers
-       const string_type & string() const         { return m_path; }
--      const string_type file_string() const;
--      const string_type directory_string() const { return file_string(); }
-+      const string_type string() const;
-+      const string_type string() const { return string(); }
- 
--      const external_string_type external_file_string() const { return Traits::to_external( *this, file_string() ); }
--      const external_string_type external_directory_string() const { return Traits::to_external( *this, directory_string() ); }
-+      const external_string_type external_file_string() const { return Traits::to_external( *this, string() ); }
-+      const external_string_type external_directory_string() const { return Traits::to_external( *this, string() ); }
- 
-       basic_path   root_path() const;
-       string_type  root_name() const;
-@@ -248,7 +248,7 @@ namespace boost
-       string_type  extension() const;
- 
- # ifndef BOOST_FILESYSTEM_NO_DEPRECATED
--      string_type  leaf() const            { return filename(); }
-+      string_type  filename().string() const            { return filename(); }
-       basic_path   branch_path() const     { return parent_path(); }
-       bool         has_leaf() const        { return !m_path.empty(); }
-       bool         has_branch_path() const { return !parent_path().empty(); }
-@@ -309,8 +309,8 @@ namespace boost
-       // are only minor differences between generic and native path grammars.
-       // Private members might be quite different in other implementations,
-       // particularly where there were wide differences between portable and
--      // native path formats, or between file_string() and
--      // directory_string() formats, or simply that the implementation
-+      // native path formats, or between string() and
-+      // string() formats, or simply that the implementation
-       // was willing expend additional memory to achieve greater speed for
-       // some operations at the expense of other operations.
- 
-@@ -338,8 +338,8 @@ namespace boost
-       basic_path( const string_type & str, name_check ) { operator/=( str ); }
-       basic_path( const typename string_type::value_type * s, name_check )
-         { operator/=( s );}
--      string_type native_file_string() const { return file_string(); }
--      string_type native_directory_string() const { return directory_string(); }
-+      string_type native_file_string() const { return string(); }
-+      string_type native_directory_string() const { return string(); }
-       static bool default_name_check_writable() { return false; } 
-       static void default_name_check( name_check ) {}
-       static name_check default_name_check() { return 0; }
-@@ -647,13 +647,13 @@ namespace boost
-             if ( !path1_arg.empty() )
-             {
-               target += ": \"";
--              target += path1_arg.file_string();
-+              target += path1_arg.string();
-               target += "\"";
-             }
-             if ( !path2_arg.empty() )
-             {
-               target += ", \"";
--              target += path2_arg.file_string();
-+              target += path2_arg.string();
-               target += "\"";
-             }
-           }
-@@ -1294,7 +1294,7 @@ namespace boost
- 
-     template<class String, class Traits>
-     const String
--    basic_path<String, Traits>::file_string() const
-+    basic_path<String, Traits>::string() const
-     {
- #   ifdef BOOST_WINDOWS_PATH
-       // for Windows, use the alternate separator, and bypass extra 
-diff --git a/libs/boost-lib/boost/filesystem/v3/path.hpp b/libs/boost-lib/boost/filesystem/v3/path.hpp
-index 0caa19f..fe3c975 100644
---- a/libs/boost-lib/boost/filesystem/v3/path.hpp
-+++ b/libs/boost-lib/boost/filesystem/v3/path.hpp
-@@ -389,7 +389,7 @@ namespace filesystem3
-     //  recently deprecated functions supplied by default
-     path&  normalize()              { return m_normalize(); }
-     path&  remove_leaf()            { return remove_filename(); }
--    path   leaf() const             { return filename(); }
-+    path   filename().string() const             { return filename(); }
-     path   branch_path() const      { return parent_path(); }
-     bool   has_leaf() const         { return !m_pathname.empty(); }
-     bool   has_branch_path() const  { return !parent_path().empty(); }
-@@ -399,8 +399,8 @@ namespace filesystem3
- # if defined(BOOST_FILESYSTEM_DEPRECATED)
-     //  deprecated functions with enough signature or semantic changes that they are
-     //  not supplied by default 
--    const std::string file_string() const               { return string(); }
--    const std::string directory_string() const          { return string(); }
-+    const std::string string() const               { return string(); }
-+    const std::string string() const          { return string(); }
-     const std::string native_file_string() const        { return string(); }
-     const std::string native_directory_string() const   { return string(); }
-     const string_type external_file_string() const      { return native(); }
-diff --git a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
-index 7adeaff..4fc0343 100644
---- a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
-+++ b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
-@@ -107,13 +107,13 @@ namespace boost
-     //        if ( !path1.empty() )
-     //        {
-     //          target += ": \"";
--    //          target += path1.file_string();
-+    //          target += path1.string();
-     //          target += "\"";
-     //        }
-     //        if ( !path2.empty() )
-     //        {
-     //          target += ", \"";
--    //          target += path2.file_string();
-+    //          target += path2.string();
-     //          target += "\"";
-     //        }
-     //      }
-diff --git a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
-index 7b0aa71..a4a6f28 100644
---- a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
-+++ b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
-@@ -166,7 +166,7 @@ private:
-             }
- 
-             boost::xtime to_wait;
--            xtime_get(&to_wait, boost::TIME_UTC);
-+            xtime_get(&to_wait, boost::TIME_UTC_);
-             to_wait.sec += sleep_ms / 1000;
-             to_wait.nsec += (sleep_ms % 1000) * (NANOSECONDS_PER_SECOND / 1000);
-             to_wait.sec += to_wait.nsec / NANOSECONDS_PER_SECOND ;
-diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
-index 1d934da..d45beb4 100644
---- a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
-+++ b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
-@@ -103,7 +103,7 @@ BOOST_DEFINE_LOG(g_l, log_type)
- void do_sleep(int ms) {
-     using namespace boost;
-     xtime next;
--    xtime_get( &next, TIME_UTC);
-+    xtime_get( &next, TIME_UTC_);
-     next.nsec += (ms % 1000) * 1000000;
- 
-     int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
-index 9746319..4b9f845 100644
---- a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
-+++ b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
-@@ -95,7 +95,7 @@ BOOST_DEFINE_LOG(g_l, log_type)
- void do_sleep(int ms) {
-     using namespace boost;
-     xtime next;
--    xtime_get( &next, TIME_UTC);
-+    xtime_get( &next, TIME_UTC_);
-     next.nsec += (ms % 1000) * 1000000;
- 
-     int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
-index d447f24..f5ad955 100644
---- a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
-+++ b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
-@@ -124,7 +124,7 @@ BOOST_DEFINE_LOG(g_log_dbg, finder::logger )
- void do_sleep(int ms) {
-     using namespace boost;
-     xtime next;
--    xtime_get( &next, TIME_UTC);
-+    xtime_get( &next, TIME_UTC_);
-     next.nsec += (ms % 1000) * 1000000;
- 
-     int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
-index 627618e..205d07a 100644
---- a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
-+++ b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
-@@ -75,7 +75,7 @@ using namespace logging;
- 
- void do_sleep(int ms) {
-     xtime next;
--    xtime_get( &next, TIME_UTC);
-+    xtime_get( &next, TIME_UTC_);
-     next.nsec += (ms % 1000) * 1000000;
- 
-     int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
-index 0bee896..2217c12 100644
---- a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
-+++ b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
-@@ -167,7 +167,7 @@ void test_resource(int idx) {
- 
- void do_sleep(int ms) {
-     xtime next;
--    xtime_get( &next, TIME_UTC);
-+    xtime_get( &next, TIME_UTC_);
-     next.nsec += (ms % 1000) * 1000000;
- 
-     int nano_per_sec = 1000000000;
-@@ -262,7 +262,7 @@ int g_run_period_secs = 200;
- 
- int main()
- {
--    xtime_get( &g_start, TIME_UTC);
-+    xtime_get( &g_start, TIME_UTC_);
- 
-     for ( int i = 0; i < g_update_thread_count; ++i)
-         thread t(&update_thread);
-diff --git a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
-index b8e1ba6..14c8281 100644
---- a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
-+++ b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
-@@ -98,7 +98,7 @@ private:
- 
- void do_sleep(int ms) {
-     xtime next;
--    xtime_get( &next, TIME_UTC);
-+    xtime_get( &next, TIME_UTC_);
-     next.nsec += (ms % 1000) * 1000000;
- 
-     int nano_per_sec = 1000000000;
-diff --git a/src/mbase/project/table.cpp b/src/mbase/project/table.cpp
-index 33ee15a..feb851a 100644
---- a/src/mbase/project/table.cpp
-+++ b/src/mbase/project/table.cpp
-@@ -427,7 +427,7 @@ void GetThemeList(Str::List& t_lst)
-         {
-             for( fs::directory_iterator itr(dir), end; itr != end; ++itr )
-                 if( IsFrameDir(*itr) )
--                    t_lst.push_back(itr->leaf());
-+                    t_lst.push_back(itr->path().filename().string());
-         }
-     }
- 
-diff --git a/src/mgui/author/script.cpp b/src/mgui/author/script.cpp
-index aa2b494..0c34a08 100644
---- a/src/mgui/author/script.cpp
-+++ b/src/mgui/author/script.cpp
-@@ -370,7 +370,7 @@ static std::string SrcFilename(VideoItem vi)
- static std::string PrefixCnvPath(VideoItem vi, const std::string& out_dir)
- {
-     std::string dst_fname = boost::format("%1%.%2%") % GetAuthorNumber(vi) 
--        % fs::path(SrcFilename(vi)).leaf() % bf::stop;
-+        % fs::path(SrcFilename(vi)).filename().string() % bf::stop;
-     return AppendPath(out_dir, dst_fname);
- }
- 
-diff --git a/src/mgui/editor/toolbar.cpp b/src/mgui/editor/toolbar.cpp
-index e549490..c6f15b3 100644
---- a/src/mgui/editor/toolbar.cpp
-+++ b/src/mgui/editor/toolbar.cpp
-@@ -287,7 +287,7 @@ Toolbar::Toolbar(): selTool(MakeSelectionToolImage()), txtTool(MakeTextToolLabel
-     	    if( fs::is_directory(dir) )
-     	    {    
-     		boost_foreach( const fs::path& pth, dir_range(dir) )
--    		    o_lst.push_back(pth.filename());
-+    		    o_lst.push_back(pth.filename().string());
-     	    }
-     	}
-     	std::sort(o_lst.begin(), o_lst.end(), &ByExtName);
-diff --git a/src/mgui/mux.cpp b/src/mgui/mux.cpp
-index 4b4a5fa..0864bc2 100644
---- a/src/mgui/mux.cpp
-+++ b/src/mgui/mux.cpp
-@@ -72,7 +72,7 @@ void SetDialogStrict(Gtk::Dialog& dlg, int min_wdh, int min_hgt, bool set_resiza
- 
- static bool RunMuxing(const std::string& dest_path, const std::string& args)
- {
--    Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).leaf() % bf::stop);
-+    Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).filename().string() % bf::stop);
-     SetDialogStrict(dlg, 400, -1);
- 
-     Gtk::TextView& txt_view = NewManaged<Gtk::TextView>();
-diff --git a/src/mgui/project/add.cpp b/src/mgui/project/add.cpp
-index db4df17..0425a9b 100644
---- a/src/mgui/project/add.cpp
-+++ b/src/mgui/project/add.cpp
-@@ -420,7 +420,7 @@ void TryAddMediaQuiet(const std::string& fname, const std::string& desc)
- static std::string StandFNameOut(const fs::path& pth)
- {
-     return "<span style=\"italic\" underline=\"low\">" + 
--                    pth.leaf() + "</span>";
-+                    pth.filename().string() + "</span>";
- }
- 
- #if GTK_CHECK_VERSION(2,18,0)
-@@ -454,7 +454,7 @@ StorageItem CheckExists(const fs::path& pth, RefPtr<MediaStore> ms)
- 
- void OneMediaError(const fs::path& err_pth, const std::string& desc)
- {
--    AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.leaf() % bf::stop, desc);
-+    AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.filename().string() % bf::stop, desc);
- }
- 
- void TryAddMedias(const Str::List& paths, MediaBrowser& brw,
-@@ -465,7 +465,7 @@ void TryAddMedias(const Str::List& paths, MediaBrowser& brw,
-     {
-         const std::string fname = paths[0];
-         fs::path pth(fname); 
--        std::string leaf = pth.leaf();
-+        std::string leaf = pth.filename().string();
-         {
-             static re::pattern dvd_video_vob("(VIDEO_TS|VTS_[0-9][0-9]_[0-9]).VOB", 
-                                               re::pattern::perl|re::pattern::icase);
-diff --git a/src/mgui/project/mconstructor.cpp b/src/mgui/project/mconstructor.cpp
-index 12e2f49..7ad2546 100644
---- a/src/mgui/project/mconstructor.cpp
-+++ b/src/mgui/project/mconstructor.cpp
-@@ -961,7 +961,7 @@ void RunConstructor(const std::string& prj_file_name, bool ask_save_on_exit)
-         static const fs::directory_iterator end_itr;
-         for( fs::directory_iterator itr(DataDirPath("bmd-icons"));
-             itr != end_itr; ++itr )
--            pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->string()));
-+            pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->path().string()));
-         Gtk::Window::set_default_icon_list(pix_lst);
-     
-         ActionFunctor after_fnr = BuildConstructor(app, prj_file_name);
-diff --git a/src/mgui/project/serialize.cpp b/src/mgui/project/serialize.cpp
-index 12b3c3a..2340b0b 100644
---- a/src/mgui/project/serialize.cpp
-+++ b/src/mgui/project/serialize.cpp
-@@ -71,7 +71,7 @@ static std::string MakeProjectTitle(bool with_path_breakdown = false)
-         return "untitled.bmd";
- 
-     fs::path full_path(db.GetProjectFName());
--    std::string res_str = full_path.leaf();
-+    std::string res_str = full_path.filename().string();
-     if( with_path_breakdown )
-         res_str += " (" + full_path.branch_path().string() + ")";
-     return res_str;
-diff --git a/src/mgui/win_utils.cpp b/src/mgui/win_utils.cpp
-index 28ad9dd..175e241 100644
---- a/src/mgui/win_utils.cpp
-+++ b/src/mgui/win_utils.cpp
-@@ -418,7 +418,7 @@ bool CheckKeepOrigin(const std::string& fname)
-     bool res = false;
-     if( fs::exists(fname) && 
-         (Gtk::RESPONSE_OK != MessageBox(BF_("A file named \"%1%\" already exists. Do you want to replace it?")
--                                        % fs::path(fname).leaf() % bf::stop,
-+                                        % fs::path(fname).filename().string() % bf::stop,
-                                         Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, 
-                                         _("Replacing the file overwrite its contents."),
-                                         true)) )
-diff --git a/src/mlib/filesystem.cpp b/src/mlib/filesystem.cpp
-index bb84860..5d4f39c 100644
---- a/src/mlib/filesystem.cpp
-+++ b/src/mlib/filesystem.cpp
-@@ -47,7 +47,7 @@ const char* FindExtDot(const char* name)
- 
- std::string get_basename(const fs::path& pth)
- {
--    std::string name_s = pth.leaf();
-+    std::string name_s = pth.filename().string();
-     const char* name = name_s.c_str();
- 
-     //if( const char* dot = strstr(name, ".") )
-@@ -58,24 +58,13 @@ std::string get_basename(const fs::path& pth)
- 
- std::string get_extension(const fs::path& pth)
- {
--    std::string name_s = pth.leaf();
-+    std::string name_s = pth.filename().string();
- 
-     if( const char* dot = FindExtDot(name_s.c_str()) )
-         return std::string(dot+1);
-     return std::string();
- }
- 
--// глобальная установка проверки имен файлов
--class tune_boost_filesystem
--{
--    public:
--    tune_boost_filesystem()
--    {
--        // чтоб любые символы в именах файлов позволялись, для utf8
--        fs::path::default_name_check(fs::native);
--    }
--} tune_boost_filesystem_obj;
--
- namespace Project
- {
- 
--- 
-1.7.11.7
-
diff --git a/media-video/bombono-dvd/metadata.xml b/media-video/bombono-dvd/metadata.xml
deleted file mode 100644
index 80185d1bbf8e..000000000000
--- a/media-video/bombono-dvd/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="gnome">Use GVFS for desktop integration</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">bombono</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/cheese/cheese-3.18.1-r1.ebuild b/media-video/cheese/cheese-3.18.1-r1.ebuild
index 85af3c823841..56c282d2767b 100644
--- a/media-video/cheese/cheese-3.18.1-r1.ebuild
+++ b/media-video/cheese/cheese-3.18.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # using clutter-gst-2.0.0 results in GLSL errors; bug #478702
 COMMON_DEPEND="
diff --git a/media-video/coherence/Manifest b/media-video/coherence/Manifest
deleted file mode 100644
index efde3236eb0c..000000000000
--- a/media-video/coherence/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Coherence-0.6.6.2.tar.gz 364908 SHA256 0b54a6ba88c1ff6274aadb68ff37b8a3961b4c6acf5ded291c5dea936a311ba4 SHA512 dd5cfa68c3b21456e75c44d9d3947b424ebf9684320726393f8da59237ed84e28d4af8414702b6f93e840e7d12a2078e59f48702a288987495d76d11861c7473 WHIRLPOOL 0162af34fdb17abaafcb11d3a2ade750b4a0ed0a70d6d91004b85bb1b285dbcdbfb87b9acd56fb74e64d78e415aa677e3cbf54e893020aa84fa96482fbfd15ce
diff --git a/media-video/coherence/coherence-0.6.6.2.ebuild b/media-video/coherence/coherence-0.6.6.2.ebuild
deleted file mode 100644
index 609fa0bf3590..000000000000
--- a/media-video/coherence/coherence-0.6.6.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit distutils python
-
-MY_P="Coherence-${PV}"
-
-DESCRIPTION="A framework written in Python for DLNA/UPnP components"
-HOMEPAGE="https://coherence.beebits.net/"
-SRC_URI="http://coherence.beebits.net/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-# deps are not exact and need some work
-DEPEND="dev-python/louie
-	dev-python/twisted-core
-	dev-python/twisted-web
-	dev-python/configobj
-	dev-python/gst-python:0.10
-	dev-python/nevow"
-RDEPEND="${DEPEND}
-	dev-python/axiom
-	dev-python/gdata
-	dev-python/feedparser
-	dev-python/tagpy"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	DOCS="docs/*"
-	distutils_src_install
-	newinitd "${FILESDIR}"/coherence-init coherence
-}
diff --git a/media-video/coherence/files/coherence-init b/media-video/coherence/files/coherence-init
deleted file mode 100644
index 6e71e8f77f6d..000000000000
--- a/media-video/coherence/files/coherence-init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-  need net
-  after bootmisc
-}
-
-start() {
-  ebegin "Starting Coherence"
-  start-stop-daemon --start --exec /usr/bin/coherence \
-    --pidfile /var/run/coherence.pid \
-    --background \
-    -- -c /etc/coherence.conf
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping Coherence"
-  start-stop-daemon --stop --exec /usr/bin/coherence \
-    --pidfile /var/run/coherence.pid
-  eend $?
-}
-
diff --git a/media-video/coherence/metadata.xml b/media-video/coherence/metadata.xml
deleted file mode 100644
index 2a705e39ce78..000000000000
--- a/media-video/coherence/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-	<name>Gentoo Video project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-video/cxfe/Manifest b/media-video/cxfe/Manifest
deleted file mode 100644
index 4670ed248bb4..000000000000
--- a/media-video/cxfe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cxfe-0.9.2.tar.bz2 77475 SHA256 030addcf0ea670b4c3525cb7411e958ac0a527a845c1925ec84830eb38a4f0dc SHA512 2ccdfc68b2eba8adde98ab5a66c67a3776a4f0c6d78fb0e64964a2ecbf9686af446b2f15d6b2aa14ed65aa80f2e6a716396a5fe3333fe42d31981b83cc50abda WHIRLPOOL 59687470ec704423cba5ed991f385b04d5ec5de8104a4ece624efe229e2cf5b2cc78eda067a99c6192e21bde2251801e24307f38d164286e62394c1b77efe881
diff --git a/media-video/cxfe/cxfe-0.9.2.ebuild b/media-video/cxfe/cxfe-0.9.2.ebuild
deleted file mode 100644
index cd8384b98eef..000000000000
--- a/media-video/cxfe/cxfe-0.9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="A command line interface for xine"
-HOMEPAGE="http://people.iola.dk/anders/cxfe/"
-
-SRC_URI="http://people.iola.dk/anders/cxfe/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-RDEPEND=">=media-libs/xine-lib-1_rc1
-	   x11-libs/libX11
-	   x11-libs/libXext
-	   lirc? ( app-misc/lirc )
-	   sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-}
-
-src_install() {
-	dobin cxfe
-	dodoc README TODO lircrc-example
-}
diff --git a/media-video/cxfe/files/cxfe-0.9.2-asneeded.patch b/media-video/cxfe/files/cxfe-0.9.2-asneeded.patch
deleted file mode 100644
index b3de1b1c78a2..000000000000
--- a/media-video/cxfe/files/cxfe-0.9.2-asneeded.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: cxfe-0.9.2/Makefile.in
-===================================================================
---- cxfe-0.9.2.orig/Makefile.in
-+++ cxfe-0.9.2/Makefile.in
-@@ -14,8 +14,8 @@ mandir = $(prefix)/man/man1
- CC = @CC@ -Wall
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = $(CPPFLAGS) @CFLAGS@ `xine-config --cflags`
--LIBS = @LIBS@
--LDFLAGS = `xine-config --libs` -L/usr/X11R6/lib -lXext@LDFLAGS@ @LIBS@ -lX11 
-+LDLIBS = `xine-config --libs` -L/usr/X11R6/lib -lXext @LIBS@ -lX11
-+LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
- 
- #CC=gcc -Wall -g -O2
diff --git a/media-video/cxfe/metadata.xml b/media-video/cxfe/metadata.xml
deleted file mode 100644
index 68b9a06fccf1..000000000000
--- a/media-video/cxfe/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>media-video@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d9f6b10eb87c..0f727cebf54d 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,3 +2,4 @@ DIST ffmpeg-2.6.3.tar.bz2 7803314 SHA256 59eb98c1b5896ac29abc0385f7c875d1b4942d6
 DIST ffmpeg-2.6.4.tar.bz2 7811925 SHA256 184f49e6b359426c398ad6c67d89abd362558373a43d3d92f86e554571655a5d SHA512 76c8bb3b23f2d2bac73b1561ef31bb3d1da49b2e182d84a13bf0bf49ea84cd0d64566c9dfafc4ac9d660aa4cecc0f08272b9ee284d1d09776e4599b87920c308 WHIRLPOOL 2d68715fb284979d703905919289c897c5cb002c3d466aca6c9759ca9f93443b749a24747cf218d005d728680ad137990880ec99210b6fb49038587966dd79f4
 DIST ffmpeg-2.8.5.tar.bz2 8580755 SHA256 3b6d9951533323ee64a21d0aa7667a780b3470bfe4e0fb7c1b33307ce290615a SHA512 2a46bef5ac99d114be7d3ece561ae71d09b87eaecba5da3c02ff1fe7e5cf4913e1b6feecca405540d1d70f9126591c209055edd7df1ad1d8bbf02f107701929e WHIRLPOOL 59ef96e7536a098ccf42526f64173df750558d489afb641c49168e2fc45672b160519d8a9e9e3093e1fd02a1af8ca1936de7f29c316685ac25946636890c760e
 DIST ffmpeg-2.8.6.tar.bz2 8582420 SHA256 40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62 SHA512 68fb41884b95953025b9c56496b17e13062196800ff9834dac43a12e9a0048d4a763f50a2256418c91cc850b63713e1debbf9170737f29621f48946adef152dc WHIRLPOOL 20a4b12b5a03f187b753cca43c65bd75b49cc21c9ffabad31b8ac0ab47fc8e017931ad5076b701c303bb594b20acb403d3ec2dabdf647fd262c070c8dabf1eea
+DIST ffmpeg-3.0.tar.bz2 8879514 SHA256 f19ff77a2f7f736a41dd1499eef4784bf3cb7461f07c13a268164823590113c0 SHA512 0128ab248dbc8134054ef58dccb1316971b7abdb52c593e2d2be7fadea2aa5a07afecbc330dbc7a088fb4559e1d0a5cf42d51ae7f957155a45b73ee516f13071 WHIRLPOOL 5872023db97df3d4f1b42eb0a988cfe9f9fcc423df07d8bad2f7eaab910dcbfd3d4bc1071506a919ac491eeacaa40736c6a1c4d0d0cda61c4c4c048760a56ddf
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index cc8493394e12..3593fbdb1fe4 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
@@ -193,7 +193,7 @@ RDEPEND="
 		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
 		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
index b9a6919e8843..4432056eb38c 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
@@ -193,7 +193,7 @@ RDEPEND="
 		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
 		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
index c21dbe35ed29..cd122a660c1f 100644
--- a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
@@ -195,7 +195,7 @@ RDEPEND="
 		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
 		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-2.8.6.ebuild b/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
index 895463285841..5737bce7e21e 100644
--- a/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
@@ -195,7 +195,7 @@ RDEPEND="
 		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
 		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-3.0.ebuild b/media-video/ffmpeg/ffmpeg-3.0.ebuild
new file mode 100644
index 000000000000..9fbf3efe29b6
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.0.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~mips ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb dcadec:libdcadec fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint flite:libflite frei0r fribidi:libfribidi
+		fontconfig ladspa libass truetype:libfreetype rubberband:librubberband
+		zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	faac:libfaac kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
+MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	dcadec? ( media-sound/dcadec[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	encode? ( faac? ( bindist ) nvenc? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use faac || use nvenc ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use xcb || ffuse+=( X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 32720defe666..31e83554f745 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 # Subslot: libavutil major.libavcodec major.libavformat major
 # Since FFmpeg ships several libraries, subslot is kind of limited here.
@@ -17,7 +17,7 @@ FFMPEG_SUBSLOT=55.57.57
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
+	SCM="git-r3"
 	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
 fi
 
@@ -63,7 +63,7 @@ fi
 # or $(use_enable foo foo) if no :bar is set.
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug doc gcrypt gnutls gmp
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
 		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
 		samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
 		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
@@ -73,9 +73,9 @@ FFMPEG_FLAG_MAP=(
 		# indevs
 		libv4l:libv4l2 pulseaudio:libpulse
 		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		amr:libopencore-amrwb amr:libopencore-amrnb dcadec:libdcadec fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus librtmp ssh:libssh
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
 		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
@@ -97,7 +97,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa +encode examples jack libressl oss pic static-libs test v4l
+	alsa doc +encode jack oss pic static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -162,6 +162,7 @@ RDEPEND="
 	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
 	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	dcadec? ( media-sound/dcadec[${MULTILIB_USEDEP}] )
 	encode? (
 		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
@@ -201,10 +202,11 @@ RDEPEND="
 		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
 		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
@@ -212,10 +214,7 @@ RDEPEND="
 	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
 	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
 	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
@@ -249,17 +248,11 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( net-misc/wget sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
@@ -301,7 +294,7 @@ src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
-	epatch_user
+	default
 }
 
 multilib_src_configure() {
@@ -410,10 +403,18 @@ multilib_src_configure() {
 		esac
 	fi
 
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
 	set -- "${S}/configure" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--mandir="${EPREFIX}/usr/share/man" \
 		--enable-shared \
 		--cc="$(tc-getCC)" \
@@ -439,7 +440,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
+	emake V=1 DESTDIR="${D}" install install-doc
 
 	if multilib_is_native_abi; then
 		for i in "${FFTOOLS[@]}" ; do
@@ -453,11 +454,6 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
 	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
 }
 
 multilib_src_test() {
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index eb97597b5ab9..ce057a06b6a6 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -18,6 +18,7 @@
 	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
 	<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
 	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
+	<flag name="dcadec">Enables DCA decoding with <pkg>media-sound/dcadec</pkg>.</flag>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
 	<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
@@ -29,6 +30,7 @@
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
 	<flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
 	<flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
+	<flag name="libilbc">Enables iLBC de/encoding via <pkg>media-libs/libilbc</pkg>.</flag>
 	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
 	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
 	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index ca39d89f6b8d..fb2bd068a2a1 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,3 +1,4 @@
 DIST ffmpegthumbnailer-2.0.10.tar.bz2 2154028 SHA256 a3022c86aa3e704849e424147bd4a319867e18930d66a4a4c93c0baefdd1fc60 SHA512 1fcfcfe9457a3e3e70a749f3234f79d080fbbb40d4d1f65b84e1c46a7051c75368afaffb25a39b43f8e205ffdbc2e156e6fb5848514fce4a1a3f5222458c1b9d WHIRLPOOL fe60513d2a26db622d02f6f38f04009590337415aeb02b441757949e4402cdfeb33d37cb295720f8dd66ebae9dcfdba9304c88256ccda4800e015fa40650151b
 DIST ffmpegthumbnailer-2.0.8.tar.gz 367186 SHA256 2c8bbefa838d38ea42fc8ac78258cda36865d974c991624b14cffdb92a3bc68b SHA512 6062d4b8f5326bde96c8c6dceaac52e1fabcec93f0a0ee4be19e203050e6c80426a006076a27e4a12582e05daceebd37beef008154fdd92a87f365fdff68ca83 WHIRLPOOL 6b0bd942777515f690f212df5616dffc4fc1c6e0e0e5be67128b376347b18d75eb144d25e9f8ac841b41099703092af5784edc31f34d7dbf81b742d678233e79
 DIST ffmpegthumbnailer-2.1.0.tar.bz2 2108351 SHA256 99ad417113c2dd7669978da2bd22b84cdfe87c2690ff3864a117b0bf72cd8c0f SHA512 c1cedcadc46e7abaa1d91ea83b96beda03b82d2ceecfbf1f4538f1865f1b336cdcc588cefd84e69c6374316b10805380cfe685999bd32a9206d82927b75e2cfa WHIRLPOOL fb8f6db18a5ea0e4423719fdac3de7927a599b4c0aec83c8a823ec73e51d1154cf8ff4b0d49345f13d350ff6be980c30c4d408d07a00d902a2892d2071ccc821
+DIST ffmpegthumbnailer-2.1.1.tar.bz2 1448731 SHA256 51bca83c0cfae283e8e2f323aa49e0c6ced206c5a068332b4be974d3905cf055 SHA512 2ac9e8b904e73086d0bf0f586a971bf3807d41bd394505164461731099c17570b45d71374e2bbf6fa2d0d7d47011564e06230b360255535120a9969fde3888a4 WHIRLPOOL 35e42062a50a0c5e3e669fc513b2e1219f77ec3681880a65ac503ff8dd463ada0c56206bb70c76460ff4d3592a40d26361b05b8ee8fe9b54269e30c4127e8e07
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.1.1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.1.1.ebuild
new file mode 100644
index 000000000000..f04e7f5ea348
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.1.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
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
+HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
+SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome gtk jpeg libav png test"
+
+RDEPEND="
+	gtk? ( dev-libs/glib:2= )
+	jpeg? ( virtual/jpeg:0= )
+	!libav? ( >=media-video/ffmpeg-2.7:0= )
+	libav? ( >=media-video/libav-11:0= )
+	png? ( media-libs/libpng:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+REQUIRED_USE="gnome? ( gtk )"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	rm -rf out* || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIO=$(usex gtk)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_THUMBNAILER=$(usex gnome)
+		-DHAVE_JPEG=$(usex jpeg)
+		-DHAVE_PNG=$(usex png)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index ee9a0dcc4c78..25d4cf1f81b2 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -3,3 +3,4 @@ DIST guvcview-src-1.7.1.tar.gz 464478 SHA256 1809f784210b295c0ba35297977e3416d6f
 DIST guvcview-src-1.7.2.tar.gz 508179 SHA256 4bedf9ce57edf60e761e7de9563a39a3ae43e4076cf9b3b8887218ec63754696 SHA512 e8bd3d9fe465486971d1d94bc73a31eb704194ce21c1482fd0d13c2cd6e256828bd99b20f5a3d7e97eb8b80c2faa5cacd4394f979c87b84b5b184d84670d8f77 WHIRLPOOL 4a5bef8dd92a8435290fec34dd8fea80f77ea1fe15e13d6e33a45f01482fd6dbce68a1ef374a8558ecb07c974c21f582c02bc5f16aff1a92efb5747e9adb0293
 DIST guvcview-src-1.7.3.tar.gz 761780 SHA256 d98612fa7bb6a5a408b26755bcefdee9c5d505e5dc0e2a45a7f316652d96da99 SHA512 36ec97e127043d9548bed2f915cd45611ba751cee3c38119382911d0c037944b0fb0abd2486155eade39c9b14c7ef3657c9b4bde1cc62666004fbf77de58db91 WHIRLPOOL 225eaad1fd40356b4699e51de1b14d6f367809d8f7bf0288392083ace20b433a770d4cba666f4edb7c636089ac3b9bf144830507d1dee13088ca44b872104483
 DIST guvcview-src-2.0.1.tar.gz 960661 SHA256 dffb86c01bd2e25216d9fbc0c246342246818036d9f63e0488111d757d9b018d SHA512 b3877f00f4caf224eac2010f62e1c3d575b94f84cd0a8da7a5f1df6c851384c7a9e356de905ce27e143dc9761137ae1cce146bb4f6c0aa6d270dd53551bce67a WHIRLPOOL 9cbf94219f5816e5fb0b98f3a7b7ad618bf3162dcd5a7b6dc9162a842470c2643f4503f6d15fc0c1c00de4901ecde5bf188680bacac279f4721bda02a7efecf5
+DIST guvcview-src-2.0.3.tar.gz 1062788 SHA256 1f2c79f2dccbf512a0aa1c397ce8e5d37fb0a48008ef72a0d3f10f9dc0758bce SHA512 976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704 WHIRLPOOL 8d94d9e669bee2f551745af03efba22d956d37927edf9b1a8b901ac943dc8c0d4e59a0aeada904b7c45e4ce693f9b49ef6e383485b827323fea066e28de0f220
diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
new file mode 100644
index 000000000000..5397d68834af
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg3.patch
@@ -0,0 +1,26 @@
+Index: guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
+===================================================================
+--- guvcview-src-2.0.3.orig/gview_v4l2core/jpeg_decoder.c
++++ guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
+@@ -1436,7 +1436,7 @@ int jpeg_init_decoder(int width, int hei
+ 		exit(-1);
+ 	}
+ 
+-	codec_data->context->pix_fmt = PIX_FMT_YUV422P;
++	codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P;
+ 	codec_data->context->width = width;
+ 	codec_data->context->height = height;
+ 	//jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
+Index: guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
+===================================================================
+--- guvcview-src-2.0.3.orig/gview_v4l2core/uvc_h264.c
++++ guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
+@@ -970,7 +970,7 @@ int h264_init_decoder(int width, int hei
+ 	}
+ 	
+ 	h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
+-	h264_ctx->context->pix_fmt = PIX_FMT_YUV420P;
++	h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
+ 	h264_ctx->context->width = width;
+ 	h264_ctx->context->height = height;
+ 	//h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
diff --git a/media-video/guvcview/guvcview-2.0.3.ebuild b/media-video/guvcview/guvcview-2.0.3.ebuild
new file mode 100644
index 000000000000..dd5fb8ac86e4
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="GTK+ UVC Viewer"
+HOMEPAGE="http://guvcview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl libav pulseaudio qt5"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/libv4l
+	>=media-libs/portaudio-19_pre
+	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	libav? ( media-video/libav:= )
+	virtual/ffmpeg
+	virtual/libusb:1
+	virtual/udev
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	gsl? ( >=sci-libs/gsl-1.15 )
+	qt5? ( dev-qt/qtwidgets:5 )
+	!qt5? ( >=x11-libs/gtk+-3.6:3 )
+	!<sys-kernel/linux-headers-3.4-r2" #448260
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/ffmpeg3.patch"
+	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+	econf \
+		--disable-debian-menu \
+		$(use_enable gsl) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable qt5) \
+		$(use_enable !qt5 gtk3)
+}
diff --git a/media-video/hwdecode-demos/Manifest b/media-video/hwdecode-demos/Manifest
deleted file mode 100644
index f416605aa5ef..000000000000
--- a/media-video/hwdecode-demos/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hwdecode-demos-0.9.5.tar.gz 642660 SHA256 35ef7bac5b95c61920ab6bae825060755051659c610c095739d9ae33b3d39d07 SHA512 2596949a6027c7d9a4053911501febaca319a4593cad23fc854d5f366e8be914fdbb7ecd08aac784fc9798dcf46147de249bf848a5a3fa513d06585c1f9f6748 WHIRLPOOL d494537d25dc17d0d8c4c058625898ea5be28522d2b7b8a30eea01662a053795fe0065d75db12a6babdeb081642689300123196d8a27ba9bb38d970cfbde614c
diff --git a/media-video/hwdecode-demos/files/avutil.patch b/media-video/hwdecode-demos/files/avutil.patch
deleted file mode 100644
index 6c518d9a2ef8..000000000000
--- a/media-video/hwdecode-demos/files/avutil.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: hwdecode-demos-0.9.5/src/Makefile.am
-===================================================================
---- hwdecode-demos-0.9.5.orig/src/Makefile.am
-+++ hwdecode-demos-0.9.5/src/Makefile.am
-@@ -93,8 +93,8 @@ endif
- if USE_FFMPEG
- ffmpeg_PROGS	= ffmpeg_h264 ffmpeg_vc1 ffmpeg_mpeg2 ffmpeg_mpeg4
- ffmpeg_source_c	= ffmpeg.c ffmpeg_video.c
--ffmpeg_CFLAGS	= -DUSE_FFMPEG $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS)
--ffmpeg_LIBS	= $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS)
-+ffmpeg_CFLAGS	= -DUSE_FFMPEG $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS) $(LIBAVUTIL_CFLAGS)
-+ffmpeg_LIBS	= $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS) $(LIBAVUTIL_LIBS)
- if USE_VAAPI
- ffmpeg_source_c	+= $(vaapi_source_c)
- ffmpeg_CFLAGS	+= $(vaapi_CFLAGS)
diff --git a/media-video/hwdecode-demos/files/dl.patch b/media-video/hwdecode-demos/files/dl.patch
deleted file mode 100644
index d46789452ec7..000000000000
--- a/media-video/hwdecode-demos/files/dl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c00dd0bd93d961bc2dfaea3406c59b672741fd26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= <vjaquez@igalia.com>
-Date: Fri, 1 Feb 2013 15:14:57 +0100
-Subject: [PATCH] Fix missing linking depenendency on -ldl
-
-Recent versions of GCC ship with a linker that doesn't add the deps of the
-DSOs of the linking process. This behavior is also found in GNU gold. This
-change fixes building with those linkers.
-
-Some references
-
-http://wiki.debian.org/ToolChain/DSOLinking
-https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
----
- configure.ac |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-Index: hwdecode-demos-0.9.5/configure.ac
-===================================================================
---- hwdecode-demos-0.9.5.orig/configure.ac
-+++ hwdecode-demos-0.9.5/configure.ac
-@@ -69,6 +69,9 @@ fi
- dnl Checks for libraries.
- AC_CHECK_LIB(rt, timer_create)
- 
-+dnl Checks if dl() comes from the C library or -ldl
-+AC_SEARCH_LIBS([dlopen], [dl])
-+
- dnl Checks for library functions.
- AC_CHECK_FUNCS(clock_gettime)
- 
diff --git a/media-video/hwdecode-demos/files/ffmpeg-1.patch b/media-video/hwdecode-demos/files/ffmpeg-1.patch
deleted file mode 100644
index f0b223e1401c..000000000000
--- a/media-video/hwdecode-demos/files/ffmpeg-1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: hwdecode-demos-0.9.5/src/ffmpeg.c
-===================================================================
---- hwdecode-demos-0.9.5.orig/src/ffmpeg.c
-+++ hwdecode-demos-0.9.5/src/ffmpeg.c
-@@ -53,7 +53,6 @@ static int ffmpeg_init(void)
-         return -1;
-     }
- 
--    avcodec_init();
-     avcodec_register_all();
- 
-     ffmpeg_context = ffmpeg;
-@@ -148,7 +147,6 @@ static int get_buffer(struct AVCodecCont
-     void *surface = (void *)(uintptr_t)vaapi->surface_id;
- 
-     pic->type           = FF_BUFFER_TYPE_USER;
--    pic->age            = 1;
-     pic->data[0]        = surface;
-     pic->data[1]        = NULL;
-     pic->data[2]        = NULL;
-Index: hwdecode-demos-0.9.5/src/ffmpeg_video.c
-===================================================================
---- hwdecode-demos-0.9.5.orig/src/ffmpeg_video.c
-+++ hwdecode-demos-0.9.5/src/ffmpeg_video.c
-@@ -23,6 +23,7 @@
- 
- #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
- # include <libavformat/avformat.h>
-+# include <libavformat/avio.h>
- #endif
- #ifdef HAVE_FFMPEG_AVFORMAT_H
- # include <ffmpeg/avformat.h>
-@@ -59,7 +60,7 @@
- int decode(void)
- {
-     AVProbeData pd;
--    ByteIOContext ioctx;
-+    AVIOContext *ioctx;
-     AVInputFormat *format = NULL;
-     AVFormatContext *ic = NULL;
-     AVCodec *codec;
-@@ -84,15 +85,20 @@ int decode(void)
-         goto end;
-     format->flags |= AVFMT_NOFILE;
- 
--    if (init_put_byte(&ioctx, (uint8_t *)video_data, video_data_size, 0, NULL, NULL, NULL, NULL) < 0)
-+    ioctx = avio_alloc_context((uint8_t *)video_data, video_data_size, 0, NULL, NULL, NULL, NULL);
-+    if (!ioctx)
-         goto end;
- 
--    if (av_open_input_stream(&ic, &ioctx, "", format, NULL) < 0)
-+    ic = avformat_alloc_context();
-+    if(!ic)
-+        goto end;
-+    ic->pb = ioctx;
-+    if (avformat_open_input(&ic, "", format, NULL) < 0)
-         goto end;
- 
-     if (av_find_stream_info(ic) < 0)
-         goto end;
--    dump_format(ic, 0, "", 0);
-+    av_dump_format(ic, 0, "", 0);
- 
-     video_stream = NULL;
-     for (i = 0; i < ic->nb_streams; i++) {
-@@ -135,6 +141,6 @@ end:
-     if (avctx)
-         avcodec_close(avctx);
-     if (ic)
--        av_close_input_stream(ic);
-+        avformat_close_input(&ic);
-     return error;
- }
diff --git a/media-video/hwdecode-demos/files/ffmpeg.patch b/media-video/hwdecode-demos/files/ffmpeg.patch
deleted file mode 100644
index fa8bdaf2cd4d..000000000000
--- a/media-video/hwdecode-demos/files/ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: hwdecode-demos-0.9.5/src/ffmpeg.c
-===================================================================
---- hwdecode-demos-0.9.5.orig/src/ffmpeg.c
-+++ hwdecode-demos-0.9.5/src/ffmpeg.c
-@@ -193,10 +193,14 @@ int ffmpeg_decode(AVCodecContext *avctx,
- {
-     CommonContext * const common = common_get_context();
-     FFmpegContext * const ffmpeg = ffmpeg_get_context();
-+    AVPacket pkt;
-     int got_picture;
- 
-     got_picture = 0;
--    if (avcodec_decode_video(avctx, ffmpeg->frame, &got_picture, (uint8_t *)buf, buf_size) < 0)
-+    av_init_packet( &pkt );
-+    pkt.data = buf;
-+    pkt.size = buf_size;
-+    if (avcodec_decode_video2(avctx, ffmpeg->frame, &got_picture, &pkt) < 0)
-         return -1;
- 
-     if (got_picture && hwaccel_type() == HWACCEL_NONE) {
-Index: hwdecode-demos-0.9.5/src/ffmpeg_video.c
-===================================================================
---- hwdecode-demos-0.9.5.orig/src/ffmpeg_video.c
-+++ hwdecode-demos-0.9.5/src/ffmpeg_video.c
-@@ -96,7 +96,7 @@ int decode(void)
- 
-     video_stream = NULL;
-     for (i = 0; i < ic->nb_streams; i++) {
--        if (ic->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO && !video_stream)
-+        if (ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO && !video_stream)
-             video_stream = ic->streams[i];
-         else
-             ic->streams[i]->discard = AVDISCARD_ALL;
diff --git a/media-video/hwdecode-demos/files/libav9.patch b/media-video/hwdecode-demos/files/libav9.patch
deleted file mode 100644
index df5dbdf03be1..000000000000
--- a/media-video/hwdecode-demos/files/libav9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Pouze v /tmp/hwdecode-demos-0.9.5/src/: config.h
-Pouze v /tmp/hwdecode-demos-0.9.5/src/: .deps
-diff -ur /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/ffmpeg_video.c /tmp/hwdecode-demos-0.9.5/src/ffmpeg_video.c
---- /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/ffmpeg_video.c	2013-06-22 19:45:54.776768969 +0200
-+++ /tmp/hwdecode-demos-0.9.5/src/ffmpeg_video.c	2013-06-22 19:45:44.720769327 +0200
-@@ -96,7 +96,7 @@
-     if (avformat_open_input(&ic, "", format, NULL) < 0)
-         goto end;
- 
--    if (av_find_stream_info(ic) < 0)
-+    if (avformat_find_stream_info(ic, NULL) < 0)
-         goto end;
-     av_dump_format(ic, 0, "", 0);
- 
-@@ -115,7 +115,7 @@
- 
-     if ((codec = avcodec_find_decoder(avctx->codec_id)) == NULL)
-         goto end;
--    if (avcodec_open(avctx, codec) < 0)
-+    if (avcodec_open2(avctx, codec, NULL) < 0)
-         goto end;
- 
-     got_picture = 0;
-Pouze v /tmp/hwdecode-demos-0.9.5/src/: Makefile
-Pouze v /tmp/hwdecode-demos-0.9.5/src/: stamp-h1
-diff -ur /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/utils_glx.h /tmp/hwdecode-demos-0.9.5/src/utils_glx.h
---- /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/utils_glx.h	2011-01-06 09:15:35.000000000 +0100
-+++ /tmp/hwdecode-demos-0.9.5/src/utils_glx.h	2013-06-22 19:45:44.720769327 +0200
-@@ -28,6 +28,13 @@
- #include <GL/glx.h>
- #include <GL/glxext.h>
- 
-+#if GL_GLEXT_VERSION >= 85
-+	/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
-+	  block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
-+	  Redefine the type here as an interim solution */
-+	typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-+#endif
-+
- const char *
- gl_get_error_string(GLenum error);
- 
diff --git a/media-video/hwdecode-demos/files/vaapi.patch b/media-video/hwdecode-demos/files/vaapi.patch
deleted file mode 100644
index a6d3e902a9a8..000000000000
--- a/media-video/hwdecode-demos/files/vaapi.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5afe6345d8ca1c673cbddcf8c7bc3af7709d5454 Mon Sep 17 00:00:00 2001
-From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-Date: Tue, 10 Jul 2012 14:43:37 +0200
-Subject: [PATCH] vaapi: fix build with recent VA-API versions.
-
----
- src/vaapi.c        |    2 ++
- src/vaapi_compat.h |    5 +++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-Index: hwdecode-demos-0.9.5/src/vaapi.c
-===================================================================
---- hwdecode-demos-0.9.5.orig/src/vaapi.c
-+++ hwdecode-demos-0.9.5/src/vaapi.c
-@@ -92,7 +92,9 @@ static const char *string_of_VADisplayAt
-         TYPE(Hue);
-         TYPE(Saturation);
-         TYPE(BackgroundColor);
-+#if !VA_CHECK_VERSION(0,34,0)
-         TYPE(DirectSurface);
-+#endif
- #undef TYPE
-     default: break;
-     }
-Index: hwdecode-demos-0.9.5/src/vaapi_compat.h
-===================================================================
---- hwdecode-demos-0.9.5.orig/src/vaapi_compat.h
-+++ hwdecode-demos-0.9.5/src/vaapi_compat.h
-@@ -91,4 +91,9 @@ typedef struct _VASliceParameterBufferBa
-       (VA_MINOR_VERSION == 31 &&                          \
-        VA_MICRO_VERSION == 0 && VA_SDS_VERSION < 5)))
- 
-+#if VA_CHECK_VERSION(0,34,0)
-+/* New vaCreateSurfaces() API with surface attributes */
-+# include <va/va_compat.h>
-+#endif
-+
- #endif /* VAAPI_COMPAT_H */
diff --git a/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild b/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild
deleted file mode 100644
index b824c55ce17b..000000000000
--- a/media-video/hwdecode-demos/hwdecode-demos-0.9.5.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=2
-
-inherit base autotools
-
-DESCRIPTION="Standalone programs showing off various HW acceleration APIs"
-HOMEPAGE="http://www.splitted-desktop.com/~gbeauchesne/hwdecode-demos/"
-SRC_URI="http://www.splitted-desktop.com/~gbeauchesne/hwdecode-demos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="opengl vaapi vdpau"
-
-RDEPEND="virtual/ffmpeg
-	x11-libs/libX11
-	opengl? ( virtual/opengl virtual/glu )
-	vaapi? ( x11-libs/libva )
-	vdpau? ( x11-libs/libvdpau )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/ffmpeg.patch"
-	"${FILESDIR}/ffmpeg-1.patch"
-	"${FILESDIR}/libav9.patch"
-	"${FILESDIR}/vaapi.patch"
-	"${FILESDIR}/dl.patch"
-	"${FILESDIR}/avutil.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-crystalhd \
-		$(use_enable opengl glx) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		--disable-xvba
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README
-}
diff --git a/media-video/hwdecode-demos/metadata.xml b/media-video/hwdecode-demos/metadata.xml
deleted file mode 100644
index 106575f01e53..000000000000
--- a/media-video/hwdecode-demos/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index a4acb064fef9..c6945223bf37 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,3 +2,4 @@ DIST mkvtoolnix-8.5.2.tar.xz 3304356 SHA256 efaae6d5e3d0963e2f53ae9c45f151be2856
 DIST mkvtoolnix-8.6.1.tar.xz 3242840 SHA256 815d8355b6a83af01c957543cee8716f1dad53e03b2ecf58b821099cd3c8fa77 SHA512 f3b14547da01a3a1268ec9b356e830391da7058741d7d8b67dcc9df5098ae9617fece67b82d6a73324f95c7060b182d94929c637baa6b9c806b2d472937151e1 WHIRLPOOL d8f4f9d3b2db77820bc018f41ac5a864057f18b22ed7711fc5c7bc3996b31041606a244b4f06b19abbaec6686990834c37ab27d5e58dd37b7c8313b24afdca51
 DIST mkvtoolnix-8.7.0.tar.xz 3273484 SHA256 33502efa9a44ad561e89753d9224b7eac95b2a887812ea3d8aa2051ff3f5c15a SHA512 18e9f3d1d4c9adf2f650838e0539646e5d3efa7aa297eca50d0a6bdbca3009b617ee2c5bca203c05ba6438b06588b493b15082557826b7d1eec6a03f56544c40 WHIRLPOOL 4473bde9a606a6ee08e774cd72ba4bc4da20ecda366dfbf556366f34359005d642550d8d411b744672b144e758e9a4e1d15429551b6d16977a1675ca6fe5e57a
 DIST mkvtoolnix-8.8.0.tar.xz 3544868 SHA256 912de8148d21f38c9100de61dfcac0041d1114d1a50462700b94f3bc8cd3a19c SHA512 c186c755522217a6eab282dd0e742eb263e12c181536c9bc156895c15c0a4002a9ef004ff9bd34d72c0a66f1c5785f44e688d0783f6a17db0653577b8868286c WHIRLPOOL b1a7fa19270592caccecbecd9cf2acdfb517396f855c1875dcda6289a9ac2606006357baa743ed089521a51e697301bb6f396c639e088a79f18ef7d2db3a0880
+DIST mkvtoolnix-8.9.0.tar.xz 3605716 SHA256 3208b2849339a8617b12922749c9325eb87c3755a943f88731605e3729aaa0d4 SHA512 fcc965ce7457fcab7f7ff58e3c4d2fdb2ff330585480a8cd15eb59dba37b188e76f4ca04e668a379ac3b6453c5c465b75ac38b91123807b96f4328da92aeda4c WHIRLPOOL ee85a942d229183e017cc4b63d6cf1783cdf763b96f023b8d62ddf8c43c29bc6795059a07b9064da926851b185ce7f1d2885dbbff5b837e704144667873ef19f
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.9.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.9.0.ebuild
new file mode 100644
index 000000000000..cb0e99667ac1
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.9.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="curl debug pch test qt5"
+
+ruby_atom() {
+	local ruby_slot=${1/ruby/}
+	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
+	echo "dev-lang/ruby:${ruby_slot}"
+}
+
+# hacks to avoid using the ruby eclasses since this requires something similar
+# to the python-any-r1 eclass for ruby which currently doesn't exist
+RUBY_IMPLS=( ruby23 ruby22 ruby21 ruby20 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
+	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
+
+RDEPEND="
+	>=dev-libs/boost-1.46.0:=
+	>=dev-libs/libebml-1.3.3:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.4:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	|| ( ${RUBY_BDEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	local ruby_impl
+	for ruby_impl in "${RUBY_IMPLS[@]}"; do
+		if has_version "$(ruby_atom ${ruby_impl})"; then
+			export RUBY=${ruby_impl}
+			break
+		fi
+	done
+	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(use_with curl) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README.md
+	doman doc/man/*.1
+}
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 2e3ea641c4c0..af34872a6704 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,7 +1,4 @@
 DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
-DIST movit-1.1.1.tar.gz 507273 SHA256 4fd1a90608a1b06cd9faf20ec99cd4d0a5cb18a9047621babef4b2abfa5c78cc SHA512 ad51bd00ad83878eb48f0949f6e0435ef66abad9e8f571244bb90b89baf7c14eb7bba72edb42541fc2f979bff9b0f50035396679bf6ec569a9ebb6447b63dbe9 WHIRLPOOL de3c5e753dc806ed98ea96bcb97e100475555c2becda69a8db85a139bd01859156151c7c2e089329c45a540c8a99768a0e35394f3599bb576a681ecbf9d0916a
-DIST movit-1.1.2.tar.gz 858539 SHA256 417e1810d588e5b4b2e82f05c2b6a86f4d14a3d9d9f4f26f4e009fce064d6a4a SHA512 082aab059864fd4feb9a66c0e7bab64babedfbdcc442ab5b1522ab60f678039d03e9c1c88095abe0e7196367c3ec1c8a9c90134cf5f97e4af31a3f7cbe98d661 WHIRLPOOL d305bd194d38b6da263471df443ef98c6854b2637eccfc6c376d0b9556a1c5be1e56b1d38f3097a0b2b8f91451728ffa4e476b46b17e829eb534f25c7053b7d1
-DIST movit-1.1.3.tar.gz 510811 SHA256 897fa5df7b261446dbed439c200f77b18a48e3693a0e6d666acf04eede806360 SHA512 ca8baa92907421d762a475fd06380fd3c9301df008ff60aaadf584f06185b0beed80633603073252492d4ad7f514ea6e09917862ba4d4630cf3bb0ecffa6f02f WHIRLPOOL 8f7efd99ee75b1e4990eac7a26fc0b0673fdfcecb49dfcc83211a0bd0e4af06a3b7b14b2b744b3823f0df6be49c020e2d9666f73257c53581fb24094330097b2
-DIST movit-1.1.tar.gz 507154 SHA256 41dcd3ccefbe218b7ccc47a7ac2577cf261f1ea10298f26ff16ffc353adf0f25 SHA512 ecb84f918b28b507c06cde680da5114fdf19b224a71e202d6f932de0e080e941f7977e590476eda9ffc9fc5839126b1f2d1056dd80039ced894281a51eebcf30 WHIRLPOOL c349a9f12b5966e57fa0b09811bbf3cf4a36abbb06b3df5cc3b9fa1b42efa7e902be9625b09e161d0250034aa05c3901db5ec9e24b8af554fb046ad725cda04a
 DIST movit-1.2.0.tar.gz 534145 SHA256 aeda1212288277ca136f2483765577a43ebd718be835dde73d81cf4b682fd473 SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154 WHIRLPOOL 3b937f8964e79066f2b9811f80d0bd8d97375d3a2154a8763f5caac0a416432c6229de7c711edd606f1d7b7970ba2da97b2b2647b61b435a677267c0d24187ac
 DIST movit-1.3.0.tar.gz 546075 SHA256 6a4b4fd6a49d6231d0ab84a2b98c822ed67bb32a803eea5a985557094b84abb3 SHA512 fea5419c4e5034f8e43d0a88845e6bdbd0b7b45bd2517368e8575432c564a62a3b14e290bc2751f046c5345c4dd64961f1829eb0b238237fbb1e09da58686658 WHIRLPOOL 3ad785ec72aca7aa8e24e448478ccf663c4f63dc638b24c574e688dd9d0aeb41d3ad357033d8e9e73749e1bab62cb5443ae74a6225250dbc24d6ff7f20310885
+DIST movit-1.3.1.tar.gz 574203 SHA256 8755d1a93b923dac21897faad883fec3aa793cb04938e05b16d96422ec7a664f SHA512 44610609ab85a8684e7e1469d50f4e6fa3a786e9bdeba58ccbb093c2312572b01e710ddec598e765bf81fa504bb31455ae430959180f326463da7a535d20b01b WHIRLPOOL 3f772cbd259a2600e850a42dca75a39569b3194ecc82c2337ffb23245a12fe5e0a9bcaec71ecbb2ccfe737d868bc0695c2c48eef6a4f35447f67742e4983784c
diff --git a/media-video/movit/files/movit-fix-locale.patch b/media-video/movit/files/movit-fix-locale.patch
new file mode 100644
index 000000000000..f98c9705e9f9
--- /dev/null
+++ b/media-video/movit/files/movit-fix-locale.patch
@@ -0,0 +1,16 @@
+--- a/init.cpp	2016-02-14 19:53:12.141197530 +0100
++++ b/init.cpp	2016-02-14 19:55:09.374196665 +0100
+@@ -388,7 +388,12 @@
+ 	// Now we have something on the form X.YY. We convert it to a float, and hope
+ 	// that if it's inexact (e.g. 1.30), atof() will round the same way the
+ 	// compiler will.
+-	float glsl_version = atof(glsl_version_str);
++	
++	std::istringstream locale_convert(glsl_version_str);
++	locale_convert.imbue(std::locale("C"));
++	double glsl_version;
++	locale_convert >> glsl_version;	
++	
+ 	free(glsl_version_str);
+ 
+ 	return glsl_version;
diff --git a/media-video/movit/movit-1.1.1.ebuild b/media-video/movit/movit-1.1.1.ebuild
deleted file mode 100644
index 80e118ce5107..000000000000
--- a/media-video/movit/movit-1.1.1.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
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa
-	dev-cpp/eigen:3
-	media-libs/libepoxy
-	sci-libs/fftw
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
diff --git a/media-video/movit/movit-1.1.2.ebuild b/media-video/movit/movit-1.1.2.ebuild
deleted file mode 100644
index 4a851415774c..000000000000
--- a/media-video/movit/movit-1.1.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
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa
-	dev-cpp/eigen:3
-	media-libs/libepoxy
-	sci-libs/fftw
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
diff --git a/media-video/movit/movit-1.1.3.ebuild b/media-video/movit/movit-1.1.3.ebuild
deleted file mode 100644
index 08927148bea1..000000000000
--- a/media-video/movit/movit-1.1.3.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
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa
-	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy
-	sci-libs/fftw
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
diff --git a/media-video/movit/movit-1.1.ebuild b/media-video/movit/movit-1.1.ebuild
deleted file mode 100644
index bffaf351c06a..000000000000
--- a/media-video/movit/movit-1.1.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
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa
-	dev-cpp/eigen:3
-	media-libs/libepoxy
-	sci-libs/fftw
-	"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
diff --git a/media-video/movit/movit-1.3.1-r1.ebuild b/media-video/movit/movit-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..f5931deb44e5
--- /dev/null
+++ b/media-video/movit/movit-1.3.1-r1.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
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	sci-libs/fftw
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/movit-fix-locale.patch"
+}
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 409cd8560032..9ea4a43c3035 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,7 @@
 DIST MPlayer-1.1.1.tar.xz 11202492 SHA256 ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76 SHA512 06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed0 WHIRLPOOL 3cd0f3845cd45961b778c384a322bc628cc9cd6fef3801b62389bd616a443ba5270c378a889412a7dc72d37ff26704d5d989d2c995a2a4a6540f6313ccacbb63
 DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72
 DIST MPlayer-1.2.tar.xz 13019196 SHA256 ffe7f6f10adf2920707e8d6c04f0d3ed34c307efc6cd90ac46593ee8fba2e2b6 SHA512 ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa WHIRLPOOL 65bcda55684dced6b286e505df4180f849d6a9f2e1e44560f3393311694ea5a0e96cd7c454b8bbc4198b92c1fd3b0fb4f7c5f6842710b40dc47216037a88b33b
+DIST MPlayer-1.3.0.tar.xz 13278984 SHA256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae WHIRLPOOL 4aaa9609b0c27c0363671e32fb6b7cac8d2c0944c3425c8e76de0250fb76865d5f47c341b11704a0ea980401288d1d28fcd172a5f8469c9713ec37f977bcb088
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
new file mode 100644
index 000000000000..8a5b4011be4d
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+	RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+	MY_P="MPlayer-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+	virtual/ttf-fonts
+	media-libs/fontconfig
+	>=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+#	nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+	sys-libs/ncurses:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	>=media-video/ffmpeg-3.0:0=[vdpau?]
+	a52? ( media-libs/a52dec )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bidi? ( dev-libs/fribidi )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
+	bs2b? ( media-libs/libbs2b )
+	cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	encode? (
+		!twolame? ( toolame? ( media-sound/toolame ) )
+		twolame? ( media-sound/twolame )
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
+		xvid? ( media-libs/xvid )
+	)
+	enca? ( app-i18n/enca )
+	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
+	gif? ( media-libs/giflib )
+	gsm? ( media-sound/gsm )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( >=media-libs/libass-0.9.10:= )
+	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	mp3? ( media-sound/mpg123 )
+	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+	rtmp? ( media-video/rtmpdump )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
+	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
+	X? ( ${X_RDEPS}	)
+	xanim? ( media-video/xanim )
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dga? ( x11-proto/xf86dgaproto )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	amd64? ( ${ASM_DEP} )
+	doc? (
+		dev-libs/libxslt app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+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"
+else
+	KEYWORDS=""
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+	dga? ( X )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	ggi? ( X )
+	libass? ( truetype )
+	opengl? ( X )
+	osdmenu? ( X )
+	truetype? ( iconv )
+	vdpau? ( X )
+	vidix? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Please note that upstream uses media-video/ffmpeg."
+		ewarn "media-video/libav should be fine in theory but if you"
+		ewarn "experience any problem, try to move to media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+	else
+		unpack ${A}
+	fi
+
+	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
+	fi
+
+	if ! use truetype; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+}
+
+src_prepare() {
+	local svf=snapshot_version
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		printf "${ESVN_WC_REVISION}" > $svf
+	fi
+	if [ ! -f VERSION ] ; then
+		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+		local sv=$(<$svf)
+		printf "SVN-r${sv} (Gentoo)" > VERSION
+	fi
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+	base_src_prepare
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# set LINGUAS
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	###################
+	#Optional features#
+	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
+	myconf+="
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
+		--disable-arts
+		--disable-kai
+		--disable-libopus
+		--disable-libilbc
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+	myconf+=" --disable-nemesi" # nemesi automagic disable
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bidi  || myconf+=" --disable-fribidi"
+	use ipv6  || myconf+=" --disable-inet6"
+	use libass || myconf+=" --disable-ass"
+	use nut   || myconf+=" --disable-libnut"
+	use rar   || myconf+=" --disable-unrarexec"
+	use samba || myconf+=" --disable-smb"
+	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf+=" --disable-cdparanoia"
+	else
+		myconf+=" --disable-libcdio"
+		use cdparanoia || myconf+=" --disable-cdparanoia"
+		use cddb || myconf+=" --disable-cddb"
+	fi
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	#
+	# SRT/ASS/SSA (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	myconf+=" --disable-tv-bsdbt848"
+	# broken upstream, won't work with recent kernels
+	myconf+=" --disable-ivtv"
+	# gone since linux-headers-2.6.38
+	myconf+=" --disable-tv-v4l1"
+	if { use dvb || use v4l || use pvr || use radio; }; then
+		use dvb || myconf+=" --disable-dvb"
+		use pvr || myconf+=" --disable-pvr"
+		use v4l || myconf+=" --disable-tv-v4l2"
+		if use radio && { use dvb || use v4l; }; then
+			myconf+="
+				--enable-radio
+				$(use_enable encode radio-capture)
+			"
+		else
+			myconf+="
+				--disable-radio-v4l2
+				--disable-radio-bsdbt848
+			"
+		fi
+	else
+		myconf+="
+			--disable-tv
+			--disable-tv-v4l2
+			--disable-radio
+			--disable-radio-v4l2
+			--disable-radio-bsdbt848
+			--disable-dvb
+			--disable-v4l2
+			--disable-pvr"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+	use dts || myconf+=" --disable-libdca"
+	if ! use mp3; then
+		myconf+="
+			--disable-mp3lame
+			--disable-mpg123
+		"
+	fi
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
+
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+	# Encoding
+	uses="faac x264 xvid toolame twolame"
+	if use encode; then
+		for i in ${uses}; do
+			use ${i} || myconf+=" --disable-${i}"
+		done
+	else
+		myconf+=" --disable-mencoder"
+		for i in ${uses}; do
+			myconf+=" --disable-${i}"
+			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+		done
+	fi
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="directfb md5sum sdl"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use aalib || myconf+=" --disable-aa"
+	use fbcon || myconf+=" --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+	use libcaca || myconf+=" --disable-caca"
+	use zoran || myconf+=" --disable-zr"
+
+	if ! use kernel_linux || ! use video_cards_mga; then
+		 myconf+=" --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf+="
+			$(use_enable video_cards_tdfx tdfxvid)
+			$(use_enable fbcon tdfxfb)
+		"
+	else
+		myconf+="
+			--disable-3dfx
+			--disable-tdfxvid
+			--disable-tdfxfb
+		"
+	fi
+
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-esd"
+	uses="alsa jack ladspa nas openal"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use pulseaudio || myconf+=" --disable-pulse"
+	if ! use radio; then
+		use oss || myconf+=" --disable-ossaudio"
+	fi
+
+	####################
+	# Advanced Options #
+	####################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	myconf+=" --disable-gui"
+	myconf+=" --disable-vesa"
+	uses="ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf+=" --disable-xvmc"
+	fi
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+		"
+	fi
+
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
+}
+
+src_compile() {
+	base_src_compile
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+		done
+		if [[ -z $BUILT_DOCS ]]; then
+			emake -j1 html-chunked
+		else
+			for i in ${BUILT_DOCS}; do
+				emake -j1 html-chunked-${i}
+			done
+		fi
+	fi
+}
+
+src_install() {
+	local i
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALLSTRIP="" \
+		install
+
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+	docinto tech/
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+	docinto TOOLS/
+	dodoc -r TOOLS
+	docinto tech/mirrors/
+	dodoc DOCS/tech/mirrors/*
+
+	if use doc; then
+		docinto html/
+		dohtml -r "${S}"/DOCS/HTML/*
+	fi
+
+	if ! use truetype; then
+		dodir /usr/share/mplayer/fonts
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+		done
+		# Fix the font symlink ...
+		rm -rf "${ED}/usr/share/mplayer/font"
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
+
+	insinto /etc/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
+	if use osdmenu; then
+		doins "${S}/etc/menu.conf"
+	fi
+
+	if use truetype; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+	fi
+
+	# bug 256203
+	if use rar; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+	newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+	# Cleanup stale symlinks
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 32c7fad785ed..586f70ab309c 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
 	sys-libs/ncurses:0=
 	app-arch/bzip2
 	sys-libs/zlib
-	>=media-video/ffmpeg-2.8:0=[vdpau?]
+	>=media-video/ffmpeg-3.0:0=[vdpau?]
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mpv/mpv-0.9.2-r1.ebuild b/media-video/mpv/mpv-0.9.2-r1.ebuild
index 9f5e768d7ba3..c75f1304dc18 100644
--- a/media-video/mpv/mpv-0.9.2-r1.ebuild
+++ b/media-video/mpv/mpv-0.9.2-r1.ebuild
@@ -50,7 +50,10 @@ REQUIRED_USE="
 
 RDEPEND="
 	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
-	!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? (
+		>=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?]
+		<media-video/ffmpeg-3.0
+	)
 	sys-libs/zlib
 	X? (
 		x11-libs/libX11
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index cfbfe7bd6642..f100dc65cc34 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -74,7 +74,7 @@ COMMON_DEPEND="
 		libguess? ( >=app-i18n/libguess-1.0 )
 		uchardet? ( dev-libs/uchardet )
 	)
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( >=media-libs/lcms-2.6:2 )
 	libass? (
diff --git a/media-video/pitivi/pitivi-0.95.ebuild b/media-video/pitivi/pitivi-0.95.ebuild
index 583aad287d17..2c48c932e085 100644
--- a/media-video/pitivi/pitivi-0.95.ebuild
+++ b/media-video/pitivi/pitivi-0.95.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.pitivi.org"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="v4l test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
new file mode 100644
index 000000000000..a5d20ed5161d
--- /dev/null
+++ b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
@@ -0,0 +1,22 @@
+Index: qx11grab-0.4.12/src/avoptions/avoptions.cpp
+===================================================================
+--- qx11grab-0.4.12.orig/src/avoptions/avoptions.cpp
++++ qx11grab-0.4.12/src/avoptions/avoptions.cpp
+@@ -178,14 +178,14 @@ namespace QX11Grab
+   {
+     QList<FFOption> list;
+     avcodec_register_all();
+-    for ( int i = 0; i < PIX_FMT_NB; i++ )
++    int i = 0;
++    for ( const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_next(NULL); pix_desc != NULL; pix_desc = av_pix_fmt_desc_next(pix_desc))
+     {
+-      const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ static_cast<PixelFormat> ( i ) ];
+       if ( ! pix_desc->name )
+         continue;
+ 
+       FFOption opt;
+-      opt.id = i;
++      opt.id = i++;
+       opt.name = QString::fromUtf8 ( pix_desc->name );
+       opt.value = QVariant ( pix_desc->name );
+       /*: ToolTip */
diff --git a/media-video/qx11grab/metadata.xml b/media-video/qx11grab/metadata.xml
index 32fe1293e9a9..17237689dcfd 100644
--- a/media-video/qx11grab/metadata.xml
+++ b/media-video/qx11grab/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>qt@gentoo.org</email>
-	<name>Gentoo Qt Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild
index a553c043b2f0..097e4d6829d3 100644
--- a/media-video/qx11grab/qx11grab-0.4.12.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.12.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	>=sys-apps/dbus-1.6.4
 	>=x11-libs/libX11-1.3.4
 	>=x11-libs/libXrandr-1.3
+	dev-libs/qjson
 	libav? ( >=media-video/libav-9:0=[X,encode,truetype] )
 	!libav? ( >=media-video/ffmpeg-1.1:0=[X,encode,truetype] )
 	kde? ( kde-base/kdelibs:4 )
@@ -36,6 +37,7 @@ DEPEND="${RDEPEND}
 	kde? ( dev-util/automoc )
 "
 PDEPEND="virtual/freedesktop-icon-theme"
+PATCHES=( "${FILESDIR}/${P}-ffmpeg3.patch" )
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 9c1e2d5eac27..4bc223d6a95a 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,3 +1,4 @@
 DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399
 DIST smplayer-15.11.0.tar.bz2 3933281 SHA256 968901fa2c86c13934c5228a8ae8a74188cdb27e49ecc05546e71eac642f19c1 SHA512 a8354a4fbb886654c654e5413e9281a38396e46dd5128fd05192b17cf1b55c6888cdb300dcaabcfaecc26581e09f1fe57c1304afa70f93b35692d418589e5cea WHIRLPOOL 201411d950a3ac841e3059640180f8ed0f7c0d06f332e33c08edc01ba3ca7ee5c55ab659f0ab6a923971cda273b343ef8a76ab930fb00adc348c7564a6d698eb
 DIST smplayer-15.9.0.tar.bz2 3874708 SHA256 85a970df1c601f266101895e9bb9a17c20d1e964796fa590546527a9669ca6fb SHA512 36d9211717d99bf1b332add7d96c602e906c1fbda7f1233cc4df2d798e63cdef6cffa5a354219e6a1c589aafd4df668c6fdf1dd42a7e28ee661f816370fa0dc8 WHIRLPOOL e27c18f33862edfc1b87cfb2cf62df05d9f7bab165f8f08b364edb68cbd6ee16eefedd932880942e11c32163015ccf52294417bc8ce97b9369c9f8503898c9b0
+DIST smplayer-16.1.0.tar.bz2 3966243 SHA256 d25c9b62d36c5ee63fb360e9a45566601d49d707e1364294a54967b956bdd8c9 SHA512 2c240a6cc392b84c7d6f725a02af33788ce7dbfae9d765d309e3b958fa9e2475e45c56b260e056118362848f64e478aa0ef9c67478fc44d9e42c568b4892e6ed WHIRLPOOL 8a7c989e3c77e6e7a696a958f848e8649f49131be80f26139b2aef17f3534cc18ab778def5083fee5a12c1e8291891e6c9d90ae26395c13a04e889ab2e4f616e
diff --git a/media-video/smplayer/smplayer-16.1.0.ebuild b/media-video/smplayer/smplayer-16.1.0.ebuild
new file mode 100644
index 000000000000..e09db3398d49
--- /dev/null
+++ b/media-video/smplayer/smplayer-16.1.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
+hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL
+sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+inherit l10n qmake-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://smplayer.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[X,qt4]
+		autoshutdown? ( dev-qt/qtdbus:4 )
+		mpris? ( dev-qt/qtdbus:4 )
+		streaming? ( dev-qt/qtcore:4[ssl] )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		autoshutdown? ( dev-qt/qtdbus:5 )
+		mpris? ( dev-qt/qtdbus:5 )
+		streaming? (
+			dev-qt/qtnetwork:5[ssl]
+			dev-qt/qtscript:5
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.6.2[libass,X]
+			streaming? ( >=net-misc/youtube-dl-2014.11.26 )
+		)
+	)
+"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch # bug 487544
+	use bidi || eapply "${FILESDIR}"/${PN}-14.9.0.6690-zero-bidi.patch
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		"${S}"/Makefile || die "sed failed"
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \
+			-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			"${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \
+			-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+
+	# Turn off nasty share widget
+	sed -e 's:DEFINES += SHAREWIDGET:#DEFINES += SHAREWIDGET:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+
+	# Turn off youtube support (which pulls in extra dependencies) if unwanted
+	if ! use streaming ; then
+		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \
+		-i "${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+}
+
+src_configure() {
+	pushd src > /dev/null || die
+	use qt4 && eqmake4
+	use qt5 && eqmake5
+	popd > /dev/null || die
+}
+
+gen_translation() {
+	local mydir
+	if use qt4; then
+		mydir="$(qt4_get_bindir)"
+	elif use qt5; then
+		mydir="$(qt5_get_bindir)"
+	fi
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of licenses
+	rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
+	rm -r docs/{de,es,fr,nl,ro} || die
+
+	emake DESTDIR="${D}" install
+}
diff --git a/media-video/snappy/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild
index bb9efdfde619..6bee87a6d518 100644
--- a/media-video/snappy/snappy-1.0-r1.ebuild
+++ b/media-video/snappy/snappy-1.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2
 DESCRIPTION="A simple media player written using GStreamer and Clutter"
 HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
index fa99db5b69c6..6cbf88731d79 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug nls"
 # opengl would mix gtk+:2 and :3 which is not possible
 
diff --git a/media-video/totem/totem-3.18.1.ebuild b/media-video/totem/totem-3.18.1.ebuild
index af3689da8221..31e0b776dd16 100644
--- a/media-video/totem/totem-3.18.1.ebuild
+++ b/media-video/totem/totem-3.18.1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	zeitgeist? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index e79626c1e258..bcc5b1887e01 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="alternatechannel">Use alternate channel on record</flag>
-		<flag name="bidi">fribid support, for languages, written from right to left</flag>
+		<flag name="bidi">fribidi support, for languages, written from right to left</flag>
 		<flag name="ddepgentry">remove duplicate EPG entries</flag>
 		<flag name="dvlvidprefer">controls video-dir choice on recording</flag>
 		<flag name="graphtft">support for <pkg>media-plugins/vdr-grapftft</pkg>plugin up from vdr-graphtft-0.1.7</flag>
diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 1a8b9d39cecb..b2dbdf0af4ce 100644
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -53,7 +53,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
 	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
 
 RDEPEND="
-		!<media-video/ffmpeg-1.2:0
+		!>=media-video/ffmpeg-3.0:0
 		dev-libs/libgpg-error:0
 		net-dns/libidn:0
 		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
diff --git a/media-video/winki/Manifest b/media-video/winki/Manifest
deleted file mode 100644
index ca593bb08528..000000000000
--- a/media-video/winki/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST winki-0.4.5.tar.gz 585135 SHA256 e27dc51dc698645a6d609df89da4cdc4815443741c819f4e9e68c93ff4e26666 SHA512 bc5dbc76e28470b1198c590ee49b56afdaa7840ea35ecd3a890d3d591731e3805c2024c51783ff8234d450265dbbf81004799173317030d4efde4b1640cbfa0b WHIRLPOOL cd8ceeaaa69acc367da206bcc9f3dc379fc59a38540e12e5248d3f392341e9fa29a3e2c67a97485c09eceb3af04db8cd529d22bf1e1d97d6166e7fd713b9be0a
diff --git a/media-video/winki/metadata.xml b/media-video/winki/metadata.xml
deleted file mode 100644
index fde97c48e40e..000000000000
--- a/media-video/winki/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="mjpeg">Enables mjpegtools support</flag>
-  </use>
-</pkgmetadata>
diff --git a/media-video/winki/winki-0.4.5-r1.ebuild b/media-video/winki/winki-0.4.5-r1.ebuild
deleted file mode 100644
index 3ad128315cf7..000000000000
--- a/media-video/winki/winki-0.4.5-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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python frontend to many popular encoding programs"
-HOMEPAGE="http://www.winki-the-ripper.de/"
-SRC_URI="http://www.winki-the-ripper.de/share/dist/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="css dvd matroska mjpeg mp3 ogg vcd"
-DEPEND=">=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
-	>=dev-python/pyorbit-2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-		media-video/mplayer[encode]
-		media-video/lsdvd
-		virtual/ffmpeg
-		dvd? ( media-video/dvdauthor )
-		mp3? ( media-sound/lame )
-		ogg? ( media-sound/ogmtools
-			media-sound/vorbis-tools )
-		vcd? ( media-video/vcdimager
-			media-libs/libdvb )
-		mjpeg? ( media-video/mjpegtools )
-		matroska? ( media-video/mkvtoolnix )
-		css? ( media-libs/libdvdcss )"
-
-DOCS="winkirip/README winkirip/CHANGELOG winkirip/TODO winkirip/AUTHORS"
diff --git a/media-video/winki/winki-0.4.5.ebuild b/media-video/winki/winki-0.4.5.ebuild
deleted file mode 100644
index add1bc2caadc..000000000000
--- a/media-video/winki/winki-0.4.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit distutils
-
-DESCRIPTION="A Python frontend to many popular encoding programs"
-HOMEPAGE="http://www.winki-the-ripper.de/"
-SRC_URI="http://www.winki-the-ripper.de/share/dist/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="css dvd matroska mjpeg mp3 ogg vcd"
-DEPEND=">=dev-lang/python-2.3
-		>=dev-python/pygtk-2:2
-		>=dev-python/pyorbit-2"
-RDEPEND="${DEPEND}
-		media-video/mplayer[encode]
-		media-video/lsdvd
-		virtual/ffmpeg
-		dvd? ( media-video/dvdauthor )
-		mp3? ( media-sound/lame )
-		ogg? ( media-sound/ogmtools
-			media-sound/vorbis-tools )
-		vcd? ( media-video/vcdimager
-			media-libs/libdvb )
-		mjpeg? ( media-video/mjpegtools )
-		matroska? ( media-video/mkvtoolnix )
-		css? ( media-libs/libdvdcss )"
-
-DOCS="winkirip/README winkirip/CHANGELOG winkirip/TODO winkirip/AUTHORS"
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index a71337996cf8..b25feb352225 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,3 +1,4 @@
 DIST arpwatch-2.1a15.tar.gz 202729 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 WHIRLPOOL e653eb83d8dbc8777c3aaa5920bc1e5b46c64aa740c64a79b24a42abdee4625baa72a51f9f0441549b7325fcb07b94f1964887df1b6d707eddde162e1073691f
 DIST arpwatch-patchset-0.5.tbz2 127740 SHA256 aa69513ba36cdb9f41862f5f9c47e47d60786d01d302a1e8177f9e1f8aae71d3 SHA512 cd1a71fc39489f3498b7614fa793226cb3dd23dbac88082baab5598d441cd585da2d2f2ee8d40183b810893f4cddd0282f5cc8aa8b6009c40bfbf2c295365dc3 WHIRLPOOL 736be0f0ea18ebd96136c5b629134b0920c3c1a648974eac7f86f57c5d5ee58c1cd284371685562a73468a79b29fc130a668bc9487e85175f61d7a3642f58db9
 DIST arpwatch-patchset-0.6.tbz2 128973 SHA256 2bfc7078fc4d5bad6bf7bd5d512df669799d09939ca249c2fe3f9fa3b8969ad8 SHA512 01c8b85e859765783a783c09ed9470b7f109b20f6713bb40ebcdc8e838ea00290df7609aa96ed1a6a2e39250e9735d6cfbd19e444961b79fdd1b04819c729253 WHIRLPOOL 96ae54f3cffe3f5eba8153ff79a6c66956ac95424dfae87e438372a4a27bf9d00136271f1e3c0e56850011cae873b2de57c6af7589fdd5a0253ef482328a602f
+DIST arpwatch-patchset-0.7.tar.xz 132868 SHA256 ccc3f84f452306b153175bbdec33f9913848ac57866a4ee52b974d7087b7fe48 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00 WHIRLPOOL f6624f459f2172b10beb6eaa15e0e5111566cd360195e4ca08ec4e5962bb1156aaf133701730e8146cb049a9759f7063bbc225d99f824827bb8bb72d3e0cebb3
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
new file mode 100644
index 000000000000..16645a58446d
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils user versionator
+
+PATCH_VER="0.7"
+
+MY_P="${PN}-$(replace_version_separator 2 'a')"
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
+HOMEPAGE="http://ee.lbl.gov/"
+SRC_URI="
+	ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
+	https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:*
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-arpwatch )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_preinst() {
+	enewuser arpwatch
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}"/arpwatch-patchset/ EPATCH_SUFFIX="patch" epatch
+	cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die
+}
+
+src_install () {
+	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
+	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
+
+	insinto /usr/share/arpwatch
+	doins ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
+
+	keepdir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newinitd "${FILESDIR}"/arpwatch.initd arpwatch
+	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
+}
+
+pkg_postinst() {
+	fowners arpwatch:0 "${ROOT}"/var/lib/arpwatch
+}
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
index ae30fbd3d4f7..ae30fbd3d4f7 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
index 85f2819786e2..5e1b22749637 100644
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
@@ -48,7 +48,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=561718
 -    CURSES_CHECKED="1"
 -fi
 +AS_IF([test "x$enable_ncurses" != "xno"], [
-+	PKG_CHECK_MODULES([NCURSES], [ncurses])
++	PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
  ])
 -fi
 -
@@ -80,3 +80,14 @@ https://bugs.gentoo.org/show_bug.cgi?id=561718
  
  noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
  
+--- bwm-ng-0.6.1/src/defines.h
++++ bwm-ng-0.6.1/src/defines.h
+@@ -48,7 +48,7 @@
+ #define LIBSTATGRAB
+ #endif
+ 
+-#if HAVE_LIBCURSES || HAVE_LIBNCURSES
++#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
+ #define HAVE_CURSES
+ #endif
+ 
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index f93518e3d521..6024bed5578a 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,2 +1,3 @@
 DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
 DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232
+DIST cacti-spine-0.8.8g.tar.gz 805321 SHA256 f7d60d5663f6fe8f730363763f31d110589c725e482c943f0f8287359a6db533 SHA512 24d208b4779e5d04e0206e950c0d49d0453937b3da4a3e3bdbb1a075bdf22db3c6bb6789bab92f6c22a67c39745a36fc98cb28371423469b87a5936b3afb3ba3 WHIRLPOOL d1106b59748ac166c0b44ffdad285c3efefb03fec98318704e16022bf788168603884ee1b4bd22d9ef5fb962c5a60bfda241c6675b987fe9c02c7c4068213ad2
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
new file mode 100644
index 000000000000..75f9d645d7dc
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.8g-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
+		"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch \
+		"${FILESDIR}"/${PN}-0.8.8g-parallel-make.patch
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog README
+}
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
new file mode 100644
index 000000000000..fa12f1ec4a79
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@
+ AC_LANG(C)
+ 
+ AM_INIT_AUTOMAKE(spine, 0.8.8g)
+-AM_CONFIG_HEADER(config/config.h)
++AC_CONFIG_HEADERS(config/config.h)
+ 
+ # static libraries
+ AC_ARG_WITH(static,
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch
new file mode 100644
index 000000000000..5ee62e2279a0
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -251,14 +251,14 @@
+ 
+ # Net-SNMP includes v3 support and insists on crypto unless compiled --without-openssl
+ AC_MSG_CHECKING([if Net-SNMP needs crypto support])
+-AC_TRY_COMPILE([#include <net-snmp-config.h>], [exit(NETSNMP_USE_OPENSSL != 1);],
++AC_TRY_COMPILE([#include <net-snmp/net-snmp-config.h>], [exit(NETSNMP_USE_OPENSSL != 1);],
+   [  AC_MSG_RESULT(yes)
+      SNMP_SSL=yes
+   ],
+   AC_MSG_RESULT(no)
+ )
+ 
+-AC_TRY_COMPILE([ #include <net-snmp-config.h> 
++AC_TRY_COMPILE([ #include <net-snmp/net-snmp-config.h> 
+   #include <net-snmp/utilities.h>
+   #include <net-snmp/net-snmp-includes.h>
+   #include <net-snmp/config_api.h>
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
new file mode 100644
index 000000000000..e7983ed759e5
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
@@ -0,0 +1,9 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,5 +9,5 @@
+ 
+ man_MANS = spine.1
+ 
+-spine.1: spine.c 
++spine.1: $(sbin_PROGRAMS)
+ 	$(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info --version-option='--version' ./spine
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 1ab0eaa53a73..913fb15fc46c 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,2 +1,3 @@
 DIST cacti-0.8.8e.tar.gz 2594446 SHA256 43b091957faf03a4b0baacc8c327320394c0843476ea34e3beb1416506ad3f55 SHA512 11eeace353b7bacb2e4f065b1557b6978f0315d372f03f25bbdd210aaa494b70661b24502885bb610d8cf042cdcd68c69ea1a6fd1cb7073af29553116500df0c WHIRLPOOL ea5f29a71504f4e1fb4d8981db84b46fb87842921d8f6f422b8a0c2b127e80b785fca60b3b037036396cf9de456240a573cd446118f03a93f25a2406fe22be40
 DIST cacti-0.8.8f.tar.gz 2594409 SHA256 2ea92407c11bf13302558a5bc9e1f3a57bd14a1d9ded48c505ec495762f76738 SHA512 b712a9f8b7bee632cb4982fed72793ac2f4d70aa042784bbd2fd3923a27901f457393aa95bbd63960187e85fe462c35e88fa3cd93e8537a3a68f94bdbf5d7f2b WHIRLPOOL 58c883780fed833df2501b204a21fc8605e76a7b5ac26ebd13f0bf22f45dda6363be35ada8af2a65f4e7db506d103b6739d73699676c1622e7051eb8a89ad555
+DIST cacti-0.8.8g.tar.gz 2584879 SHA256 3187bd5054ae4e54496bb23187f14c79a441fedcfd397a2d27cd60179f0dee33 SHA512 cbac69de47a32de8b87d0fc2f32e90eb70f7f13828fd17764957b5afbbcc7a8954ccc49f30f414d5fdf09142967a9ddcb4cde66d03569407ae05fc36612b731c WHIRLPOOL 47633f00e8875f98d80806cb0743b817030c487a3c62ede453e73125f87c210c320820c92df95555227e32148ff8271c8760c504955a683d6affadda73846213
diff --git a/net-analyzer/cacti/cacti-0.8.8g.ebuild b/net-analyzer/cacti/cacti-0.8.8g.ebuild
new file mode 100644
index 000000000000..3c9a4a9b9b6f
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.8g.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README || die
+	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt}
+	use doc && dohtml -r docs/html/
+	rm -rf docs
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild
index 3d5859faf79e..1b4e768f10d3 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="selinux systemd"
 
 RDEPEND="
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index a1529b7ad61e..2aeebe4a2ea0 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1 +1,2 @@
 DIST fwlogwatch-1.4.tar.bz2 92652 SHA256 0ca67b2f2a36e4f79ac202018d5440809d50a1cb7203e2a02818f2aade112e9a SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6 WHIRLPOOL 7dc01a46be44733cab6f69525f704f4ed86802112bfff284480df4d9151174e6d0bb03a6cc7349a77b7c32b6d312dea582627c0e7b71cad4e36073fda46057f9
+DIST fwlogwatch-1.5.tar.bz2 94451 SHA256 0c8c9465b9d6c653b26492028bb040f60987804dfc53e480cb8cfde62cb72b1d SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85 WHIRLPOOL 6dd21c08158c2fd99c13ea46e8cbd9ebd7ec7e0612cf21f6cef07efcbe134aec900bae33ecd74f61fa1ddbc799bfd22d37f5c42927a72f02b8298c7851f2e2b0
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
new file mode 100644
index 000000000000..1479b995f8d8
--- /dev/null
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A packet filter and firewall log analyzer"
+HOMEPAGE="http://fwlogwatch.inside-security.de/"
+SRC_URI="${HOMEPAGE}sw/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-1"
+SLOT="0"
+IUSE="nls zlib"
+
+RDEPEND="
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i po/
+		local lingua pofile
+		for pofile in po/*.po; do
+			lingua=${pofile/po\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				sed -i \
+					-e "/${lingua}.[mp]o/d" \
+					Makefile po/Makefile || die
+			fi
+		done
+	fi
+
+	sed -i \
+		-e '/^INSTALL_/s|$| -D|g' \
+		-e 's|make|$(MAKE)|g ' \
+		Makefile || die
+}
+
+src_configure() {
+	if ! use zlib; then
+		sed -i Makefile -e '/^LIBS/ s|-lz||g' || die
+	else
+		append-cflags -DHAVE_ZLIB
+	fi
+
+	use nls && append-cflags -DHAVE_GETTEXT
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+	use nls && emake -C po
+}
+
+src_install() {
+	emake \
+		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
+		install
+	use nls && emake \
+		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
+		install-i18n
+
+	dosbin contrib/fwlw_notify
+	dosbin contrib/fwlw_respond
+
+	dodoc AUTHORS ChangeLog CREDITS README
+
+	insinto /usr/share/fwlogwatch/contrib
+
+	doins contrib/fwlogsummary.cgi
+	doins contrib/fwlogsummary_small.cgi
+	doins contrib/fwlogwatch.php
+
+	insinto /etc
+	doins fwlogwatch.config
+}
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 42cf01f5b442..3ce90561355b 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	python_fix_shebang python/wx_sink_c.py
 	cmake-utils_src_prepare
 }
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index ca4447807f1c..08406bd9a091 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
 DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20
+DIST icinga2-2.4.3.tar.gz 1359833 SHA256 63dd01134274a794d5a5b00c421214260946335d6579f4ae405be558c58bcaa6 SHA512 bc3efac97c97d8cfaa936749c8987a50dc484595f509fc31a2caf620748a7e01da79a972920f51a57cb2823741ef1cab52d3be6351aea67f2f57a9d6e1475ad6 WHIRLPOOL 46753433c2fd3b38712cae01b8065759fb3f339b89759ee93ae9ff276136c3a29988d75dce76ee783f2fb44970330858be25978ad99703351f630fe0375cb675
diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
index 72033245e1eb..d628f3985041 100644
--- a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="
diff --git a/net-analyzer/icinga2/icinga2-2.4.3.ebuild b/net-analyzer/icinga2/icinga2-2.4.3.ebuild
new file mode 100644
index 000000000000..3902285bdaae
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 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 console lto mail minimal nano-syntax +plugins studio +vim-syntax"
+
+CDEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:2.9 )"
+
+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() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	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
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	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:icingacmd /var/lib/icinga2/api
+	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/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
new file mode 100644
index 000000000000..10a71f49309a
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -0,0 +1,3 @@
+DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 SHA256 959e269e58795cf89fab61b041511513d1b724855f1d38338f1f5e4e1083a8a7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4 WHIRLPOOL cd00353df2c133576e36f8fe204e11fb754fed081565d87b305905b0ee2a1e6c652f11a9bb99769e1467e838711583886dfe9ecfeb3c40c566069ce07af84cd0
+DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 SHA256 eb33c54b6c532076dafe72bc80905c17d1604fc306f5075b6fdc6cf41dcd8ac2 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9 WHIRLPOOL 8af62afd9eff172ab4e24bbde564c52826390ad40130ae091d62c10634e0313cb55f39e163988349015694389c152a6e4930c84ebd230ac3686a59e8b6ca56b9
+DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 SHA256 423da601fa7471dda5db839a07a52ce21e33ec00e09ad859f4fac4705f6bad18 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446 WHIRLPOOL 791836ab95edc679cd2288ba9231c4eccddd1d7a09cca68ce446fde498503942a040d48862f4157ebe1b83f645d31b77f7a7a6785095d3e4a5a7a40f56dd56c4
diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml
new file mode 100644
index 000000000000..61b6124e4182
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Nagios/Icinga plugin to check current server's RAID status; this tool
+		wraps MANY different RAID tools and provides a consistent check for
+		them.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">glensc/nagios-plugin-check_raid</remote-id>
+	</upstream>
+	<use>
+		<flag name='3ware'>Support 3ware RAID controllers</flag>
+		<flag name='aacraid'>Support Adaptec AAC-RAID controllers</flag>
+		<flag name='dmraid'>Support Device-Mapper RAID</flag>
+		<flag name='hpa'>Support HP Array controllers</flag>
+		<flag name='hpsa'>Support HP SmartArray (CCISS) controllers</flag>
+		<flag name='megaraid-sas'>Support LSI MegaRAID SAS controllers</flag>
+		<flag name='megaraid-scsi'>Support LSI MegaRAID SCSI controllers</flag>
+		<flag name='mpt-sas2'>Support LSI SAS-2 controllers</flag>
+		<flag name='mpt'>Support LSI MPT Fusion controllers</flag>
+		<flag name='i2o'>Support DPT-I2O controllers (mostly Adaptec)</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..ab33b2b07844
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+# TODO:
+# Package all the other Perl build pieces, and stop using the monolithic perl script.
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
new file mode 100644
index 000000000000..7698f47e7a08
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+COMMIT="5da4400ff978189d6be889f2448099535baa01f4"
+MY_PV="${COMMIT:-$PV}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
new file mode 100644
index 000000000000..d2d29efcdf9e
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+COMMIT="02b6425dac3db7e98d4c36bf0836357c6b36196c"
+MY_PV="${COMMIT:-$PV}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
index 373349f57c55..365cfd0ece06 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
new file mode 100644
index 000000000000..2bd809f9bf67
--- /dev/null
+++ b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
@@ -0,0 +1,36 @@
+diff --git a/speedtest_cli.py b/speedtest_cli.py
+index d93d5c3..930e42b 100755
+--- a/speedtest_cli.py
++++ b/speedtest_cli.py
+@@ -108,6 +108,8 @@ except ImportError:
+         def write(data):
+             if not isinstance(data, basestring):
+                 data = str(data)
++            if isinstance(data, unicode):
++                data = data.encode('utf-8', 'ignore')
+             fp.write(data)
+ 
+         want_unicode = False
+@@ -635,7 +637,7 @@ def speedtest():
+                 line = ('%(id)4s) %(sponsor)s (%(name)s, %(country)s) '
+                         '[%(d)0.2f km]' % server)
+                 serverList.append(line)
+-            print_('\n'.join(serverList).encode('utf-8', 'ignore'))
++            print_('\n'.join(serverList))
+             sys.exit(0)
+     else:
+         servers = closestServers(config['client'])
+@@ -703,8 +705,8 @@ def speedtest():
+         best = getBestServer(servers)
+ 
+     if not args.simple:
+-        print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
+-               '%(latency)s ms' % best).encode('utf-8', 'ignore'))
++        print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
++               '%(latency)s ms' % best)
+     else:
+         print_('Ping: %(latency)s ms' % best)
+ 
+-- 
+2.7.1
+
diff --git a/net-analyzer/speedtest-cli/metadata.xml b/net-analyzer/speedtest-cli/metadata.xml
index 186cbe3a3ca9..718c71bda885 100644
--- a/net-analyzer/speedtest-cli/metadata.xml
+++ b/net-analyzer/speedtest-cli/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zx2c4@gentoo.org</email>
-    <name>Jason A. Donenfeld</name>
-  </maintainer>
-  <longdescription lang="en">
-Interfaces with speedtest.net's server from the command line.
-</longdescription>
-  <upstream>
-    <remote-id type="github">sivel/speedtest-cli</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<longdescription lang="en">
+		Command line interface for testing internet bandwidth using speedtest.net.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sivel/speedtest-cli</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..444654da3806
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 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,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+PATCHES=( "${FILESDIR}/${PN}-0.3.4-fix-unicode-py3.patch" )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild
deleted file mode 100644
index fb3a5b4b88cf..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild
+++ /dev/null
@@ -1,27 +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="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( CONTRIBUTING.md )
-
-python_install_all() {
-	doman ${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index e35b5b90b2e4..cff174945383 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,2 +1 @@
-DIST suricata-2.0.10.tar.gz 3090730 SHA256 c8d1d3b6ce3d2a56577fca224424071afd921739d3859efc8a62229556d4beef SHA512 fa3683a93d85b26166b0f67a85f1a498941aadf4372ef98bd7fe62fcdef150af46b65456e3a764e054c385abbf44138ae6f70882c68ba320508eade6e181f2c6 WHIRLPOOL b867003e76df2b0b1b56c89415ed96acbf9d8966739d77aa303055d29ae5cdad8ad0b58e969336f0c1fc2e5d9990941622c19c062828dae58bf062f5662225f3
 DIST suricata-2.0.11.tar.gz 3091124 SHA256 c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e SHA512 659e893fef3cdcca8440f2af7596d5cc58b142d3350b9ea5ba57d855c6759a00adafeb15a1dfe91dd55eca1437487eb4e842b4e2913d12417f0b906ca3d54ec9 WHIRLPOOL 5cfa55abd90284a0a3441853af9db18075a23fa5661d89448b409b8fdd1031ad348d76d455b7dfe7b2688e69633f5bbb65dc060cc2426af017ab1bcb824c9ac5
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 9ec4bf7286c8..517666e56cef 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -8,9 +8,11 @@
     <flag name="af-packet">Enable AF_PACKET support</flag>
     <flag name="control-socket">Enable unix socket</flag>
     <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+    <flag name="detection">Enable detection modules</flag>
     <flag name="luajit">Enable Luajit support</flag>
     <flag name="nflog">Enable libnetfilter_log support</flag>
     <flag name="nfqueue">Enable AF_PACKET support</flag>
     <flag name="rules">Enable AF_PACKET support</flag>
+    <flag name="system-htp">Use net-libs/libhtp instead of bundled one</flag>
   </use>
 </pkgmetadata>
diff --git a/net-analyzer/suricata/suricata-2.0.10.ebuild b/net-analyzer/suricata/suricata-2.0.10.ebuild
deleted file mode 100644
index 3c69998a1b55..000000000000
--- a/net-analyzer/suricata/suricata-2.0.10.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
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug geoip hardened lua luajit nflog +nfqueue +rules test"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-#	system-htp? ( >=net-analyzer/htp-0.5.5 )
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fortify_source-numeric.patch"
-	epatch "${FILESDIR}/magic-location.patch"
-	epatch "${FILESDIR}/json.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--disable-detection" \
-		$(use_enable af-packet) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	# htp not added into portage yet
-# 	if use system-htp ; then
-# 		myeconfargs+=( $(use_enable system-htp non-bundled-htp) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	econf LIBS="${LIBS}" ${myeconfargs[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-}
\ No newline at end of file
diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
index 3c69998a1b55..0323836a2407 100644
--- a/net-analyzer/suricata/suricata-2.0.11.ebuild
+++ b/net-analyzer/suricata/suricata-2.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug geoip hardened lua luajit nflog +nfqueue +rules test"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules system-htp test"
 
 DEPEND="
 	>=dev-libs/jansson-2.2
@@ -31,11 +31,11 @@ DEPEND="
 	luajit?     ( dev-lang/luajit:* )
 	nflog?      ( net-libs/libnetfilter_log )
 	nfqueue?    ( net-libs/libnetfilter_queue )
+	system-htp? ( >=net-libs/libhtp-0.5.18 )
 "
 # #446814
 #	prelude?    ( dev-libs/libprelude )
 #	pfring?     ( sys-process/numactl net-libs/pf_ring)
-#	system-htp? ( >=net-analyzer/htp-0.5.5 )
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -54,8 +54,8 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		"--localstatedir=/var/" \
-		"--disable-detection" \
 		$(use_enable af-packet) \
+		$(use_enable detection) \
 		$(use_enable nfqueue) \
 		$(use_enable test coccinelle) \
 		$(use_enable test unittests) \
@@ -85,10 +85,9 @@ src_configure() {
 # 	if use prelude ; then
 # 		myeconfargs+=( $(use_enable prelude) )
 # 	fi
-	# htp not added into portage yet
-# 	if use system-htp ; then
-# 		myeconfargs+=( $(use_enable system-htp non-bundled-htp) )
-# 	fi
+	if use system-htp ; then
+		myeconfargs+=( $(use_enable system-htp non-bundled-htp) )
+	fi
 	if use lua ; then
 		myeconfargs+=( $(use_enable lua) )
 	fi
@@ -117,4 +116,4 @@ src_install() {
 	dodir "/var/log/${PN}"
 	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
 	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-}
\ No newline at end of file
+}
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index e5b7d4babf62..0e8725a48900 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,4 +1,3 @@
-DIST traceroute-2.0.18.tar.gz 66931 SHA256 5994a88520927fefe3c9754aaf1e02b4d0f3f8fb1f521a68fa86215c3fcab9ef SHA512 8eb096c10e4e450839126b41f858b380ef01990092e3de76c9423343a34edfc118fad6b2017fca2e8106c1065f6634cd9a892ea4118453f8c28ad5ab8c6c1c93 WHIRLPOOL aa9d4b1b603fcffc4c1294087d96286aec6b28e229f3a3916f36ec6adf37f4db340fb99a78f9011314975e6769c76959ceb313e162cf0b2f793c5ae3e1425724
-DIST traceroute-2.0.19.tar.gz 69614 SHA256 082be58ec3e6fe9717a52160150e2f6d52fa90f8ecb82abf3b363c8150b0607e SHA512 406b742dd0248720f1c15f2fc30050f9c420c8cfe564028b6f9519158afcbde6810af10d86739377809342762cb403fc32487867413a281b0644349ede125485 WHIRLPOOL 8272957b42a2ca92b1bd991e1e034454dd5406c1445fc28e30b28dd5b6190a44e0b6addc8d0be8d00250b3fc5b2d7714ac52d6d4226bcbc71650e15caafb8d08
 DIST traceroute-2.0.20.tar.gz 68907 SHA256 2facba9525c95428d7bff3a313fc6ecfd8c529c678ae666c73015558a0edc271 SHA512 ba82468f5e52a14cf029ff977d85e9cc395bdac2fdf8c29232f9e664bf15efdbaca4f56a78533f2afadd3aef95e31d4497f00f4fc29f74a699a149f0434b484d WHIRLPOOL f7fad8dca126291b17194b6f2f2fd2de98c358d63aa7bcf9e853b888562a8a9c251afdfb85ba5990a7c52f3c4e518b153a1323de0997ce6292113545c133e8b5
 DIST traceroute-2.0.21.tar.gz 69159 SHA256 f7ac93ef30b13a587292b8d6a7e2538a65bc978a3a576eab238c392b884e96e0 SHA512 437cfc596e045d89f0f477f404e410347fb4e8d5db00c9e2ce1317457a99377d1239e68949a6e44e8d424f480c8bfacb7213ce3f03efc46880a369678eb49589 WHIRLPOOL 870a228ac77f5ca72a0ea1757f3e86372fd4c809133d15ae6de8a637fb9edfe3e9b62c82f8b53ad85c3300086e69829c7b7248bdfa52801ca2103253d23d0018
+DIST traceroute-2.0.22.tar.gz 69001 SHA256 ee36c35a7dd0ea859734778c1fe95b49a861d30dbf64496ac673c2429f539ada SHA512 f7981188b5aa13b6a6c26e7bb3b6cbab88b1adec53a04bff4b878f800bb32a62d82fa389fb36aefd81cc3e9da31740e095f6b6f7eba4dd5926520ad3cff7a92c WHIRLPOOL b65d03913d497b800c0d9f567e099f1c65bae1bc9c380187039afa4bb18997e7810e5dc69b3ca193d5b86b6a0bbed27e45c28d5b5f51cc12223c085734819050
diff --git a/net-analyzer/traceroute/traceroute-2.0.18.ebuild b/net-analyzer/traceroute/traceroute-2.0.18.ebuild
deleted file mode 100644
index 1d1619984755..000000000000
--- a/net-analyzer/traceroute/traceroute-2.0.18.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Utility to trace the route of IP packets"
-HOMEPAGE="http://traceroute.sourceforge.net/"
-SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-src_compile() {
-	use static && append-ldflags -static
-	tc-export CC AR RANLIB
-	emake env=yes || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		install \
-		|| die
-	dodoc ChangeLog CREDITS README TODO
-}
diff --git a/net-analyzer/traceroute/traceroute-2.0.19-r1.ebuild b/net-analyzer/traceroute/traceroute-2.0.19-r1.ebuild
deleted file mode 100644
index b7417366b83d..000000000000
--- a/net-analyzer/traceroute/traceroute-2.0.19-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Utility to trace the route of IP packets"
-HOMEPAGE="http://traceroute.sourceforge.net/"
-SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="static"
-
-RDEPEND="!<net-misc/iputils-20121221-r1"
-
-src_compile() {
-	use static && append-ldflags -static
-	tc-export CC AR RANLIB
-	emake env=yes
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		install
-	dodoc ChangeLog CREDITS README TODO
-
-	dosym traceroute /usr/bin/traceroute6
-	dosym traceroute.8 /usr/share/man/man8/traceroute6.8
-}
diff --git a/net-analyzer/traceroute/traceroute-2.0.19.ebuild b/net-analyzer/traceroute/traceroute-2.0.19.ebuild
deleted file mode 100644
index f88725631db2..000000000000
--- a/net-analyzer/traceroute/traceroute-2.0.19.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"
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Utility to trace the route of IP packets"
-HOMEPAGE="http://traceroute.sourceforge.net/"
-SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-src_compile() {
-	use static && append-ldflags -static
-	tc-export CC AR RANLIB
-	emake env=yes
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		install
-	dodoc ChangeLog CREDITS README TODO
-}
diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
index 7939e0ee201e..ad19d1f39608 100644
--- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/traceroute/${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 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
@@ -20,6 +20,7 @@ RDEPEND="!<net-misc/iputils-20121221-r1
 
 src_compile() {
 	use static && append-ldflags -static
+	append-ldflags -L../libsupp #432116
 	tc-export AR CC RANLIB
 	emake env=yes
 }
diff --git a/net-analyzer/traceroute/traceroute-2.0.21.ebuild b/net-analyzer/traceroute/traceroute-2.0.21.ebuild
index fef5017aa9be..4983e1f3a178 100644
--- a/net-analyzer/traceroute/traceroute-2.0.21.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.21.ebuild
@@ -20,6 +20,7 @@ RDEPEND="!<net-misc/iputils-20121221-r1
 
 src_compile() {
 	use static && append-ldflags -static
+	append-ldflags -L../libsupp #432116
 	tc-export AR CC RANLIB
 	emake env=yes
 }
diff --git a/net-analyzer/traceroute/traceroute-2.0.22.ebuild b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
new file mode 100644
index 000000000000..da6a15364a09
--- /dev/null
+++ b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utility to trace the route of IP packets"
+HOMEPAGE="http://traceroute.sourceforge.net/"
+SRC_URI="mirror://sourceforge/traceroute/${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 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static"
+
+RDEPEND="!<net-misc/iputils-20121221-r1
+	!net-misc/iputils[traceroute]"
+
+src_compile() {
+	use static && append-ldflags -static
+	append-ldflags -L../libsupp #432116
+	tc-export AR CC RANLIB
+	emake env=yes
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	dodoc ChangeLog CREDITS README TODO
+	dosym traceroute /usr/bin/traceroute6
+	dosym traceroute.8 /usr/share/man/man8/traceroute6.8
+}
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
new file mode 100644
index 000000000000..7c00d8b13167
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
@@ -0,0 +1,10 @@
+--- a/extcap/Makefile.am
++++ b/extcap/Makefile.am
+@@ -46,6 +46,7 @@
+ 	../wiretap/libwiretap.la	\
+ 	../wsutil/libwsutil.la		\
+ 	@GLIB_LIBS@			\
++	@PCAP_LIBS@			\
+ 	@SOCKET_LIBS@
+ 
+ if ENABLE_STATIC
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch
new file mode 100644
index 000000000000..daef2a1a7cb0
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,6 +1101,7 @@
+ AC_SUBST(PIE_CFLAGS)
+ AC_SUBST(PIE_LDFLAGS)
+ 
++AC_ARG_ENABLE(sse4_2,[  --enable-sse4_2         Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[
+ WS_CFLAGS_saved="$WS_CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$can_add_to_cflags" = "xyes"
+@@ -1128,6 +1129,9 @@
+ 	fi
+ fi
+ WS_CFLAGS="$WS_CFLAGS_saved"
++],[
++AC_MSG_RESULT(no)
++])
+ 
+ if test "x$ac_sse4_2_flag" != x; then
+ 	#
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 786f1b1f1169..21cfa158ac8f 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -97,11 +97,9 @@ src_unpack() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
 		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.patch
+		"${FILESDIR}"/${PN}-99999999-sse4_2.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.patch
 
 	epatch_user
 
@@ -155,7 +153,6 @@ src_configure() {
 	econf \
 		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
 		$(use_enable androiddump) \
-		$(use_enable ipv6) \
 		$(use_enable tfshark) \
 		$(use_with adns c-ares) \
 		$(use_with caps libcap) \
@@ -212,7 +209,6 @@ src_install() {
 	# install headers
 	local wsheader
 	for wsheader in \
-		color.h \
 		config.h \
 		epan/*.h \
 		epan/crypt/*.h \
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
deleted file mode 100644
index 6022714831d7..000000000000
--- a/net-dialup/capisuite/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST capisuite-0.4.5.tar.gz 1184603 SHA256 3e94e42eae6477a222c608c2cd040568fd9fcfa4e8eb0b06a538175d44cbae96 SHA512 f52a0a687443562d514f2d485724208b4a0d856b87c202190fdbf520f5c11929c3c7ddf9fed73ed64b02fdfab19631973c5a54d7301d290d339bcb12274fceaa WHIRLPOOL 163c9d6cedf9966fd3ada091e42534f16d2dccfbdd1cfa383c74543af422ec66697db110c1be76eb124669e19fc19bb7f751c77b06f1428bf1392bf54a629c40
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r8.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r8.ebuild
deleted file mode 100644
index 7fbc8b9ae73e..000000000000
--- a/net-dialup/capisuite/capisuite-0.4.5-r8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=none # bugs 468292 and 468380
-PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils flag-o-matic python-single-r1
-
-DESCRIPTION="ISDN telecommunication suite providing fax and voice services"
-HOMEPAGE="http://www.capisuite.org"
-SRC_URI="http://www.capisuite.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="${PYTHON_DEPS}
-	media-sound/sox
-	>=media-libs/tiff-3.7.1
-	media-gfx/jpeg2ps
-	media-gfx/sfftobmp
-	app-text/ghostscript-gpl
-	net-dialup/capi4k-utils"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-PATCHES=(
-	"${FILESDIR}/${P}-as-needed.patch"
-	# taken from capisuite-0.4.5-5.src.rpm (SuSE-9.3)
-	"${FILESDIR}/${P}-capi4linux_v3.diff"
-	# patched scripts/cs_helpers.pyin (bug #96540)
-	"${FILESDIR}/${P}-date-header.patch"
-	# patched src/backend/connection.cpp (bug #69522)
-	"${FILESDIR}/${PN}-fax-compatibility.patch"
-	# patched scripts/{incoming,idle}.py (bug #147854)
-	"${FILESDIR}/${P}-syntax.patch"
-	# GCC 4.3 patches (bug #236777)
-	"${FILESDIR}/${P}-gcc43.patch"
-	# Python 2.5 patches (bug #232734)
-	"${FILESDIR}/${P}-python25.patch"
-	# Compability with current SOX (bug #250320)
-	"${FILESDIR}/${P}-sox.patch"
-	# Compatibility with automake >= 1.11.2 (bug #424892)
-	"${FILESDIR}/${P}-automake-1.11.patch"
-	# Respect AR (bug #467222)
-	"${FILESDIR}/${P}-respect-ar.patch"
-)
-
-src_configure() {
-	strip-flags  # see bug #90901
-
-	local myeconfargs=(
-		--localstatedir="/var"
-		--with-docdir="/usr/share/doc/${PF}"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm -f "${D}"/usr/{lib,share}/capisuite/README
-	rmdir -p --ignore-fail-on-non-empty "${D}/var/log"
-	rm -f "${D}/usr/share/doc/${PF}"/{COPYING,manual.pdf}
-	keepdir /var/spool/capisuite/{done,failed,sendq,users}
-
-	newinitd "${FILESDIR}/capisuite.initd" capisuite
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/capisuite.logrotated" capisuite
-
-	exeinto /etc/cron.daily
-	doexe capisuite.cron
-
-	insinto /etc/capisuite
-	doins cronjob.conf
-}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-as-needed.patch b/net-dialup/capisuite/files/capisuite-0.4.5-as-needed.patch
deleted file mode 100644
index d740366ddca2..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acinclude.m4.old	2007-08-02 21:34:26.000000000 +0200
-+++ acinclude.m4	2007-08-02 21:42:36.000000000 +0200
-@@ -155,7 +155,7 @@
- _python_libbasemod=`grep '^BASEMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
- 
- pgac_tab="	" # tab character
--python_libspec=`echo X"$_python_libs $_python_libc $_python_libm -lpython$python_version $_python_liblocalmod $_python_libbasemod" | sed -e 's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
-+python_libspec=`echo X"-lpython$python_version $_python_liblocalmod $_python_libbasemod $_python_libm $_python_libs $_python_libc" | sed -e 's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
- LIBS="$LIBS $python_libspec"
- LDFLAGS="$LDFLAGS -L$python_configdir $python_linkforshared"
- AC_MSG_RESULT([${python_libspec}])
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch b/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch
deleted file mode 100644
index 4abd3265194b..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/Makefile.am.orig	2012-07-05 14:10:56.725746439 +0200
-+++ scripts/Makefile.am	2012-07-05 14:12:00.840861325 +0200
-@@ -1,7 +1,8 @@
- spooldir = @localstatedir@/spool/capisuite
- pkgsysconfdir = @sysconfdir@/capisuite
- 
--dist_pkglib_DATA = idle.py incoming.py README
-+scriptdatadir=$(pkglibdir)
-+dist_scriptdata_DATA = idle.py incoming.py README
- python_module_DATA = cs_helpers.py
- EXTRA_DIST = cs_helpers.pyin fax.confin answering_machine.confin capisuitefax.in
- 
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-capi4linux_v3.diff b/net-dialup/capisuite/files/capisuite-0.4.5-capi4linux_v3.diff
deleted file mode 100644
index 1f4e50199ae5..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-capi4linux_v3.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -urN capisuite-0.4.5.org/acinclude.m4 capisuite-0.4.5/acinclude.m4
---- capisuite-0.4.5.org/acinclude.m4	2004-11-28 14:35:28.000000000 +0100
-+++ capisuite-0.4.5/acinclude.m4	2005-03-08 07:31:42.130970593 +0100
-@@ -72,6 +72,21 @@
- )
- ]) dnl CS_TEST_CAPI4LINUX
- 
-+#
-+# old capiutils.h missed the Globalconfiguration in BProtocol
-+# in library version 3 this was added to the API
-+#
-+AC_DEFUN([CS_TEST_CAPI4LINUX_V3],
-+[AC_MSG_CHECKING([for capi20 ALERT with sending complete])
-+AC_TRY_COMPILE([#include <capiutils.h>],
-+  [_cmsg cm;void *p; p=CONNECT_REQ_GLOBALCONFIGURATION(&cm);],
-+  [
-+    AC_DEFINE([HAVE_CAPI4LINUX_V3],1,[we have GLOBALCONFIGURATION in BProtocol])
-+    AC_MSG_RESULT([yes])
-+  ],
-+  [AC_MSG_RESULT([no])]
-+)]) dnl CS_TEST_CAPI4LINUX_V3
-+
- # PGAC_CHECK_PYTHON_DIRS
- # -----------------------
- # Determine the name of various directory of a given Python installation.
-diff -urN capisuite-0.4.5.org/config.h.in capisuite-0.4.5/config.h.in
---- capisuite-0.4.5.org/config.h.in	2004-11-28 14:36:20.000000000 +0100
-+++ capisuite-0.4.5/config.h.in	2005-03-08 07:31:42.135969715 +0100
-@@ -18,6 +18,9 @@
- /* we have new ALERT_REQ implementation */
- #undef HAVE_NEW_CAPI4LINUX
- 
-+/* we have GLOBALCONFIGURATION in BProtocol */
-+#undef HAVE_CAPI4LINUX_V3
-+
- /* we can #include<ostream> instead of ostream.h - new gcc3 feature */
- #undef HAVE_OSTREAM
- 
-diff -urN capisuite-0.4.5.org/configure.in capisuite-0.4.5/configure.in
---- capisuite-0.4.5.org/configure.in	2004-11-28 14:35:16.000000000 +0100
-+++ capisuite-0.4.5/configure.in	2005-03-08 07:31:42.141968662 +0100
-@@ -18,6 +18,7 @@
- CS_TEST_GCC3
- CS_TEST_SFFTOBMP
- CS_TEST_CAPI4LINUX
-+CS_TEST_CAPI4LINUX_V3
- 
- CS_SET_DOCDIR
- 
-diff -urN capisuite-0.4.5.org/src/backend/capi.cpp capisuite-0.4.5/src/backend/capi.cpp
---- capisuite-0.4.5.org/src/backend/capi.cpp	2004-11-28 14:35:25.000000000 +0100
-+++ capisuite-0.4.5/src/backend/capi.cpp	2005-03-08 07:35:02.553782154 +0100
-@@ -148,7 +148,15 @@
- 		<< " CIPValue 0x" << CIPValue << ", B1proto 0x" << B1protocol << ", B2proto 0x" << B2protocol <<", B3proto 0x" << B3protocol << endl;
- 	}
- 	unsigned info=CONNECT_REQ(&CMSG, applId, messageNumber, controller, CIPValue, calledPartyNumber, callingPartyNumber, NULL, NULL,
--		B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-+		B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration,
-+	#ifdef HAVE_CAPI4LINUX_V3
-+		NULL,
-+	#endif
-+		NULL, NULL, NULL, NULL, NULL, NULL, NULL
-+	#ifdef HAVE_CAPI4LINUX_V3
-+		,NULL
-+	#endif
-+	);
- 	if (debug_level >= 2) {
- 		debug << prefix() << "info: " << info << endl;
- 	}
-@@ -181,7 +189,12 @@
- 
- 	if (debug_level >= 2)	    	debug << prefix() << ">SELECT_B_PROTOCOL_REQ: ApplId 0x" << hex << applId << ", MsgNr 0x" << messageNumber << ", PLCI 0x" << plci
- 	 		     << ", B1protocol " << B1protocol << ", B2protocol " << B2protocol << ", B3protocol " << B3protocol << endl;
--	unsigned info=SELECT_B_PROTOCOL_REQ(&CMSG, applId, messageNumber++, plci, B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration);
-+	unsigned info=SELECT_B_PROTOCOL_REQ(&CMSG, applId, messageNumber++, plci, B1protocol, B2protocol, B3protocol,
-+		B1configuration, B2configuration, B3configuration
-+	#ifdef HAVE_CAPI4LINUX_V3
-+		,NULL
-+	#endif
-+	);
- 	if (debug_level >= 2)
- 			debug << prefix() << "info: " << info << endl;
- 
-@@ -295,12 +308,17 @@
- 		 << reject << ", B1proto 0x" << B1protocol << ", B2proto 0x" << B2protocol << ", B3proto 0x" << B3protocol << endl;
- 
- 	_cmsg new_message;
--	unsigned info=CONNECT_RESP(&new_message, applId, messageNumber, plci, reject, B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-+	unsigned info=CONNECT_RESP(&new_message, applId, messageNumber, plci, reject, B1protocol, B2protocol, B3protocol,
-+		B1configuration, B2configuration, B3configuration,
-+	#ifdef HAVE_CAPI4LINUX_V3
-+		NULL,
-+	#endif
-+		NULL, NULL, NULL, NULL, NULL, NULL, NULL);
- 	if (debug_level >= 2)
- 		debug << prefix() << "info: " << info << endl;
- 
- 	if (info != 0)
--   		throw(CapiMsgError(info,"Error while CONNECT_REQ: "+Capi::describeParamInfo(info),"Capi::connect_resp()"));
-+   		throw(CapiMsgError(info,"Error while CONNECT_RESP: "+Capi::describeParamInfo(info),"Capi::connect_resp()"));
- 
- }
- 
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-date-header.patch b/net-dialup/capisuite/files/capisuite-0.4.5-date-header.patch
deleted file mode 100644
index 76738fb78a74..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-date-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- scripts/cs_helpers.pyin.orig	2004-11-28 14:35:23.000000000 +0100
-+++ scripts/cs_helpers.pyin	2005-06-19 20:55:49.000000000 +0200
-@@ -10,6 +10,7 @@
- #  (at your option) any later version.
- 
- import os
-+import time
- 
- # the name of the config file read by the scripts; see there for options and
- # descriptions
-@@ -170,6 +171,7 @@
- 	msg['Subject']=mail_subject
- 	msg['From']=mail_from
- 	msg['To']=mail_to
-+	msg['Date']=time.strftime('%a, %d %b %Y %H:%M:%S %z')
- 
- 	msg.preamble = 'This is a Multipart-MIME-message. Please use a capable mailer.\n'
- 	msg.epilogue = '' # To guarantee the message ends with a newline
-@@ -267,6 +269,7 @@
- 	msg['Subject'] = mail_subject
- 	msg['From'] = mail_from
- 	msg['To'] = mail_to
-+	msg['Date'] = time.strftime('%a, %d %b %Y %H:%M:%S %z')
- 
- 	try:
- 		server = smtplib.SMTP('localhost')
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch b/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch
deleted file mode 100644
index 51326c30af6b..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/backend/connection.cpp.orig	2008-09-05 08:53:19.000000000 +0200
-+++ src/backend/connection.cpp	2008-09-05 08:54:08.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <pthread.h>
- #include <errno.h> // for errno
- #include <iconv.h> // for iconv(), iconv_open(), iconv_close()
-+#include <cstring>
- #include "capi.h"
- #include "callinterface.h"
- #include "connection.h"
-
---- src/backend/capi.cpp.orig	2008-09-05 09:01:18.000000000 +0200
-+++ src/backend/capi.cpp	2008-09-05 09:01:38.000000000 +0200
-@@ -16,6 +16,7 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstdlib>
- #include "connection.h"
- #include "applicationinterface.h"
- #include "capi.h"
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch b/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch
deleted file mode 100644
index e86919a2336d..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/application/pythonscript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
-+++ src/application/pythonscript.cpp	2008-08-03 17:12:45.000000000 +0200
-@@ -99,14 +99,14 @@
- 			if ( !(py_traceback=cStringIO->cgetvalue(catch_stderr)) )
- 				throw ApplicationError("unable to get traceback","PythonScript::run()");
- 			
--			int length;
-+			Py_ssize_t length;
- 			char *traceback;
- 			if (PyString_AsStringAndSize(py_traceback, &traceback, &length))
- 				throw ApplicationError("unable to convert traceback to char*","PythonScript::run()");
- 
-                         error << prefix() << "A python error occured. See traceback below." << endl;
- 			error << prefix(false) << "Python traceback: ";
--			for (int i=0;i<length-1;i++) {
-+			for (Py_ssize_t i=0;i<length-1;i++) {
- 				error << traceback[i];
- 				if (traceback[i]=='\n')
- 					error << prefix(false) << "Traceback: ";
---- src/application/idlescript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
-+++ src/application/idlescript.cpp	2008-08-03 17:13:55.000000000 +0200
-@@ -28,6 +28,7 @@
- 	IdleScript *instance=static_cast<IdleScript*>(arg);
- 	instance->run();
- 	pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
-+	return NULL;
- }
- 
- void idlescript_cleanup_handler(void* arg)
---- src/application/incomingscript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
-+++ src/application/incomingscript.cpp	2008-08-03 17:14:36.000000000 +0200
-@@ -31,6 +31,7 @@
- 	IncomingScript *instance=static_cast<IncomingScript*>(arg);
- 	instance->run();
- 	pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
-+	return NULL;
- }
- 
- void incomingscript_cleanup_handler(void* arg)
---- src/backend/capi.cpp.orig	2008-08-03 17:10:41.000000000 +0200
-+++ src/backend/capi.cpp	2008-08-03 17:21:37.000000000 +0200
-@@ -30,6 +30,7 @@
- 
- 	Capi *instance=static_cast<Capi*>(arg);
- 	instance->run();
-+	return NULL;
- }
- 
- Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned short DDILength, unsigned short DDIBaseLength, vector<string> DDIStopNumbers, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError)
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-respect-ar.patch b/net-dialup/capisuite/files/capisuite-0.4.5-respect-ar.patch
deleted file mode 100644
index caadae69643e..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-respect-ar.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.orig	2013-04-26 12:48:19.758668706 +0400
-+++ configure.in	2013-04-26 12:48:27.147668235 +0400
-@@ -6,6 +6,7 @@
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_INSTALL
-+AM_PROG_AR
- AC_PROG_RANLIB
- AC_PROG_MAKE_SET
- AC_PATH_PROG(doxygen,doxygen)
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-sox.patch b/net-dialup/capisuite/files/capisuite-0.4.5-sox.patch
deleted file mode 100644
index ef58325ff6e9..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-sox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur capisuite-0.4.5.orig/scripts/cs_helpers.pyin capisuite-0.4.5/scripts/cs_helpers.pyin
---- capisuite-0.4.5.orig/scripts/cs_helpers.pyin	2004-11-28 15:35:23.000000000 +0200
-+++ capisuite-0.4.5/scripts/cs_helpers.pyin	2009-05-12 20:58:34.000000000 +0300
-@@ -227,7 +227,7 @@
- 		elif (mail_type=="la"): # voice file
- 			# la -> wav
- 			# don't use stdout as sox needs a file to be able to seek in it otherwise the header will be incomplete
--			ret = os.spawnlp(os.P_WAIT,"sox","sox",attachment,"-w",basename+"wav")
-+			ret = os.spawnlp(os.P_WAIT,"sox","sox",attachment,"-2",basename+"wav")
- 			if (ret or not os.access(basename+"wav",os.R_OK)):
- 				raise "conv-error","Error while calling sox. Not installed?"
- 			filepart = email.MIMEAudio.MIMEAudio(open(basename+"wav").read(),"x-wav",email.Encoders.encode_base64,name=os.path.basename(basename)+"wav")
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-syntax.patch b/net-dialup/capisuite/files/capisuite-0.4.5-syntax.patch
deleted file mode 100644
index 0a0725f9b6b3..000000000000
--- a/net-dialup/capisuite/files/capisuite-0.4.5-syntax.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- scripts/incoming.py.orig	2004-11-28 14:35:23.000000000 +0100
-+++ scripts/incoming.py	2006-09-22 15:17:28.000000000 +0200
-@@ -1,3 +1,4 @@
-+# -*- coding: UTF-8 -*-
- #              incoming.py - standard incoming script for capisuite
- #              ----------------------------------------------------
- #    copyright            : (C) 2002 by Gernot Hillier
-@@ -48,7 +49,7 @@
- 			if config.has_option(u,'fax_numbers'):
- 				numbers=config.get(u,'fax_numbers')
- 				if (call_to in numbers.split(',') or numbers=="*"):
--				 	if (service in (capisuite.SERVICE_FAXG3,capisuite.SERVICE_VOICE)):
-+					if (service in (capisuite.SERVICE_FAXG3,capisuite.SERVICE_VOICE)):
- 						curr_user=u
- 						curr_service=capisuite.SERVICE_FAXG3
- 						break
-@@ -133,8 +134,8 @@
- 
- 	if (os.access(filename,os.R_OK)):
- 		cs_helpers.writeDescription(filename,
--		  "call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
--		  +time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
-+			"call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
-+			+time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
- 		userdata=pwd.getpwnam(curr_user)
- 		os.chmod(filename,0600)
- 		os.chown(filename,userdata[2],userdata[3])
-@@ -153,8 +154,8 @@
- 			action="saveonly"
- 		if (action=="mailandsave"):
- 			cs_helpers.sendMIMEMail(fromaddress, mailaddress, "Fax received from "+call_from+" to "+call_to, faxFormat,
--			  "You got a fax from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
--			  +"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
-+				"You got a fax from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
-+				+"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
- 
- # @brief called by callIncoming when an incoming voice call is received
- #
-@@ -234,8 +235,8 @@
- 
- 	if (os.access(filename,os.R_OK)):
- 		cs_helpers.writeDescription(filename,
--		  "call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
--		  +time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
-+			"call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
-+			+time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
- 		userdata=pwd.getpwnam(curr_user)
- 		os.chmod(filename,0600)
- 		os.chown(filename,userdata[2],userdata[3])
-@@ -250,8 +251,8 @@
- 			mailaddress=curr_user
- 		if (action=="mailandsave"):
- 			cs_helpers.sendMIMEMail(fromaddress, mailaddress, "Voice call received from "+call_from+" to "+call_to, "la",
--			  "You got a voice call from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
--			  +"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
-+				"You got a voice call from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
-+				+"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
- 
- 
- # @brief remote inquiry function (uses german wave snippets!)
-@@ -418,7 +419,7 @@
- #
- # Revision 1.9  2003/06/27 07:51:09  gernot
- # - replaced german umlaut in filename "nachricht-gelscht.la", can cause
--#   problems on Redhat, thx to Herbert H�bner for reporting
-+#   problems on Redhat, thx to Herbert Hübner for reporting
- #
- # Revision 1.8  2003/06/16 10:21:05  gernot
- # - define filename in any case (thx to Axel Schneck for reporting and
---- scripts/idle.py.orig	2004-11-28 14:35:16.000000000 +0100
-+++ scripts/idle.py	2006-09-22 15:33:50.000000000 +0200
-@@ -1,3 +1,4 @@
-+# -*- coding: UTF-8 -*-
- #                  idle.py - default script for capisuite
- #              ---------------------------------------------
- #    copyright            : (C) 2002 by Gernot Hillier
-@@ -105,13 +106,13 @@
- 				movejob(job_fax,sendq,done,user)
- 				capisuite.log("job "+job_fax+": finished successfully",1)
- 				mailtext="Your fax job to "+addressee+" ("+dialstring+") was sent successfully.\n\n" \
--				  +"Subject: "+subject+"\nFilename: "+job_fax \
--				  +"\nNeeded tries: "+str(tries) \
--				  +("\nLast result: 0x%x/0x%x" % (result,resultB3)) \
--				  +"\n\nIt was moved to file://"+done+user+"-"+job_fax
-+					+"Subject: "+subject+"\nFilename: "+job_fax \
-+					+"\nNeeded tries: "+str(tries) \
-+					+("\nLast result: 0x%x/0x%x" % (result,resultB3)) \
-+					+"\n\nIt was moved to file://"+done+user+"-"+job_fax
- 				cs_helpers.sendSimpleMail(fromaddress,mailaddress,
--				  "Fax to "+addressee+" ("+dialstring+") sent successfully.",
--				  mailtext)
-+					"Fax to "+addressee+" ("+dialstring+") sent successfully.",
-+					mailtext)
- 			else:
- 				max_tries=int(cs_helpers.getOption(config,"","send_tries","10"))
- 				delays=cs_helpers.getOption(config,"","send_delays","60,60,60,300,300,3600,3600,18000,36000").split(",")
-@@ -123,19 +124,19 @@
- 				starttime=time.time()+next_delay
- 				capisuite.log("job "+job_fax+": delayed for "+str(next_delay)+" seconds",2)
- 				cs_helpers.writeDescription(sendq+job_fax,"dialstring=\""+dialstring+"\"\n"
--				  +"starttime=\""+time.ctime(starttime)+"\"\ntries=\""+str(tries)+"\"\n"
--				  +"user=\""+user+"\"\naddressee=\""+addressee+"\"\nsubject=\""+subject+"\"\n")
-+					+"starttime=\""+time.ctime(starttime)+"\"\ntries=\""+str(tries)+"\"\n"
-+					+"user=\""+user+"\"\naddressee=\""+addressee+"\"\nsubject=\""+subject+"\"\n")
- 				if (tries>=max_tries):
- 					movejob(job_fax,sendq,failed,user)
- 					capisuite.log("job "+job_fax+": failed finally",1)
- 					mailtext="I'm sorry, but your fax job to "+addressee+" ("+dialstring \
--					  +") failed finally.\n\nSubject: "+subject \
--					  +"\nFilename: "+job_fax+"\nTries: "+str(tries) \
--					  +"\nLast result: 0x%x/0x%x" % (result,resultB3) \
--					  +"\n\nIt was moved to file://"+failed+user+"-"+job_fax
-+						+") failed finally.\n\nSubject: "+subject \
-+						+"\nFilename: "+job_fax+"\nTries: "+str(tries) \
-+						+"\nLast result: 0x%x/0x%x" % (result,resultB3) \
-+						+"\n\nIt was moved to file://"+failed+user+"-"+job_fax
- 					cs_helpers.sendSimpleMail(fromaddress,mailaddress,
--					  "Fax to "+addressee+" ("+dialstring+") FAILED.",
--					  mailtext)
-+						"Fax to "+addressee+" ("+dialstring+") FAILED.",
-+						mailtext)
- 
- 			fcntl.lockf(lockfile,fcntl.LOCK_UN)
- 			lockfile.close()
-@@ -149,7 +150,7 @@
- 		if (stationID==None):
- 			capisuite.error("Warning: fax_stationID for user "+user+" not set")
- 			stationID=""
-- 		headline=cs_helpers.getOption(config,user,"fax_headline","")
-+		headline=cs_helpers.getOption(config,user,"fax_headline","")
- 		(call,result)=capisuite.call_faxG3(capi,controller,outgoing_nr,dialstring,timeout,stationID,headline)
- 		if (result!=0):
- 			return(result,0)
diff --git a/net-dialup/capisuite/files/capisuite-fax-compatibility.patch b/net-dialup/capisuite/files/capisuite-fax-compatibility.patch
deleted file mode 100644
index 859ca889764d..000000000000
--- a/net-dialup/capisuite/files/capisuite-fax-compatibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u -b -B src.orig/backend/connection.cpp src/backend/connection.cpp
---- src.orig/backend/connection.cpp	2003-07-20 14:08:44.000000000 -0500
-+++ src/backend/connection.cpp	2004-11-12 20:35:22.035045216 -0600
-@@ -85,7 +85,7 @@
- 				CIPvalue=16;
- 			break;
- 			case FAXG3:
--				CIPvalue=17;
-+				CIPvalue=4;
- 			break;
- 			default:
- 				throw CapiExternalError("unsupported service given","Connection::Connection()");
diff --git a/net-dialup/capisuite/files/capisuite.initd b/net-dialup/capisuite/files/capisuite.initd
deleted file mode 100644
index 679bb428388d..000000000000
--- a/net-dialup/capisuite/files/capisuite.initd
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-opts="reload"
-
-depend() {
-	need capi
-}
-
-checkconfig() {
-	local conf_fax conf_voice sec rest
-	# Check if there are configured users for fax or
-	# answering machine. Otherwise exit.
-	# IMPORTANT: Change this or comment it out if you want to use
-	#            your own CapiSuite scripts.
-	while read -r sec rest; do
-		if [ "${sec:0:1}" = "[" -a "$sec" != "[GLOBAL]" ]; then
-			conf_fax=yes
-			break
-		fi
-	done < /etc/capisuite/fax.conf
-	while read -r sec rest; do
-		if [ "${sec:0:1}" = "[" -a "$sec" != "[GLOBAL]" ]; then
-			conf_voice=yes
-			break
-		fi
-	done < /etc/capisuite/answering_machine.conf
-	# end check for configured users
-
-	if ! [ "$conf_fax" -o "$conf_voice" ]; then
-		eerror "Please configure CapiSuite first!"
-		return 1
-        fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting CapiSuite"
-	start-stop-daemon --start --quiet --exec /usr/sbin/capisuite -- -d
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping CapiSuite"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/capisuite --retry 10 --signal TERM >/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reload CapiSuite"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/capisuite --signal HUP
-	eend $?
-}
diff --git a/net-dialup/capisuite/files/capisuite.logrotated b/net-dialup/capisuite/files/capisuite.logrotated
deleted file mode 100644
index 9298cc5078d4..000000000000
--- a/net-dialup/capisuite/files/capisuite.logrotated
+++ /dev/null
@@ -1,39 +0,0 @@
-/var/log/capisuite.log {
-        weekly
-        missingok
-        rotate 52
-        compress
-        delaycompress
-        notifempty
-        create 640 root adm
-        sharedscripts
-        postrotate
-           if [ -f /var/run/capisuite.pid ]; then \
-             if [ -x /usr/sbin/invoke-rc.d ]; then \
-                invoke-rc.d capisuite restart > /dev/null; \
-             else \
-                /etc/init.d/capisuite restart > /dev/null; \
-             fi; \
-           fi;
-        endscript
-}
-
-/var/log/capisuite.error {
-        weekly
-        missingok
-        rotate 52
-        compress
-        delaycompress
-        notifempty
-        create 640 root adm
-        sharedscripts
-        postrotate
-	  if [ -f /var/run/capisuite.pid ]; then \
-             if [ -x /usr/sbin/invoke-rc.d ]; then \
-                invoke-rc.d capisuite restart > /dev/null; \
-             else \
-                /etc/init.d/capisuite restart > /dev/null; \
-             fi; \
-           fi;
-        endscript
-}
diff --git a/net-dialup/capisuite/metadata.xml b/net-dialup/capisuite/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-dialup/capisuite/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
index fa2e1e330b9d..6eba5de3ef8e 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="scp shadow static-libs"
 
diff --git a/net-dialup/moserial/moserial-3.0.10.ebuild b/net-dialup/moserial/moserial-3.0.10.ebuild
index d19babf50070..9c32ced20df2 100644
--- a/net-dialup/moserial/moserial-3.0.10.ebuild
+++ b/net-dialup/moserial/moserial-3.0.10.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/moserial"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 5e9703b1b612..d6e8b910f12a 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,2 +1,2 @@
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
-DIST avahi-0.6.32_rc.tar.gz 922001 SHA256 e5eb81b1686bb7c7fb02f6b752c508c103f21d170039303fe0796d3282fa2f44 SHA512 2876510aa78b2db0f51383e5f39440cd5dd3a153663862044a6c531ebc67a546e5a5b5fd9c52ab42083300eb39d906511c0c5ab917e6b5979aaba35688e942b6 WHIRLPOOL a612138090770617f82e80be601e76ad0ec9c757a19f1d30de008912044c93976b3b97c0c4946878a32fe44e773648fa64abaecd30d675b48cf75db6dc69244f
+DIST avahi-0.6.32.tar.gz 934004 SHA256 7eb693d878246f0cd05034173fb3ed53447a84dd3b7f01745313cad11071226e SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18 WHIRLPOOL e139eca2d1698976a5fca21361c037dd2b1c075654b01674bea3fa22db70067999aba2a61cbfcf69281d5274f5080450e24cf64f9cec1702d142e129fbf03dc7
diff --git a/net-dns/avahi/avahi-0.6.32.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild
new file mode 100644
index 000000000000..e2946ca199d7
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.32.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="gdbm"
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
+
+REQUIRED_USE="
+	utils? ( || ( gtk gtk3 ) )
+	python? ( dbus gdbm )
+	mono? ( dbus )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-libs/libdaemon
+	dev-libs/expat
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
+	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	kernel_linux? ( sys-libs/libcap )
+	introspection? ( dev-libs/gobject-introspection:= )
+	mono? (
+		dev-lang/mono
+		gtk? ( dev-dotnet/gtk-sharp )
+	)
+	python? (
+		${PYTHON_DEPS}
+		gtk? ( dev-python/pygtk )
+		dbus? ( dev-python/dbus-python )
+	)
+	bookmarks? (
+		dev-python/twisted-core
+		dev-python/twisted-web
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	app-doc/xmltoman
+	dev-util/intltool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	selinux? ( sec-policy/selinux-avahi )
+"
+
+pkg_preinst() {
+	enewgroup netdev
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+
+	if use autoipd; then
+		enewgroup avahi-autoipd
+		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
+	fi
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+}
+
+src_prepare() {
+	if ! use ipv6; then
+		sed -i \
+			-e s/use-ipv6=yes/use-ipv6=no/ \
+			avahi-daemon/avahi-daemon.conf || die
+	fi
+
+	sed -i\
+		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
+		doxygen_to_devhelp.xsl || die
+
+	# Make gtk utils optional
+	# https://github.com/lathiat/avahi/issues/24
+	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	# https://github.com/lathiat/avahi/issues/24
+	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
+
+	# Fix build under various locales, bug #501664
+	# https://github.com/lathiat/avahi/issues/27
+	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
+
+	# Bug #525832
+	epatch_user
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+	use python && python_export_best
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+			$(multilib_native_use_enable gtk pygtk)
+		)
+	fi
+
+	if use mono; then
+		myconf+=( $(multilib_native_use_enable doc monodoc) )
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--enable-manpages \
+		--enable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		--enable-gobject \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable autoipd) \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(multilib_native_use_enable doc doxygen-doc) \
+		$(multilib_native_use_enable mono) \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable utils gtk-utils) \
+		--disable-qt3 \
+		$(use_enable qt4) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	multilib_is_native_abi && use doc && emake avahi.devhelp
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	use bookmarks && use python && use dbus && use gtk || \
+		rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+	# https://github.com/lathiat/avahi/issues/28
+	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
+
+	if multilib_is_native_abi && use doc; then
+		dohtml -r doxygen/html/. || die
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp || die
+	fi
+}
+
+multilib_src_install_all() {
+	if use autoipd; then
+		insinto /$(get_libdir)/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /$(get_libdir)/netifrc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use autoipd; then
+		elog
+		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
+		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
+		elog
+	fi
+}
diff --git a/net-dns/avahi/avahi-0.6.32_rc.ebuild b/net-dns/avahi/avahi-0.6.32_rc.ebuild
deleted file mode 100644
index dc9cd67709f0..000000000000
--- a/net-dns/avahi/avahi-0.6.32_rc.ebuild
+++ /dev/null
@@ -1,239 +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="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
-	python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/0.6.32-rc.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/avahi-0.6.32-rc"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	app-doc/xmltoman
-	dev-util/intltool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if ! use ipv6; then
-		sed -i \
-			-e s/use-ipv6=yes/use-ipv6=no/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	# https://github.com/lathiat/avahi/issues/25
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
-
-	# Allow building client without the daemon
-	# https://github.com/lathiat/avahi/issues/26
-	epatch "${FILESDIR}"/${PN}-0.6.31-build-client-without-daemon.patch
-
-	# Fix build under various locales, bug #501664
-	# https://github.com/lathiat/avahi/issues/27
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
-
-	# Bug #525832
-	epatch_user
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-src_configure() {
-	# those steps should be done once-per-ebuild rather than per-ABI
-	use sh && replace-flags -O? -O0
-	use python && python_export_best
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=( --disable-static )
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable gtk pygtk)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--enable-manpages \
-		--enable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(multilib_native_use_enable mono) \
-		$(use_enable dbus) \
-		$(multilib_native_use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /$(get_libdir)/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index c41ce7a4bd12..3121a4b5b946 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,5 +1,2 @@
 DIST c-ares-1.10.0.tar.gz 809073 SHA256 3d701674615d1158e56a59aaede7891f2dde3da0f46a6d3c684e0ae70f52d3db SHA512 fef6945549034390ddaa03acf5509d0095e97c151e5f4047ffc32c51945a7261759228b20fdd77b9e4bf4a95f3a61bfb79bee0c66a860219debfd2916b390693 WHIRLPOOL 660d04b20371a75b4a9dea45449407b10c782ae8367356e2f6b0b73cb2d62485068a543b4a2303673f688c6c784afd9925faa18be943aa771d8467077f8ea407
-DIST c-ares-1.7.4.tar.gz 639365 SHA256 6b8a7c4ecd67240cca50a345bc955ffbe2d6d1f43982defc77a8e76031a6cb06 SHA512 e16703c158cebbdf8f1b8a83f47496d5c6450905a9f267aaf07c8968715a6f8746e30421eb1b6e877e99ddf82e93e6ce11bd8c4f1859913cf1f41abc69b47245 WHIRLPOOL fc719d15fcad0c0c3859da8ec8684a7331c61390be619a1e4dad386b5fb3ddb5eaf4e1ef6ec8a5fc2b0e11087e92c71024b9376cb75541e2fa66fa6867d5e792
-DIST c-ares-1.7.5.tar.gz 746032 SHA256 a6b6381e5a025ef942c76360989341ac5b0c82007e2979d40ded7d16396656a8 SHA512 121be9eaeb127f2648744d0b74d93ea80c02932082e42f08df42834aa0f9180e386cb26f85f1962d5388365770f7204510f5f22ed9b85ee01dbcf8009d9f74ce WHIRLPOOL 1faf9f740fbb6543e09447310b0f9a4f277312f7bdb9a261830b021052619f8f0b6ccfe0906c4cfe37323b87ef97e10665722158b7fca101c1043b1582f6df6f
-DIST c-ares-1.8.0.tar.gz 778926 SHA256 f4d9b3721966043645f3b953b40c0185483d597f743cb834456d85fa501d8f62 SHA512 972f21a8ee50268773f4b90be6380c405fcd11089c102068665615c8a9bd8f8b7726d53d45cea46a87b863983535afd412cdddae83083e9cbd036ed8a4e7b5fa WHIRLPOOL ad54c63eca4d62760d17135628319b4e77b6baafb6007a1e0538e9d0b8cddd25f7062fd68dd9149672adc24a917058d93990354db69176f6522571d75ee3e7ef
-DIST c-ares-1.9.1.tar.gz 782945 SHA256 023f28001f2f839645c8700187391a011198950c73ddd91510c7549d87373936 SHA512 896acd810912ae269d67904e0a2533faab855943444fffae45aa4c1633eefec72a59006cbdf5b8cc67788df6977ed72244e8d14bd6fff9e6d5670283d12be6d2 WHIRLPOOL d32efdce6ddafbb1e13f9203eb82ffdcb4d08737225bba0a4aeefa50f78717b21add847beb2f328f7516695f80dd983f687ff31bb0c56f75ee54819d0cd6f261
+DIST c-ares-1.11.0.tar.gz 1102531 SHA256 b3612e6617d9682928a1d50c1040de4db6519f977f0b25d40cf1b632900b3efd SHA512 0a3bbe95dbc80201a7024db564c057a788f252b09c4bcc1539d2db8b12f3497db66710e24b1c18132579ddbe3015f1d916b378b83f9c32deb5fba206ffaf9f27 WHIRLPOOL f70a4aff5e50eb46e356d09b3466021f0cd2eb93959bc4d752d7ff26415f1de387a123f0607f97d87d42f75f643094f7382205ff9ea84c00205a9291d0faa700
diff --git a/net-dns/c-ares/c-ares-1.10.0.ebuild b/net-dns/c-ares/c-ares-1.10.0.ebuild
deleted file mode 100644
index 7e7ddf5badee..000000000000
--- a/net-dns/c-ares/c-ares-1.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES NEWS README RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-dns/c-ares/c-ares-1.11.0.ebuild b/net-dns/c-ares/c-ares-1.11.0.ebuild
new file mode 100644
index 000000000000..374cbc8bbe49
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="http://c-ares.haxx.se/"
+SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+IUSE="static-libs"
+
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-nonblocking \
+		--enable-symbol-hiding \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+}
diff --git a/net-dns/c-ares/c-ares-1.7.4.ebuild b/net-dns/c-ares/c-ares-1.7.4.ebuild
deleted file mode 100644
index a3745ad9cdea..000000000000
--- a/net-dns/c-ares/c-ares-1.7.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	econf --enable-shared --enable-nonblocking  --enable-symbol-hiding \
-		--enable-warnings
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc RELEASE-NOTES CHANGES NEWS README*
-}
diff --git a/net-dns/c-ares/c-ares-1.7.5.ebuild b/net-dns/c-ares/c-ares-1.7.5.ebuild
deleted file mode 100644
index 6e7fb3dfbebb..000000000000
--- a/net-dns/c-ares/c-ares-1.7.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES README README.cares RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-dns/c-ares/c-ares-1.8.0.ebuild b/net-dns/c-ares/c-ares-1.8.0.ebuild
deleted file mode 100644
index 6e7fb3dfbebb..000000000000
--- a/net-dns/c-ares/c-ares-1.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES README README.cares RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-dns/c-ares/c-ares-1.9.1.ebuild b/net-dns/c-ares/c-ares-1.9.1.ebuild
deleted file mode 100644
index 1c9d1e07ffcd..000000000000
--- a/net-dns/c-ares/c-ares-1.9.1.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=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES NEWS README RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index c6b84c95f3f6..c886122c08c6 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,3 +1,4 @@
 DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17 WHIRLPOOL ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
 DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118 WHIRLPOOL 49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
 DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02 WHIRLPOOL b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
+DIST dnscrypt-proxy-1.6.1.tar.gz 1721006 SHA256 c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 SHA512 8d49be73e4b2fe1131349846191f54c7f212ff301a6a6c2a77505225f81b0615e968c945013e732c4fce3b6090606245ec7343fb0d6145bb10b67dd4112d2367 WHIRLPOOL ca5a1c3792728ff54ee5e3c5a8815deb1ce2e1bdd016438ad0b84d89458064e0178df3c1dee77c8a685894092e48a305b521dc8e4bfc3cb40a0d7ac7e7e66d18
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
new file mode 100644
index 000000000000..524bed43fffa
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.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
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
+HOMEPAGE="http://dnscrypt.org/"
+SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins systemd"
+
+CDEPEND="
+	dev-libs/libsodium
+	net-libs/ldns
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+	econf \
+		$(use_enable plugins) \
+		$(use_with systemd)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver <DNSCRYPT_LOCALIP>"
+	elog
+	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
+	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+	elog
+	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
new file mode 100644
index 000000000000..e7a02d696ea0
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
@@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-syslog}
+DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
+
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+runas_user=${runas_user:-dnscrypt}
+runas_group=${runas_user:-dnscrypt}
+
+depend() {
+	use net
+	before dns
+	after logger
+}
+
+start() {
+	if [ ! -d "${rundir}" ]; then
+		mkdir "${rundir}"
+		if [ -n "${runas_user}" ]; then
+			touch "${DNSCRYPT_LOGFILE}"
+			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
+			chown -R ${runas_user}:${runas_group} "${rundir}"
+		fi
+	fi
+
+	if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
+		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+		return 1
+	elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
+		resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
+	elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
+		resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
+	else
+		eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+		return 1
+	fi
+
+	if [[ "${DNSCRYPT_LOGFILE}" == "syslog" ]]; then
+		logopt="--syslog"
+	else
+		logopt="--logfile='${DNSCRYPT_LOGFILE}'"
+	fi
+	ebegin "Starting dnscrypt-proxy"
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/dnscrypt-proxy \
+		-- \
+		$logopt \
+		--pidfile="${pidfile}" \
+		--daemonize --user=${runas_user} \
+		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+		$resolver_opts \
+		${DNSCRYPT_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dnscrypt-proxy"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
+	eend $?
+}
diff --git a/net-dns/host/Manifest b/net-dns/host/Manifest
deleted file mode 100644
index 44d34daa540a..000000000000
--- a/net-dns/host/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST host-20070128.tar.gz 152347 SHA256 a2a56ab236f9e8549366175a3055e0dc7758dafd46658ed8bea58d87de39bd9f SHA512 80f4d4878af40c93f33cc6c43d19b01415e66b3939b157544b4921b9f0b83ef1baa9ce0e151d951417be92973c4b038df80efae974be4bca2bbce43299db65fc WHIRLPOOL 7072f75f1f39b25375f38387625ced95469f7baeeed069429718a5cb438ee0751a612e3ac0f76e91af9ca653ebe97487476dac2cdaeb1d1fc21a49d67ba62527
diff --git a/net-dns/host/files/host-20070128-Makefile.patch b/net-dns/host/files/host-20070128-Makefile.patch
deleted file mode 100644
index 931c4389db1d..000000000000
--- a/net-dns/host/files/host-20070128-Makefile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.orig	2003-06-05 03:01:45.000000000 +0200
-+++ Makefile	2010-03-12 18:53:17.000000000 +0100
-@@ -117,16 +117,11 @@
- # Compilation definitions.
- # ----------------------------------------------------------------------
- 
--DEBUGDEFS = -DDEBUG
- 
- DEFS = $(CONFIGDEFS) $(DEBUGDEFS) $(SYSDEFS) $(INCLUDES)
- 
--COPTS = -pipe
- 
--COPTIM = -O2
--COPTIM = -O
- 
--CDEBUG = -g
- 
- # GCC lint-like warnings -- any warnings are likely bugs in the
- # platform headers or in gcc itself....
-@@ -139,7 +134,6 @@
-  -Wswitch \
-  -Wcomment \
-  -Wcast-qual \
-- -Wid-clash-30 \
-  -Wpointer-arith \
-  -Wshadow
- #endif
-@@ -147,7 +141,6 @@
- #if $(__GNULD__) >= 1
- GNULDWARNFLAGS = -W \
-  -Wall \
-- -Wid-clash-30
- #endif
- 
- #if $(__GNUC__) >= 2
-@@ -169,7 +162,7 @@
- #endif
- 
- CPPFLAGS = $(DEFS)
--CFLAGS = $(COPTS) $(CDEBUG) $(COPTIM) $(GCCWARNFLAGS) $(GCC2WARNFLAGS) $(GCC3WARNFLAGS)
-+CFLAGS += $(GCCWARNFLAGS) $(GCC2WARNFLAGS) $(GCC3WARNFLAGS)
- 
- # Select your favorite compiler if make doesn't already know it...
- #if defined(next)
-@@ -250,7 +243,7 @@
- # Unfortunately SunOS-5.9 has only libresolv.so !!!
- #
- #if defined(NEED_LIBRESOLV) && !defined(sunos5.x) && !(BIND-8.4.x)
--LDFLAGS = -static $(GNULDWARNFLAGS)
-+LDFLAGS += $(GNULDWARNFLAGS)
- #else
- #LDFLAGS = $(GNULDWARNFLAGS)
- #endif
-@@ -294,7 +287,7 @@
- # ----------------------------------------------------------------------
- 
- BINOWN = root
--BINGRP = staff
-+BINGRP = root
- BINMODE = 755
- #STRIPFLAG = -s
- 
diff --git a/net-dns/host/host-20070128-r1.ebuild b/net-dns/host/host-20070128-r1.ebuild
deleted file mode 100644
index 8673e8e03813..000000000000
--- a/net-dns/host/host-20070128-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="A powerful command-line DNS query and test tool implementing many additional protocols"
-HOMEPAGE="http://www.weird.com/~woods/projects/host.html"
-SRC_URI="ftp://ftp.weird.com/pub/Planix/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-# Bug 91515
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	sed -i  -e "s:^\(# if defined(__alpha).*\):\1 || defined(__x86_64__):" \
-		port.h || die "sed failed"
-}
-
-src_compile() {
-	use debug && export DEBUGDEFS="-DDEBUG"
-	emake CC="$(tc-getCC)" RES_LIB=/usr/$(get_libdir)/libresolv.a || die "emake failed"
-}
-
-src_install () {
-	# This tool has slightly different format of output from "standard" host.
-	# Renaming it to host-woods, hopefully this does not conflict with anything.
-
-	newbin host host-woods || die "newbin failed"
-	newman host.1 host-woods.1 || die "newman failed"
-	dodoc RELEASE_NOTES ToDo || die "dodoc failed"
-}
diff --git a/net-dns/host/metadata.xml b/net-dns/host/metadata.xml
deleted file mode 100644
index 4edfd402d267..000000000000
--- a/net-dns/host/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>george@gentoo.org</email>
-    </maintainer>
-</pkgmetadata>
diff --git a/net-dns/noip-updater/Manifest b/net-dns/noip-updater/Manifest
deleted file mode 100644
index 5c266764e1d5..000000000000
--- a/net-dns/noip-updater/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST noip-2.1.9.tar.gz 152995 SHA256 86ad0a6362263a33f59a658d1b1ce428e255556ddad0d062aa0ee4b7f412f98a SHA512 3e76d39e22383dc3eceee10f8bdf791fc5ed253c756cd2d345fdd8fb9c9ab3bac6a1a6ca123a26cebbf6e615bb8f236c58d4ecf6254fcaf6b92da17f42f0dd6f WHIRLPOOL 4a737490fdf8be0bc6f708c7f73d2025f62a8e7c043e6259ee34738a5ed1b78d34c4243b58f7f61bb7afcf05d9e786b7f80b16bb641be59f5a5a5bd0929adee3
diff --git a/net-dns/noip-updater/files/noip-2.1.9-daemon.patch b/net-dns/noip-updater/files/noip-2.1.9-daemon.patch
deleted file mode 100644
index b2fb4e66d0c7..000000000000
--- a/net-dns/noip-updater/files/noip-2.1.9-daemon.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/noip2.c b/noip2.c
---- a/noip2.c	2004-01-09 14:18:39.000000000 +0000
-+++ b/noip2.c	2007-07-20 14:02:41.100377515 +0100
-@@ -895,16 +895,13 @@
- 	char    *err_string;
- 	static int startup = 1;
- 
--	x = fork();
-+	x = daemon (0, 0);
- 	switch (x) {
- 	    case -1:		// error
- 		err_string = strerror(errno);
- 		Msg( "Can't fork!! (%s) Ending!\n", err_string);
- 		return FATALERR;
--	    default:		// parent
--		exit(0);
- 	    case 0:		//child
--		setsid();
- 		if (get_shm_info() == FATALERR)	
- 		    return FATALERR;
- 		log2syslog++;
diff --git a/net-dns/noip-updater/files/noip-2.1.9-flags.patch b/net-dns/noip-updater/files/noip-2.1.9-flags.patch
deleted file mode 100644
index 9fe05f36ac2d..000000000000
--- a/net-dns/noip-updater/files/noip-2.1.9-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2006-09-07 09:52:55.000000000 +0200
-+++ b/Makefile	2006-09-07 09:54:54.000000000 +0200
-@@ -21,7 +21,7 @@
- # ARCH=sun
- 
- ${TGT}: Makefile ${TGT}.c 
--	${CC} -Wall -g -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
-+	${CC} ${CFLAGS} -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS} ${LDFLAGS}
- 
- install: ${TGT} 
- 	if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi
diff --git a/net-dns/noip-updater/files/noip.service b/net-dns/noip-updater/files/noip.service
deleted file mode 100644
index b4834e843dd0..000000000000
--- a/net-dns/noip-updater/files/noip.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=No-IP Dynamic DNS Update Client
-Require=network-online.target
-After=network-online.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/noip2 -c /etc/no-ip2.conf
-
-[Install]
-WantedBy=multi-user.target
- 
diff --git a/net-dns/noip-updater/files/noip2.start b/net-dns/noip-updater/files/noip2.start
deleted file mode 100644
index 2330ee669183..000000000000
--- a/net-dns/noip-updater/files/noip2.start
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need localmount
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f /etc/no-ip2.conf ]
-	then
-		einfo "Answer the following questions about your no-ip account."
-		noip2 -C || return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting noip"
-	start-stop-daemon --quiet --start -x /usr/sbin/noip2 -- -c /etc/no-ip2.conf
-	eend $? "noip did not start, error code $?"
-}
-
-stop() {
-	ebegin "Stopping noip"
-	start-stop-daemon --quiet --stop -x /usr/sbin/noip2
-	noip_ecode=$?
-	eend $noip_ecode "Error stopping the noip daemon, error $noip_ecode"
-	checkconfig || return 1
-	ebegin "Setting noip addresses to 0.0.0.0"
-	noip2 -c /etc/no-ip2.conf -i 0.0.0.0 >& /dev/null
-	eend $? "Failed to set noip addresses to 0.0.0.0, error $?"
-	return $noip_ecode
-}
diff --git a/net-dns/noip-updater/metadata.xml b/net-dns/noip-updater/metadata.xml
deleted file mode 100644
index 25f9805c380e..000000000000
--- a/net-dns/noip-updater/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>boothfsec@gmail.com</email>
-		<name>Francis Booth</name>
-		<description>Active Maintainer, Assign bugs</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		no-ip.com dynamic DNS updater
-	</longdescription>
-</pkgmetadata>
diff --git a/net-dns/noip-updater/noip-updater-2.1.9-r1.ebuild b/net-dns/noip-updater/noip-updater-2.1.9-r1.ebuild
deleted file mode 100644
index 493e086f9ad7..000000000000
--- a/net-dns/noip-updater/noip-updater-2.1.9-r1.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 readme.gentoo systemd toolchain-funcs
-
-MY_P=${P/-updater/}
-DESCRIPTION="no-ip.com dynamic DNS updater"
-HOMEPAGE="http://www.no-ip.com"
-SRC_URI="http://www.no-ip.com/client/linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-devel/gcc"
-
-S=${WORKDIR}/${MY_P}
-
-DOC_CONTENTS="
-	Configuration can be done manually via /usr/sbin/noip2 -C or
-	by using this ebuild's config option.
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/noip-2.1.9-flags.patch
-	epatch "${FILESDIR}"/noip-2.1.9-daemon.patch
-	sed -i \
-		-e "s:\(#define CONFIG_FILEPATH\).*:\1 \"/etc\":" \
-		-e "s:\(#define CONFIG_FILENAME\).*:\1 \"/etc/no-ip2.conf\":" \
-		noip2.c || die "sed failed"
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		PREFIX=/usr \
-		CONFDIR=/etc
-}
-
-src_install() {
-	dosbin noip2
-	dodoc README.FIRST
-	newinitd "${FILESDIR}"/noip2.start noip
-	systemd_dounit "${FILESDIR}"/noip.service
-	readme.gentoo_create_doc
-}
-
-pkg_config() {
-	cd /tmp
-	einfo "Answer the following questions."
-	noip2 -C || die
-}
diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
index 0d750af25a95..51020bc9a781 100644
--- a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
@@ -67,7 +67,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 84ddb5e6494b..01b5e44fc3ee 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,7 +1,6 @@
 DIST autofs-5.0.10.tar.xz 258480 SHA256 98150c09639112a125a6d0ddc6aa1920ae4e6c41736e65d8a004c3171fcca70b SHA512 899d3b7040d1162312f9d595df0fd6c40489e4aefb7086893b51993446da78f10707d7e8caf8440ff24000d54794faca869aaf8564e5622caf8bb046af6fcf3b WHIRLPOOL 32c964a58f5125dfbfe589345e1fdf3da357fdadead790e3adbc840f0fc1b7093a0191224ac8d07ac792184914f6630ba08d572ffdcca0423e2a41bb2892ceaf
 DIST autofs-5.0.7-patches-3.tar.lzma 37967 SHA256 16de3486573a94d476f70f2c422656d6fddd79b3581ce05faeb5dd55748ba1cb SHA512 8cbb683a82d2cdc5e3c97921ba3a5bc5af5ab9fb45e4802de021a6161eaeaebb192790a351d281d48b68ed0f8ea6e3a0c0514a4f4a1c546191d8acca9e856ca7 WHIRLPOOL a42f6d609ee4160dfb2d84d94516667f41b8dbe9bf6bdef923f424f82ec00f6115f211dc2985170c45be53bdc45ea47026cc3750c61c7e14aa02ce3384bb9908
 DIST autofs-5.0.7.tar.bz2 319117 SHA256 08c4304d8076dc80c14df559bc5fd821b67ef3457b245f61068bd053d8f94ccc SHA512 672c53e0a5477097779088d8654edaad4cb01ab68ade2ee175d963c7d4895d1bdeeeabc87057ecca2f4f3a0f08014298dae40e5e8e862c20c0b1477d72431f84 WHIRLPOOL 220cbd618ee4f34c82eaad823312284cc787aa28a0a8b9638a4b495cf38a3a6f9da194e74722febe04ee2b5ac4e1e9eccccde1f562d0d554f1e8a5ff4b5faec8
-DIST autofs-5.0.8.tar.bz2 328559 SHA256 2e0e42c654b7762b1235ec0131317224c57fdc6757ec00c820b2aa86338c9f7d SHA512 72b01b4a45e70b651ab6f4cd63039bc3d7f389a21fde354a4ba1e0e172b5480abd9b12134b8a9c74284712c2d4ff0d46ad2b47ca1692b510b0d1be5d56bf3335 WHIRLPOOL 4d9cd57819930070d6741d174f61d7c99d00ff6af364e1f9ced3f4dc8eacdf3af4c1d843127e2d8d4e57238389542976379d8c009562fa51e3fdecf7f3db29d0
-DIST autofs-5.0.9.tar.xz 256680 SHA256 81ab99ee1656a10ecaffe7933c26e8fc720f0b639ed47ab52adc66cdd868fd5c SHA512 36ecc38fa5108766069d5bbfcc22b186481d2e8aaa1b101406b389787280ae5e87ee21aab697f7ed0c9c9705278e8cd8b0143aee5fc2affd1becd85535dd9d73 WHIRLPOOL 915486d725e0a3b0d939b28dfd030d79c4fd71b7ff12c3f09bbbe558f00a8560141b9483263a5a04e84cc84eb0f92c90b1bb18df747aa5746046470b0f18bc00
 DIST autofs-5.1.0.tar.xz 288288 SHA256 f4b343797e6df03627a9fd41bda6fd85acb84aa3fdd15694eec03ec90a52bc27 SHA512 a455df8d93bc29aa87c3f928edea5bb3f91ab9c7bd7bbca8eb1370fdcc4c32b3a30d7f2c0d79800f65ac08716634f118c81ede7e816ef567048e4361aafac476 WHIRLPOOL ed265b1a9e697c08e802f0a17c0de482e5f1f292aecf8ab42cd7cf7177a605b0337ff6ab81b72950fc38687d31c47f9c01ff68cd0a8f10952a59b69a590e19ca
+DIST autofs-5.1.1-patches-0.tar.lzma 41178 SHA256 ef9f94aacff845d29d3118c73ca7d08199d40a7de5edae1025d341530e7dc2b4 SHA512 5c3ba26711401b3f9dc8cd36d3a85b1a8efce409621efedfc4f1caf2a15536646f6f89a79b8e12c703d3b3a4627ecda8c800386ebff34e20fdfad39041d91aa4 WHIRLPOOL d3d91c432e643911a4d8b5463e056aa50c717c08287e6ccf75bf1d6ca071460cc709aa32387f53cbe763de27b86eef1e26ab75a2fd334c783fd024b9f1d47ba3
 DIST autofs-5.1.1.tar.xz 290300 SHA256 e08ff0ef9ff365d87b6c33dca136d20e4e07675197a324f2816894cb437021c3 SHA512 37c0f10ee06bbfc76059ff9ae54d9b462f1c2bc39e8779e96dd5bfc2b07055606c0710f1c3de95e6f099edd2c5bb5a6f8a341be989d7554bf80011bfbe90c905 WHIRLPOOL 063e7bcabb3e93a17e8e7da75e6b42af59769e794e3b31240762a4617cc2ac626b4b4985a38455bdca56753fb897fed1a3173c633f1f9a594e79f891dc41f523
diff --git a/net-fs/autofs/autofs-5.0.8-r1.ebuild b/net-fs/autofs/autofs-5.0.8-r1.ebuild
deleted file mode 100644
index 5bd78c5b0bdc..000000000000
--- a/net-fs/autofs/autofs-5.0.8-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-	epatch "${FILESDIR}"/${P}-ldap-wo-sasl.patch
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_with hesiod)
-		$(use_enable mount-locking)
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd
-		systemddir="$(systemd_get_unitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.0.8-r2.ebuild b/net-fs/autofs/autofs-5.0.8-r2.ebuild
deleted file mode 100644
index 9a5e314f66f6..000000000000
--- a/net-fs/autofs/autofs-5.0.8-r2.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
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
-)
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-	epatch "${FILESDIR}"/${P}-ldap-wo-sasl.patch
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_with hesiod)
-		$(use_enable mount-locking)
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd
-		systemddir="$(systemd_get_unitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.0.9-r1.ebuild b/net-fs/autofs/autofs-5.0.9-r1.ebuild
deleted file mode 100644
index 5b4189a85627..000000000000
--- a/net-fs/autofs/autofs-5.0.9-r1.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
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
-)
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_with hesiod)
-		$(use_enable mount-locking)
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_unitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.0.9.ebuild b/net-fs/autofs/autofs-5.0.9.ebuild
deleted file mode 100644
index 9b780aa49e7c..000000000000
--- a/net-fs/autofs/autofs-5.0.9.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_with hesiod)
-		$(use_enable mount-locking)
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_unitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.0.ebuild b/net-fs/autofs/autofs-5.1.0.ebuild
deleted file mode 100644
index 5da580fe026b..000000000000
--- a/net-fs/autofs/autofs-5.1.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-missing-stdarg.patch"
-)
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_with hesiod)
-		$(use_enable mount-locking)
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_unitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.1-r1.ebuild b/net-fs/autofs/autofs-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..57ee11a2122a
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.1-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+AUTOTOOLS_IN_SOURCE_BUILD=true
+
+inherit autotools-utils linux-info multilib systemd toolchain-funcs
+
+PATCH_VER=0
+[[ -n ${PATCH_VER} ]] && \
+	PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI="
+	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
+	${PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-dmalloc hesiod ldap +libtirpc mount-locking sasl"
+
+# USE="sasl" adds SASL support to the LDAP module which will not be build. If
+# SASL support should be available, please add "ldap" to the USE flags.
+REQUIRED_USE="sasl? ( ldap )"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=sys-apps/util-linux-2.20
+	dmalloc? ( dev-libs/dmalloc[threads] )
+	hesiod? ( net-dns/hesiod )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)
+	libtirpc? ( net-libs/libtirpc )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+CONFIG_CHECK="~AUTOFS4_FS"
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${PATCH_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+			epatch "${WORKDIR}"/patches
+	fi
+
+	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# bug #483716
+	tc-export AR
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	local myeconfargs=(
+		--with-confdir=/etc/conf.d
+		--with-mapdir=/etc/autofs
+		$(use_with dmalloc)
+		$(use_with ldap openldap)
+		$(use_with libtirpc)
+		$(use_with sasl)
+		$(use_with hesiod)
+		$(use_enable mount-locking)
+		--disable-ext-env
+		--enable-sloppy-mount # bug #453778
+		--enable-force-shutdown
+		--enable-ignore-busy
+		--with-systemd="$(systemd_get_unitdir)" #bug #479492
+		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile DONTSTRIP=1
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if kernel_is -lt 2 6 30; then
+		# kernel patches
+		docinto patches
+		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+	fi
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index fa5ff8e45369..9777594a25e3 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,4 +1,3 @@
-DIST cifs-utils-5.9.tar.bz2 388403 SHA256 ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2 SHA512 c4d789c6dce2c0927ccc9359147c12151ea9a688bc376c1df21deec66a98669dc4fb6dd8e26d549475d0bbe1e5449ce08fb86e45c765eee7013ec2040c23600e WHIRLPOOL ef4c9b23b2e12a53d936acd19ce10fbe347279ee3c2914a2cbe26d101898bad22606c622ca005af68e0c44605c4137b3633691171387e269caf06542919cec90
 DIST cifs-utils-6.1.tar.bz2 390958 SHA256 381f1e9caccdafdcdb0efa32a4cceb77c1a96b0b58702394e4b86dac4825f3b5 SHA512 6427b74edbf56b865dee38a610c74ac5483cdc13096082cfc1e9d225a048c9b5ee0c7afb30e625a615a0e8e9f3767e33765220e27148e2c2a29d12d4129b01fd WHIRLPOOL a800a02a0729996035a331b460cb28ae5463ddecaf205d88173dc08efd7a2bee577995ebba97b36977858c8435ac3b7ec9c7ce5d193f8b30d0602f9546fed5b1
-DIST cifs-utils-6.3.tar.bz2 392465 SHA256 fff73b2a2547628acba05d324cf096e50f13fa8712f01bf0eb0dbabfe268375b SHA512 d1a16d56852d0b7570c795e04b6cee89a678e18401ec4a48bf734e5c941518c70d2cf82e795ce857c9aad07d9dfee68e96524e5d6e1392283cfee0a8b38e185e WHIRLPOOL e983ce227234cbc3141aac96d41a576b3bfb8a7cd0ea85191287d489b595e22e20bc9115a92b803da49931bcb7ac567cd3133b5729105ce99f6ea39c504535a8
 DIST cifs-utils-6.4.tar.bz2 392809 SHA256 38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614 WHIRLPOOL 335262eb329860318750fcd081dc2c082f36c75a32e5e596a45b51e73b08be7ee66133c2e4e2bc3089631d3909018abd9c2f36f79d82cd9ea7f6fe2530900f72
+DIST cifs-utils-6.5.tar.bz2 402158 SHA256 e2776578b8267c6dc0862897f5e10f87f10f8337fca9ca6a9118f5eb30cf49f7 SHA512 c5eea97d2be455ad676a3ff693641512d5c1d81d75eb1d7d08e4274b6844a1353b6791aa3ced4d8d656ed4a09b3c17ae80f289a90a3d429a8a94210e15f3e90e WHIRLPOOL 880b3c5762e791317140213fea008759b9d2599ddefb08319877ba6a5ced517fd6e0246050975ad01b74110b20f2233bb6cb505ecf3b2e05dca014ae378eaba5
diff --git a/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild
deleted file mode 100644
index 008bc47371e7..000000000000
--- a/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils confutils linux-info
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
-IUSE="ads +caps caps-ng creds"
-
-DEPEND="!net-fs/mount-cifs
-	!<net-fs/samba-3.6_rc1
-	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
-	caps? ( sys-libs/libcap )
-	caps-ng? ( sys-libs/libcap-ng )
-	creds? ( sys-apps/keyutils )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="^^ ( caps caps-ng )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	confutils_use_conflict caps caps-ng
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-}
-
-src_prepare() {
-	# bug #459040
-	epatch "${FILESDIR}"/${P}-set-parsed_info-got_user-when-a-cred-file.patch
-}
-
-src_configure() {
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf \
-		$(use_enable ads cifsupcall) \
-		$(use_with caps libcap) \
-		$(use_with caps-ng libcap-ng) \
-		$(use_enable creds cifscreds) \
-		--with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \
-		--disable-cifsidmap \
-		--disable-cifsacl
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -print0 | xargs --null rmdir \
-		--ignore-fail-on-non-empty &>/dev/null
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	ewarn "setuid use flag was dropped due to multiple security implications"
-	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
-	ewarn "You are free to set setuid flags by yourself"
-
-	# Inform about upcall usage
-	if use ads ; then
-		ewarn "Using mount.cifs in combination with keyutils"
-		ewarn "in order to mount DFS shares, you need to add"
-		ewarn "the following line to /etc/request-key.conf:"
-		ewarn "  create dns_resolver * * /usr/sbin/cifs.upcall %k"
-		ewarn "Otherwise, your DFS shares will not work properly."
-	fi
-}
diff --git a/net-fs/cifs-utils/cifs-utils-6.3.ebuild b/net-fs/cifs-utils/cifs-utils-6.3.ebuild
deleted file mode 100644
index 4b81eb6deba9..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-info multilib
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="+acl +ads +caps +caps-ng creds"
-
-DEPEND="!net-fs/mount-cifs
-	!<net-fs/samba-3.6_rc1
-	ads? (
-		sys-apps/keyutils
-		sys-libs/talloc
-		virtual/krb5
-	)
-	caps? ( !caps-ng? ( sys-libs/libcap ) )
-	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
-	creds? ( sys-apps/keyutils )"
-PDEPEND="${DEPEND}
-	acl? ( || (
-		=net-fs/samba-3.6*[winbind]
-		>=net-fs/samba-4.0.0_alpha1
-	) )
-"
-
-REQUIRED_USE="acl? ( ads )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-}
-
-src_configure() {
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf \
-		$(use_enable acl cifsacl cifsidmap) \
-		$(use_enable ads cifsupcall) \
-		$(use caps && use_with !caps-ng libcap || echo --without-libcap) \
-		$(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
-		$(use_enable creds cifscreds)
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -print0 | xargs --null rmdir \
-		--ignore-fail-on-non-empty &>/dev/null
-
-	if use acl ; then
-		dodir /etc/cifs-utils
-		dosym /usr/$(get_libdir)/cifs-utils/idmapwb.so \
-			/etc/cifs-utils/idmap-plugin
-		dodir /etc/request-key.d
-		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
-			> "${ED}/etc/request-key.d/cifs.idmap.conf"
-	fi
-
-	if use ads ; then
-		dodir /etc/request-key.d
-		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.upcall.conf"
-	fi
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	ewarn "setuid use flag was dropped due to multiple security implications"
-	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
-	ewarn "You are free to set setuid flags by yourself"
-
-	# Inform about upcall usage
-	if use acl ; then
-		einfo "The cifs.idmap utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
-		einfo "This enables you to get and set CIFS acls."
-	fi
-
-	if use ads ; then
-		einfo "The cifs.upcall utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
-		einfo "This enables you to mount DFS shares."
-	fi
-}
diff --git a/net-fs/cifs-utils/cifs-utils-6.5.ebuild b/net-fs/cifs-utils/cifs-utils-6.5.ebuild
new file mode 100644
index 000000000000..02edf08db2f5
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils linux-info multilib
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
+SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+IUSE="+acl +ads +caps +caps-ng creds"
+
+DEPEND="!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	ads? (
+		sys-apps/keyutils
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( !caps-ng? ( sys-libs/libcap ) )
+	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
+	creds? ( sys-apps/keyutils )"
+PDEPEND="${DEPEND}
+	acl? ( || (
+		=net-fs/samba-3.6*[winbind]
+		>=net-fs/samba-4.0.0_alpha1
+	) )
+"
+
+REQUIRED_USE="acl? ( ads )"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
+		ewarn "You must enable CIFS support in your kernel config, "
+		ewarn "to be able to mount samba shares. You can find it at"
+		ewarn
+		ewarn "  File systems"
+		ewarn "	Network File Systems"
+		ewarn "			CIFS support"
+		ewarn
+		ewarn "and recompile your kernel ..."
+	fi
+}
+
+src_configure() {
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf \
+		$(use_enable acl cifsacl cifsidmap) \
+		$(use_enable ads cifsupcall) \
+		$(use caps && use_with !caps-ng libcap || echo --without-libcap) \
+		$(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
+		$(use_enable creds cifscreds)
+}
+
+src_install() {
+	default
+
+	# remove empty directories
+	find "${ED}" -type d -print0 | xargs --null rmdir \
+		--ignore-fail-on-non-empty &>/dev/null
+
+	if use acl ; then
+		dodir /etc/cifs-utils
+		dosym /usr/$(get_libdir)/cifs-utils/idmapwb.so \
+			/etc/cifs-utils/idmap-plugin
+		dodir /etc/request-key.d
+		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
+			> "${ED}/etc/request-key.d/cifs.idmap.conf"
+	fi
+
+	if use ads ; then
+		dodir /etc/request-key.d
+		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.upcall.conf"
+	fi
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	ewarn "setuid use flag was dropped due to multiple security implications"
+	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
+	ewarn "You are free to set setuid flags by yourself"
+
+	# Inform about upcall usage
+	if use acl ; then
+		einfo "The cifs.idmap utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
+		einfo "This enables you to get and set CIFS acls."
+	fi
+
+	if use ads ; then
+		einfo "The cifs.upcall utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
+		einfo "This enables you to mount DFS shares."
+	fi
+}
diff --git a/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch b/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch
deleted file mode 100644
index 2faa853e0a58..000000000000
--- a/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0eb3daa4b17ee64b464594f1a5d413ecb364957c Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlayton@samba.org>
-Date: Thu, 14 Jun 2012 10:59:18 -0400
-Subject: [PATCH 1/1] mount.cifs: set rc to 0 in libcap toggle_dac_capability
-
-Thus spake Jochen:
-
-The mount.cifs program from the cifs-utils package 5.5 did not work on
-my Linux system. It just exited without an error message and did not
-mount anything.
-
-[...]
-
-I think, when this variable rc is now used in this function, it has also
-to be properly initialized there.
-
-Reported-by: Jochen Roderburg <roderburg@uni-koeln.de>
-Signed-off-by: Jeff Layton <jlayton@samba.org>
----
- mount.cifs.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index a1b0454..6f3f382 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -495,7 +495,7 @@ free_caps:
- static int
- toggle_dac_capability(int writable, int enable)
- {
--	int rc;
-+	int rc = 0;
- 	cap_t caps;
- 	cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH;
- 
--- 
-1.7.0.4
-
diff --git a/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch b/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch
deleted file mode 100644
index d06ae015d038..000000000000
--- a/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jeff Layton <jlayton@samba.org>
-Date: Sun, 13 Jan 2013 03:02:01 +0000 (-0500)
-Subject: mount.cifs: set parsed_info->got_user when a cred file supplies a username
-X-Git-Url: https://gitweb.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=1a01f7c4b90695211d12291d7a24bec05b1f2922
-
-mount.cifs: set parsed_info->got_user when a cred file supplies a username
-
-commit 85d18a1ed introduced a regression when using a credentials file.
-It set the username in the parsed mount info properly, but didn't set
-the "got_user" flag in it.
-
-Also, fix an incorrect strlcpy length specifier in open_cred_file.
-
-Reported-by: "Mantas M." <grawity@gmail.com>
-Signed-off-by: Jeff Layton <jlayton@samba.org>
----
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index c7c3055..40b77e9 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
- 		switch (parse_cred_line(line_buf + i, &temp_val)) {
- 		case CRED_USER:
- 			strlcpy(parsed_info->username, temp_val,
--				sizeof(parsed_info->domain));
-+				sizeof(parsed_info->username));
-+			parsed_info->got_user = 1;
- 			break;
- 		case CRED_PASS:
- 			i = set_password(parsed_info, temp_val);
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index e1a8d0dc28c0..9b691c12b76c 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -2,5 +2,7 @@ DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e
 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
 DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
+DIST openafs-1.6.16-src.tar.bz2 14612920 SHA256 3431702bdcbd1b27833060c50869e618a192495877ebb0a66e4610de0b48eb81 SHA512 775c6b51e4a916ab14c2a33b746ffc67ce7f8e4d4d75e17374341d81b8d8b424971ffd67ba191848be28560cefceecc51f1f608ccdc7d896bafafa68e1726cb9 WHIRLPOOL 0da43210ee7779e49b86bb337bef5f3b70fdf3876eca763025d45628533a7ce7104b193c0c9d98d2f4363314faa79c7bd367432c5272c9b12249623f9b342812
 DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
+DIST openafs-patches-20160223.tar.xz 10536 SHA256 19c14ecd625ce96370fe3629faffd2841567954d687e1ee30c81a848702231a6 SHA512 83018a4ace8189182de7b878094c773996d824f9127f15167e1b5795e4b7af8f3cb3a86e054b95043343ff88c8b505376005cd97cc91b50e6bf05b2d5242ccbd WHIRLPOOL 8f58b30446fccf37df9460ff3ab87cbd2338346c545aca48bc328578951b92b3e34fe102ade2bcb822ddee5c826d9834d0c2ce257092aa9bdde4717afbbd756d
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild
new file mode 100644
index 000000000000..316d7c91e4d2
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools linux-mod multilib toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_PN="${PN/-kernel}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="20160223"
+
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
+ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is ge 4 3 ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: <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 "Please do not file a bug report about this."
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	local myconf=""
+	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
+	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+		myconf="--enable-linux-d_splice_alias-extra-iput"
+	fi
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	if use kernel_linux; then
+		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+			--with-linux-kernel-build="${KV_OUT_DIR}"
+		)
+	elif use kernel_FreeBSD; then
+		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
+	fi
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
+}
+
+src_install() {
+	if use kernel_linux; then
+		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+		linux-mod_src_install
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${S}"/src/libafs/MODLOAD/libafs.ko
+	fi
+}
+
+pkg_postinst() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postrm
+}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index e1a8d0dc28c0..4f15a9971f8a 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,5 +2,8 @@ DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e
 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
 DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
+DIST openafs-1.6.16-doc.tar.bz2 3533244 SHA256 4916a5e155a4419186dd166e5eff4f30881399e81a255f7d3f43942a0b5bbcba SHA512 0a193fd24a11bb06621378e7c54feca8dc835b191f0c921c6fa6deb3d43be140ab4854f01128d29c76a075a705e88178128c94e9483162f4ba8c5e7ce4a06606 WHIRLPOOL 0be7495c40ef614d8198606afa297828fbb3fbdb063598dbb6d58e95375e9b1a49c4d6ab793f3581520bd27c655da158d3efb1602dfbaa8bca0bfadc5c94ab35
+DIST openafs-1.6.16-src.tar.bz2 14612920 SHA256 3431702bdcbd1b27833060c50869e618a192495877ebb0a66e4610de0b48eb81 SHA512 775c6b51e4a916ab14c2a33b746ffc67ce7f8e4d4d75e17374341d81b8d8b424971ffd67ba191848be28560cefceecc51f1f608ccdc7d896bafafa68e1726cb9 WHIRLPOOL 0da43210ee7779e49b86bb337bef5f3b70fdf3876eca763025d45628533a7ce7104b193c0c9d98d2f4363314faa79c7bd367432c5272c9b12249623f9b342812
 DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
+DIST openafs-patches-20160223.tar.xz 10536 SHA256 19c14ecd625ce96370fe3629faffd2841567954d687e1ee30c81a848702231a6 SHA512 83018a4ace8189182de7b878094c773996d824f9127f15167e1b5795e4b7af8f3cb3a86e054b95043343ff88c8b505376005cd97cc91b50e6bf05b2d5242ccbd WHIRLPOOL 8f58b30446fccf37df9460ff3ab87cbd2338346c545aca48bc328578951b92b3e34fe102ade2bcb822ddee5c826d9834d0c2ce257092aa9bdde4717afbbd756d
diff --git a/net-fs/openafs/openafs-1.6.16.ebuild b/net-fs/openafs/openafs-1.6.16.ebuild
new file mode 100644
index 000000000000..429eecbc9e43
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.16.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="20160223"
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
+
+IUSE="doc kerberos +modules pam"
+
+CDEPEND="
+	sys-libs/ncurses:0=
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+RDEPEND="${CDEPEND}
+	modules? ( ~net-fs/openafs-kernel-${PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+src_prepare() {
+	default
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		--enable-supergroups \
+		$(use_enable pam) \
+		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+		$(use_with kerberos krb5)
+}
+
+src_compile() {
+	emake all_nolibafs
+	local d
+	if use doc; then
+		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+			emake -C "${d}" html;
+		done
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use pam && doman src/pam/pam_afs.5
+	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
+			src/afsd/CellServDB NEWS README )
+
+	# documentation package
+	if use doc ; then
+		DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
+		dohtml -r doc/xml/
+	fi
+
+	einstalldocs
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+
+	# used directories: client
+	keepdir /etc/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a97ff2f99fa9..ac8e1407a421 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,11 +1,10 @@
 DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
 DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
 DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
-DIST samba-4.2.7.tar.gz 20741971 SHA256 f586ab3166ce4c663360f15b1de24ef083816a5471856e3ad49bc26b35f0104a SHA512 74314083c04689696f0423bc990947bfafad679edcac97e6c137e99c17de1e262a4d8450b57de733a70c86c746300c7c5a1365b56c0e353ce79b05e0baf8eb9a WHIRLPOOL 84e7d2f3a60701ee929198caf86371c9e1694be6def47a4f0f12d4d221b995209505c23564c304fbdd95ab5ae528f941946bd361ec6e388f7ba4db08792ff3ba
 DIST samba-4.2.8.tar.gz 20745527 SHA256 d2c0ca97ab415ede829d15ddad411d76e4f7b6a82e280bf7fbc9910c30fa4593 SHA512 cdee04ebc2303c1cadf2c0a45530909b6c97838e611378498faaaa6fcade8850746253d51ae71fd872c741f54ec2d3a9d452651291355e20001ca443fae9054a WHIRLPOOL 84b3f78b41da98eaa463f9b1c467e3c82268d31ac3d3e48d75b0a4dc04f479d12f2387c045281b0caa3a841c351587d0eabec403163ff479d8c700f0b638e5f4
-DIST samba-4.3.4.tar.gz 20434434 SHA256 5d0eb52e842832af922f7d57716eacff23192906ec3bdf6727e18ca24f1419d9 SHA512 021351534a70cd351934d7f8bfc3c4e9ed9ea3f11f778f6f9d076b3368103f7f478ff1745cb257de0bf2ee38ae76ecba58e01a4db6cbcacbd8a4876e8e1b30f2 WHIRLPOOL 328721951ed932c5813d6157ca2933e22adb793d5cd6667577e40151bcdae8dcddf5ca4e053cd6494e0f82f5801ae480716520c625dd9c337557abc168e00dec
-DIST samba-4.4.0rc2.tar.gz 20569387 SHA256 931c6241f239621244fc170f9a5b188c024fe578279c28494dc40e696e5572e3 SHA512 5258eb588f0e553e4d8742440ea9da1e91a4bbdc33fafd2c070e58a1b473bcf2d4a1c4db787856535b3404b08002a639f1de4c182f662284d0c441617ca74977 WHIRLPOOL d0ab40694bee7330fd06f9fd8f461b890ccac36e3366247d020cf9ae284ccd80dc5f1c98e029a5cd38bca65cd092cb4094c6d2c9644212d2e212f2a015c3b720
+DIST samba-4.3.5.tar.gz 20443260 SHA256 583f927a823b272757fd4df0be267bd20a223b06cfc3c662df17e4870f14bf1c SHA512 0d04eb8d5bbe2e47f3ba810631662083f7d2b5118f47242e27d87c304a6c0f57808e636333c798b5b70c4adbf8c2ea4f89b377c637bfcdfd8a285fdc1f3afc50 WHIRLPOOL 5be389cf08bc83a4ae66da6b2ee78e596cd52df2a693999d311a5a02c194ba7381132a1ec34cefc0926ef24474efaa6677c46d0ed71c8a79efbaff6d094a6ee3
+DIST samba-4.4.0rc3.tar.gz 20568791 SHA256 62003df716d8f45fb153ebfce6256e889a2b2239d8486fcb039848fb028e3454 SHA512 c624bd3e2ab2251bd1dd85ca014683c8f628c92e750a82f9707e34a7479773c3a28ccb3fa27c0ce5236ef79a2ad39a0d534398d3935d8b0b7c7b8cf0bff09388 WHIRLPOOL 60b2f2a0ff8bc4cc2219a9c3e8f151830d236f9bbe8628cdd27504f100c984ccbf59ab1802fbe028604cfd43b4f9cca203c2048ca4738a612ca19dc840917368
 DIST samba-disable-python-patches-4.2.7.tar.xz 6296 SHA256 06a1b9aeb91b622d3c2a02a86edfc26e26f10303699c8b2badbd21ce68b10ec0 SHA512 ff746c2969b254d9ccad1440699fccd5958222eea8284a8e068b96df377d6cea8551ec3c6be7103cebf227b0b9038a5b06d3b06d9b247e181403e9fe1ad7eedf WHIRLPOOL 8ea9f34c5f011624b43c0f3f27601574c27e00c5a728d9af5b1cece090da362d51f93ef6cecd37f1204bbd4e608ed58027f52ef5c3d700a1cfdbbb0e5355c3b8
-DIST samba-disable-python-patches-4.3.3.tar.xz 6016 SHA256 00debe6c5cc57b87150ded67db8dc54e5ec487f6ed610c96e8fa393743c47f66 SHA512 775abcee86690605e156f4c560f25d762f5cc2e72177a55003ad5124ed643322f2c84514342ed0eadad2c8e1ea97006bc6ce7d504ca8a29c27a201666ce4bdf6 WHIRLPOOL 86c40669e706f6c3b955e6fb892931532e241dd92cae2e7b5986e78f6b5fe50c42c019b97650942de81c8c4989568bcb93e49a7bcb2f9fd300d189da5fa08fe4
-DIST samba-disable-python-patches-4.4.0.tar.xz 6188 SHA256 35f7aa4b01716d9dd3ed55db3dc2427f00e65cf3e6643b02118de07ecd97aca4 SHA512 d5b6a9e303368982f8d22027e6b497923f7e861d60cfdd286183d67fcbd5ff8055879c846d491fa13af46b36a9f795dd7a363f1b6bef93d7d92370fc92455126 WHIRLPOOL 55af9b0e307d2143a78a613c79465c6584dc81a59ebb9c07b8a0672e98dd2d9484ddb236318baefdcd553afb9e88a16ee61173a1587538799b30038eb7cc5e58
+DIST samba-disable-python-patches-4.3.5.tar.xz 6028 SHA256 6889d77331e74e24becd638b860d6b3a0f8f92f34d0e3af733d44cef24042915 SHA512 1d3171eacff5d009c4e30405ed96c6b57c2ff4fb0d82f0196bb6d63ad331adf11f8b9e81f8a42cdc5d6ebe32c60c20bff0d07013ce7a431e0e35e9d620240e9a WHIRLPOOL f8c97a57f54da0ac956112131bbf790269460abe904b1e0e2d75449696e0451e80b3d2cd43d05fe14b32ab8c2a21a71d41f67ef9c615bf9c0ba5b07354b78b2e
+DIST samba-disable-python-patches-4.4.0_rc3.tar.xz 6180 SHA256 bfdde228c1cc41cccb489658208402425038ac2834b4cd870bb89dc10510c8e5 SHA512 de88335e0cbcc6f0e47a170bf91efe63f943973e2ae3f5f7b2025426565b09bce28cf2e56d0105424f9f5ffee0b1fb2e9866b8a4c22b7696c7c18e298af2d0cd WHIRLPOOL c8d83d95c87e9bec3efbdecd00a76858da1538b8df05009198d24ed87b8c93f85f3165b0c1d7054dad61ddb46ff701ba03a688327eee7f97ecea1c97e846caa6
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/files/samba-4.2.7-pam.patch b/net-fs/samba/files/samba-4.2.7-pam.patch
index 0777baeb58b6..22b393e78677 100644
--- a/net-fs/samba/files/samba-4.2.7-pam.patch
+++ b/net-fs/samba/files/samba-4.2.7-pam.patch
@@ -1,5 +1,5 @@
---- /tmp/samba-4.2.7/source3/wscript	2015-07-14 12:54:24.000000000 +0200
-+++ source3/wscript	2016-01-05 22:48:50.669250837 +0100
+--- samba-4.2.7/source3/wscript
++++ samba-4.2.7/source3/wscript
 @@ -853,11 +853,11 @@
          if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
              conf.env.with_iconv = False
diff --git a/net-fs/samba/files/samba-4.4.0-pam.patch b/net-fs/samba/files/samba-4.4.0-pam.patch
index e5f360b73929..451601383d4b 100644
--- a/net-fs/samba/files/samba-4.4.0-pam.patch
+++ b/net-fs/samba/files/samba-4.4.0-pam.patch
@@ -1,5 +1,5 @@
---- a/samba-4.4.0rc2/source3/wscript	2016-01-26 15:25:54.000000000 -0500
-+++ b/samba-4.4.0rc2/source3/wscript	2016-02-09 14:37:46.385279942 -0500
+--- samba-4.4.0rc2/source3/wscript
++++ samba-4.4.0rc2/source3/wscript
 @@ -870,7 +870,7 @@
          if conf.env.with_iconv:
              conf.DEFINE('HAVE_ICONV', 1)
diff --git a/net-fs/samba/samba-4.2.7-r2.ebuild b/net-fs/samba/samba-4.2.7-r2.ebuild
deleted file mode 100644
index 8ea672219c7c..000000000000
--- a/net-fs/samba/samba-4.2.7-r2.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal 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
-	https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-${PV}.tar.xz"
-KEYWORDS="~amd64 ~hppa ~x86"
-[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
-
-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"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	sys-libs/readline:=
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.24[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/nss_wrapper-1.0.2[${MULTILIB_USEDEP}]
-	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.25[${MULTILIB_USEDEP}]
-	>=sys-libs/uid_wrapper-1.0.1[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	aio? ( dev-libs/libaio )
-	cluster? ( !dev-db/ctdb )
-	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[${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	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 !system-mitkrb5 )
-	ads? ( acl gnutls ldap )
-	${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
-	"${FILESDIR}/${PN}-4.2.7-pam.patch"
-)
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-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 cluster ; then
-		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
-	fi
-}
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-
-	# install the patches from tarball(s)
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	# Allow user patches
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_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
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(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)
-			$(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' '')
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--without-aio-support
-			--disable-avahi
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--disable-iprint
-			$(use_with ldap)
-			--without-pam
-			--without-pam_smbpass
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# 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
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-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.4-r1.ebuild b/net-fs/samba/samba-4.3.4-r1.ebuild
deleted file mode 100644
index cf4f9af611d3..000000000000
--- a/net-fs/samba/samba-4.3.4-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal 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
-	https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-4.3.3.tar.xz"
-KEYWORDS="~amd64 ~hppa ~x86"
-[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
-
-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"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	sys-libs/readline:=
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.24[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/nss_wrapper-1.0.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.3[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.7[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.25[${MULTILIB_USEDEP}]
-	>=sys-libs/uid_wrapper-1.1.0[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	aio? ( dev-libs/libaio )
-	cluster? ( !dev-db/ctdb )
-	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[${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	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 !system-mitkrb5 )
-	ads? ( acl gnutls ldap )
-	${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
-	"${FILESDIR}/${PN}-4.2.7-pam.patch"
-)
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-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 cluster ; then
-		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
-	fi
-}
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-
-	# install the patches from tarball(s)
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	# Allow user patches
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_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
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(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)
-			$(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' '')
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--without-aio-support
-			--disable-avahi
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--disable-iprint
-			$(use_with ldap)
-			--without-pam
-			--without-pam_smbpass
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# 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
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-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.5.ebuild b/net-fs/samba/samba-4.3.5.ebuild
new file mode 100644
index 000000000000..c695178480ed
--- /dev/null
+++ b/net-fs/samba/samba-4.3.5.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal 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
+	https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.3.5.tar.xz"
+KEYWORDS="~amd64 ~hppa ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
+
+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"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.24[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/nss_wrapper-1.0.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.3[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.7[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.25[${MULTILIB_USEDEP}]
+	>=sys-libs/uid_wrapper-1.1.0[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( !dev-db/ctdb )
+	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[${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	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 !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
+	"${FILESDIR}/${PN}-4.2.7-pam.patch"
+)
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+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 cluster ; then
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the patches from tarball(s)
+	eapply "${WORKDIR}/patches/"
+
+	multilib_copy_sources
+}
+
+multilib_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
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(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)
+			$(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' '')
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--without-aio-support
+			--disable-avahi
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--disable-iprint
+			$(use_with ldap)
+			--without-pam
+			--without-pam_smbpass
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# 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
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+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.4.0_rc2.ebuild b/net-fs/samba/samba-4.4.0_rc2.ebuild
deleted file mode 100644
index fa243f9ee1fd..000000000000
--- a/net-fs/samba/samba-4.4.0_rc2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal 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
-	https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-4.4.0.tar.xz"
-KEYWORDS="~amd64 ~hppa ~x86"
-[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads avahi client cluster cups dmapi fam gnutls iprint
-ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	sys-libs/readline:=
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.25[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/nss_wrapper-1.0.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.3[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.7[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.25[${MULTILIB_USEDEP}]
-	>=sys-libs/uid_wrapper-1.1.0[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	cluster? ( !dev-db/ctdb )
-	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[${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	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 !system-mitkrb5 )
-	ads? ( acl gnutls ldap )
-	${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
-	fi
-}
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-
-	# install the patches from tarball(s)
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	# Allow user patches
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_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
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(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_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)
-			$(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' '')
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--disable-avahi
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--disable-iprint
-			$(use_with ldap)
-			--without-pam
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# 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
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-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.4.0_rc3.ebuild b/net-fs/samba/samba-4.4.0_rc3.ebuild
new file mode 100644
index 000000000000..f038b6aa2220
--- /dev/null
+++ b/net-fs/samba/samba-4.4.0_rc3.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal 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
+	https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.4.0_rc3.tar.xz"
+KEYWORDS="~amd64 ~hppa ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.25[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/nss_wrapper-1.0.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.3[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.7[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.25[${MULTILIB_USEDEP}]
+	>=sys-libs/uid_wrapper-1.1.0[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	cluster? ( !dev-db/ctdb )
+	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[${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	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 !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the patches from tarball(s)
+	eapply "${WORKDIR}/patches/"
+
+	multilib_copy_sources
+}
+
+multilib_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
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(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_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)
+			$(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' '')
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--disable-avahi
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--disable-iprint
+			$(use_with ldap)
+			--without-pam
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# 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
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+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/lftp/lftp-4.6.5.ebuild b/net-ftp/lftp/lftp-4.6.5.ebuild
index 914a38819c29..50e4194b2f27 100644
--- a/net-ftp/lftp/lftp-4.6.5.ebuild
+++ b/net-ftp/lftp/lftp-4.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest
index f190c4bfdddb..08e888af0146 100644
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -1,2 +1 @@
-DIST yafc-1.2.6.tar.xz 367408 SHA256 96bd46c4dbfbff5d83cb0cec0809b2d1d73c66aff6b30fdd44a291267325b617 SHA512 155339f04eb17e63383e35573497e4838a09ac6f6608c07e8639b0e163c755c40a426f0ade941efd8ba774c6b577358dac6fd18c56bbea7d1fec57b00cb05d35 WHIRLPOOL 673ebaba7e816f3901b696004dddfa0727344aec3f6a4edd86f8dd69058d1dcbe607334a942974e7b8180519292961ce44dc5b656024eb6aa73120f9cec41947
 DIST yafc-1.3.7.tar.xz 363692 SHA256 4b3ebf62423f21bdaa2449b66d15e8d0bb04215472cb63a31d473c3c3912c1e0 SHA512 2547cf3d6f1918a5cd2d3bc29455311d48fcd7dbccfdc8ae4ce08d1fd63cfabae07b70ebf005206a61937bd5b686e19d3af095f876616a5ac4b0593e90cd39c5 WHIRLPOOL e9f0f39de54131b8fb237cda99463ff9cc8badb4cd902fced1cb3024c9379f5db1972d5ed3df58787b5f81f8d5c01a5683af06aba16bd5319574a29677465873
diff --git a/net-ftp/yafc/yafc-1.2.6.ebuild b/net-ftp/yafc/yafc-1.2.6.ebuild
deleted file mode 100644
index 3d89d53cab6c..000000000000
--- a/net-ftp/yafc/yafc-1.2.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Console ftp client with a lot of nifty features"
-HOMEPAGE="http://www.yafc-ftp.com/"
-SRC_URI="http://www.yafc-ftp.com/upload/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="ipv6 readline kerberos socks5 ssh"
-
-DEPEND="dev-libs/openssl:0
-	readline? ( >=sys-libs/readline-6 )
-	kerberos? ( virtual/krb5 )
-	socks5? ( net-proxy/dante )
-	ssh? ( net-libs/libssh )"
-RDEPEND="${DEPEND}"
-
-DOCS=( BUGS NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	export ac_cv_ipv6=$(usex ipv6)
-	econf \
-		$(use_with readline readline /usr) \
-		$(use_with socks5 socks /usr) \
-		$(use_with socks5 socks5 /usr) \
-		$(use_with kerberos krb5) \
-		$(use_with ssh) \
-		--with-bash-completion="$(get_bashcompdir)" \
-		--without-krb4
-}
-
-src_install() {
-	default
-	dodoc -r samples
-}
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index b3e9e0895883..d0c30fc0b3a9 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,32 @@
+DIST cache_tab-1.0.1.zip 16719 SHA256 149eff4dfb01f633cab643f368e5f96825c26c85ae9e6c22de3f5792e5d3dc28 SHA512 ada72a578359909201d62ad775ca85969aed5cab9be31d38bd505f726434d08bb311f06654f3f26a3b639b9ae2742dd1950ba527489aef84f2ac0dfdb7fba0c8 WHIRLPOOL d026a7452274cb8cfd536da4c5dbabaf0414ddaa5fe835aa80d825d1afae9f952a71e61eaa825d89ee65f6a1d4db9714c3710e7ed36c8fac1be73730e732f362
+DIST eiconv-0.9.0.zip 101407 SHA256 fdaa09bcc79b556f2250c4693bc57c89ce474a5ea6ea12429cbb6c2d4ed3619b SHA512 44d0af378b9873dede92657c53557a565050cd4259598a1fe92e1c9bddc8219922ff093bfc20e380f3e39fc0d5648d6d6f72766a5847781cf2101dbd4b922fb6 WHIRLPOOL 97d97f527aaf4d0fb0176723bde464ab003b49b12acca1f657efe83f8c03186e6b4819f4aadedebb8e703e16cc4af23d317b6ebebe96a9a794e6aa78c8e6fc80
 DIST ejabberd-15.03.tar.xz 6274856 SHA256 3a6fd6e94d6f24575dcaff1aa7ca319944eb76970a9d3b6bf5f30819824143fc SHA512 b292b596094aeab576d9d4aadea47042eeda130881de5dd523985dc60cd0644726dae8d525364ec72992c0c45ba9e0673b7a6ffc2bc20613ba0092e2b285e16f WHIRLPOOL 630feba542f5d4bac1e4c17f453b2298a500c0d18159e8f09a4f11e9d372f7ffbf6e2e600c0ee849c689868872644404c03ebfb375d4852f3bbbd966417d951e
+DIST ejabberd-16.01.tgz 1651587 SHA256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 SHA512 f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a WHIRLPOOL 65bc13ba5e380a999ed2ae9c816856f90e24393343d16ae52349350687dfdb15857a3358d856de5694c30718cefc5513b9d3c75871bb368cac54547becc1607a
 DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
 DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702
+DIST elixir-f2a9c7016633ca63541a8160c63a53eb7edbccdb.zip 1335681 SHA256 4ef8cd93e68a314bb4702547629f9be7a6bb840f6b7956aead6f51700e73c41a SHA512 a6e5170f8d3efc1d31aa82477f4ff377ea7205d106bbf633075df5bef0b22a276cc6897c2a8b7fcbbff269c9fe8378f4802876e0e2aecb90012c0c2165c2b8e8 WHIRLPOOL 716e45804df24b7a4a55e0ad81f72c9961e4066dd3e24b1e3cd1ba041c6c1dc8426d0feaf97580eaf9b369d0fee33cb9e3c26b71eaf6c91d318590e9e6b5ab0c
+DIST epam-1.0.0.zip 47889 SHA256 6704010b14034881d8c60f52d1a82d8125f20cdf1e52a7113c838f1db6be7e81 SHA512 710919ff2883a5e1a99703f3b72ad8a0d61c612b2af66b57b88a6bd9faddc64c61b8b44998feb37d3d3338d24d4c1d8d6a73d6836e254b8f8452249b41427c78 WHIRLPOOL 48a9fedc2fa52a7d5dc1cdcf11a48096798cd87d37987b709ffd0c6cf49881f9afec7fd85b3f8d84020e41920e129534d5f8d6adce92916370ab3a413d4919c9
+DIST eredis-cbc013f516e464706493c01662e5e9dd82d1db01.zip 133223 SHA256 707c54c568b6d07a4a1ac82a528cabef73469136cc14b4f69457e28de9827227 SHA512 fbaa323da0d668fc7147bc406dd4f00bd132d592d4fd3d61c2bee59f4b1c9390784a4c03737d6efd3b004855a92911878bfb11a966dc1853a785c9b10714f34f WHIRLPOOL d6713eef9328f70d6f003c4a27b560715d7a4c433d522dde3a99731e7b868353082b2ba62060fcefc6241977713627b57353ba47919553fe6eb47a554d3b7264
+DIST erlang-sqlite3-cbc3505f7a131254265d3ef56191b2581b8cc172.zip 1843206 SHA256 10db9c7f1a8b8fe16e5e5695a3085584c63dc6d074e56d5e8595e2cc82d0679d SHA512 37f0530e83d69efa02ad1bbc98a4da760d93a8fe764086832bc838a0905843e635d342917c6c6784d1cb3f87f8af8a27189d87a25096bfccf36a561bd66e9696 WHIRLPOOL f25270e56bfd0a168c4a20ce0eb016ec3ee8313d5a78de221134e34ccc7cfa6c4a59d78374c9ae08daf1cdc8f76f26028a796b4b8065664b1a47df7450d0883e
+DIST erlang_protobuffs-6e7fc924506e2dc166a6170e580ce1d95ebbd5bd.zip 255081 SHA256 a8d329ca06631951e8dd723ee07a28d84056efdfcf107ffc4390773de2c2652d SHA512 58d01ef598ca4b1894353a57cc561889b4b80f032df3bee1a0661edcb1f02775177a3655e85526ac855af128700a528987ad64854e3a4e6bf885778d0c76cc85 WHIRLPOOL 5f221d1bfe61f23290bbd5067a1c60a15e302cfb484df592bd92a27788803e7b66ca560a0ef575c592ab33a684f8fa0a5eeed31d6a2281fa388fd6d1eebc3871
+DIST goldrush-212299233c7e7eb63a97be2777e1c05ebaa58dbe.zip 36124 SHA256 529fd62c47a995e6efa4e96a015402177bc54d6f6c68e035799025679223f359 SHA512 af9999a8e687e3f06b2cbbdac2cc2933e4a136698661da350e16b1ecac34bbccdae9175d5a4e1ce2a4e237d0d8e846fcfb00d3a7143a5ac0c230a73dfef6c660 WHIRLPOOL 5cff5953b8c4096d8ec402f3be6ee94e839e50d3c087468d48c63ce914a50f35c80f93f2920564cdd74faeaa5047eb8a7176045c834347ffcc2566333540f4b8
+DIST hamcrest-erlang-908a24fda4a46776a5135db60ca071e3d783f9f6.zip 174732 SHA256 74c28779da72861132cc4c641dcafd1185e0579280b092fd2eeee6089e02cfcf SHA512 0110f69640cdd762a0d939fcda9d3a3da5942335f31b580dd7712c2c50ba53ec97b43f6d5f059db075597d7978e3b089f83dce1d86eb586cad80832ef8612406 WHIRLPOOL 1fff0a6d979309c657a139d37b26e8ccf3e3f0b779c55d1db0bd5e27a557733a9d95e4f63714a495e5926176aa37410df2eb68adf268b9e27fde7eb7fa8c5475
+DIST jiffy-0.14.5.zip 1899711 SHA256 80e7bc14aab3e9dbfb6b930eb99807843bce9902c37cba145f601e1d47e3633b SHA512 f8a021111501db2646b1b806a9260f2eda40d7aa4d58454fb445e75dbaeb9efcda74403b0c2a1d00a7d102ee9133abb813980692842fd4c899c42a2588f07e5f WHIRLPOOL 7f55d12e016058ad0c126a6721f8e05215518c49e088d4c6ca861073174c0de1f9ef599fc1278584ce4f120581072525ed9b6b312a882c7260a77137fe9be0e6
+DIST lager-3.0.2.zip 254249 SHA256 ccb4811774b847fa31b35dbd85edde0560406b1a0dc9c3f2dc71d69ccf687e61 SHA512 69143704067a5a757713d9fb127bac0ef799bb4d6a06e47d9426f1893a0156ad31289b42f55b8ff5a5b15ec8b3b82548485989eae75ef84641e5b4728a89811e WHIRLPOOL d91d106c8fea377e9a30df4d55c74f9b4768c0f3f265f19a69c50465b6479fcd836b9a4b203b2feeb69d00da83ce83b63b7e1e8649a4c29e63c3f779a7301799
+DIST meck-0.8.2.zip 222637 SHA256 c6ba50da30d30e904067f9ea661028dbea3b33c4c5f7631c1fb893ac264f91ec SHA512 58b98b665f56c1b0416e47e7f7e7b94cfbcaca2dc26571802ebb6cdb6fb79ab6207e27a0ee981efa25ed034b602f0abcac33ee4ac23ffef19ba2c02aa845d4e3 WHIRLPOOL d104084426cda735758a8ad4e46819a926431826bb1f32dfbaede39ce5acda920992ea744f852b39cf608bb69c350e7b42b143c7d248adb09f7b45fd0c5dbf39
+DIST mysql-1.0.0.zip 21330 SHA256 3d240192062ee8e78be218b7f365ff5ade5beeef16bd8315077338f4cb2c20b9 SHA512 554573b8d570bb001998196e44d71ae7fc0c87f35badaa3dc2a39695fb847d49ef95e140bf0668843e5593a78e35cc8ababb8cd9f181718c4434bc965f7eea0e WHIRLPOOL 7f3b6ac53e504cd311251fce1eeb3854f333c073b13b65e333139d4071cfac2df3cd9afb943f57a0f5de6468bc7d06e8da63134643ae09c7106fcdc7b7073b40
+DIST oauth2-8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8.zip 225059 SHA256 8e043e96eabd4ced74f7f5b6c4ff6606c3027bc9ca9d807f6a348f4e0e4c66b3 SHA512 c9257054f579badfa78653b9deaabdd4fa71f84b742bdfb2dab1fb0fffa52d40b6236f01523c67ecc61068d9dbfd4a2ab2c19b9b90fa926dc359f76cfa18085b WHIRLPOOL 2e35022969739844a9b08cbd3149c204cd6798d6f8f009134a3c0d2cc14e46d6c3ef06f9d87a8f65a2cbb6915087be643a7040498ee4c1698d1a14978381ecb4
+DIST p1_logger-1.0.0.zip 21168 SHA256 416026a99ee3ae739d1cb7cccfe0546635e441b16433cd8e5ff0a76e8f72a9c0 SHA512 11dafee5ba7d726a5f526583533d8ce1a5cf247c16b1ed4c2617a8cc46fcb3dc9358c70e6924c4b7b5b6911d99fa8a57adfc8b3b40ade6cc798f0f5c2b040810 WHIRLPOOL c4cb246c0d9121f2d9097b5cf63372f14a32f3b147202763a605e519f80fa60e1331a1ad5a03ca32445df2555aeaaa5f6fd79d44b2cf4ebdce0ebc514a9b1713
+DIST p1_sip-1.0.0.zip 268267 SHA256 d21b4468f32483817ddd81aef1896e112939118c6c93768a241ab37a10649171 SHA512 987051968696a04969e00e5a43e5787cfdd52c453829b822b2ed065fa31e265ddef4e367ec5bb0d1ed260e3b46a5085efbc845195c29b6d8c14e2a85a31204b3 WHIRLPOOL e5254cbb8fb57324da3fab5708f390d6ef52e29f47da72707b4f6f27d87c55d7963dd6669c96dfe58be44578b0cec38f95efc3dcff3dc60d44c405a601a4c0bb
+DIST p1_utils-1.0.2.zip 41661 SHA256 9fd24f82aecbe6681a4cff9d3e515847afc77d1562ace5b704f2b566de0ffc8d SHA512 836db43bec11405bc229c4b6e7aff4d17869d32b9d51b523447b3fe53523d527db9aeb5b69d3c1fc010ebed1f597814d1b403331aadae5bfca97845082aa3d0b WHIRLPOOL cf0e8b1b5a8b4b70ebb3a6041bab1c90ac953c678cd7e6c9cf0519c2c9a5e416ad0fbb3be53d79170073f71603f7607261ce6e35c50890297a0ae9cd26fcdc38
+DIST p1_yaml-1.0.0.zip 196536 SHA256 02d60f14b5510469bdff8a9ce091035cde6b87ee44e896ec11c18c3479f09ebe SHA512 105cc9c29db5bf6635c24b1be44a06e4c982b8d03de56655a6a7ed7c24343d47652279243f3fc28417dde023cc570c519d5f2bbf9ba57f343459a61225e7476e WHIRLPOOL 8893fd98a00170fc8f1f7f51212f48027fefa068d61b75ef15d4785d6735d81e35c74bf98f30e7f6f693dcb6b4016a399ac692d8249fef0d2c2006712f35fccf
+DIST pgsql-1.0.0.zip 19384 SHA256 470bfee28dc0ce4d93fb7bf4d59e782e49dc03a040db5471d9f1e09c37f8a0c2 SHA512 9b637a337a14cd0175c3f64d34056e28957d8c38b2f151b0f4be489667ebc7231b7295523f7bf6328a0cd565a2b00b1ec81b8e885e33b2a79c3298fce908b517 WHIRLPOOL 281c13ac3151b70b56a07f172451c7af746e2a26c349126fc720a0588b35f86f66c1649b9122449468614d3158654991b3c257ce0a06a53194a893ddbdc1033c
+DIST rebar_elixir_plugin-0.1.0.zip 6553 SHA256 b9760890b74827805a35899c9c2e237c1b3e0f651446871b5095bb49e98bd09d SHA512 e4733c76fdb1f09222cbbbf61dbf274c39b3ec9ca286502782cbf6f967afcb6047e0d0f5464f4821f8ae8df7e7f156c21014c719147da029dbff29197047b7bf WHIRLPOOL cf003c2f232f70d5879561c8de13b6b5d8c238085b17d6dfcb7a71ea3728d687b8f4c5f1f114ec0d2934c0b52fe3de472aae7efb6ec42f5ef446f932c7decbbb
+DIST riak-erlang-client-527722d12d0433b837cdb92a60900c2cb5df8942.zip 242131 SHA256 ef3539206f774b1680a36c4ae50dc764b9b87a60efa2225d0b69c7064b24140e SHA512 e228be58754867a2f2084683c326ebc973b4e520d3ef33171b49833c33be8dda7749c09f8368a7cc92b67b866185efada1062a172515cf69340a75d50e97f35d WHIRLPOOL 651b3e3eedbcae36c21bdfe551623945be709a2890da28b352ba74f5a96c6d23eefe756fe9f6652c7dbfbb3e40330dd3fdf319eafa7372fe26e6bfc3590ab4a6
+DIST riak_pb-1a43334c03cfe81712c71c6f166b68fe9270f008.zip 235172 SHA256 485295f8123c163d43767ead3c66e58c4bc7e4f13a2dd55be6de263b51c42a4a SHA512 5c56bfbccd6c6bfa82f1772cbbf7228ed46ee23078c7eda2d2251ec0c97dae46786df8f17aa65fe672f89f425e86cfe07a37bf50a3a8f0c0747a9604c43d1d1a WHIRLPOOL d28aff0cc311dd9345a705b8e8d4066b26e8b25d6896c98e96098b5649bafced51b2b6437f282017a61c653efc54777d794834318da468ec2e10bb02c1d9a187
+DIST stringprep-1.0.0.zip 101552 SHA256 e2a71b59084f9556133a9c99ba4a6621f4853abfb902fa1301224d2fd6791aef SHA512 7b724c8eb888e3683b421220c823553ba695fb4d94225fcc968f2f8f1386a5090a0e2fd85113ebb7d67c50f687011ad461802cb89a52b4a26c02b03c9e72f123 WHIRLPOOL 46a1ceb7db35d7c231c12e47c0ea9599c9809bc763b90aa241b6b0dfca71d0d04f0b933c99c002805dc9f70f776585ed2e7b62ba47bf0cf61f05ae086d5dc97a
+DIST stun-0.9.0.zip 38634 SHA256 c99f2965f8832488abc8ad753afd538f6f492dd5bea1889cb4a787ed4bc2b7c6 SHA512 d4210ad5563aae291a6239256090c1dab4e98b62ece7474f25107a4bf6ba2e65d1c9858b26967a9546f81b64386979e4c020142a089be04d1b12f2f09353a38e WHIRLPOOL 564a14fbbf09ad6f9709d0b57004628105c63f35d9533c84bbb831c93eb392b914fa9cab419569a433d63f48ddd72d3f2b612d3260b22bcc1f08f02feaffca68
+DIST tls-1.0.0.zip 66622 SHA256 1434a7f580839f427b455b4f49ac504d26d97e9836f3bbdf59a130611a37c0f4 SHA512 84533d13e3aa631359e962597d3ea63d899a4bc4c776f05fcc78e46e3de9319ecbc653363c809f0a98c0a27e685f332cde64587b86bc9bb5a968058352beab06 WHIRLPOOL 89862f08f68e6bf478c1e25b168ae57c7fb7d253e953a3609f768f8aee8d42fb83ef09d317f05d4e6b7984a2da7a35ca735dfa4b5a3940ac10f4818caa238f04
+DIST xml-1.1.1.zip 94306 SHA256 2a9013ca2756dcd4c8b3387fcfa21ecc36b3e8cf50dd27afc8b80776f4c0892d SHA512 ccfd6929498b2f9ed17c4b7a1d0be13172b9a8304b00c3cbdfb49cc7df054c76cdf06844fa29fef7d17d45e5e2717c8fea22cd1eac61cf8293545310fe9098e7 WHIRLPOOL 1fb22cb2845c699a5fc8a8291d1ec804fa22e2c169b65f00ade151484a4c4d0d38a4cb9f1e90f3adad8eefb38c425823579d0b3ff90987b343b246607c19bae8
+DIST xmlrpc-1.15.zip 139769 SHA256 841488a5405f4a32182cae863c7305464daba7ed150dca55ec5b04f198df503a SHA512 a96fa31422e95b75afcdecd844fe020bb1be9144fc31d957a238658498d8ae4b8ed069d27e06ed105230b42a4fd4c37d95b4a09c96dbffd60e6a49faae94eead WHIRLPOOL cba32ff8c0024de1fff30620bbb0d93c1a49beb74ec1f58eeffc4de683ce1ad3743e2e30217834b285016a9cc4a7de596dfc8f6597a22fb5eb74478d12e2c7e0
+DIST zlib-1.0.0.zip 48754 SHA256 82f934a5ea146195a3046e56b38ef7bbdb3f04dbc6c5c05bec4245384f010a15 SHA512 f4598dd2e4dd5b27b9599d3aecdba690368d684a81309838655bf8dfc338573cf227f49aa0976940b7fd9ea97f7e881fdf88fea128fdc7bc99f2d78ffe42264a WHIRLPOOL def5ec392f3ba133a3b7462cc10edee41585c2f1d8580ccfbd4bb74f2fb327aa1d7a10b4a3fbe3b21c56aeab224861ea91e632758fd2e36f7f89ed0d8f2790be
diff --git a/net-im/ejabberd/ejabberd-16.01-r1.ebuild b/net-im/ejabberd/ejabberd-16.01-r1.ebuild
new file mode 100644
index 000000000000..3415ae6da4b1
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-16.01-r1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+declare -A PLUGINS{_REPO_NAME,_COMMIT,_URL,_PV}
+declare -A mods
+
+# regenerate url list
+#for i in *; do pushd $i > /dev/null; name="$i"; rev=`git show-ref -s HEAD`; url=`git config remote.origin.url`; repo_base=`dirname "$url"`; repo_name=`basename "$url"`; echo "PLUGINS_REPO_NAME[$name]=$repo_name"; echo "PLUGINS_COMMIT[$name]=$rev"; echo "PLUGINS_PV[$name]=\"\${PLUGINS_REPO_NAME[$name]}-\${PLUGINS_COMMIT[$name]}\""; echo "PLUGINS_URL[$name]=\"$repo_base/\${PLUGINS_REPO_NAME[$name]}/archive/\${PLUGINS_COMMIT[$name]}.zip\""; echo; popd > /dev/null; done
+
+PLUGINS_REPO_NAME[cache_tab]=cache_tab
+PLUGINS_COMMIT[cache_tab]=1.0.1
+PLUGINS_PV[cache_tab]="${PLUGINS_REPO_NAME[cache_tab]}-${PLUGINS_COMMIT[cache_tab]}"
+PLUGINS_URL[cache_tab]="https://github.com/processone/${PLUGINS_REPO_NAME[cache_tab]}/archive/${PLUGINS_COMMIT[cache_tab]}.zip"
+
+PLUGINS_REPO_NAME[elixir]=elixir
+PLUGINS_COMMIT[elixir]=f2a9c7016633ca63541a8160c63a53eb7edbccdb
+PLUGINS_PV[elixir]="${PLUGINS_REPO_NAME[elixir]}-${PLUGINS_COMMIT[elixir]}"
+PLUGINS_URL[elixir]="https://github.com/elixir-lang/${PLUGINS_REPO_NAME[elixir]}/archive/${PLUGINS_COMMIT[elixir]}.zip"
+
+PLUGINS_REPO_NAME[eredis]=eredis
+PLUGINS_COMMIT[eredis]=cbc013f516e464706493c01662e5e9dd82d1db01
+PLUGINS_PV[eredis]="${PLUGINS_REPO_NAME[eredis]}-${PLUGINS_COMMIT[eredis]}"
+PLUGINS_URL[eredis]="https://github.com/wooga/${PLUGINS_REPO_NAME[eredis]}/archive/${PLUGINS_COMMIT[eredis]}.zip"
+
+PLUGINS_REPO_NAME[esip]=p1_sip
+PLUGINS_COMMIT[esip]=1.0.0
+PLUGINS_PV[esip]="${PLUGINS_REPO_NAME[esip]}-${PLUGINS_COMMIT[esip]}"
+PLUGINS_URL[esip]="https://github.com/processone/${PLUGINS_REPO_NAME[esip]}/archive/${PLUGINS_COMMIT[esip]}.zip"
+
+PLUGINS_REPO_NAME[goldrush]=goldrush
+PLUGINS_COMMIT[goldrush]=212299233c7e7eb63a97be2777e1c05ebaa58dbe
+PLUGINS_PV[goldrush]="${PLUGINS_REPO_NAME[goldrush]}-${PLUGINS_COMMIT[goldrush]}"
+PLUGINS_URL[goldrush]="https://github.com/DeadZen/${PLUGINS_REPO_NAME[goldrush]}/archive/${PLUGINS_COMMIT[goldrush]}.zip"
+
+PLUGINS_REPO_NAME[hamcrest]=hamcrest-erlang
+PLUGINS_COMMIT[hamcrest]=908a24fda4a46776a5135db60ca071e3d783f9f6
+PLUGINS_PV[hamcrest]="${PLUGINS_REPO_NAME[hamcrest]}-${PLUGINS_COMMIT[hamcrest]}"
+PLUGINS_URL[hamcrest]="https://github.com/hyperthunk/${PLUGINS_REPO_NAME[hamcrest]}/archive/${PLUGINS_COMMIT[hamcrest]}.zip"
+
+PLUGINS_REPO_NAME[jiffy]=jiffy
+PLUGINS_COMMIT[jiffy]=0.14.5
+PLUGINS_PV[jiffy]="${PLUGINS_REPO_NAME[jiffy]}-${PLUGINS_COMMIT[jiffy]}"
+PLUGINS_URL[jiffy]="https://github.com/davisp/${PLUGINS_REPO_NAME[jiffy]}/archive/${PLUGINS_COMMIT[jiffy]}.zip"
+
+PLUGINS_REPO_NAME[lager]=lager
+PLUGINS_COMMIT[lager]=3.0.2
+PLUGINS_PV[lager]="${PLUGINS_REPO_NAME[lager]}-${PLUGINS_COMMIT[lager]}"
+PLUGINS_URL[lager]="https://github.com/basho/${PLUGINS_REPO_NAME[lager]}/archive/${PLUGINS_COMMIT[lager]}.zip"
+
+PLUGINS_REPO_NAME[meck]=meck
+PLUGINS_COMMIT[meck]=0.8.2
+PLUGINS_PV[meck]="${PLUGINS_REPO_NAME[meck]}-${PLUGINS_COMMIT[meck]}"
+PLUGINS_URL[meck]="https://github.com/eproxus/${PLUGINS_REPO_NAME[meck]}/archive/${PLUGINS_COMMIT[meck]}.zip"
+
+PLUGINS_REPO_NAME[oauth2]=oauth2
+PLUGINS_COMMIT[oauth2]=8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8
+PLUGINS_PV[oauth2]="${PLUGINS_REPO_NAME[oauth2]}-${PLUGINS_COMMIT[oauth2]}"
+PLUGINS_URL[oauth2]="https://github.com/kivra/${PLUGINS_REPO_NAME[oauth2]}/archive/${PLUGINS_COMMIT[oauth2]}.zip"
+
+PLUGINS_REPO_NAME[p1_iconv]=eiconv
+PLUGINS_COMMIT[p1_iconv]=0.9.0
+PLUGINS_PV[p1_iconv]="${PLUGINS_REPO_NAME[p1_iconv]}-${PLUGINS_COMMIT[p1_iconv]}"
+PLUGINS_URL[p1_iconv]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_iconv]}/archive/${PLUGINS_COMMIT[p1_iconv]}.zip"
+
+PLUGINS_REPO_NAME[p1_logger]=p1_logger
+PLUGINS_COMMIT[p1_logger]=1.0.0
+PLUGINS_PV[p1_logger]="${PLUGINS_REPO_NAME[p1_logger]}-${PLUGINS_COMMIT[p1_logger]}"
+PLUGINS_URL[p1_logger]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_logger]}/archive/${PLUGINS_COMMIT[p1_logger]}.zip"
+
+PLUGINS_REPO_NAME[p1_mysql]=mysql
+PLUGINS_COMMIT[p1_mysql]=1.0.0
+PLUGINS_PV[p1_mysql]="${PLUGINS_REPO_NAME[p1_mysql]}-${PLUGINS_COMMIT[p1_mysql]}"
+PLUGINS_URL[p1_mysql]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_mysql]}/archive/${PLUGINS_COMMIT[p1_mysql]}.zip"
+
+PLUGINS_REPO_NAME[p1_pam]=epam
+PLUGINS_COMMIT[p1_pam]=1.0.0
+PLUGINS_PV[p1_pam]="${PLUGINS_REPO_NAME[p1_pam]}-${PLUGINS_COMMIT[p1_pam]}"
+PLUGINS_URL[p1_pam]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_pam]}/archive/${PLUGINS_COMMIT[p1_pam]}.zip"
+
+PLUGINS_REPO_NAME[p1_pgsql]=pgsql
+PLUGINS_COMMIT[p1_pgsql]=1.0.0
+PLUGINS_PV[p1_pgsql]="${PLUGINS_REPO_NAME[p1_pgsql]}-${PLUGINS_COMMIT[p1_pgsql]}"
+PLUGINS_URL[p1_pgsql]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_pgsql]}/archive/${PLUGINS_COMMIT[p1_pgsql]}.zip"
+
+PLUGINS_REPO_NAME[p1_stringprep]=stringprep
+PLUGINS_COMMIT[p1_stringprep]=1.0.0
+PLUGINS_PV[p1_stringprep]="${PLUGINS_REPO_NAME[p1_stringprep]}-${PLUGINS_COMMIT[p1_stringprep]}"
+PLUGINS_URL[p1_stringprep]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_stringprep]}/archive/${PLUGINS_COMMIT[p1_stringprep]}.zip"
+
+PLUGINS_REPO_NAME[p1_stun]=stun
+PLUGINS_COMMIT[p1_stun]=0.9.0
+PLUGINS_PV[p1_stun]="${PLUGINS_REPO_NAME[p1_stun]}-${PLUGINS_COMMIT[p1_stun]}"
+PLUGINS_URL[p1_stun]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_stun]}/archive/${PLUGINS_COMMIT[p1_stun]}.zip"
+
+PLUGINS_REPO_NAME[p1_tls]=tls
+PLUGINS_COMMIT[p1_tls]=1.0.0
+PLUGINS_PV[p1_tls]="${PLUGINS_REPO_NAME[p1_tls]}-${PLUGINS_COMMIT[p1_tls]}"
+PLUGINS_URL[p1_tls]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_tls]}/archive/${PLUGINS_COMMIT[p1_tls]}.zip"
+
+PLUGINS_REPO_NAME[p1_utils]=p1_utils
+PLUGINS_COMMIT[p1_utils]=1.0.2
+PLUGINS_PV[p1_utils]="${PLUGINS_REPO_NAME[p1_utils]}-${PLUGINS_COMMIT[p1_utils]}"
+PLUGINS_URL[p1_utils]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_utils]}/archive/${PLUGINS_COMMIT[p1_utils]}.zip"
+
+PLUGINS_REPO_NAME[p1_xml]=xml
+PLUGINS_COMMIT[p1_xml]=1.1.1
+PLUGINS_PV[p1_xml]="${PLUGINS_REPO_NAME[p1_xml]}-${PLUGINS_COMMIT[p1_xml]}"
+PLUGINS_URL[p1_xml]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_xml]}/archive/${PLUGINS_COMMIT[p1_xml]}.zip"
+
+PLUGINS_REPO_NAME[p1_yaml]=p1_yaml
+PLUGINS_COMMIT[p1_yaml]=1.0.0
+PLUGINS_PV[p1_yaml]="${PLUGINS_REPO_NAME[p1_yaml]}-${PLUGINS_COMMIT[p1_yaml]}"
+PLUGINS_URL[p1_yaml]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_yaml]}/archive/${PLUGINS_COMMIT[p1_yaml]}.zip"
+
+PLUGINS_REPO_NAME[p1_zlib]=zlib
+PLUGINS_COMMIT[p1_zlib]=1.0.0
+PLUGINS_PV[p1_zlib]="${PLUGINS_REPO_NAME[p1_zlib]}-${PLUGINS_COMMIT[p1_zlib]}"
+PLUGINS_URL[p1_zlib]="https://github.com/processone/${PLUGINS_REPO_NAME[p1_zlib]}/archive/${PLUGINS_COMMIT[p1_zlib]}.zip"
+
+PLUGINS_REPO_NAME[protobuffs]=erlang_protobuffs
+PLUGINS_COMMIT[protobuffs]=6e7fc924506e2dc166a6170e580ce1d95ebbd5bd
+PLUGINS_PV[protobuffs]="${PLUGINS_REPO_NAME[protobuffs]}-${PLUGINS_COMMIT[protobuffs]}"
+PLUGINS_URL[protobuffs]="https://github.com/basho/${PLUGINS_REPO_NAME[protobuffs]}/archive/${PLUGINS_COMMIT[protobuffs]}.zip"
+
+PLUGINS_REPO_NAME[rebar_elixir_plugin]=rebar_elixir_plugin
+PLUGINS_COMMIT[rebar_elixir_plugin]=0.1.0
+PLUGINS_PV[rebar_elixir_plugin]="${PLUGINS_REPO_NAME[rebar_elixir_plugin]}-${PLUGINS_COMMIT[rebar_elixir_plugin]}"
+PLUGINS_URL[rebar_elixir_plugin]="https://github.com/processone/${PLUGINS_REPO_NAME[rebar_elixir_plugin]}/archive/${PLUGINS_COMMIT[rebar_elixir_plugin]}.zip"
+
+PLUGINS_REPO_NAME[riakc]=riak-erlang-client
+PLUGINS_COMMIT[riakc]=527722d12d0433b837cdb92a60900c2cb5df8942
+PLUGINS_PV[riakc]="${PLUGINS_REPO_NAME[riakc]}-${PLUGINS_COMMIT[riakc]}"
+PLUGINS_URL[riakc]="https://github.com/basho/${PLUGINS_REPO_NAME[riakc]}/archive/${PLUGINS_COMMIT[riakc]}.zip"
+
+PLUGINS_REPO_NAME[riak_pb]=riak_pb
+PLUGINS_COMMIT[riak_pb]=1a43334c03cfe81712c71c6f166b68fe9270f008
+PLUGINS_PV[riak_pb]="${PLUGINS_REPO_NAME[riak_pb]}-${PLUGINS_COMMIT[riak_pb]}"
+PLUGINS_URL[riak_pb]="https://github.com/basho/${PLUGINS_REPO_NAME[riak_pb]}/archive/${PLUGINS_COMMIT[riak_pb]}.zip"
+
+PLUGINS_REPO_NAME[sqlite3]=erlang-sqlite3
+PLUGINS_COMMIT[sqlite3]=cbc3505f7a131254265d3ef56191b2581b8cc172
+PLUGINS_PV[sqlite3]="${PLUGINS_REPO_NAME[sqlite3]}-${PLUGINS_COMMIT[sqlite3]}"
+PLUGINS_URL[sqlite3]="https://github.com/alexeyr/${PLUGINS_REPO_NAME[sqlite3]}/archive/${PLUGINS_COMMIT[sqlite3]}.zip"
+
+PLUGINS_REPO_NAME[xmlrpc]=xmlrpc
+PLUGINS_COMMIT[xmlrpc]=1.15
+PLUGINS_PV[xmlrpc]="${PLUGINS_REPO_NAME[xmlrpc]}-${PLUGINS_COMMIT[xmlrpc]}"
+PLUGINS_URL[xmlrpc]="https://github.com/rds13/${PLUGINS_REPO_NAME[xmlrpc]}/archive/${PLUGINS_COMMIT[xmlrpc]}.zip"
+
+inherit eutils multilib pam ssl-cert systemd
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+	mysql?	( "${PLUGINS_URL[p1_mysql]}" -> "${PLUGINS_PV[p1_mysql]}.zip" )
+	postgres? ( "${PLUGINS_URL[p1_pgsql]}" -> "${PLUGINS_PV[p1_pgsql]}.zip" )
+	sqlite?	( "${PLUGINS_URL[sqlite3]}" -> "${PLUGINS_PV[sqlite3]}.zip" )
+	pam?	( "${PLUGINS_URL[p1_pam]}" -> "${PLUGINS_PV[p1_pam]}.zip" )
+	zlib?	( "${PLUGINS_URL[p1_zlib]}" -> "${PLUGINS_PV[p1_zlib]}.zip" )
+	riak?	( "${PLUGINS_URL[riakc]}" -> "${PLUGINS_PV[riakc]}.zip"
+		  "${PLUGINS_URL[riak_pb]}" -> "${PLUGINS_PV[riak_pb]}.zip"
+		  "${PLUGINS_URL[hamcrest]}" -> "${PLUGINS_PV[hamcrest]}.zip"
+		  "${PLUGINS_URL[protobuffs]}" -> "${PLUGINS_PV[protobuffs]}.zip" )
+	elixir?	( "${PLUGINS_URL[rebar_elixir_plugin]}" -> "${PLUGINS_PV[rebar_elixir_plugin]}.zip"
+		  "${PLUGINS_URL[elixir]}" -> "${PLUGINS_PV[elixir]}.zip" )
+	iconv?	( "${PLUGINS_URL[p1_iconv]}" -> "${PLUGINS_PV[p1_iconv]}.zip" )
+	lager?	( "${PLUGINS_URL[lager]}" -> "${PLUGINS_PV[lager]}.zip"
+		  "${PLUGINS_URL[goldrush]}" -> "${PLUGINS_PV[goldrush]}.zip" )
+	!lager?	( "${PLUGINS_URL[p1_logger]}" -> "${PLUGINS_PV[p1_logger]}.zip" )
+	tools?	( "${PLUGINS_URL[meck]}" -> "${PLUGINS_PV[meck]}.zip" )
+	redis?	( "${PLUGINS_URL[eredis]}" -> "${PLUGINS_PV[eredis]}.zip" )
+"
+
+mods[core]="p1_tls p1_stringprep p1_xml esip p1_stun p1_yaml p1_utils cache_tab jiffy oauth2 xmlrpc"
+
+for plugin in ${mods[core]} ; do
+	SRC_URI+=" ${PLUGINS_URL[$plugin]} -> ${PLUGINS_PV[$plugin]}.zip" ; done
+
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+EJABBERD_MODULES="mod_bosh mod_irc mod_muc mod_proxy65 mod_pubsub"
+IUSE="captcha debug elixir +iconv +lager ldap mssql mysql odbc pam postgres redis riak sqlite ssl tools +zlib ${EJABBERD_MODULES}"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-libs/libyaml-0.1.4
+	>=dev-lang/erlang-17.1[ssl]
+	odbc? ( dev-db/unixODBC[-minimal] )
+	ldap? ( =net-nds/openldap-2* )
+	dev-libs/openssl:0
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	zlib? ( >=sys-libs/zlib-1.2.3 )"
+RDEPEND="${DEPEND}
+	>=sys-apps/shadow-4.1.4.2-r3
+	elixir? ( !dev-lang/elixir )
+	pam? ( virtual/pam )"
+
+REQUIRED_USE="mssql? ( odbc )"
+
+# paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+#JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ejabberdctl.patch
+
+	#emulate rebar unpack
+	mkdir "${S}/deps"
+	for plugin in ${!PLUGINS_COMMIT[@]}; do
+	    mv "$WORKDIR/${PLUGINS_PV[$plugin]}" "$S/deps/${plugin}" 2>/dev/null
+	done
+	touch "${S}"/deps/.got
+
+	#patch rebar dependency checks
+	sed -e "s/vsn, git/vsn, \"0.14.4\"/" \
+		-i deps/jiffy/src/jiffy.app.src || die
+
+	if use riak; then
+	sed -e "s/vsn, git/vsn, \"2.1.1\"/" \
+		-i deps/riakc/src/riakc.app.src || die
+	sed -e "s/vsn, git/vsn, \"2.1.0.7\"/" \
+		-i deps/riak_pb/src/riak_pb.app.src || die
+	sed -e "s/vsn, git/vsn, \"0.8.2\"/" \
+		-i deps/protobuffs/src/protobuffs.app.src || die
+	fi
+
+#	if use elixir; then
+#	sed -e "s/vsn, git/vsn, \"0.1.0\"/" \
+#		-i deps/rebar_elixir_plugin/src/rebar_elixir_plugin.app.src || die
+#	fi
+
+	# don't install release notes (we'll do this manually)
+	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
+	# Set correct paths from jabber-base package
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
+		-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+			-i Makefile.in || die
+	sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
+		-e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+			-i ejabberdctl.template || die
+
+	# fix up the ssl cert paths in ejabberd.yml to use our cert and
+	# also use the correct pam service name
+	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+		-e "s:pamservicename:xmpp:" \
+		-i ejabberd.yml.example || die
+
+	# correct path to captcha script in default ejabberd.yml
+	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1/usr/'$(get_libdir)'/erlang/lib/'${PN}'/'${P}'/priv/bin/captcha.sh"}|' \
+		-i ejabberd.yml.example || die
+
+	# disable mod_irc in ejabberd.yml
+	if ! use mod_irc; then
+		sed -e "s/{mod_irc,/%{mod_irc,/" \
+			-i ejabberd.yml.example || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/${PN}/" \
+		$(use_enable tools) \
+		$(use_enable odbc) \
+		$(use_enable mysql) \
+		$(use_enable mssql) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable zlib) \
+		$(use_enable sqlite) \
+		$(use_enable riak) \
+		$(use_enable redis) \
+		$(use_enable iconv) \
+		$(use_enable elixir) \
+		$(use_enable debug) \
+		$(use_enable lager) \
+		--enable-user=jabber
+}
+
+src_compile() {
+	emake $(use debug && echo debug=true ejabberd_debug=true)
+}
+
+src_install() {
+	default
+
+	# Pam helper module permissions
+	# http://docs.ejabberd.im/admin/guide/configuration/#pam-authentication
+	if use pam; then
+		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
+		local epamdir="p1_pam-${PLUGINS_COMMIT[p1_pam]}"
+		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PN}/${epamdir}/priv/bin/epam"
+		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PN}/${epamdir}/priv/bin/epam"
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "For configuration instructions, please see"
+		elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+		elog "http://docs.ejabberd.im/admin/guide/"
+	else
+		elog "Ejabberd now defaults to using a YAML format for its config file."
+		elog "The old ejabberd.cfg file can be converted using the following instructions:"
+		echo
+		elog "1. Make sure all processes related to the previous version of ejabberd aren't running."
+		elog "   Usually this just means the ejabberd daemon and possibly the pam-related processes"
+		elog "   (epmd and epam) if pam support is enabled."
+		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can fail to"
+		elog "   start ejabberd properly for various reasons. Check ejabberd's main log file"
+		elog "   at /var/log/jabber/ejabberd.log to confirm it started successfully."
+		elog "3. Run \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config file."
+		echo
+	fi
+
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
+	install_cert /etc/ssl/ejabberd/server
+	# Fix ssl cert permissions bug #369809
+	chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
+	chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
+}
diff --git a/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild b/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild
deleted file mode 100644
index 258df615503f..000000000000
--- a/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib pam ssl-cert systemd
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-	mod_statsdx? ( https://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
-IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-12.2.5[ssl]
-	<dev-lang/erlang-16
-	odbc? ( dev-db/unixODBC )
-	ldap? ( =net-nds/openldap-2* )
-	>=dev-libs/openssl-0.9.8e
-	captcha? ( media-gfx/imagemagick[truetype,png] )
-	zlib? ( sys-libs/zlib )"
-#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
-RDEPEND="${DEPEND}
-	>=sys-apps/shadow-4.1.4.2-r3
-	pam? ( virtual/pam )"
-
-S=${WORKDIR}/${P}/src
-
-# paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-#JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
-
-src_prepare() {
-	if use mod_statsdx; then
-		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
-		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/${PN}-mod_statsdx-1118.patch
-	fi
-
-	# don't install release notes (we'll do this manually)
-	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
-	# Set correct paths
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
-		-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-			-i Makefile.in || die
-	sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
-		-e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
-			-i ejabberdctl.template || die
-
-	# Set shell, so it'll work even in case jabber user have no shell
-	# This is gentoo specific I guess since other distributions may have
-	# ejabberd user with reall shell, while we share this user among different
-	# jabberd implementations.
-	sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
-	sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
-
-	#sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
-
-	# fix up the ssl cert paths in ejabberd.cfg to use our cert
-	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
-		-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# correct path to captcha script in default ejabberd.cfg
-	sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
-			-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# disable mod_irc in ejabberd.cfg
-	if ! use mod_irc; then
-		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
-			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
-	fi
-
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
-		$(use_enable mod_irc) \
-		$(use_enable ldap eldap) \
-		$(use_enable mod_muc) \
-		$(use_enable mod_proxy65) \
-		$(use_enable mod_pubsub) \
-		$(use_enable web) \
-		$(use_enable odbc) \
-		$(use_enable zlib ejabberd_zlib) \
-		$(use_enable pam) \
-		--enable-user=jabber
-}
-
-src_compile() {
-	emake $(use debug && echo debug=true ejabberd_debug=true)
-}
-
-src_install() {
-	default
-
-	# Pam helper module permissions
-	# http://www.process-one.net/docs/ejabberd/guide_en.html
-	if use pam; then
-		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
-		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
-		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
-	fi
-
-	cd "${WORKDIR}"/${P}/doc
-	dodoc release_notes_${PV%%_rc*}.txt
-
-	newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "For configuration instructions, please see"
-		elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
-		elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
-
-		if ! use web ; then
-			ewarn
-			ewarn "The web USE flag is off, this has disabled the web admin interface."
-			ewarn
-		fi
-
-		elog
-		elog '===================================================================='
-		elog 'Quick Start Guide:'
-		elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
-		elog '   {hosts, ["localhost", "thehost"]}.'
-		elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
-		elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
-		elog '3) Start the server'
-		elog '   # /etc/init.d/ejabberd start (for openRC)'
-		elog '	 # systemctl start ejabberd (for Systemd)'
-		elog '4) Register the admin user'
-		elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
-		elog '5) Log in with your favourite jabber client or using the web admin'
-	fi
-
-	# Upgrading from ejabberd-2.0.x:
-	if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
-		source "${EROOT}/etc/conf.d/ejabberd"
-		ewarn
-		ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
-		ewarn "Starting with 2.1.x some paths and configuration files were"
-		ewarn "changed to reflect upstream intentions better. Notable changes are:"
-		ewarn
-		ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
-		ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
-		ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
-		ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
-		ewarn
-		ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
-		ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
-		ewarn
-		ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
-		ewarn
-		ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
-		ewarn
-		ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
-
-		local i ctlcfg new_ctlcfg
-		i=0
-		ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
-		while :; do
-			new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
-			[[ ! -e ${new_ctlcfg} ]] && break
-			ctlcfg=${new_ctlcfg}
-			((i++))
-		done
-
-		ewarn
-		ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
-		sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
-
-		if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
-			ewarn "Moving .erlang.cookie..."
-			if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
-				mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
-			fi
-			mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
-		fi
-		ewarn
-		ewarn "We'll try to handle upgrade automagically but, please, do your"
-		ewarn "own checks and do not forget to run 'etc-update'!"
-		ewarn "PLEASE! Run 'etc-update' now!"
-	fi
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
-	install_cert /etc/ssl/ejabberd/server
-	# Fix ssl cert permissions bug #369809
-	chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
-	chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
-	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
-		ewarn
-		ewarn "The location of SSL certificates has changed. If you are"
-		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
-		ewarn "want to move your old certificates from /etc/jabber into"
-		ewarn "/etc/ssl/ejabberd/, update config files and"
-		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
-		ewarn
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
new file mode 100644
index 000000000000..3ca0b2f5a883
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib pam ssl-cert systemd
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+	mod_statsdx? ( https://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
+EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
+IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-lang/erlang-12.2.5[ssl]
+	<dev-lang/erlang-16
+	odbc? ( dev-db/unixODBC )
+	ldap? ( =net-nds/openldap-2* )
+	>=dev-libs/openssl-0.9.8e
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	zlib? ( sys-libs/zlib )"
+#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
+RDEPEND="${DEPEND}
+	>=sys-apps/shadow-4.1.4.2-r3
+	pam? ( virtual/pam )"
+
+S=${WORKDIR}/${P}/src
+
+# paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+#JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
+
+src_prepare() {
+	if use mod_statsdx; then
+		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
+		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
+		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/${PN}-mod_statsdx-1118.patch
+	fi
+
+	# don't install release notes (we'll do this manually)
+	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
+	# Set correct paths
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
+		-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+			-i Makefile.in || die
+	sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
+		-e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
+			-i ejabberdctl.template || die
+
+	# Set shell, so it'll work even in case jabber user have no shell
+	# This is gentoo specific I guess since other distributions may have
+	# ejabberd user with reall shell, while we share this user among different
+	# jabberd implementations.
+	sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
+	sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
+
+	#sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
+
+	# fix up the ssl cert paths in ejabberd.cfg to use our cert
+	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+		-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
+
+	# correct path to captcha script in default ejabberd.cfg
+	sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
+			-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
+
+	# disable mod_irc in ejabberd.cfg
+	if ! use mod_irc; then
+		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
+			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
+	fi
+
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
+		$(use_enable mod_irc) \
+		$(use_enable ldap eldap) \
+		$(use_enable mod_muc) \
+		$(use_enable mod_proxy65) \
+		$(use_enable mod_pubsub) \
+		$(use_enable web) \
+		$(use_enable odbc) \
+		$(use_enable zlib ejabberd_zlib) \
+		$(use_enable pam) \
+		--enable-user=jabber
+}
+
+src_compile() {
+	emake $(use debug && echo debug=true ejabberd_debug=true)
+}
+
+src_install() {
+	default
+
+	# Pam helper module permissions
+	# http://www.process-one.net/docs/ejabberd/guide_en.html
+	if use pam; then
+		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
+		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+	fi
+
+	cd "${WORKDIR}"/${P}/doc
+	dodoc release_notes_${PV%%_rc*}.txt
+
+	newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "For configuration instructions, please see"
+		elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+		elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
+
+		if ! use web ; then
+			ewarn
+			ewarn "The web USE flag is off, this has disabled the web admin interface."
+			ewarn
+		fi
+
+		elog
+		elog '===================================================================='
+		elog 'Quick Start Guide:'
+		elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
+		elog '   {hosts, ["localhost", "thehost"]}.'
+		elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
+		elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
+		elog '3) Start the server'
+		elog '   # /etc/init.d/ejabberd start (for openRC)'
+		elog '	 # systemctl start ejabberd (for Systemd)'
+		elog '4) Register the admin user'
+		elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
+		elog '5) Log in with your favourite jabber client or using the web admin'
+	fi
+
+	# Upgrading from ejabberd-2.0.x:
+	if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
+		source "${EROOT}/etc/conf.d/ejabberd"
+		ewarn
+		ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
+		ewarn "Starting with 2.1.x some paths and configuration files were"
+		ewarn "changed to reflect upstream intentions better. Notable changes are:"
+		ewarn
+		ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
+		ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
+		ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
+		ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
+		ewarn
+		ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
+		ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
+		ewarn
+		ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
+		ewarn
+		ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
+		ewarn
+		ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
+
+		local i ctlcfg new_ctlcfg
+		i=0
+		ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
+		while :; do
+			new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
+			[[ ! -e ${new_ctlcfg} ]] && break
+			ctlcfg=${new_ctlcfg}
+			((i++))
+		done
+
+		ewarn
+		ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
+		sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
+
+		if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
+			ewarn "Moving .erlang.cookie..."
+			if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
+				mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
+			fi
+			mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
+		fi
+		ewarn
+		ewarn "We'll try to handle upgrade automagically but, please, do your"
+		ewarn "own checks and do not forget to run 'etc-update'!"
+		ewarn "PLEASE! Run 'etc-update' now!"
+	fi
+
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
+	install_cert /etc/ssl/ejabberd/server
+	# Fix ssl cert permissions bug #369809
+	chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
+	chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
+	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
+		ewarn
+		ewarn "The location of SSL certificates has changed. If you are"
+		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
+		ewarn "want to move your old certificates from /etc/jabber into"
+		ewarn "/etc/ssl/ejabberd/, update config files and"
+		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
+		ewarn
+	fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch
new file mode 100644
index 000000000000..7a1c9e650fa5
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch
@@ -0,0 +1,49 @@
+Set SHELL since the generic jabber user used on Gentoo for jabber servers
+doesn't have a valid shell set by default and fix EXEC_CMD otherwise it fails
+with "This account is currently not available" again due to jabber not having
+a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when instead
+it defaults to /dev/null on Gentoo.
+
+--- ejabberdctl.template	2016-01-12 11:07:58.000000000 +0000
++++ ejabberdctl.template.new	2016-02-15 21:36:27.508297627 +0000
+@@ -16,6 +16,7 @@
+ EPMD={{bindir}}/epmd
+ INSTALLUSER={{installuser}}
+ ERL_LIBS={{libdir}}
++SHELL=/bin/sh
+ 
+ # check the proper system user is used if defined
+ if [ "$INSTALLUSER" != "" ] ; then
+@@ -23,11 +24,11 @@
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+-            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su $INSTALLUSER -p -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -100,6 +101,7 @@
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define mnesia options
+ MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
+@@ -159,6 +161,8 @@
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
++export SHELL
+ 
+ shell_escape()
+ {
diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd-3.initd
index 29a30da3610d..18150a782c16 100644
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ b/net-im/ejabberd/files/ejabberd-3.initd
@@ -5,7 +5,7 @@
 
 depend() {
 	use dns
-	need net
+	need epmd net
 	provide jabber-server
 }
 
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 8f5537ed6960..45ac1e31a8bd 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -17,11 +17,16 @@
 		<flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
 		<flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
 		<flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
-		<flag name="elixir">Enable Elixir language support (http://elixir-lang.org/)</flag>
+		<flag name="elixir">Enable Elixir language support (http://elixir-lang.org/). Use bundled plugin instead of dev-lang/elixir.</flag>
+		<flag name="lager">Use lager Erlang logging tool instead of standard error logger</flag>
 		<flag name="mod_bosh">Enable support for XMPP over BOSH (XEP-0206)</flag>
 		<flag name="mod_irc">Build irc gateway</flag>
 		<flag name="mod_muc">Build Multi User Chat module</flag>
 		<flag name="mod_pubsub">Build Pubsub module</flag>
+		<flag name="mssql">Build Microsoft SQL Server support</flag>
+		<flag name="mysql">Build Native MySQL support</flag>
+		<flag name="odbc">Build ODBC data storage support</flag>
+		<flag name="postgres">Build Native PostgreSQL support</flag>
 		<flag name="redis">Enable Redis support</flag>
 		<flag name="riak">Enable Riak support</flag>
 		<flag name="tools">Build development tools</flag>
diff --git a/net-irc/asuka/Manifest b/net-irc/asuka/Manifest
deleted file mode 100644
index 678ff3d26c7f..000000000000
--- a/net-irc/asuka/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asuka-1.2.1.tar.bz2 705316 SHA256 4714f0786a39e7a4a39e795919dc3386797d27439d3bdbc61d7ae11d00543fb3 SHA512 6509be1356a7e7ad5105cade0284d0b2a4cecc9047cb39d350cdf8f6830bb279ad36cba949544444a5cb773570324e63a738ad7eea7ea645c877ca0ecfe14b49 WHIRLPOOL 4e46e7f2d02228bd4267bf2538ce92832ab82410218fa5b8f159887db82b8bdbdb7bb03d740edc932b07daef0b4442b9598b5e23f5171ce80d47c3cefa05cec5
diff --git a/net-irc/asuka/asuka-1.2.1.ebuild b/net-irc/asuka/asuka-1.2.1.ebuild
deleted file mode 100644
index 4c9505dc2f95..000000000000
--- a/net-irc/asuka/asuka-1.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="The QuakeNet IRC Server"
-HOMEPAGE="http://dev-com.quakenet.org/"
-SRC_URI="http://dev-com.quakenet.org/releases/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="x86 sparc"
-
-IUSE="debug"
-
-src_compile() {
-	# configure fails with this flag, bug 171780
-	filter-flags -ggdb
-
-	econf \
-		--with-symlink=asuka-ircd \
-		--with-dpath=/etc/asuka \
-		--with-cpath=/etc/asuka/ircd.conf \
-		--with-lpath=/var/log/asuka/asuka.log \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	newbin ircd/ircd asuka-ircd || die "newbin failed"
-	newman doc/ircd.8 asuka-ircd.8 || die "newman failed"
-
-	insinto /etc/asuka
-	doins doc/ircd.conf.sample || die "doins failed"
-
-	newinitd ${FILESDIR}/asuka.init.d asuka || die "newinitd failed"
-	newconfd ${FILESDIR}/asuka.conf.d asuka || die "newconfd failed"
-
-	keepdir /var/log/asuka
-
-	dodoc \
-		INSTALL* LICENSE README* RELEASE.NOTES TODO* \
-		doc/readme.* doc/p10.html doc/features.txt doc/Authors \
-		|| die "dodoc failed"
-}
-
-pkg_postinst() {
-	enewuser asuka
-	chown asuka ${ROOT}/var/log/asuka
-
-	elog
-	elog "A sample config file can be found at /etc/asuka/ircd.conf.sample"
-	elog
-}
diff --git a/net-irc/asuka/files/asuka.conf.d b/net-irc/asuka/files/asuka.conf.d
deleted file mode 100644
index c68a8227318a..000000000000
--- a/net-irc/asuka/files/asuka.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Config file for /etc/init.d/asuka
-
-ASUKA_UID="asuka"
diff --git a/net-irc/asuka/files/asuka.init.d b/net-irc/asuka/files/asuka.init.d
deleted file mode 100644
index 510b8e97a1ad..000000000000
--- a/net-irc/asuka/files/asuka.init.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting asuka-ircd"
-	start-stop-daemon --start --quiet --chuid ${ASUKA_UID} --exec /usr/bin/asuka-ircd
-	eend $? "Failed to start asuka-ircd"
-}
-
-stop() {
-	ebegin "Stopping asuka-ircd"
-	start-stop-daemon --stop --quiet --exec /usr/bin/asuka-ircd
-	eend $? "Failed to stop asuka-ircd"
-}
diff --git a/net-irc/asuka/metadata.xml b/net-irc/asuka/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-irc/asuka/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-irc/polari/polari-3.18.1.ebuild b/net-irc/polari/polari-3.18.1.ebuild
index 8ba3d367660b..5e5219230e44 100644
--- a/net-irc/polari/polari-3.18.1.ebuild
+++ b/net-irc/polari/polari-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/ccrtp/ccrtp-2.0.9.ebuild b/net-libs/ccrtp/ccrtp-2.0.9.ebuild
index 230c8a4f1e11..66cd8276a29a 100644
--- a/net-libs/ccrtp/ccrtp-2.0.9.ebuild
+++ b/net-libs/ccrtp/ccrtp-2.0.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport prot
 HOMEPAGE="https://www.gnu.org/software/ccrtp/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2"
 IUSE="doc"
 SLOT="0/2"
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index 8a72535e77ee..e0b6a98c7fdc 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-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"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/glib-networking/glib-networking-2.46.1.ebuild b/net-libs/glib-networking/glib-networking-2.46.1.ebuild
index 6f1fc6db4329..241ca65d4530 100644
--- a/net-libs/glib-networking/glib-networking-2.46.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.46.1.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.46.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index f3e57e073e29..1ec1e393d176 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-online-accounts-3.16.4.1.tar.xz 1440252 SHA256 68c688730a4a0be0a29e77106a78681fd0ea2c4e1aabafe4df7e20a22dbdb120 SHA512 3c563f422afc30994f7d3ac1102a3ace3b0c4ae645e76d4e40566a8aa01324f47737d978352a18e51e268ab3d707fc707ce7d5f0c8c281ebe3c9f86042a4f6b9 WHIRLPOOL 4697f67b55a7b85641efeed101afd384e4b19d9c920b871bdfcf0e6058b27850a771ba1da354b33ceab302ec87d4b6ce46a243637e401abc4e85dbcf3e449feb
-DIST gnome-online-accounts-3.18.2.1.tar.xz 1474116 SHA256 ca0a9c58ea5ac08437ed68fea9e8c3de69a8804e670ccf5a578c6786096ecfac SHA512 7c3fa120450c0ebce4a424e18475aebf5b93b5dbb52b9cdad70677493975e7b5dae1d5f631e63a4a6a8aebc6da76c1ab4633ad26d51cb531119493ff612467d4 WHIRLPOOL d096e285ef24b0366fa691c383bc0e6c068e118f1f47533f83e46c602f40f3d344dfa3c7f38c3fce013d2b6c9829134734b58db49c45bba802b357f2778fc140
 DIST gnome-online-accounts-3.18.3.tar.xz 1475580 SHA256 bfb983831af8b1fbd81b70befda7683a38f86ca4cc911f763ae31207306e3827 SHA512 8305ee3cafdf81c7b534d76d2f8b92dfc6bd7acfc27cb02f74f901b4513d2742815a377e523b7d767b1a2e26a2899312ed86bd00e1aedc9c7ecff924f4d91bde WHIRLPOOL 62aafdc8ebb33cc6f0353a378330bb1bdbdd364503fdc86f2b79065a1ec5c5c7634dd8268a275b1f10e20fa3a3b8db1d45f159457e3bd7e5b41071e441c28246
+DIST gnome-online-accounts-3.18.4.tar.xz 1384756 SHA256 9f23460aa6b1d8a63a8f3e979cba791cc88b5e07116f07da59fdcea09d79c74d SHA512 1d78d8720d3547e782a9c9b1fee5ec794c8a0ec56d94f690adc1cce9d4f20da07b85a7c6e657b591153db667b3580d8900217e789144ac2e40eb963a7ac8d1a8 WHIRLPOOL 5459b9670c555a331c1c89583abd81836b8da2369355a97784fa370473341c49d5543d88870c49a8f47afd72a11feb27e3bfdb081b10fce8eb1a057eab279d02
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.2.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.2.1.ebuild
deleted file mode 100644
index 96e2dc18ce7c..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.2.1.ebuild
+++ /dev/null
@@ -1,83 +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 gnome2
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	net-libs/telepathy-glib
-	>=net-libs/webkit-gtk-2.7.2:4
-	>=x11-libs/gtk+-3.11.1:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	# telepathy optional support is really a badly done, bug #494456
-	gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-telepathy \
-		--enable-windows-live \
-		$(use_enable kerberos)
-		#$(use_enable telepathy)
-	# gudev & cheese from sub-configure is overriden
-	# by top level configure, and disabled so leave it like that
-}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
new file mode 100644
index 000000000000..8618e7745d99
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
@@ -0,0 +1,83 @@
+# 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 gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.35:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	net-libs/telepathy-glib
+	>=net-libs/webkit-gtk-2.7.2:4
+	>=x11-libs/gtk+-3.11.1:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=
+		app-crypt/mit-krb5 )
+"
+#	telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.3
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	# telepathy optional support is really a badly done, bug #494456
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-telepathy \
+		--enable-windows-live \
+		$(use_enable kerberos)
+		#$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index e6162f4dc04f..9b73bb0f8106 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,3 +1,3 @@
 DIST gssdp-0.14.11.tar.xz 291872 SHA256 7bf5aeaf2119fe0bec5f3632ecf39dae15bc85276c72c2ad8dd4b0e345c6535a SHA512 1954f048b073338a744cc3d8b31c3e006a52ab2223d1b4adbeed5c563fb4cd0bd51bb4dfa018b0fd200e175e4c12d11b9a1de43a5109c5c647dcc26398dd774b WHIRLPOOL 069647057f4feaffeff6dd5fadd4a51ba2a3fba742a6b2c022292bcdafdea72dc5db5405c6417db4e7962824105978c487ed2cffe30ca347282565bff18c4887
-DIST gssdp-0.14.12.1.tar.xz 297532 SHA256 b3d570455746284f3e65843c7f94d9595be54d68a9525629b625196bad2cac07 SHA512 c0d1445858f4303e353ff1287eb6e28e150e8162d095c3ffde18dee8426486b0f7bcd120e67076380f5a7f4b559b335e759d2aea4032ec2152a20c5a1ac268f5 WHIRLPOOL 7d1e670c26271a8e7509159668b7c1f0fd3156c182f5aab06bb4509b04c026c25a439f0d97733150764bc954ba8f635d6dd09c682209120d3375f7e3154a9db1
 DIST gssdp-0.14.13.tar.xz 297668 SHA256 43057f0e3c07a12ad698cfb70420da21fc6e6eefe3c83161ef69e8308979eaea SHA512 e9411d9afee28458d841b2455e08714260bd857384288603e8593adb3f48461b8b14e6f8b8b48f6b16715364e24119b32cd69a57f470fae3f7d6d74ba3784aca WHIRLPOOL e8ecdfec3b52386cfea719ea07d790420089a33d06b6f71ec29b0d6a75f7a1bda442c4ca39b690095424249a95c96d4e55beeb5881fa22a2b56f8fe10b2e50fc
+DIST gssdp-0.14.14.tar.xz 298488 SHA256 685718755b5b8d24aaeadda44047e515443784712891fc53879ab9a4865b48d6 SHA512 07edc257b93db80e47d427da140a62f5d4e8084d15be4c2e6d575748cd30cfb87aedd7a9259ea10aca783fb82a7f9db5f67a2d2e8da37d2c4eab0effb4569f36 WHIRLPOOL fe1fd9db6331c4a58da9196abb4113bc027614671c70b361af4496a31e9a50d139854a3050cb46331b7658ccb7db74053f76a4d9a8da8642596e3f6c5482ce11
diff --git a/net-libs/gssdp/gssdp-0.14.12.1.ebuild b/net-libs/gssdp/gssdp-0.14.12.1.ebuild
deleted file mode 100644
index a484bc59dcc9..000000000000
--- a/net-libs/gssdp/gssdp-0.14.12.1.ebuild
+++ /dev/null
@@ -1,59 +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 gnome2 multilib-minimal vala
-
-DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+introspection +gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	introspection? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.6.7:= )
-	!<net-libs/gupnp-vala-0.10.3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	# Disable functional test as it requires port that might be used by rygel to
-	# be free of use
-	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
-		-i "${S}"/tests/Makefile.in || die
-
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with gtk) \
-		--disable-static
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/gssdp/gssdp-0.14.14.ebuild b/net-libs/gssdp/gssdp-0.14.14.ebuild
new file mode 100644
index 000000000000..4259c9010702
--- /dev/null
+++ b/net-libs/gssdp/gssdp-0.14.14.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal vala
+
+DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+introspection +gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	introspection? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.36:= )
+	!<net-libs/gupnp-vala-0.10.3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# Disable functional test as it requires port that might be used by rygel to
+	# be free of use
+	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
+		-i "${S}"/tests/Makefile.in || die
+
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with gtk) \
+		--disable-static
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index f047682b21da..9de6a2f3efb3 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,2 +1,2 @@
-DIST gupnp-av-0.12.6.tar.xz 348264 SHA256 e0553d60dd7c7277c65c02a68a270c4dcb9036a4c7075c902fc8111c6a5e6a44 SHA512 0eee23c8b30eae445cb9732d030d89dd6538f2683ed57482ceebc611b8a0524b60760bc76a1b26a9d2d8845dfa836183c636a798c165102f0ecdcd3ba7d9121e WHIRLPOOL c401829e74395697a6ed1e5d9e183794f3875d718517ee3ccd50f83bd30e4f69190cc7396b87f48a3add8c2384164c3141d3cead6b1eeb695c185d0b41a29f2d
 DIST gupnp-av-0.12.7.tar.xz 349292 SHA256 35e775bc4f7801d65dcb710905a6b8420ce751a239b5651e6d830615dc906ea8 SHA512 21af09a74409c696124b7d92746ba72a46f804df65ca968034cbfe10f0c73b18446b7cceceb8e62e4d1689f699ef9a785c465cb8caf9294ec8e9bc38e86d16c2 WHIRLPOOL 4c102cb8ebab50e377159b12e0d633718fa60365f2099a8e7c0680367c41e3d7dbace96abb4790600ad2d5d1c67123883ad50e2dd978f9a0e3be16b08af56f60
+DIST gupnp-av-0.12.8.tar.xz 357248 SHA256 759bc7d46aff894c282d17f508d9b5be82de96aa74b10cb6b0fc6c5e07cc273c SHA512 d56b9316758c0e4f4fbe3c5f4ca25b60c6f5a4fbbdd6037695598f1643fa112b334a7eca72df531c37e3c994e018c3fc018694f29f5c4240cff3a3e63075bcb7 WHIRLPOOL 67e20c07126b28f53ce69c3ba9a71a8a17a9943b262c25ab65a3f9a6438a2e7c5a7435d5b72c7156e2f1f93f59ce0b86dde8604e52d80ee8482f643c57417a0e
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.6.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.6.ebuild
deleted file mode 100644
index fd60afe33890..000000000000
--- a/net-libs/gupnp-av/gupnp-av-0.12.6.ebuild
+++ /dev/null
@@ -1,44 +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_MIN_API_VERSION="0.22" #532568
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 vala
-
-DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	>=net-libs/gssdp-0.9.2[introspection?]
-	>=net-libs/libsoup-2.28.2:2.4[introspection?]
-	dev-libs/libxml2
-	>=net-libs/gupnp-0.19[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild
new file mode 100644
index 000000000000..3c8994d8c4e1
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.12.8.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"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/2" # subslot: soname version
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=net-libs/gssdp-0.9.2[introspection?]
+	>=net-libs/libsoup-2.28.2:2.4[introspection?]
+	dev-libs/libxml2
+	>=net-libs/gupnp-0.19[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	!net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	virtual/pkgconfig
+	introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 8e160a894cac..cdfee509021f 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,3 @@
-DIST gupnp-0.20.13.tar.xz 395356 SHA256 d779b094f13097a5900689b3587e5b495d79112d0855ed842577acba25c902b3 SHA512 dfc73a50f93dba84042652556a3fad870137fda3659fac4fe735c3d2cecf94d6908382d88cf85122840dd61017b9348f97edb6ded6d876d5e35058d70f9b8dc1 WHIRLPOOL 5d3cb3f9411324d73d33728e137c7b75c16386a5c57470c5213c3393582b6ebdd9889d6e5cc702128bb1c0f8514958b3bf70607cbd38dfe957b11bd03dda3009
 DIST gupnp-0.20.14.tar.xz 396764 SHA256 77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd SHA512 56d0ee6c2ef8a3c82c61793cf2ce81cd0dd86a0975c1366678337f80178e64f473fbe985e41f7e04225b150edf44e74a9ff96fe687d5710ab90f0b033750edf4 WHIRLPOOL b7de86ff4e364f775699932669dc6c58cb25cde1b8825de72243dc04828400a685c21a12d43a7a36aa1c2cfe64089c47c9ca9298f174a09ba17dcdf75422c809
 DIST gupnp-0.20.15.tar.xz 403812 SHA256 0446b42d0d5b8adfcdca78832f2ce6173ab33793fca055afc97aec1fcc579fe2 SHA512 e0d62d188c364d2e56071e1050d838d155cc82320871b6e9bfac299028225a190eb288a8308a80d2f3b5b2d069f869bb81a8080507728b42be06053cec391c94 WHIRLPOOL d3b40099d7ad7ccbf79b2fb77ab4941ed0985b49e22f5d7798872b1d67141edce83ea0f8a61941893ff876c6561dbbd5b0219a6dfc3b01cf2892283c0468c4e9
+DIST gupnp-0.20.16.tar.xz 406912 SHA256 ff1119eff12529c46837e03c742f69dc4fae48d59097d79582d38a383b832602 SHA512 3db3b72a4e5eed6c7910eba4f27e7acacc21d4b4c63488dc3a0328a7a8ab4082fad203bd67923fc35cb6475a4bc918ca95cb50a6eb6ac8e1c6e88e969d9549f7 WHIRLPOOL 1f46ed6dd5725720ce6c6617d712552ec7dac05f0e75e5cf7d3d99a82299427cacb1d4b807e6149a3b9b7ea489233cf7cb299528108b80b3c8ff0210533d27e0
diff --git a/net-libs/gupnp/gupnp-0.20.13.ebuild b/net-libs/gupnp/gupnp-0.20.13.ebuild
deleted file mode 100644
index 27c85acab58b..000000000000
--- a/net-libs/gupnp/gupnp-0.20.13.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"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-# FIXME: Claims to works with python3 but appears to be wishful thinking
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 multilib-minimal python-r1 vala
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="connman +introspection kernel_linux networkmanager"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=net-libs/gssdp-0.14.7:0=[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	|| (
-		>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-		<sys-libs/e2fsprogs-libs-1.41.8[${MULTILIB_USEDEP}] )
-	introspection? (
-			>=dev-libs/gobject-introspection-0.6.4
-			$(vala_depend) )
-	connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=unix
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		--disable-static \
-		--with-context-manager=${backend}
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	python_foreach_impl python_doscript tools/gupnp-binding-tool
-}
diff --git a/net-libs/gupnp/gupnp-0.20.16.ebuild b/net-libs/gupnp/gupnp-0.20.16.ebuild
new file mode 100644
index 000000000000..314f2612ae2c
--- /dev/null
+++ b/net-libs/gupnp/gupnp-0.20.16.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+# FIXME: Claims to works with python3 but appears to be wishful thinking
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 multilib-minimal python-r1 vala
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="connman +introspection kernel_linux networkmanager"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="
+	${PYTHON_DEPS}
+	>=net-libs/gssdp-0.14.13:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? (
+			>=dev-libs/gobject-introspection-1.36:=
+			$(vala_depend) )
+	connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	!net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=unix
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		--disable-static \
+		--with-context-manager=${backend}
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_foreach_impl python_doscript tools/gupnp-binding-tool
+}
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 8b5f871f34c3..8a0bb1c2d5f0 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,2 +1,2 @@
-DIST libaccounts-glib-1.18.tar.gz 579435 SHA256 7aab9ec2ba3ae2548125f4bb330ed433e8066c672e32101a339cbb7f4657ff56 SHA512 133b336cd000f302f14d4285d5a3c6d032a2b5497bf8ce5cd22175e6c847b54e4f8919a6c37786c9b39bac874146683a1bc0547db3f2563e3fe7a3d686d82b85 WHIRLPOOL 102cdd1261bff9980c14f6563bcc41fc561b1751cc6adcc5ed7f6045800c8974443a99512f18352d2ebecd58ee9f69bebd30b52a8106fb15d59095705afaefe9
 DIST libaccounts-glib-1.19.tar.gz 126032 SHA256 098362920817fb2e4429814b8a26451c00bddd5e4702ab584a37fda42a539e50 SHA512 1f0dfb3ee9faa32e08c839130bb2fb32d71ab57973d9a5704e145d192815795c3a8ddb4cc004e12647dffb02bd6e5f3ae908dfd7006e14f9b18e6454b5eb3d76 WHIRLPOOL 36e7a5b33dbc5ffdbffb0cdcfe21d07c624601002b3959d25698fcad786bc3b00ada074597042dbb45e95bc8b7518b66f24fefc8bbebf6b516ddc91c233ba4b2
+DIST libaccounts-glib-1.21.tar.gz 126032 SHA256 098362920817fb2e4429814b8a26451c00bddd5e4702ab584a37fda42a539e50 SHA512 1f0dfb3ee9faa32e08c839130bb2fb32d71ab57973d9a5704e145d192815795c3a8ddb4cc004e12647dffb02bd6e5f3ae908dfd7006e14f9b18e6454b5eb3d76 WHIRLPOOL 36e7a5b33dbc5ffdbffb0cdcfe21d07c624601002b3959d25698fcad786bc3b00ada074597042dbb45e95bc8b7518b66f24fefc8bbebf6b516ddc91c233ba4b2
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.18.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.18.ebuild
deleted file mode 100644
index b3373fd66f96..000000000000
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.18.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
-
-DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-
-RESTRICT="test"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libxml2"
-
-RDEPEND="$DEPEND"
-
-src_configure() {
-	export HAVE_GCOV_FALSE='#'
-	econf \
-		$(use_enable debug) \
-		--disable-tests
-}
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.21.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.21.ebuild
new file mode 100644
index 000000000000..339afc3432fc
--- /dev/null
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.21.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils vcs-snapshot
+
+DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=VERSION_1.19 -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS NEWS )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-python \
+		--disable-tests \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-libs/libbt/Manifest b/net-libs/libbt/Manifest
deleted file mode 100644
index 1751813d0546..000000000000
--- a/net-libs/libbt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libbt-1.05.tar.gz 322880 SHA256 d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7 SHA512 66774fcf640d4e46cf0ed495bac93acaa72eebaa9749222a5014351d4e00bc2ead68ca3744de9af5e81211bbe91775507a1cff28569d97586d79fbb531756ccb WHIRLPOOL 74dd3613e5e0c0cbc748503567e4f6d54047f0faf3aff9429119839213cfbdebc14b085c2dab78d6149def8a2b6fb755c626b0baf1a367fc20cae1016295a513
-DIST libbt-1.06.tar.gz 334835 SHA256 89f7887ef892158fec2691efaf26036dab2a239ab87881473ae405f2f2d13560 SHA512 ad6e3d585a9f4cdf6143b462d52f44ee863156e4db365b8b870a840b7cb17203e5e3602dc541f554005a436900d742e2bf65b73d3345a1583f055f0c185a47b2 WHIRLPOOL 8fb6a129714da43782224f818ce9945e9f7f46b8888cfd39c1c05676bcaf508b1f0281c815ddbedebe2bc5952774f3a68196f783cdf123839209146032a504ed
diff --git a/net-libs/libbt/files/1.05-btlist.patch b/net-libs/libbt/files/1.05-btlist.patch
deleted file mode 100644
index e4eca5ae01db..000000000000
--- a/net-libs/libbt/files/1.05-btlist.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/btlist.c.orig
-+++ src/btlist.c
-@@ -13,6 +13,7 @@
-
- #include "config.h"
-
-+#include <sys/types.h>
- #include <openssl/sha.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/net-libs/libbt/files/libbt-1.05-build.patch b/net-libs/libbt/files/libbt-1.05-build.patch
deleted file mode 100644
index cd82787e6e0b..000000000000
--- a/net-libs/libbt/files/libbt-1.05-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix building with newer glibc
-
-http://bugs.gentoo.org/248034
-
---- src/peer.c
-+++ src/peer.c
-@@ -35,6 +35,7 @@
- #include <time.h>
- #include <poll.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include "bterror.h"
- #include "btmessage.h"
diff --git a/net-libs/libbt/files/libbt-1.06-build.patch b/net-libs/libbt/files/libbt-1.06-build.patch
deleted file mode 100644
index de778a75f165..000000000000
--- a/net-libs/libbt/files/libbt-1.06-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-http://bugs.gentoo.org/152489
-http://bugs.gentoo.org/248034
-http://bugs.gentoo.org/315213
-
---- src/btlist.c
-+++ src/btlist.c
-@@ -13,6 +13,7 @@
-
- #include "config.h"
-
-+#include <sys/types.h>
- #include <openssl/sha.h>
- #include <stdlib.h>
- #include <string.h>
---- src/peer.c
-+++ src/peer.c
-@@ -35,6 +35,7 @@
- #include <time.h>
- #include <poll.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include "bterror.h"
- #include "btmessage.h"
---- src/udpproto.c	2009-12-07 15:03:54.000000000 +0100
-+++ src/udpproto.c	2009-12-07 15:04:10.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- 
---- src/Makefile.in	2009-12-07 15:57:24.000000000 +0100
-+++ src/Makefile.in	2009-12-07 15:57:34.000000000 +0100
-@@ -30,7 +30,7 @@
- CPPFLAGS:=@CPPFLAGS@
- CFLAGS+=-g -Wall -I../include -I$(top_srcdir)/include
- 
--LIBS:=@LIBS@ `curl-config --libs` -lm
-+LIBS:=@LIBS@ `curl-config --libs` -lm -lcrypto
- LDFLAGS:=-g -L. @LDFLAGS@
- VERSION=1.06
- MAKEDEPEND=@MAKEDEPEND@
---- Makefile.in	2009-12-07 17:36:18.000000000 +0100
-+++ Makefile.in	2009-12-07 17:36:28.000000000 +0100
-@@ -1,4 +1,4 @@
--all:	depend compile
-+all:	compile
- 
- compile:
- 	cd src && ${MAKE}
diff --git a/net-libs/libbt/libbt-1.05.ebuild b/net-libs/libbt/libbt-1.05.ebuild
deleted file mode 100644
index e82ba6389b18..000000000000
--- a/net-libs/libbt/libbt-1.05.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools
-
-DESCRIPTION="implementation of the BitTorrent core protocols in C"
-HOMEPAGE="http://libbt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	net-misc/curl
-	>=sys-apps/util-linux-2.16.2
-	!x11-wm/blackbox"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch #248034
-	epatch "${FILESDIR}"/${PV}-btlist.patch # 152489
-	sed -i -e '/CFLAGS/s|:=|+=|' src/Makefile.in || die
-	# fix force as-needed. Bug #315213
-	sed -i -e "/^LIBS/s:-lm:& -lcrypto:" src/Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	dobin src/btlist src/btget src/btcheck || die
-	doman man/*
-	insinto /usr/include/libbt
-	doins include/*
-	dolib src/libbt.a
-	dodoc CHANGELOG CREDITS README docs/*
-}
diff --git a/net-libs/libbt/libbt-1.06.ebuild b/net-libs/libbt/libbt-1.06.ebuild
deleted file mode 100644
index 165802c74c76..000000000000
--- a/net-libs/libbt/libbt-1.06.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="implementation of the BitTorrent core protocols in C"
-HOMEPAGE="http://libbt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	net-misc/curl
-	>=sys-apps/util-linux-2.16.2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-}
-
-src_install() {
-	dobin src/bt{check,get,list} || die
-
-	insinto /usr/include/libbt
-	doins include/*.h || die
-	newlib.a src/libbt.a libbt-static.a || die
-
-	doman man/*.1
-	dodoc CHANGELOG CREDITS README docs/*.txt
-}
diff --git a/net-libs/libbt/metadata.xml b/net-libs/libbt/metadata.xml
deleted file mode 100644
index 12bfc8f3cc57..000000000000
--- a/net-libs/libbt/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">libbt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/libdexter/Manifest b/net-libs/libdexter/Manifest
deleted file mode 100644
index aa10622a7549..000000000000
--- a/net-libs/libdexter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libdexter-0.2.1.tar.bz2 449775 SHA256 73b37398c693f0a6d827ab6ef2fa6a33390b7d7bafc21c330c75c0a89a77fb7c SHA512 3dac039d37c1b01a4b6288e1e6212846a7ccf57ccb0483e0f2d7b00cdae930b49ac3c9202f080881da7b35f7adbc318305a8736bb48fc21f0d224794d4a76a79 WHIRLPOOL 994b9efaa76c007e9162e6dd15a02d96d92ee153a92b07208a4fb7a4d0f74a4f2716b4c66da56f2823658c28e83747b602e993018f0f9a3b961fa95cfdb0e42a
diff --git a/net-libs/libdexter/libdexter-0.2.1-r1.ebuild b/net-libs/libdexter/libdexter-0.2.1-r1.ebuild
deleted file mode 100644
index 6642f080f389..000000000000
--- a/net-libs/libdexter/libdexter-0.2.1-r1.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 gnome2-utils eutils
-
-DESCRIPTION="A plugin-based, distributed sampling library"
-HOMEPAGE="http://libdexter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libdexter/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# gnutls disabled as will break with gnutls-3, bug #456306
-IUSE="tcpd" #gnutls
-
-#gnutls? ( >=net-libs/gnutls-1.4.4:= )
-RDEPEND="
-	tcpd? ( sys-apps/tcp-wrappers:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-libs/glib-2.30:2
-"
-
-src_prepare() {
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		$(use_enable tcpd tcp-wrappers) \
-		--disable-tls
-#		$(use_enable gnutls tls)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/net-libs/libdexter/metadata.xml b/net-libs/libdexter/metadata.xml
deleted file mode 100644
index 8f782868fa0a..000000000000
--- a/net-libs/libdexter/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">libdexter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
new file mode 100644
index 000000000000..79fe4babfcf6
--- /dev/null
+++ b/net-libs/libhtp/Manifest
@@ -0,0 +1 @@
+DIST htp-0.5.18.tar.gz 799444 SHA256 53f81a2b639edbd9df9f1f0cebcfe9c2a2b381f9d61e2944c020b855a7e89a79 SHA512 e3efaedb74b8a0655b58922f2d0a079f5dfb5dcead117e21394d5d76ff93a3a7260ab56994468764ceeaa2dd584bcfa988b146efb85831e8a98efcda06b28876 WHIRLPOOL 816456580434b2254af8e88e24ff80e5721966ee742bbb89870324e9edcf12bfee4a54727855937c7bbb0d44ba9423dcf714f93a713287dbf0777ca5eeb93c86
diff --git a/net-libs/libhtp/libhtp-0.5.18.ebuild b/net-libs/libhtp/libhtp-0.5.18.ebuild
new file mode 100644
index 000000000000..2c11b3bb98ed
--- /dev/null
+++ b/net-libs/libhtp/libhtp-0.5.18.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib-minimal
+
+MY_P=${P#lib}
+
+DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
+HOMEPAGE="https://github.com/OISF/libhtp"
+SRC_URI="https://github.com/OISF/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="sys-libs/zlib[static-libs?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	# The debug configure logic is broken.
+	ECONF_SOURCE=${S} \
+	econf \
+		$(usex debug '--enable-debug' '') \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/libhtp/metadata.xml b/net-libs/libhtp/metadata.xml
new file mode 100644
index 000000000000..ee432479ac41
--- /dev/null
+++ b/net-libs/libhtp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>vapier@gentoo.org</email>
+	<description>feel free to update</description>
+</maintainer>
+<upstream>
+	<remote-id type="github">OISF/libhtp</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-libs/libmapi/Manifest b/net-libs/libmapi/Manifest
deleted file mode 100644
index 44ceaf06a730..000000000000
--- a/net-libs/libmapi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openchange-1.0-BORG.tar.gz 1979219 SHA256 f18c1fdb0dec10ea6a469cb7be5fc24010a44d8c5de42a23da5b0c864f343bb4 SHA512 20c3923bcbbbb09aeebe686727f0fd1d6d5e0d23e815e4c1c945077dd34b646bc80a64f103c830f95e2b26111685400c050717c5bed21ab79167fc913f88a54e WHIRLPOOL 92ffe9e36a0c8c60768d6a5a79b2ac6295f3cacedb245188103254105bcb93526d920739196b2d8738d38e81afe52acfa7096d2abf716b14ab785326a045436d
diff --git a/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch b/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch
deleted file mode 100644
index 0579ddd0663c..000000000000
--- a/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile~	2012-03-15 13:50:43.000000000 +0000
-+++ Makefile	2012-10-10 12:12:29.318900417 +0000
-@@ -212,6 +212,7 @@
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 0755 libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
- 	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT)
-+	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
- ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
- 	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
- endif
-@@ -400,6 +401,7 @@
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 0755 libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
- 	ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT)
-+	ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
- ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
- 	ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION)
- endif
diff --git a/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch b/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch
deleted file mode 100644
index 8e8d243960c0..000000000000
--- a/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.ac~	2012-03-15 13:50:43.000000000 +0000
-+++ configure.ac	2012-10-10 12:00:15.225031516 +0000
-@@ -328,7 +328,7 @@
- AC_SUBST(PYTHON_LIBS)
- 
- AC_MSG_CHECKING(python library directory)
--pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
-+pythondir=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
- AC_MSG_RESULT($pythondir)
- AC_SUBST(pythondir)
- 
-@@ -661,7 +661,7 @@
- 			   [build Python bindings for libmapi]),
- 			   enable_pymapi="$enableval",
- 			   enable_pymapi=no)
--PYCDIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='\\$(prefix)')"`
-+PYCDIR=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
- AC_SUBST(PYCDIR)
- 
- dnl Enable pyopenchange by default
diff --git a/net-libs/libmapi/libmapi-1.0.ebuild b/net-libs/libmapi/libmapi-1.0.ebuild
deleted file mode 100644
index 9939d5600926..000000000000
--- a/net-libs/libmapi/libmapi-1.0.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="4"
-PYTHON_DEPEND="python? *"
-
-inherit autotools eutils python
-
-MY_PN=openchange
-MY_P=${MY_PN}-${PV}-BORG
-
-DESCRIPTION="Portable open-source implementations of Exchange protocols"
-HOMEPAGE="http://www.openchange.org/"
-SRC_URI="http://tracker.openchange.org/attachments/download/180/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="python"
-
-RDEPEND=">=net-fs/samba-4.0.0_rc2
-	dev-libs/boost
-	python? ( dev-lang/python )"
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${MY_P}"-python-location-fix.patch
-	epatch "${FILESDIR}"/"${MY_P}"-fix-soname-QA.patch
-	eaclocal
-	eautoconf
-}
-src_configure() {
-	ECONF="--disable-coverage
-		$(use_enable python pymapi)"
-
-	econf ${ECONF}
-}
-
-src_compile() {
-	emake libmapi libmapixx || die "libmapi compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" libmapi-install libmapixx-install || die "libmapi install failed"
-
-	if use python ; then
-		emake DESTDIR="${D}" python-install || die "pymapi install failed"
-	fi
-}
diff --git a/net-libs/libmapi/metadata.xml b/net-libs/libmapi/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-libs/libmapi/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-libs/libopkele/Manifest b/net-libs/libopkele/Manifest
deleted file mode 100644
index 8ac75e6d3c45..000000000000
--- a/net-libs/libopkele/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopkele-2.0.4.tar.bz2 321277 SHA256 102e22431e4ec6f1f0baacb6b1b036476f5e5a83400f2174807a090a14f4dc67 SHA512 98515f1e29bbdbb761d2ac2f3c316c006624b4472ba9ea7d1370c188acaa16cdb4d2bc73aa17c7dad99f30c364a0e7abd5e7f1872a578dca94d7a818d161dec9 WHIRLPOOL 575acd7bc4bfcea83f4f5e0235e083072527ae7ccae1e5173913c29ed101d328509e3a974b67f2e0966c4f4e50abb5440ac549ba84508e91fb090af584ffd17e
diff --git a/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch b/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch
deleted file mode 100644
index 5da095348e15..000000000000
--- a/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9ff6244998b0d41e71f7cc7351403ad590e990e4 Mon Sep 17 00:00:00 2001
-From: qdii <qdii@reblochon.be>
-Date: Fri, 02 Nov 2012 19:46:03 +0000
-Subject: Fix argument-lookup failure on GCC 4.7.1, causing compilation to crash.
-
-Modified-by: Michael Krelin <hacker@klever.net>
-Signed-off-by: Michael Krelin <hacker@klever.net>
----
-diff --git a/include/opkele/discovery.h b/include/opkele/discovery.h
-index f2721a6..985eef6 100644
---- a/include/opkele/discovery.h
-+++ b/include/opkele/discovery.h
-@@ -21,7 +21,7 @@ namespace opkele {
- 		public:
- 
- 		    inline _DT& add(long priority,const _DT& d) {
--			return insert(typename map_type::value_type(priority,d))->second;
-+			return this->insert(typename map_type::value_type(priority,d))->second;
- 		    }
- 
- 		    bool has_value(const _DT& d) const {
---
-cgit v0.9-30-gcd78
diff --git a/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch b/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch
deleted file mode 100644
index 184852749478..000000000000
--- a/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 648ae5dbd90e062f3432f809a846d50d994b86d4 Mon Sep 17 00:00:00 2001
-From: qdii <qdii@reblochon.be>
-Date: Fri, 02 Nov 2012 13:49:03 +0000
-Subject: Function _exit was referenced in the code, but <unistd.h> was not included, causing compilation to fail.
-
----
-diff --git a/test/idiscover.cc b/test/idiscover.cc
-index 4b1e90c..8a5a3fb 100644
---- a/test/idiscover.cc
-+++ b/test/idiscover.cc
-@@ -2,6 +2,7 @@
- #include <stdexcept>
- #include <iterator>
- #include <algorithm>
-+#include <unistd.h>
- using namespace std;
- #include <opkele/exception.h>
- #include <opkele/discovery.h>
-diff --git a/test/test.cc b/test/test.cc
-index 2143ac0..770e0c6 100644
---- a/test/test.cc
-+++ b/test/test.cc
-@@ -1,5 +1,6 @@
- #include <iostream>
- #include <stdexcept>
-+#include <unistd.h>
- using namespace std;
- #include <opkele/exception.h>
- #include <opkele/util.h>
---
-cgit v0.9-30-gcd78
diff --git a/net-libs/libopkele/libopkele-2.0.4-r1.ebuild b/net-libs/libopkele/libopkele-2.0.4-r1.ebuild
deleted file mode 100644
index 52f4ec6aa68c..000000000000
--- a/net-libs/libopkele/libopkele-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A C++ implementation of an OpenID decentralized identity system"
-HOMEPAGE="http://kin.klever.net/libopkele/"
-SRC_URI="http://kin.klever.net/dist/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/htmltidy
-	dev-libs/libpcre
-	dev-libs/openssl
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc471.patch \
-		"${FILESDIR}"/${P}-missing_includes.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS
-}
diff --git a/net-libs/libopkele/metadata.xml b/net-libs/libopkele/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-libs/libopkele/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
new file mode 100644
index 000000000000..e87c3d8f67b5
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
@@ -0,0 +1,15 @@
+Description: Fix running tests with the parallel harness
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Last-Update: 2013-06-26
+
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -29,7 +29,7 @@ isprefix_driver_LDADD = ../isprefix.o # XXX: should link replaced functions
+ # failed.  Generally these tests should be ordered so that more basic
+ # tests are run first.
+ 
+-TESTS_ENVIRONMENT = $(SH) $(srcdir)/driver.sh
++TEST_LOG_COMPILER = $(SH) $(srcdir)/driver.sh
+ 
+ TESTS = \
+ 	signature.test mutate.test sources.test isprefix.test	\
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index 704e50c4b14e..2451aefca0c6 100644
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-getopt.patch
 	"${FILESDIR}"/${P}-implicit-declaration.patch
+	"${FILESDIR}"/${P}-fix-testsuite.patch
 	)
 
 src_prepare() {
diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild
index d65747c8bf84..c0b90a7b71c6 100644
--- a/net-libs/librsync/librsync-2.0.0.ebuild
+++ b/net-libs/librsync/librsync-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
index 32d532addd0f..9adfcf564dfd 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI//-gnome}"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="+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.52.2.ebuild b/net-libs/libsoup/libsoup-2.52.2.ebuild
index cfe6dec51362..8fe0dcd1d5af 100644
--- a/net-libs/libsoup/libsoup-2.52.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.52.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="+introspection samba ssl test vala"
-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"
 
 REQUIRED_IUSE="vala? ( introspection )"
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 114693c74b9b..a35a89f4ce95 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,6 +1,4 @@
 DIST libssh-0.6.5-compilefix.patch 737 SHA256 952c6a617791c35fe8d44a47d1252aebd2d844f40480170b14391c80f2092fff SHA512 fa9d8322778ca93b6ae62e0012722a2df94179891f5bafefc67a7502f4bc96ec86768e07f374f37486641614298472227eb48aa5747dabf840636e9f1ce9cbde WHIRLPOOL 575bca37a3dbe892e44b362c02f370cc13f94ef2706c435a9d3e2604941cece285637dd6831c27337ab5fc76c4e8588092f106e2ea963dc15d46129cecd1f2cb
 DIST libssh-0.6.5.tar.xz 281564 SHA256 0fd52763e033d5e9b1cd55f60a74e619731c5ba630938eec95682dbe4cf7dc2c SHA512 55d614ff311a29a20b93094ac1dd16a2ad1345368b874a0e385f0c235e8defde8816948ab04eab68ade477a0a6901b317c7884df1ba3078cf12db89dfc4169cc WHIRLPOOL 9801eee45a178306b0645d75c268df381d206a8c566695d8b6c228ea7f5638a313bdbdf990ad7bd299c24d280595007b44fd16449ee3a0643b6e2084bb148d09
-DIST libssh-0.7.0-ssh_forward_listen.patch 813 SHA256 3d5d4d4a5c7eb34b9790ebb557de2df359c98f955ff37e812945f256b8bdd482 SHA512 727face00743cf964b9fbbff001f2d2240c6d1ac64d2e65298bca97e973d06d2e1591755446fb7c8fd8d83bf1247c42591c47dcc7f008ca89b84d817b5b2f457 WHIRLPOOL f7fdb169a1f6db68dae4d591a2802901d12f030342da1c32e5bc85f95a6f3ea62cade29081d760e0dd67b77b91ec0aa6314a319280c1dd8abd777493237b1d9e
-DIST libssh-0.7.0.tar.xz 349548 SHA256 0551bc341f33641ddc349b31730b3010870ad26a4dbfad3d090a1738fe3e402b SHA512 2ef897f7295d2b4ba63f0d797c51ba2c8cb7d8569152d34ec982d2b88adccc97c8f2aabea3bbc88b72421256d3d0be661f82bbcf5c4b151018b5a695be445568 WHIRLPOOL 1337ca1fc69c5de60f2d33ce1d66f04b0d2807b01794af6787a5d4b7ca84715afe00ff72d8b1bb21590186b7af9058fa90c69af865a0534402735076dec51397
-DIST libssh-0.7.1.tar.xz 349888 SHA256 2fc7ccf96d3263cbd8ab520118cb94d9a2e11714c61e22b3f761fc5352fd046d SHA512 c7cea829e97c9f37c23b5d331e02ea5b8c8bea1a0b28fad62a273b252040a30ea9631b502ea165a1e041b6e23c3bf6746d49800875fa492d8f42c7d1e232ebb9 WHIRLPOOL 7569b16a9524efac40d7a7b8c91201a8ce2c37c56008c7262e4d7628f5ac0993a0164bccc845a121438a62451a10d94b71ba69788b145d0592b83fa88ee251e1
 DIST libssh-0.7.2.tar.xz 350540 SHA256 a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62 SHA512 9cb15254478e2522e736688052e0862c856e2c1321d090c9b9d9562504fcb59cee344c07576eeee9c6d0ac5ead137d9ff05216d973c457c6a17ffa9fba475f5a WHIRLPOOL bf878264b900bfbbfe76f08d1c22e5ca2f1300024fc561841ed3fbef374ceab7a08ba0211c093d90d7e4047a896cce9f73e78268300362beaec194025eda1ed8
+DIST libssh-0.7.3.tar.xz 350464 SHA256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 SHA512 6797ea9492c9d07e0169163e6559a7880dd368ee763eff297b3cbddda5e892703cf32506f9513e7d9b5135984e1e888c4893b342df07da1b7ee30968c9185869 WHIRLPOOL f22c3f4ef8c3cbf4e93c5603224ae4d0f598639a471bc002c0917243c487e1de61a79db09308bcb570791cd1ab3b95f43d44f92652a7f0ec596d552cab0031c5
diff --git a/net-libs/libssh/libssh-0.7.0-r1.ebuild b/net-libs/libssh/libssh-0.7.0-r1.ebuild
deleted file mode 100644
index f6cc31c3b7ef..000000000000
--- a/net-libs/libssh/libssh-0.7.0-r1.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
-
-MY_P=${PN}-${PV/_rc/rc}
-inherit eutils cmake-multilib multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/140/${MY_P}.tar.xz -> ${P}.tar.xz
-	https://projects.archlinux.org/svntogit/packages.git/plain/trunk/ssh_forward_listen.patch?h=packages/libssh&id=e7628675b7b5dec45371b67745ce786ee5b78d8c -> ${PN}-0.7.0-ssh_forward_listen.patch"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-	"${DISTDIR}"/${P}-ssh_forward_listen.patch
-)
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with gssapi)
-		$(cmake-utils_use_with pcap)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use_with test STATIC_LIB)
-		$(cmake-utils_use_with test TESTING)
-		$(cmake-utils_use_with zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	multilib_is_native_abi && use doc && dohtml -r doc/html/.
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.7.1.ebuild b/net-libs/libssh/libssh-0.7.1.ebuild
deleted file mode 100644
index a35bde428cac..000000000000
--- a/net-libs/libssh/libssh-0.7.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-${PV/_rc/rc}
-inherit eutils cmake-multilib multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/154/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-)
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with gssapi)
-		$(cmake-utils_use_with pcap)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use_with test STATIC_LIB)
-		$(cmake-utils_use_with test TESTING)
-		$(cmake-utils_use_with zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	multilib_is_native_abi && use doc && dohtml -r doc/html/.
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.7.3.ebuild b/net-libs/libssh/libssh-0.7.3.ebuild
new file mode 100644
index 000000000000..da20cc8482dd
--- /dev/null
+++ b/net-libs/libssh/libssh-0.7.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-multilib multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/195/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	!gcrypt? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-tests.patch
+)
+
+src_prepare() {
+	# just install the examples do not compile them
+	sed -i \
+		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
+		-DWITH_DEBUG_CRYPTO="$(usex debug)"
+		-DWITH_gcrypt="$(usex gcrypt)"
+		-DWITH_gssapi="$(usex gssapi)"
+		-DWITH_pcap="$(usex pcap)"
+		-DWITH_server="$(usex server)"
+		-DWITH_sftp="$(usex sftp)"
+		-DWITH_ssh1="$(usex ssh1)"
+		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DWITH_STATIC_LIB="$(usex test)"
+		-DWITH_TESTING="$(usex test)"
+		-DWITH_zlib="$(usex zlib)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc -r doc/html/.
+	fi
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild b/net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild
index 044db2a68f3f..4f71ea2cb10b 100644
--- a/net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild
+++ b/net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils
 DESCRIPTION="GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"
 HOMEPAGE="http://www.gnutelephony.org/index.php/GNU_ZRTP"
 SRC_URI="mirror://gnu/ccrtp/${P}.tar.gz"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 LICENSE="GPL-3"
 IUSE=""
 SLOT="0"
diff --git a/net-libs/neon/files/neon-0.30.1-gnutls3.4.patch b/net-libs/neon/files/neon-0.30.1-gnutls3.4.patch
new file mode 100644
index 000000000000..c5165a0958ad
--- /dev/null
+++ b/net-libs/neon/files/neon-0.30.1-gnutls3.4.patch
@@ -0,0 +1,282 @@
+Description: fix building with GnuTLS 3.4
+ Rewrite GnuTLS PKCS#11 support to work (exclusively) with the new
+ GnuTLS 3.x API.
+Origin: upstream, r1963
+Author: Joe Orton <joe@light.plus.com>
+Bug-Debian: https://bugs.debian.org/782832
+Last-Update: 2015-10-03
+
+---
+
+--- neon27-0.30.1.orig/macros/neon.m4
++++ neon27-0.30.1/macros/neon.m4
+@@ -982,10 +982,11 @@ gnutls)
+ 
+    # Check for functions in later releases
+    NE_CHECK_FUNCS([gnutls_session_get_data2 gnutls_x509_dn_get_rdn_ava \
+-                  gnutls_sign_callback_set \
+                   gnutls_certificate_get_issuer \
+                   gnutls_certificate_get_x509_cas \
+-                  gnutls_x509_crt_sign2])
++                  gnutls_x509_crt_sign2 \
++                  gnutls_certificate_set_retrieve_function2 \
++                  gnutls_privkey_import_ext])
+ 
+    # fail if gnutls_x509_crt_sign2 is not found (it was introduced in 1.2.0, which is required)
+    if test x${ac_cv_func_gnutls_x509_crt_sign2} != xyes; then
+@@ -1039,7 +1040,7 @@ posix|yes)
+   ;;
+ esac
+ 
+-case ${with_pakchois}X${ac_cv_func_gnutls_sign_callback_set}Y${ne_cv_lib_ssl097} in
++case ${with_pakchois}X${ac_cv_func_gnutls_privkey_import_ext}Y${ne_cv_lib_ssl097} in
+ noX*Y*) ;;
+ *X*Yyes|*XyesY*)
+     # PKCS#11... ho!
+--- neon27-0.30.1.orig/src/ne_gnutls.c
++++ neon27-0.30.1/src/ne_gnutls.c
+@@ -89,6 +89,13 @@ struct ne_ssl_client_cert_s {
+     ne_ssl_certificate cert;
+     gnutls_x509_privkey_t pkey;
+     char *friendly_name;
++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT
++    /* Signing callback & userdata provided by ne_pkcs11.c.  It would
++     * be better to rewrite the whole module to use gnutls_privkey_t
++     * directly, but it seems impossible to dup such an object. */
++    gnutls_privkey_sign_func sign_func;
++    void *sign_ud;
++#endif
+ };
+ 
+ /* Returns the highest used index in subject (or issuer) DN of
+@@ -525,6 +532,10 @@ static ne_ssl_client_cert *dup_client_ce
+     
+     if (cc->keyless) {
+         newcc->keyless = 1;
++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT
++        newcc->sign_func = cc->sign_func;
++        newcc->sign_ud = cc->sign_ud;
++#endif
+     }
+     else {
+         ret = gnutls_x509_privkey_init(&newcc->pkey);
+@@ -553,7 +564,15 @@ dup_error:
+ static int provide_client_cert(gnutls_session_t session,
+                                const gnutls_datum_t *req_ca_rdn, int nreqs,
+                                const gnutls_pk_algorithm_t *sign_algos,
+-                               int sign_algos_length, gnutls_retr_st *st)
++                               int sign_algos_length, 
++#ifdef HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2
++                               gnutls_pcert_st **pcert, 
++                               unsigned int *pcert_length, 
++                               gnutls_privkey_t *pkey
++#else
++                               gnutls_retr2_st *st
++#endif
++    )
+ {
+     ne_session *sess = gnutls_session_get_ptr(session);
+     
+@@ -611,27 +630,59 @@ static int provide_client_cert(gnutls_se
+     if (sess->client_cert) {
+         gnutls_certificate_type_t type = gnutls_certificate_type_get(session);
+         if (type == GNUTLS_CRT_X509
+-#if LIBGNUTLS_VERSION_NUMBER > 0x030000
+-            /* Ugly hack; prevent segfaults w/GnuTLS 3.0. */
+-            && sess->client_cert->pkey != NULL
++            && (sess->client_cert->pkey || sess->client_cert->keyless)) {
++            int ret;
++
++#ifdef HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2
++            *pkey = gnutls_malloc(sizeof *pkey);
++            gnutls_privkey_init(pkey);
++
++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT
++            if (sess->client_cert->sign_func) {
++                int algo = gnutls_x509_crt_get_pk_algorithm(sess->client_cert->cert.subject, NULL);
++                NE_DEBUG(NE_DBG_SSL, "ssl: Signing for %s.\n", gnutls_pk_algorithm_get_name(algo));
++                         
++                ret = gnutls_privkey_import_ext(*pkey, algo, sess->client_cert->sign_ud,
++                                                sess->client_cert->sign_func, NULL, 0);
++            }
++            else
+ #endif
+-            ) {
+-            NE_DEBUG(NE_DBG_SSL, "Supplying client certificate.\n");
++            if (sess->client_cert->keyless) {
++                ret = GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE;
++            }
++            else {
++                ret = gnutls_privkey_import_x509(*pkey, sess->client_cert->pkey, 0);
++            }
+ 
+-            st->type = type;
++            if (ret) {
++                NE_DEBUG(NE_DBG_SSL, "ssl: Failed to import private key: %s.\n", gnutls_strerror(ret));
++                ne_set_error(sess, _("Failed to import private key: %s"), gnutls_strerror(ret));
++                return ret;
++            }
++            
++            *pcert = gnutls_malloc(sizeof *pcert);
++            gnutls_pcert_import_x509(*pcert, sess->client_cert->cert.subject, 0);
++            *pcert_length = 1;
++#else /* !HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2 */
++            st->cert_type = type;
+             st->ncerts = 1;
+             st->cert.x509 = &sess->client_cert->cert.subject;
+             st->key.x509 = sess->client_cert->pkey;
+             
+             /* tell GNU TLS not to deallocate the certs. */
+             st->deinit_all = 0;
++#endif
+         } else {
+             return GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE;
+         }
+     } 
+     else {
+-        NE_DEBUG(NE_DBG_SSL, "No client certificate supplied.\n");
++        NE_DEBUG(NE_DBG_SSL, "ssl: No client certificate supplied.\n");
++#ifdef HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2
++        *pcert_length = 0;
++#else        
+         st->ncerts = 0;
++#endif
+         sess->ssl_cc_requested = 1;
+         return 0;
+     }
+@@ -649,8 +700,12 @@ ne_ssl_context *ne_ssl_context_create(in
+     ne_ssl_context *ctx = ne_calloc(sizeof *ctx);
+     gnutls_certificate_allocate_credentials(&ctx->cred);
+     if (flags == NE_SSL_CTX_CLIENT) {
++#ifdef HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2
++        gnutls_certificate_set_retrieve_function2(ctx->cred, provide_client_cert);
++#else
+         gnutls_certificate_client_set_retrieve_function(ctx->cred,
+                                                         provide_client_cert);
++#endif
+     }
+     gnutls_certificate_set_verify_flags(ctx->cred, 
+                                         GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
+@@ -1206,8 +1261,10 @@ ne_ssl_client_cert *ne_ssl_clicert_impor
+     }
+ }
+ 
+-ne_ssl_client_cert *ne__ssl_clicert_exkey_import(const unsigned char *der,
+-                                                 size_t der_len)
++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT
++ne_ssl_client_cert *ne__ssl_clicert_exkey_import(const unsigned char *der, size_t der_len,
++                                                 gnutls_privkey_sign_func sign_func,
++                                                 void *userdata)
+ {
+     ne_ssl_client_cert *cc;
+     gnutls_x509_crt_t x5;
+@@ -1226,9 +1283,12 @@ ne_ssl_client_cert *ne__ssl_clicert_exke
+     cc->keyless = 1;
+     cc->decrypted = 1;
+     populate_cert(&cc->cert, x5);
++    cc->sign_func = sign_func;
++    cc->sign_ud = userdata;
+ 
+-    return cc;    
++    return cc;
+ }
++#endif
+ 
+ int ne_ssl_clicert_encrypted(const ne_ssl_client_cert *cc)
+ {
+--- neon27-0.30.1.orig/src/ne_pkcs11.c
++++ neon27-0.30.1/src/ne_pkcs11.c
+@@ -156,6 +156,13 @@ static RSA_METHOD *pk11_rsa_method(ne_ss
+ }
+ #endif
+ 
++#ifdef HAVE_GNUTLS
++static int pk11_sign_callback(gnutls_privkey_t pkey,
++                              void *userdata,
++                              const gnutls_datum_t *raw_data,
++                              gnutls_datum_t *signature);
++#endif
++
+ static int pk11_find_x509(ne_ssl_pkcs11_provider *prov,
+                           pakchois_session_t *pks, 
+                           unsigned char *certid, unsigned long *cid_len)
+@@ -203,7 +210,7 @@ static int pk11_find_x509(ne_ssl_pkcs11_
+             ne_ssl_client_cert *cc;
+             
+ #ifdef HAVE_GNUTLS
+-            cc = ne__ssl_clicert_exkey_import(value, a[0].value_len);
++            cc = ne__ssl_clicert_exkey_import(value, a[0].value_len, pk11_sign_callback, prov);
+ #else
+             cc = ne__ssl_clicert_exkey_import(value, a[0].value_len, pk11_rsa_method(prov));
+ #endif
+@@ -298,10 +305,8 @@ static int find_client_cert(ne_ssl_pkcs1
+ #ifdef HAVE_GNUTLS
+ /* Callback invoked by GnuTLS to provide the signature.  The signature
+  * operation is handled here by the PKCS#11 provider.  */
+-static int pk11_sign_callback(gnutls_session_t session,
++static int pk11_sign_callback(gnutls_privkey_t pkey,
+                               void *userdata,
+-                              gnutls_certificate_type_t cert_type,
+-                              const gnutls_datum_t *cert,
+                               const gnutls_datum_t *hash,
+                               gnutls_datum_t *signature)
+ {
+@@ -571,11 +576,6 @@ void ne_ssl_pkcs11_provider_pin(ne_ssl_p
+ void ne_ssl_set_pkcs11_provider(ne_session *sess, 
+                                 ne_ssl_pkcs11_provider *provider)
+ {
+-#ifdef HAVE_GNUTLS
+-    sess->ssl_context->sign_func = pk11_sign_callback;
+-    sess->ssl_context->sign_data = provider;
+-#endif
+-
+     ne_ssl_provide_clicert(sess, pk11_provide, provider);
+ }
+ 
+--- neon27-0.30.1.orig/src/ne_privssl.h
++++ neon27-0.30.1/src/ne_privssl.h
+@@ -58,6 +58,10 @@ ne__ssl_clicert_exkey_import(const unsig
+ 
+ #include <gnutls/gnutls.h>
+ 
++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT
++#include <gnutls/abstract.h>
++#endif
++
+ struct ne_ssl_context_s {
+     gnutls_certificate_credentials_t cred;
+     int verify; /* non-zero if client cert verification required */
+@@ -78,17 +82,13 @@ struct ne_ssl_context_s {
+         } client;
+ #endif
+     } cache;
+-
+-#ifdef HAVE_GNUTLS_SIGN_CALLBACK_SET
+-    gnutls_sign_func sign_func;
+-    void *sign_data;
+-#endif
+ };
+ 
+ typedef gnutls_session_t ne_ssl_socket;
+ 
+ NE_PRIVATE ne_ssl_client_cert *
+-ne__ssl_clicert_exkey_import(const unsigned char *der, size_t der_len);
++ne__ssl_clicert_exkey_import(const unsigned char *der, size_t der_len,
++                             gnutls_privkey_sign_func sign_func, void *userdata);
+ 
+ #endif /* HAVE_GNUTLS */
+ 
+--- neon27-0.30.1.orig/src/ne_socket.c
++++ neon27-0.30.1/src/ne_socket.c
+@@ -1793,11 +1793,6 @@ int ne_sock_connect_ssl(ne_socket *sock,
+     gnutls_session_set_ptr(sock->ssl, userdata);
+     gnutls_credentials_set(sock->ssl, GNUTLS_CRD_CERTIFICATE, ctx->cred);
+ 
+-#ifdef HAVE_GNUTLS_SIGN_CALLBACK_SET
+-    if (ctx->sign_func)
+-        gnutls_sign_callback_set(sock->ssl, ctx->sign_func, ctx->sign_data);    
+-#endif
+-
+     if (ctx->hostname) {
+         gnutls_server_name_set(sock->ssl, GNUTLS_NAME_DNS, ctx->hostname,
+                                strlen(ctx->hostname));
diff --git a/net-libs/neon/neon-0.30.1-r1.ebuild b/net-libs/neon/neon-0.30.1-r1.ebuild
index c2b7f79bcbfb..e4de8328538c 100644
--- a/net-libs/neon/neon-0.30.1-r1.ebuild
+++ b/net-libs/neon/neon-0.30.1-r1.ebuild
@@ -56,7 +56,8 @@ src_prepare() {
 	done
 	sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.ac || die
 
-	epatch "${FILESDIR}"/${P}-xml2-config.patch
+	epatch "${FILESDIR}"/${P}-xml2-config.patch \
+		"${FILESDIR}"/${P}-gnutls3.4.patch
 	AT_M4DIR="macros" eautoreconf
 
 	elibtoolize
diff --git a/net-libs/nghttp2/nghttp2-1.7.1.ebuild b/net-libs/nghttp2/nghttp2-1.7.1.ebuild
index 776f0f6311a0..032a291eedb8 100644
--- a/net-libs/nghttp2/nghttp2-1.7.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.7.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-2
 else
 	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
index 749979fc8d93..3a80ece829e8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
@@ -17,7 +17,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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
 # seccomp
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 d58738ca35bb..3678472dc106 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
 		virtual/rubygems[ruby_targets_ruby20]
 		virtual/rubygems[ruby_targets_ruby21]
 		virtual/rubygems[ruby_targets_ruby22]
+		virtual/rubygems[ruby_targets_ruby23]
 		virtual/rubygems[ruby_targets_ruby19]
 	)
 	>=dev-libs/atk-2.8.0
@@ -206,7 +207,9 @@ src_configure() {
 
 	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="RUBY=$(type -P ruby23)"
+	elif 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)"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
index dcf3c4515295..fd95a77acc31 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -81,6 +81,7 @@ DEPEND="${RDEPEND}
 		virtual/rubygems[ruby_targets_ruby20]
 		virtual/rubygems[ruby_targets_ruby21]
 		virtual/rubygems[ruby_targets_ruby22]
+		virtual/rubygems[ruby_targets_ruby23]
 		virtual/rubygems[ruby_targets_ruby19]
 	)
 	>=app-accessibility/at-spi2-core-2.5.3
@@ -219,7 +220,9 @@ src_configure() {
 
 	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="RUBY=$(type -P ruby23)"
+	elif 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)"
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 6c00c22f75ca..8100718e2711 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -4,3 +4,4 @@ DIST zeromq-3.2.5.tar.gz 2082960 SHA256 09653e56a466683edb2f87ee025c4de55b8740df
 DIST zeromq-4.1.1.tar.gz 1383196 SHA256 43d61e5706b43946aad4a661400627bcde9c63cc25816d4749c67b64c3dab8db SHA512 6f626c89e573900d3b094ea6058693dee290eb9e4039a8a03d61d41b1d8976ed5596027ca76a43f371dbf86820edfbd56a84ecfab6864adfeee73035df7b5353 WHIRLPOOL b72f9118a0422bb2a6cc99e490085715739e7438fe88fb556b85e6da70a995c92ad0cdde296e02e31c02979458ad4bb6962ff0acd4f5642273659c29b43892e9
 DIST zeromq-4.1.2.tar.gz 1367275 SHA256 f9162ead6d68521e5154d871bac304f88857308bb02366b81bb588497a345927 SHA512 69f8992dabd1d2ae90b0f8fadf39d89eac054f6593e175432e35f0f8edd224bc588b015280ee2e9dd34c55269dd9daf4a4f275e547535b2a24ea0cb9617b2e80 WHIRLPOOL 59885d9b9d2267e26a2ff07be71bd360a64b649a6e6fa5243f7e99fcf88a9d4d0df562541d0dbabba25f07bb381c1f62c8371c4a16c911809e8295503e54ea01
 DIST zeromq-4.1.3.tar.gz 1372069 SHA256 61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 SHA512 2c993d18ea44e1cba890e024176af65b85b842ca4f8a22d319be4ace8388ab8828dd706b065f02754025bf271b1d7aa878c3f6655878248f7826452cb2a6134c WHIRLPOOL b22f2c8467976da27cb9a3cd14a498687328ec0978a95ccb383001cd184140adaf2878cb3c36db1afb1188ef88c756a21c6971ef69a12bc5f80789c16870ce8d
+DIST zeromq-4.1.4.tar.gz 1400012 SHA256 e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378 SHA512 8a8cf4f52ad78dddfff104bfba0f80bbc12566920906a0fafb9fc340aa92f5577c2923cb2e5346c69835cd2ea1609647a8893c2883cd22c1f0340a720511460c WHIRLPOOL ef7a700ab732cb319dbc3647184710bcc0f7d265b92d3e97b5e3ae393a4e055d9530de48fadf369c705e68bcfbd4c4c592db1e1f081e6fbe18eff12a9d74a83c
diff --git a/net-libs/zeromq/zeromq-4.1.4.ebuild b/net-libs/zeromq/zeromq-4.1.4.ebuild
new file mode 100644
index 000000000000..c4461410ca59
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.1.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="pgm static-libs test"
+
+RDEPEND="
+	dev-libs/libsodium:=
+	pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux
+	pgm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-relaxed
+		--with-libsodium
+		$(use_with pgm)
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test -j1
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	doman doc/*.[1-9]
+}
diff --git a/net-mail/checkpw/Manifest b/net-mail/checkpw/Manifest
deleted file mode 100644
index be60325a8511..000000000000
--- a/net-mail/checkpw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST checkpw-1.02.tar.gz 28631 SHA256 685a7fd4f4c783d0dcee342d109b0e492d3251e3c0cbc0ef77d33613cac6bced SHA512 e2d9fdca8a6a7f53eca46677f320fdc184daa982cb4a401fca78eecbc09eba5dc1759e2af91074dfc31850497ba08ba7f1c690ed985419a79b9e73109944b93f WHIRLPOOL da606d02ce5c1ce8158b3916edca3a258a6e7893e284070e7cb081e100aefb56f78be1f4c0ec43a693307c7058792a0dc86ac12e96aa2507e9f45be4fe6cb7b5
diff --git a/net-mail/checkpw/checkpw-1.02.ebuild b/net-mail/checkpw/checkpw-1.02.ebuild
deleted file mode 100644
index fc74a8e3bb6d..000000000000
--- a/net-mail/checkpw/checkpw-1.02.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="an implementation of the checkpassword interface that checks a password"
-HOMEPAGE="http://checkpw.sourceforge.net/checkpw/"
-SRC_URI="mirror://sourceforge/checkpw/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="static"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-qa.patch"
-	sed -i -e 's/head -1/head -n 1/g' Makefile auto_*.do default.do || die
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo ".maildir" > conf-maildir || die
-
-	if [ -z "${QMAIL_HOME}" ]; then
-		QMAIL_HOME="/var/qmail"
-		ewarn "QMAIL_HOME is null! Using default."
-		ewarn "Create the qmail user and set the homedir to your desired location."
-	fi
-	einfo "Using ${QMAIL_HOME} as qmail's default home directory."
-	echo "${QMAIL_HOME}" > conf-qmail || die
-
-	emake || die
-}
-
-src_install() {
-	into /
-	dobin checkpw checkapoppw selectcheckpw loginlog
-	fperms 0700 /bin/checkpw /bin/checkapoppw /bin/selectcheckpw
-
-	dodoc CHANGES README
-	docinto samples
-	dodoc run-{apop,both,multidir,multipw,pop,rules}
-}
-
-pkg_postinst() {
-	elog
-	elog "How to set password:"
-	elog
-	elog " % echo 'YOURPASSWORD' > ~/.maildir/.password"
-	elog " % chmod 600 ~/.maildir/.password"
-	elog
-	elog "Replace YOURPASSWORD with your plain password."
-	elog
-}
diff --git a/net-mail/checkpw/files/checkpw-1.02-qa.patch b/net-mail/checkpw/files/checkpw-1.02-qa.patch
deleted file mode 100644
index d529ce87b9d4..000000000000
--- a/net-mail/checkpw/files/checkpw-1.02-qa.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur checkpw-1.02.orig/checkapoppw.c checkpw-1.02/checkapoppw.c
---- checkpw-1.02.orig/checkapoppw.c	2002-01-07 16:25:10.000000000 +0900
-+++ checkpw-1.02/checkapoppw.c	2008-12-06 01:14:38.000000000 +0900
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <sys/stat.h>
- #include "error.h"
- #include "pathexec.h"
-diff -Naur checkpw-1.02.orig/checkpw.c checkpw-1.02/checkpw.c
---- checkpw-1.02.orig/checkpw.c	2002-01-07 16:23:51.000000000 +0900
-+++ checkpw-1.02/checkpw.c	2008-12-06 01:24:07.000000000 +0900
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <sys/stat.h>
- #include "error.h"
- #include "pathexec.h"
diff --git a/net-mail/checkpw/metadata.xml b/net-mail/checkpw/metadata.xml
deleted file mode 100644
index aec0843c7475..000000000000
--- a/net-mail/checkpw/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>
-	<longdescription>checkpw checks password which is stored in a file in the Maildir directory.
-The file has read and write permissions to the user only.
-checkpw checks real user's password. For virtual users, vucheckpw is available
-http://checkpw.sourceforge.net/vucheckpw/</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">checkpw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index 8fe5d334f5b4..896f474d8e29 100644
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index ca7395023554..c3600c249ca4 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,2 +1,4 @@
 DIST chrome-remote-desktop_47.0.2526.18_amd64.deb 16611922 SHA256 311bd33e434fae2cb0471a9a494f875faab551d53c769140b5a9715d239a68dd SHA512 3503a1471f6f2236951832035c97d18d64917bf374ca01edf93ae652ea10572a8d84d63a8b7a970a5ea37c67c8b24d3a2563db61e2aaeeedc94a5a06936dbb3c WHIRLPOOL bcd24c053c04f7fe352b346d63238783d6cc5b5f205a66bd066fe477371e7558322f846452ac03f89260bc536a8ed49c1d56988b5b14c62ab4ebef36033f1c00
 DIST chrome-remote-desktop_47.0.2526.18_i386.deb 17153928 SHA256 3de83736447f20193d85733d15617befa1adb7a70c0b17c0dd46bcc31b7af414 SHA512 ec03a967c49f092593ec46c8dbf1a72ce7d5b2e63dbaa6d0ea9ea1c0e47ebcbc2aa130ba3135ac6559e3d55b14e77f17568cb72181c86d30f7b64b5666d4c8d6 WHIRLPOOL 032c43af5447bab5a790bf6cb78627573caafceb31de84a3e5024ef25239fb9eb44d44746f1a64d3bc92221cd0c0662b0d511beb8ce538ad162954e9a29456f8
+DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 SHA256 2f3cb883e1ff2465db47d5aadf773efb49c5f11b0bfe3dfba973608e4db45047 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330 WHIRLPOOL 6662bfc8a8c298b7c062e4a10752aa3dfe910c7602a0bc20dc64533195d61ceb414dbc411c7f872e085dd13c46372ee46b33904d68bb5aae13698a04442e3905
+DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 SHA256 00e480a90b3ed3545ea762d7501b323f2471eb06b11f87882c046598b8f38df7 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8 WHIRLPOOL effd2650ee7d5b97f87ede0ac79bc1818ddc06e3eb742a080b12a4ef67283f5ba20495d5a5b4f5a5923d2a9a574a711513344b08abac3938ad142f27af48ed88
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild
index b244ef808554..ea1c036bbc64 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild
@@ -29,7 +29,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 # All the libs this package links against.
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
new file mode 100644
index 000000000000..b244ef808554
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 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="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit unpacker eutils python-single-r1
+
+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
+	${PYTHON_DEPS}
+	>=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
+	python_fix_shebang opt/google/chrome-remote-desktop/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/chrony/Manifest b/net-misc/chrony/Manifest
index 487b9dba5c2c..4ed75be1b452 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,3 +1,3 @@
 DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860545d84ae9f9d8b9bbd73796 SHA512 caa18a22e7e64186f24f474e02862296bfa74c99671bc98e926caf27b88ce3580282543594602e76ad4be9b7f9623350888def893a7c1d96a7370d13a636442f WHIRLPOOL 77500bc25496dc15f17bce60023b86330205945999011b243272db26a924ac67193da70089c59e19bea7666c05059c8c4c1975ca19057775ec2dd8e468ab8dce
 DIST chrony-2.2.tar.gz 340285 SHA256 d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485 SHA512 40e5f3b803016a8ce2a3450f24e07e02b54c8b0134c005342e52e1f122592af646186ca231644801bdb7bbb00c576347da34e162d33920ef71f4018204e8a866 WHIRLPOOL 0f517914935b150bce9a42507f1c4b04ec50d9406d1ac504b396abbe0646a3bce21299cb6b946159e7369800bbcd106257bf2c02e544fffd19d8211f232ed469
-DIST chrony-2.3-pre1.tar.gz 351989 SHA256 828644968d15d030c8a3aa8562229a29b4502a21b7c8d96f7124c3a33ea59100 SHA512 321d714f5d7b085198ad516bdc77a41d9243c84a80ec584af9bccbee4d46e4008885d6ff9e1e46a49e0eb1ea507ce0814df5e98dc06ba8ef1246f52bf57a1dca WHIRLPOOL 03bbff5c502e9eb48925c1504a386b327c785fcc1aeab4f4a9e5e90c60ad592356bbcee3ccc8c565bb3d17891448dd8f33b8515095dc01b148ef793f0c5966a8
+DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080 WHIRLPOOL 06864181ac74b2cf13baf7d9098404f8540c26db41035fe38005fbfea8e12f2de179008f5b1a2544e24ebb7e4cca712421746690edb7f36b90416ad87901e920
diff --git a/net-misc/chrony/chrony-2.3_pre1.ebuild b/net-misc/chrony/chrony-2.3.ebuild
index 04ce021eb38e..04ce021eb38e 100644
--- a/net-misc/chrony/chrony-2.3_pre1.ebuild
+++ b/net-misc/chrony/chrony-2.3.ebuild
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 45dd3922b4c1..052c0552f2bd 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,2 +1 @@
-DIST cmst-2015.03.01.tar.gz 340176 SHA256 c97d0fe4ab2cfe822121514b8ba6200d4e733bb63f05f04cd17d0b53794d465c SHA512 4178ff101df007e4aab43514250036947b150623f3a45e36dcee7a37be75d2180ba44ee0fb66ecf7240990084d43ccacd4f59259595db91d94a4ea0d08845b77 WHIRLPOOL e6d253bcebb007fcf70d51534b729b4bcdb6c292e4d7b89ef0d702a4308308a4bf1837e24b0051939ee0dfe01bc38b57de9a3e6d6761a958725cc959b24a1565
 DIST cmst-2015.12.03.tar.gz 1137034 SHA256 a67bd61a7b30d262b5ba4ac0dc2fed4c11bb14e0d605ec9aeae453cefb446010 SHA512 7705d15e71fac5b951c14d187c7424ff5329a7b5621bb9f765c564fd268cd2925c8130410c4e66760bcc7214a1ecf4e3ff0c8242f1bdcda0c4a3b97d1645324f WHIRLPOOL 014444884f9e90034e012d19b3938bd41f64f106cda7e648c7d251d41c2755e75c8371b5728f549adbf4c499285f35636e0e019d4edaa99062328dfc52805143
diff --git a/net-misc/cmst/cmst-2015.03.01.ebuild b/net-misc/cmst/cmst-2015.03.01.ebuild
deleted file mode 100644
index d6d4a4e4df8d..000000000000
--- a/net-misc/cmst/cmst-2015.03.01.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit multilib qmake-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-misc/connman
-	x11-libs/libxkbcommon"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	sed -i misc/desktop/cmst.desktop \
-		-e 's/Version=1.1/Version=1.0/' \
-		-e '/Categories/ s/$/;/'
-}
-
-src_configure() {
-	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-misc/cmst/metadata.xml b/net-misc/cmst/metadata.xml
index 2529600a4fbd..9bea61da3108 100644
--- a/net-misc/cmst/metadata.xml
+++ b/net-misc/cmst/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <upstream>
-    <bugs-to>https://github.com/andrew-bibb/cmst/issues</bugs-to>
-    <remote-id type="github">andrew-bibb/cmst</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/andrew-bibb/cmst/issues</bugs-to>
+		<remote-id type="github">andrew-bibb/cmst</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
index c4cf6d661943..2a1f46ca56e4 100644
--- a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
@@ -11,7 +11,7 @@ else
 	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"
+	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
 
diff --git a/net-misc/gip/Manifest b/net-misc/gip/Manifest
deleted file mode 100644
index 564531eb2ae0..000000000000
--- a/net-misc/gip/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gip-1.7.0-1.tar.gz 69533 SHA256 c525886d90d496839b6a51e3ab771f2511abfea2fcb78cfcfe82059a4e53c6b9 SHA512 ab918fcc57d09226690ef2936bbfa5c0a9332ffe7f0bef33a7bd820bbc5af0e8220429cb5e9d10014ea66cdf49cfa96fc02afc246edea4f25647eeb2a073f984 WHIRLPOOL b4aea30722898167b8665a15a31f13e90959a2755e2950a3e0f73791af580345f76706abfa17a274ac579a07739f0bbf01adc976b8b178dca75354c7e2eae073
-DIST gip_1.7.0-1-3.debian.tar.gz 6689 SHA256 7f9e7818ffb726347f69cdc6d86a45d7c07186f4f21bf81bb08c04ff2511e494 SHA512 d17a02900f7dd9fbe3113977c86d52ff94fabc988406bad0ca7f148d87e1185f5f679a1539726227569534b4b810290954e42fa6df0586c84ddb074053196580 WHIRLPOOL acc967221c9a388f7539216a32ba82f1702c36b890637a46a6c360e15201732f946f4afeb0ec8e38e457657d944f315c26925c86e196da39802c13624ad2d6a0
diff --git a/net-misc/gip/files/gip-1.7.0.1-asneeded.patch b/net-misc/gip/files/gip-1.7.0.1-asneeded.patch
deleted file mode 100644
index 2c0bbe3df488..000000000000
--- a/net-misc/gip/files/gip-1.7.0.1-asneeded.patch
+++ /dev/null
@@ -1,33 +0,0 @@
- installer/build_files.sh |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/installer/build_files.sh b/installer/build_files.sh
-index 8d469b0..bc653cf 100755
---- a/installer/build_files.sh
-+++ b/installer/build_files.sh
-@@ -27,7 +27,7 @@ compile_file() {
-   # Compile.
-   echo Compiling: $FILE...
-   set -x
--  g++ -fPIC $CFLAGS -c $FILE -o $OBJECTFILE
-+  g++ -fPIC $CFLAGS $CXXFLAGS -c $FILE -o $OBJECTFILE
-   ERR="$?"
-   set +x
-   if [ "$ERR" -ne "0" ]; then
-@@ -122,14 +122,14 @@ fi
- if [ "$SHARED" = "" ]; then
-   # Link as an executable.
-   set -x
--  g++ $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
-+  g++ $CFLAGS $CXXFLAGS $LDFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
-   ERR="$?"
-   set +x
- else
-   # Link as a shared library.
-   SHAREDNAME=`echo $OUTFILE | sed 's/\..*//'`
-   set -x
--  g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
-+  g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS $CXXFLAGS $LDFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
-   ERR="$?"
-   set +x
- fi
diff --git a/net-misc/gip/gip-1.7.0.1.ebuild b/net-misc/gip/gip-1.7.0.1.ebuild
deleted file mode 100644
index c97c60d94317..000000000000
--- a/net-misc/gip/gip-1.7.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils versionator
-
-MY_PV="$(replace_version_separator 3 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A nice GNOME GUI for making IP address based calculations"
-HOMEPAGE="https://code.google.com/p/gip/"
-SRC_URI="
-	https://gip.googlecode.com/files/${MY_P}.tar.gz
-	mirror://debian/pool/main/g/${PN}/${PN}_${MY_PV}-3.debian.tar.gz"
-#http://ftp.de.debian.org/debian/pool/main/g/gip/gip_1.7.0-1-3.debian.tar.gz
-#http://dl.debain.org/gip/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	dev-libs/glib:2
-	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/debian/patches/*.diff \
-		"${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e "s:g++:$(tc-getCXX):g" \
-		-i installer/build_files.sh
-
-#	sed \
-#		-e 's:CFLAGS=":CFLAGS+=" :g' \
-#		-i build.sh || die
-
-#		"${FILESDIR}"/${PN}-1.6.1.1-asneeded.patch
-
-#		"${FILESDIR}/${P}-libsigcpp.patch" \
-#	sed -i -e 's@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@g' build.sh
-#	sed -i -e 's@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@g' build.sh
-#	sed -i -e 's@INST_DOCDIR=\"$INST_PREFIX/doc/$EXECUTABLE\"@INST_DOCDIR=\"$INST_PREFIX/share/doc/'${PF}'\"@g' build.sh
-}
-
-src_compile() {
-	# Crazy build system...
-	export CXXFLAGS="${CXXFLAGS}"
-	./build.sh --prefix "${D}/usr" || die "./build failed"
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	# Crazy build system...
-	./build.sh --install --prefix "${D}/usr" || die "./build --install failed"
-	make_desktop_entry gip "GIP IP Address Calculator" gnome-calc3 Network
-}
diff --git a/net-misc/gip/metadata.xml b/net-misc/gip/metadata.xml
deleted file mode 100644
index bd94cd044ec1..000000000000
--- a/net-misc/gip/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-		Gip is a nice GNOME GUI for making IP address based calculations. For
-		example, it can display IP addresses in binary format. Also, it is
-		possible to calculate subnets.
-	</longdescription>
-	<longdescription lang="ja">
-		Gip は IP アドレス関係の計算をするのに便利な GNOME GUI のプログラムです。例えば、2進法で表現された IP アドレスを10進法にします。サブネットを計算することもできます。
-	</longdescription>
-</pkgmetadata>
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
index 1822c2960fe4..d9fbf9aaf9ad 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.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/gnome-rdp/metadata.xml b/net-misc/gnome-rdp/metadata.xml
index 4965c206c652..df7f2aef113e 100644
--- a/net-misc/gnome-rdp/metadata.xml
+++ b/net-misc/gnome-rdp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
 	<longdescription>Mono Remote Desktop Client for the GNOME Desktop. Supported protocols: RDP, VNC, SSH. Configured sessions can be saved to the built in list</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">gnome-rdp</remote-id>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index 70e4b177ce65..be90dbf1bc0e 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,3 +1,4 @@
 DIST gsutil_3.42.tar.gz 1878904 SHA256 50fc7acb7d1db8752f3eee106a3d8d65188107943e7cb30cfd3f94a9cfcdcf37 SHA512 084aaf43a44528af0cdfd9bd22beeb5d6abff240c09843cf35016d685d51b854ed5b2837eaa50c97bb44d5e1a3cdccbae6688ef27aa13f2a5db6040bf501b381 WHIRLPOOL 5b0d0fb1d2446a7b8777f368f073fdb4f7ad2d6407735976c178a2727a2548bf28522e06469dd0b7df1578d5586bc152fba3520b66f88d706417947aa3aa5578
 DIST gsutil_4.15.tar.gz 2826243 SHA256 faf481515be2ee0af2a04560ec207fe6253e9854804813eae1d800adbfd2a419 SHA512 60cd516e354505d47267aa46b54d56373443e630d79c012df8712238fa63746de8b3509932222ea920ec9bc45b664f305136f2a2686640c72c246d550e2b558f WHIRLPOOL 34c5ed0ff717c3749ffc76e31c1962b94ffe888091173ab0abfffd42e690bf8a37429fa2edfd5253e41c02781792182d8ff75161c89df538d5bad5138bddd54a
 DIST gsutil_4.16.tar.gz 2676340 SHA256 4c2fc1b900b75ada9b7636cba00db35e55c5a1d40063ea222e3cc2335cb5dea7 SHA512 5e0009d551eaf163169dc90b634bc2d3be5b1ac19bff5e9c69f9e7c977576b7b9cc334fce7d4b4f643b9b6e9feb6386ba81958321645dd0b43e4977c730cfedd WHIRLPOOL defbd62c81c3658eb500dbd6c4b6c3a7a8545e565551c32f2913c4281a97dbd56896632e6cdccfecd0c28b40507d13e67776549fb42eba98a4e6417e9b86886d
+DIST gsutil_4.17.tar.gz 2677212 SHA256 bdb0037c74f425d0cbd3c70d5ed3777a44051840c4ccf950185f34a8c9eb079f SHA512 a1a207aa7f1c145492d1b78bab2e9a486b729729c38f0be5db67149562673614ca8a3187fa7e8ecaaf099c4d9d4e3e1fe41e955b728b95e8bda084b8c1b524c8 WHIRLPOOL 99964c49b5e18cb0c3f9d1565bff8ded9e86610a19094be268c2408ea43eb121c6507187bc9e0c4a4af1733a4dd00233a73b015090f80b87b8cb2bb1b7609118
diff --git a/net-misc/gsutil/gsutil-4.17.ebuild b/net-misc/gsutil/gsutil-4.17.ebuild
new file mode 100644
index 000000000000..117830654c9c
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.17.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.38.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.9[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.4.12[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.16-use-friendy-version-checks.patch
+)
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
index 5637df30a246..6b1b31ea1c6c 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/i2pd/files/i2pd-2.4.0.service b/net-misc/i2pd/files/i2pd-2.4.0.service
new file mode 100644
index 000000000000..c5acee0ce2b8
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.4.0.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=C++ daemon for accessing the I2P network
+After=network.target
+
+[Service]
+Type=forking
+Restart=on-abnormal
+PIDFile=/var/run/i2pd.pid
+User=i2pd
+Group=i2pd
+PermissionsStartOnly=yes
+ExecStartPre=/bin/touch /var/run/i2pd.pid /var/log/i2pd.log
+ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd.pid /var/log/i2pd.log
+ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-misc/i2pd/i2pd-2.4.0-r1.ebuild b/net-misc/i2pd/i2pd-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..bf6489cfc687
--- /dev/null
+++ b/net-misc/i2pd/i2pd-2.4.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd user cmake-utils
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
+
+RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
+			dev-libs/crypto++
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+			upnp? ( net-libs/miniupnpc )
+		)"
+DEPEND="${RDEPEND}
+	static? ( >=dev-libs/boost-1.46[static-libs,threads]
+		dev-libs/crypto++[static-libs]
+		!libressl? ( dev-libs/openssl:0[static-libs] )
+		libressl? ( dev-libs/libressl[static-libs] )
+		upnp? ( net-libs/miniupnpc[static-libs] ) )
+	i2p-hardening? ( >=sys-devel/gcc-4.7 )
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
+
+I2PD_USER="${I2PD_USER:-i2pd}"
+I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+
+CMAKE_USE_DIR="${S}/build"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_installed_components.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_PCH=$(usex pch ON OFF)
+		-DWITH_STATIC=$(usex static ON OFF)
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.md
+	doman "${FILESDIR}/${PN}.1"
+	keepdir /var/lib/i2pd/
+	insinto "/var/lib/i2pd"
+	doins -r "${S}/contrib/certificates"
+	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+	fperms 700 /var/lib/i2pd/
+	dodir "/etc/${PN}"
+	insinto "/etc/${PN}"
+	doins "${FILESDIR}/${PN}.conf"
+	doins "${FILESDIR}/tunnels.cfg"
+	fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
+	fperms 600 "/etc/${PN}/${PN}.conf"
+	dodir /usr/share/i2pd
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_newunit "${FILESDIR}/${PN}-2.4.0.service" "${PN}.service"
+	doenvd "${FILESDIR}/99${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_setup() {
+	enewgroup "${I2PD_GROUP}"
+	enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
+}
diff --git a/net-misc/i2pd/i2pd-2.4.0.ebuild b/net-misc/i2pd/i2pd-2.4.0.ebuild
deleted file mode 100644
index bf590824dfee..000000000000
--- a/net-misc/i2pd/i2pd-2.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd user cmake-utils
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
-			dev-libs/crypto++
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-			upnp? ( net-libs/miniupnpc )
-		)"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.46[static-libs,threads]
-		dev-libs/crypto++[static-libs]
-		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
-		upnp? ( net-libs/miniupnpc[static-libs] ) )
-	i2p-hardening? ( >=sys-devel/gcc-4.7 )
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
-
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix_installed_components.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	doman "${FILESDIR}/${PN}.1"
-	keepdir /var/lib/i2pd/
-	insinto "/var/lib/i2pd"
-	doins -r "${S}/contrib/certificates"
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	doins "${FILESDIR}/${PN}.conf"
-	doins "${FILESDIR}/tunnels.cfg"
-	fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
-	fperms 600 "/etc/${PN}/${PN}.conf"
-	dodir /usr/share/i2pd
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	doenvd "${FILESDIR}/99${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
diff --git a/net-misc/i2pd/metadata.xml b/net-misc/i2pd/metadata.xml
index b713bcadb757..d90429157ba5 100644
--- a/net-misc/i2pd/metadata.xml
+++ b/net-misc/i2pd/metadata.xml
@@ -9,12 +9,16 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>tomboy64@sina.cn</email>
+		<name>Proxy maintainer. Please subscribe to bugs.</name>
+	</maintainer>
 	<use>
 		<flag name="i2p-hardening">
 			Compile with hardening on vanilla compilers/linkers
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">PrivacySolutions/i2pd</remote-id>
+		<remote-id type="github">PurpleI2P/i2pd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index fd6545614734..573134bc2499 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,3 +1,3 @@
 DIST iperf-2.0.5.tar.gz 248583 SHA256 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b SHA512 da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f WHIRLPOOL d66b007fad372516c7f7377872b69ea450fa9ff6d1492f2a224a73f2fb3f7616bd2d57a34a815d4d95683d81fd02d76472d4727323e920410034ba725f6476ce
 DIST iperf-3.0.11.tar.gz 426434 SHA256 c774b807ea4db20e07558c47951df186b6fb1dd0cdef4282c078853ad87cc712 SHA512 292b826099a1fc813f2fbe4506f8bd8b3b2e4dde04e33a097cce966d7502b3c521a29b9ba74e55fe38406fdb85090695f59febbf4ca31bb1ffc801b3b7615d19 WHIRLPOOL e16799997d7e3c0abe2e2a93bd559a69c0d3c96aab954cd9fb4be93cc8ce4f38c7a2ced034b1b03b2dc257bd5c82d202b4da528ee11f86ed99890fb02cad4b04
-DIST iperf-3.1_beta3.tar.gz 542912 SHA256 ed96fd8dcc7150f3bb93536e3f1858121210e7f90cd637d76400e26cb1426679 SHA512 eab26b54a14e86fbe1503979b5924abdb3438710c7baf782fef97e7170f4d81eb9946b000fadd89d123daecb03b6a09fc429615c076fb0a444d30929983e3be8 WHIRLPOOL a627a88fe7c863af354a7e00bfe066bd06daee7e1fc72de385d4294b7304bd7ce1af7c35a0bf257305b5851db8a1b376d58f39e2053c8aa801b7a16bae0c9531
+DIST iperf-3.1.2.tar.gz 545107 SHA256 48b5c783bb4a9c44f2bdcfe52c5d45b77ab1e1c82de3d0131f692457950811f9 SHA512 f0503e8dc77c575fe85f0800da9242da73c7d1ffce3aae0971f8fe7c5c3e74901ebdc3956bfe0bb58a5ffe4f6ccbe5a6d5402f188b0ceb1a02c410f5589a568d WHIRLPOOL 1537ba5a9e300b2b67ff42ba78fe97c09f99891feff6e2b66ec460dd1c12e29acdfee1e17b3af2d5a74aac17bd4bb635b0a268646b1117d5147dd8790ad77af9
diff --git a/net-misc/iperf/files/iperf3.initd b/net-misc/iperf/files/iperf3.initd
new file mode 100644
index 000000000000..d02f560146ff
--- /dev/null
+++ b/net-misc/iperf/files/iperf3.initd
@@ -0,0 +1,11 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="IP bandwidth measurement server"
+command="/usr/bin/iperf3"
+
+command_background="yes"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-s ${IPERF_OPTS}"
diff --git a/net-misc/iperf/iperf-2.0.5-r2.ebuild b/net-misc/iperf/iperf-2.0.5-r2.ebuild
index 3e2238c03f75..dc081c8d1126 100644
--- a/net-misc/iperf/iperf-2.0.5-r2.ebuild
+++ b/net-misc/iperf/iperf-2.0.5-r2.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-inherit base
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://iperf.sourceforge.net/"
diff --git a/net-misc/iperf/iperf-3.1.2.ebuild b/net-misc/iperf/iperf-3.1.2.ebuild
new file mode 100644
index 000000000000..985ad2a7b95f
--- /dev/null
+++ b/net-misc/iperf/iperf-3.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+LICENSE="BSD"
+SLOT="3"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="static-libs sctp"
+
+DEPEND="sctp? ( net-misc/lksctp-tools )"
+RDEPEND="$DEPEND"
+
+S=${WORKDIR}/${P/_beta/b}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.5-flags.patch
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	prune_libtool_files
+}
diff --git a/net-misc/iperf/iperf-3.1_beta3.ebuild b/net-misc/iperf/iperf-3.1_beta3.ebuild
deleted file mode 100644
index 6e0d1842d7a7..000000000000
--- a/net-misc/iperf/iperf-3.1_beta3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-LICENSE="BSD"
-SLOT="3"
-HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="static-libs sctp"
-
-DEPEND="sctp? ( net-misc/lksctp-tools )"
-RDEPEND="$DEPEND"
-
-S=${WORKDIR}/${P/_beta/b}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.5-flags.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/italc/Manifest b/net-misc/italc/Manifest
deleted file mode 100644
index 5b2f89adecd8..000000000000
--- a/net-misc/italc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST italc-2.0.0.tar.bz2 3413075 SHA256 edb5e0502ad73e3398f63e2f485fa7ca7d12cae50315801ac3f22304ccdb6aac SHA512 2e0a0ce97933df1d7332f37d8342f39dd3fad019147e212cb4c2e4e241fdace9ae7febb48cd8808017108de201850d132de7dde35d01a7e60fef6f69302cb4af WHIRLPOOL fa90a335cc5253a513eda1216def0e712e47ccb5b6c1991066090447569a6580d1ee58ac9faa337498e62a7c9c43c40cd17c5260acb7447fb2fffb88d93002a5
diff --git a/net-misc/italc/files/italc-2.0.0-gcc-4.7.patch b/net-misc/italc/files/italc-2.0.0-gcc-4.7.patch
deleted file mode 100644
index b000b4f34852..000000000000
--- a/net-misc/italc/files/italc-2.0.0-gcc-4.7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- lib/src/LocalSystem.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/lib/src/LocalSystem.cpp b/lib/src/LocalSystem.cpp
-index fd40609..5827634 100644
---- a/lib/src/LocalSystem.cpp
-+++ b/lib/src/LocalSystem.cpp
-@@ -30,6 +30,7 @@
- #include <QtGui/QWidget>
- #include <QtNetwork/QHostInfo>
- 
-+#include <unistd.h>
- 
- #ifdef ITALC_BUILD_WIN32
- 
diff --git a/net-misc/italc/italc-2.0.0.ebuild b/net-misc/italc/italc-2.0.0.ebuild
deleted file mode 100644
index 57f24f152557..000000000000
--- a/net-misc/italc/italc-2.0.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-r2 eutils cmake-utils user
-
-DESCRIPTION="Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school"
-HOMEPAGE="http://italc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/italc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/lzo
-	dev-libs/openssl
-	sys-apps/tcp-wrappers
-	sys-libs/zlib
-	virtual/jpeg
-	dev-qt/qtcore:4
-	dev-qt/qtxmlpatterns:4
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-apps/xinput
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto"
-
-PROPERTIES="interactive"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-4.7.patch )
-
-DOCS=( TODO README AUTHORS INSTALL ChangeLog )
-
-pkg_setup() {
-	enewgroup italc
-}
-
-pkg_postinst() {
-	elog "On the master, please run "
-	elog "# emerge --config =${CATEGORY}/${PF}"
-
-	elog "Please add the logins of master users (teachers) to the italc group by running"
-	elog "# usermod -a -G italc <loginname>"
-
-	echo ""
-}
-
-pkg_config() {
-	if [ ! -d /etc/italc/keys ] ; then
-		einfo "Creating public and private keys for italc in /etc/italc/keys."
-		/usr/bin/ica -role teacher -createkeypair > /dev/null
-		eend $?
-		einfo "Setting chmod 640 on private keys."
-		chgrp -R italc /etc/italc
-		chmod -R o-rwx /etc/italc/keys/private
-	else
-		einfo "Not creating new keypair, as /etc/italc/keys already exists"
-	fi
-}
diff --git a/net-misc/italc/metadata.xml b/net-misc/italc/metadata.xml
deleted file mode 100644
index 7bd1b5cd73e1..000000000000
--- a/net-misc/italc/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">italc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/ixp4xx/Manifest b/net-misc/ixp4xx/Manifest
deleted file mode 100644
index 1103f79f5c90..000000000000
--- a/net-misc/ixp4xx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GPL_ixp400LinuxEthernetDriverPatch-1_5.zip 30291 RMD160 d38e5898683cf03cd738c92e76416ba92e5f453d SHA1 ed5905aeff0e663100dd0ae4c2be0b608afe48f1 SHA256 7136fcdb4c7d7d9d9a879dd0e00541993cc95388bdcbc823b1b6545508ae21e4
-DIST IPL_ixp400AccessLibrary-2_1.zip 2227460 RMD160 3b2efba0d72b4e74a14c4d14c9194339ab3a6103 SHA1 0c1d2d49454cfeecff2a09cbaed18fe6d6ccc00a SHA256 5ae00e704db0a2d8186b603c8699738b4d0a60361a6226002654d5b7a7ae1987
-DIST IPL_ixp400NpeLibrary-2_1.zip 168570 RMD160 d295fbecd51144ec6c6e9c9223d5c2b7e6eb6f12 SHA1 cbc3eb2720dff73c3c8a79e4eddc9567a762f25f SHA256 a641c27a73731f4596058837f9d8463155729fe4f2fe14a8429a317302af9152
diff --git a/net-misc/ixp4xx/files/2.1/10-oe-ixethdb-header.patch b/net-misc/ixp4xx/files/2.1/10-oe-ixethdb-header.patch
deleted file mode 100644
index 0b3702a3e101..000000000000
--- a/net-misc/ixp4xx/files/2.1/10-oe-ixethdb-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ixp400_xscale_sw/src/ethDB/include/IxEthDB_p.h
-+++ ixp400_xscale_sw/src/ethDB/include/IxEthDB_p.h
-@@ -693,7 +693,7 @@ IX_ETH_DB_PUBLIC UINT32 ixEthDBEntryXORH
- IX_ETH_DB_PUBLIC UINT32 ixEthDBKeyXORHash(void *macAddress);
- 
- /* Port updates */
--IX_ETH_DB_PUBLIC IxEthDBStatus ixEthDBNPEUpdateHandler(IxEthDBPortId portID, IxEthDBFeature type);
-+IX_ETH_DB_PUBLIC IxEthDBStatus ixEthDBNPEUpdateHandler(IxEthDBPortId portID, IxEthDBRecordType type);
- IX_ETH_DB_PUBLIC void ixEthDBUpdatePortLearningTrees(IxEthDBPortMap triggerPorts);
- IX_ETH_DB_PUBLIC void ixEthDBNPEAccessRequest(IxEthDBPortId portID);
- IX_ETH_DB_PUBLIC void ixEthDBUpdateLock(void);
diff --git a/net-misc/ixp4xx/files/2.1/11-oe-bit-macro.patch b/net-misc/ixp4xx/files/2.1/11-oe-bit-macro.patch
deleted file mode 100644
index 40cc8d87d9b5..000000000000
--- a/net-misc/ixp4xx/files/2.1/11-oe-bit-macro.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ixp400_xscale_sw/src/include/IxTypes.h
-+++ ixp400_xscale_sw/src/include/IxTypes.h
-@@ -79,6 +79,10 @@
- #endif
- #endif
- 
-+#ifndef BIT
-+#define BIT(x)  ((1)<<(x))
-+#endif
-+
- #include "IxOsalBackward.h"
- 
- #endif /* IxTypes_H */
-
diff --git a/net-misc/ixp4xx/files/2.1/12-oe-ixnpemhconfigisr-is-private.patch b/net-misc/ixp4xx/files/2.1/12-oe-ixnpemhconfigisr-is-private.patch
deleted file mode 100644
index 3b1848fb67d9..000000000000
--- a/net-misc/ixp4xx/files/2.1/12-oe-ixnpemhconfigisr-is-private.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ixp400_xscale_sw/src/npeMh/IxNpeMhSymbols.c
-+++ ixp400_xscale_sw/src/npeMh/IxNpeMhSymbols.c
-@@ -63,7 +63,6 @@ EXPORT_SYMBOL(ixNpeMhMessagesReceive);
- EXPORT_SYMBOL(ixNpeMhShow);
- EXPORT_SYMBOL(ixNpeMhShowReset);
- 
--extern void ixNpeMhConfigIsr (void *parameter);
- extern BOOL ixNpeMhConfigInFifoIsFull(IxNpeMhNpeId npeId);
- extern BOOL ixNpeMhConfigOutFifoIsEmpty (IxNpeMhNpeId npeId);
- extern void ixNpeMhConfigLockRelease (IxNpeMhNpeId npeId);
-@@ -72,7 +71,6 @@ extern void ixNpeMhConfigOutFifoRead (Ix
- extern void ixNpeMhConfigInFifoWrite (IxNpeMhNpeId npeId,IxNpeMhMessage message);
- extern struct ixNpeMhConfigNpeInfo ixNpeMhConfigNpeInfo[IX_NPEMH_NUM_NPES];
- 
--EXPORT_SYMBOL(ixNpeMhConfigIsr);
- EXPORT_SYMBOL(ixNpeMhConfigInFifoIsFull);
- EXPORT_SYMBOL(ixNpeMhConfigOutFifoIsEmpty);
- EXPORT_SYMBOL(ixNpeMhConfigLockRelease);
diff --git a/net-misc/ixp4xx/files/2.1/13-oe-le.patch b/net-misc/ixp4xx/files/2.1/13-oe-le.patch
deleted file mode 100644
index 0a52db5e060b..000000000000
--- a/net-misc/ixp4xx/files/2.1/13-oe-le.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ixp400_xscale_sw/src/include/IxQMgr.h
-+++ ixp400_xscale_sw/src/include/IxQMgr.h
-@@ -96,8 +98,8 @@
- 
- #else
- 
--#define IX_QMGR_INLINE_READ_LONG IX_OSAL_READ_LONG_LE_DC
--#define IX_QMGR_INLINE_WRITE_LONG IX_OSAL_WRITE_LONG_LE_DC
-+#define IX_QMGR_INLINE_READ_LONG IX_OSAL_READ_LONG_LE_AC
-+#define IX_QMGR_INLINE_WRITE_LONG IX_OSAL_WRITE_LONG_LE_AC
- 
- #endif
- 
diff --git a/net-misc/ixp4xx/files/2.1/30-oe-Makefile.patch b/net-misc/ixp4xx/files/2.1/30-oe-Makefile.patch
deleted file mode 100644
index 8332b4daeaa3..000000000000
--- a/net-misc/ixp4xx/files/2.1/30-oe-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ixp_osal/Makefile
-+++ ixp_osal/Makefile
-@@ -185,7 +185,7 @@ endif
- INCLUDE_DIRS = include $(OSAL_DIRS:%=$(MAIN_INC_PREFIX)/%) $(OSAL_DIRS:%=$(OS_INC_PREFIX)/%)  
- 
- ifeq ($(IX_OSAL_MK_HOST_OS), linux)
--INCLUDE_DIRS += $(LINUX_SRC)/include/asm-arm/arch-ixp425/
-+INCLUDE_DIRS += $(LINUX_SRC)/include/asm-arm/arch-ixp4xx/
- endif
- 
- CFLAGS += $(INCLUDE_DIRS:%=-I%) 
---- ixp_osal/os/linux/make/macros.mk
-+++ ixp_osal/os/linux/make/macros.mk
-@@ -88,10 +88,10 @@ AR := $(LINUX_CROSS_COMPILE)ar
- # Compiler & linker options
- 
- # Compiler flags
--LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mcpu=xscale -mtune=xscale
-+LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mtune=xscale
- 
- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common \
--          -pipe -mapcs-32 -mshort-load-bytes -msoft-float -DMODULE \
-+          -pipe -mapcs-32 -msoft-float -DMODULE \
-           -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS) -DEXPORT_SYMTAB
- 
- # Linux linker flags
diff --git a/net-misc/ixp4xx/files/2.1/31-oe-2.6.patch b/net-misc/ixp4xx/files/2.1/31-oe-2.6.patch
deleted file mode 100644
index edea920cb781..000000000000
--- a/net-misc/ixp4xx/files/2.1/31-oe-2.6.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- ixp_osal/os/linux/src/core/IxOsalOsMsgQ.c
-+++ ixp_osal/os/linux/src/core/IxOsalOsMsgQ.c
-@@ -45,9 +45,9 @@
-  * -- End Intel Copyright Notice --
-  */
- #include <linux/linkage.h>
-+#include <linux/spinlock.h>
- #include <linux/ipc.h>
- #include <linux/msg.h>
--#include <linux/spinlock.h>
- #include <linux/interrupt.h>
- 
- #include "IxOsal.h"
---- ixp_osal/os/linux/src/core/IxOsalOsSemaphore.c
-+++ ixp_osal/os/linux/src/core/IxOsalOsSemaphore.c
-@@ -46,7 +46,7 @@
-  */
- 
- #include <linux/slab.h>
--#include <asm-arm/hardirq.h>
-+#include <linux/hardirq.h>
- #include "IxOsal.h"
- 
- /* Define a large number */
-@@ -93,7 +93,7 @@
- {
- 
-     IX_STATUS ixStatus = IX_SUCCESS;
--    UINT32 timeoutTime;
-+    unsigned long timeoutTime;
- 
-     if (sid == NULL)
-     {
-@@ -261,7 +261,7 @@ ixOsalMutexInit (IxOsalMutex * mutex)
- PUBLIC IX_STATUS
- ixOsalMutexLock (IxOsalMutex * mutex, INT32 timeout)
- {
--    UINT32 timeoutTime;
-+    unsigned long timeoutTime;
- 
-     if (in_irq ())
-     {
---- ixp_osal/os/linux/src/core/IxOsalOsServices.c
-+++ ixp_osal/os/linux/src/core/IxOsalOsServices.c
-@@ -54,6 +54,7 @@
- #include <linux/time.h>
- #include <linux/sched.h>
- #include <linux/slab.h>
-+#include <linux/interrupt.h>
- 
- #include "IxOsal.h"
- 
-@@ -89,7 +90,7 @@
- /*
-  * General interrupt handler
-  */
--static void
-+static irqreturn_t
- ixOsalOsIsrProxy (int irq, void *dev_id, struct pt_regs *regs)
- {
-     IxOsalInfoType *isr_proxy_info = (IxOsalInfoType *) dev_id;
-@@ -98,6 +99,7 @@
- 		   "ixOsalOsIsrProxy: Interrupt used before ixOsalIrqBind was invoked");
- 
-     isr_proxy_info->routine (isr_proxy_info->parameter);
-+    return IRQ_HANDLED;
- }
- 
- /*
-@@ -105,11 +107,12 @@
-  * This handler saves the interrupted Program Counter (PC)
-  * into a global variable
-  */
--static void
-+static irqreturn_t
- ixOsalOsIsrProxyWithPC (int irq, void *dev_id, struct pt_regs *regs)
- {
-     ixOsalLinuxInterruptedPc = regs->ARM_pc;
-     ixOsalOsIsrProxy(irq, dev_id, regs);
-+    return IRQ_HANDLED;
- }
- 
- /**************************************
-@@ -191,10 +194,15 @@
- PUBLIC UINT32
- ixOsalIrqLock ()
- {
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+    unsigned long flags;
-+    local_irq_save(flags);
-+#else
-     UINT32 flags;
-     save_flags (flags);
-     cli ();
--    return flags;
-+#endif
-+    return (UINT32)flags;
- }
- 
- /* Enable interrupts and task scheduling,
-@@ -204,7 +212,11 @@
- PUBLIC void
- ixOsalIrqUnlock (UINT32 lockKey)
- {
-+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+    local_irq_restore((unsigned long)lockKey);
-+# else
-     restore_flags (lockKey);
-+# endif
- }
- 
- PUBLIC UINT32
-@@ -329,7 +341,7 @@
- PUBLIC void
- ixOsalSleep (UINT32 milliseconds)
- {
--    if (milliseconds != 0)
-+    if (milliseconds*HZ >= 1000)
-     {
-         set_current_state(TASK_INTERRUPTIBLE); 
-         schedule_timeout ((milliseconds * HZ) / 1000);
---- ixp_osal/os/linux/src/core/IxOsalOsThread.c
-+++ ixp_osal/os/linux/src/core/IxOsalOsThread.c
-@@ -65,12 +65,7 @@ thread_internal (void *unused)
-     void *arg = IxOsalOsThreadData.arg;
-     static int seq = 0;
- 
--    daemonize ();
--    reparent_to_init ();
--
--    exit_files (current);
--
--    snprintf(current->comm, sizeof(current->comm), "IxOsal %d", ++seq);
-+    daemonize ("IxOsal %d", ++seq);
- 
-     up (&IxOsalThreadMutex);
- 
diff --git a/net-misc/ixp4xx/files/2.1/32-oe-invalidate-cache.patch b/net-misc/ixp4xx/files/2.1/32-oe-invalidate-cache.patch
deleted file mode 100644
index bb20ff026e8a..000000000000
--- a/net-misc/ixp4xx/files/2.1/32-oe-invalidate-cache.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- ixp_osal/os/linux/include/core/IxOsalOs.h
-+++ ixp_osal/os/linux/include/core/IxOsalOs.h
-@@ -56,6 +56,7 @@
- #include <linux/cache.h>
- #include <linux/mm.h>
- #include <linux/config.h>
-+#include <linux/version.h>
- #include <asm/pgalloc.h>
- 
- /**
-@@ -66,9 +67,23 @@
- 
- #define IX_OSAL_OS_MMU_PHYS_TO_VIRT(addr)  ((addr) ? phys_to_virt((unsigned int)(addr)) : 0)
- 
--#define IX_OSAL_OS_CACHE_INVALIDATE(addr, size)  ( invalidate_dcache_range((__u32)addr, (__u32)addr + size )) 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+/*
-+ * 2.6 kernels do not export the required cache functions.
-+ */
-+extern void ixOsalCacheInvalidateRange(unsigned long start, unsigned long size);
-+extern void ixOsalCacheFlushRange(unsigned long start, unsigned long size);
-+
-+#define IX_OSAL_OS_CACHE_INVALIDATE(addr, size) \
-+ixOsalCacheInvalidateRange((unsigned long)addr, (unsigned long)addr + size)
-+#define IX_OSAL_OS_CACHE_FLUSH(addr, size) \
-+ixOsalCacheFlushRange((unsigned long)addr, (unsigned long)addr + size )
- 
-+#else
-+
-+#define IX_OSAL_OS_CACHE_INVALIDATE(addr, size)  ( invalidate_dcache_range((__u32)addr, (__u32)addr + size )) 
- #define IX_OSAL_OS_CACHE_FLUSH(addr, size) ( clean_dcache_range((__u32)addr, (__u32)addr + size ))
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
- 
- /* Cache preload not available*/
- #define IX_OSAL_OS_CACHE_PRELOAD(addr,size) {}
---- ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c
-+++ ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c
-@@ -210,3 +210,59 @@ ixOsalCacheDmaFree (void *ptr)
- 	free_pages ((unsigned int) memptr, order);
-     }
- }
-+
-+
-+/*
-+ * 2.6 kernels do not export the required cache functions.
-+ */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+
-+#define _IX_STR(x) #x
-+#define IX_STR(x) _IX_STR(x)
-+#define IX_CLM IX_STR(IX_OSAL_CACHE_LINE_SIZE-1)
-+
-+/*
-+ * reimplementation of kernel's invalidate_dcache_range()
-+ */
-+void
-+ixOsalCacheInvalidateRange(unsigned long start, unsigned long size)
-+{
-+  __asm__
-+    ("    tst    %0, #" IX_CLM "\n"
-+     "    mcrne  p15, 0, %0, c7, c10, 1      @ clean D cache line\n"
-+     "    bic    %0, %0, #" IX_CLM "\n"
-+     "    tst    %1, #" IX_CLM "\n"
-+     "    mcrne  p15, 0, %1, c7, c10, 1      @ clean D cache line\n"
-+     "1:  mcr    p15, 0, %0, c7, c6, 1       @ invalidate D cache line\n"
-+     "    add    %0, %0, #" IX_STR(IX_OSAL_CACHE_LINE_SIZE) "\n"
-+     "    cmp    %0, %1\n"
-+     "    blo    1b\n"
-+     "    mcr    p15, 0, %0, c7, c10, 4      @ drain write & fill buffer\n"
-+     : /* no output */
-+     : "r"(start), "r"(size)
-+     : "cc");
-+}
-+
-+/*
-+ * reimplementation of kernel's invalidate_dcache_range()
-+ */
-+void
-+ixOsalCacheFlushRange(unsigned long start, unsigned long size)
-+{
-+  __asm__
-+    ("    bic    %0, %0, #" IX_CLM "\n"
-+     "1:  mcr    p15, 0, %0, c7, c10, 1      @ clean D cache line\n"
-+     "    add    %0, %0, #" IX_STR(IX_OSAL_CACHE_LINE_SIZE) "\n"
-+     "    cmp    %0, %1\n"
-+     "    blo    1b\n"
-+     "    mcr    p15, 0, %0, c7, c10, 4      @ drain write & fill buffer\n"
-+     : /* no output */
-+     : "r"(start), "r"(size)
-+     : "cc");
-+}
-+
-+#undef _IX_STR
-+#undef IX_STR
-+#undef IX_CLM
-+
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
---- ixp_osal/os/linux/src/core/IxOsalOsSymbols.c
-+++ ixp_osal/os/linux/src/core/IxOsalOsSymbols.c
-@@ -64,6 +64,10 @@ EXPORT_SYMBOL (ixOsalMemSet);
- 
- EXPORT_SYMBOL (ixOsalCacheDmaMalloc);
- EXPORT_SYMBOL (ixOsalCacheDmaFree);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+EXPORT_SYMBOL (ixOsalCacheInvalidateRange);
-+EXPORT_SYMBOL (ixOsalCacheFlushRange);
-+#endif
- 
- EXPORT_SYMBOL (ixOsalThreadCreate);
- EXPORT_SYMBOL (ixOsalThreadStart);
diff --git a/net-misc/ixp4xx/files/2.1/33-oe-ixp4xx-header.patch b/net-misc/ixp4xx/files/2.1/33-oe-ixp4xx-header.patch
deleted file mode 100644
index 3246bd2f45b5..000000000000
--- a/net-misc/ixp4xx/files/2.1/33-oe-ixp4xx-header.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h
-+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h
-@@ -0,0 +1,72 @@
-+/*
-+ * Glue for the current linux definitons of this stuff.
-+ */
-+#ifndef IxOsalOsIxp425Base_H
-+#define IxOsalOsIxp425Base_H 1
-+#include <asm-arm/arch-ixp4xx/ixp4xx-regs.h>
-+
-+/* Force Address Coherent (the default) mapping on LE - Linux 2.6
-+ * does not have a way of changing it.
-+ */
-+#if defined IX_OSAL_LINUX_LE
-+# if !defined IX_OSAL_ENFORCED_LE_AC_MAPPING
-+#  define IX_OSAL_ENFORCED_LE_AC_MAPPING
-+# endif
-+# if defined IX_OSAL_LE_DC_MAPPING
-+#  error Little Endian Data Coherent mapping not supported on this platform
-+# endif
-+
-+/* This doesn't matter on a BE build because it will never be used,
-+ * however it will be selected and will fail on an LE build.
-+ */
-+# undef IX_OSAL_LE_DC
-+# define IX_OSAL_LE_DC IX_OSAL_LE_DC_IS_INVALID_ON_THIS_PLATFORM
-+#endif
-+
-+/* Physical addresses. */
-+#define IXP425_PERIPHERAL_BASE_PHYS	IXP4XX_PERIPHERAL_BASE_PHYS
-+#define IXP425_EXP_CFG_BASE_PHYS	IXP4XX_EXP_CFG_BASE_PHYS
-+#define IXP425_PCI_CFG_BASE_PHYS	IXP4XX_PCI_CFG_BASE_PHYS
-+
-+//#define IXP425_EXP_BUS_BASE1_PHYS
-+#define IXP425_EXP_BUS_BASE2_PHYS	IXP4XX_EXP_BUS_CS2_BASE_PHYS
-+//#define IXP425_EXP_BUS_CS0_BASE_PHYS
-+//#define IXP425_EXP_BUS_CS1_BASE_PHYS
-+//#define IXP425_EXP_BUS_CS4_BASE_PHYS
-+#define IXP425_EthA_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0x9000)
-+#define IXP425_EthB_BASE_PHYS		(IXP4XX_PERIPHERAL_BASE_PHYS + 0xA000)
-+//#define IXP425_GPIO_BASE_PHYS
-+#define IXP425_INTC_BASE_PHYS		IXP4XX_INTC_BASE_PHYS
-+//#define IXP425_NPEA_BASE_PHYS
-+//#define IXP425_NPEB_BASE_PHYS
-+//#define IXP425_NPEC_BASE_PHYS
-+//#define IXP425_PMU_BASE_PHYS
-+#define IXP425_QMGR_BASE_PHYS		IXP4XX_QMGR_BASE_PHYS
-+#define IXP425_TIMER_BASE_PHYS 		IXP4XX_TIMER_BASE_PHYS
-+//#define IXP425_UART1_BASE_PHYS
-+//#define IXP425_UART2_BASE_PHYS
-+#define IXP425_USB_BASE_PHYS		IXP4XX_USB_BASE_PHYS
-+
-+/* Virtual addresses. */
-+#define IXP425_PERIPHERAL_BASE_VIRT	IXP4XX_PERIPHERAL_BASE_VIRT
-+#define IXP425_PERIPHERAL_REGION_SIZE	IXP4XX_PERIPHERAL_REGION_SIZE
-+#define IXP425_EXP_CFG_BASE_VIRT	IXP4XX_EXP_CFG_BASE_VIRT
-+#define IXP425_PCI_CFG_BASE_VIRT	IXP4XX_PCI_CFG_BASE_VIRT
-+
-+//#define IXP425_EthA_BASE_VIRT
-+//#define IXP425_EthB_BASE_VIRT
-+//#define IXP425_GPIO_BASE_VIRT
-+//#define IXP425_NPEA_BASE_VIRT
-+//#define IXP425_NPEB_BASE_VIRT
-+//#define IXP425_NPEC_BASE_VIRT
-+//#define IXP425_QMGR_BASE_VIRT	/* must be ioremapped on Linux 2.6 */
-+//#define IXP425_TIMER_BASE_VIRT
-+//#define IXP425_UART1_BASE_VIRT
-+//#define IXP425_UART2_BASE_VIRT
-+//#define IXP425_USB_BASE_VIRT
-+
-+/* Miscellaneous stuff. */
-+#define IRQ_IXP425_XSCALE_PMU		IRQ_IXP4XX_XSCALE_PMU
-+#define IXP425_ICMR			IXP4XX_ICMR
-+#define IRQ_IXP425_USB			IRQ_IXP4XX_USB
-+#endif
---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h
-+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h
-@@ -53,6 +53,8 @@
- #error "Error: IxOsalOsIxp425Sys.h cannot be included directly before IxOsalOsIxp400.h"
- #endif
- 
-+#include "IxOsalOsIxp425Base.h"
-+
- /* Memory Base Address */
- #define IX_OSAL_IXP400_EXP_BUS_PHYS_BASE       	IXP425_EXP_BUS_BASE2_PHYS
- #define IX_OSAL_IXP400_EXP_BUS_BOOT_PHYS_BASE  	IXP425_EXP_BUS_BASE1_PHYS
-@@ -98,12 +100,12 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[] 
-      * Queue Manager 
-      */
-     {
--     IX_OSAL_STATIC_MAP,	/* type            */
-+     IX_OSAL_DYNAMIC_MAP,	/* type            */
-      IX_OSAL_IXP400_QMGR_PHYS_BASE,	/* physicalAddress */
-      IX_OSAL_IXP400_QMGR_MAP_SIZE,	/* size            */
--     IX_OSAL_IXP400_QMGR_VIRT_BASE,	/* virtualAddress  */
--     NULL,			/* mapFunction     */
--     NULL,			/* unmapFunction   */
-+     0,				/* virtualAddress  */
-+     ixOsalLinuxMemMap,		/* mapFunction     */
-+     ixOsalLinuxMemUnmap,	/* unmapFunction   */
-      0,				/* refCount        */
-      IX_OSAL_BE | IX_OSAL_LE_DC,	/* endianType      */   
-      "qMgr"			/* name            */
diff --git a/net-misc/ixp4xx/files/2.1/34-oe-le.patch b/net-misc/ixp4xx/files/2.1/34-oe-le.patch
deleted file mode 100644
index 46af56ba24ab..000000000000
--- a/net-misc/ixp4xx/files/2.1/34-oe-le.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- ixp_osal/include/modules/ioMem/IxOsalIoMem.h
-+++ ixp_osal/include/modules/ioMem/IxOsalIoMem.h
-@@ -117,8 +117,8 @@ ixOsalCoreWordSwap (UINT32 wordIn)
- #endif /* ndef __wince */
- 
- #define IX_OSAL_SWAP_SHORT(sData)         ((sData >> 8) | ((sData & 0xFF) << 8))
--#define IX_OSAL_SWAP_SHORT_ADDRESS(sAddr) ((sAddr) ^ 0x2)
--#define IX_OSAL_SWAP_BYTE_ADDRESS(bAddr)  ((bAddr) ^ 0x3)
-+#define IX_OSAL_SWAP_SHORT_ADDRESS(sAddr) ((UINT16*)((UINT32)(sAddr) ^ 0x2))
-+#define IX_OSAL_SWAP_BYTE_ADDRESS(bAddr)  ((UINT8*)((UINT32)(bAddr) ^ 0x3))
- 
- #define IX_OSAL_BE_XSTOBUSL(wData)  (wData)
- #define IX_OSAL_BE_XSTOBUSS(sData)  (sData)
---- ixp_osal/include/modules/ioMem/IxOsalMemAccess.h
-+++ ixp_osal/include/modules/ioMem/IxOsalMemAccess.h
-@@ -84,7 +84,7 @@
- 
- #elif defined (IX_OSAL_LINUX_LE)
- 
--#define IX_SDRAM_LE_DATA_COHERENT
-+#define IX_SDRAM_LE_ADDRESS_COHERENT
- 
- #elif defined (IX_OSAL_WINCE_LE)
- 
---- ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h
-+++ ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h
-@@ -171,7 +171,7 @@
-  ***************************/
- #if (IX_COMPONENT_NAME == ix_qmgr)
- 
--#define IX_OSAL_LE_DC_MAPPING
-+#define IX_OSAL_LE_AC_MAPPING
- 
- #endif /* qmgr */
- 
---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h
-+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h
-@@ -107,7 +107,7 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[] 
-      ixOsalLinuxMemMap,		/* mapFunction     */
-      ixOsalLinuxMemUnmap,	/* unmapFunction   */
-      0,				/* refCount        */
--     IX_OSAL_BE | IX_OSAL_LE_DC,	/* endianType      */   
-+     IX_OSAL_BE | IX_OSAL_LE_AC,	/* endianType      */   
-      "qMgr"			/* name            */
-      },
- 
---- ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c
-+++ ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c
-@@ -45,6 +45,7 @@
-  * -- End Intel Copyright Notice --
-  */
- 
-+#include <asm/page.h>
- #include <asm/io.h>
- #include <linux/ioport.h>
- 
-@@ -54,6 +55,8 @@
- PUBLIC void
- ixOsalLinuxMemMap (IxOsalMemoryMap * map)
- {
-+    /* Linux requires LE mappings to use address coherency */
-+    IX_OSAL_ENSURE((map->mapEndianType & IX_OSAL_LE_DC) == 0, "LE Data Coherency not supported");
-     map->virtualAddress = (UINT32) ioremap (map->physicalAddress, map->size);
- }
- 
diff --git a/net-misc/ixp4xx/files/2.1/35-oe-assert.patch b/net-misc/ixp4xx/files/2.1/35-oe-assert.patch
deleted file mode 100644
index 0ba1e0f0fcf7..000000000000
--- a/net-misc/ixp4xx/files/2.1/35-oe-assert.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# Unnecessary patch - reduces the code size slightly, gives clearer
-# messages if IX_OSAL_ENSURE_ON is set
---- ixp_osal/include/IxOsalAssert.h
-+++ ixp_osal/include/IxOsalAssert.h
-@@ -72,8 +72,8 @@
-  */
- #ifdef IX_OSAL_ENSURE_ON
- #define IX_OSAL_ENSURE(c, str) do { \
--if (!(c)) ixOsalLog (IX_OSAL_LOG_LVL_MESSAGE, IX_OSAL_LOG_DEV_STDOUT, str, \
--0, 0, 0, 0, 0, 0); } while (0)
-+if (!(c)) ixOsalLog (IX_OSAL_LOG_LVL_MESSAGE, IX_OSAL_LOG_DEV_STDOUT, __FILE__ ": line %d: " str, \
-+__LINE__, 0, 0, 0, 0, 0); } while (0)
- 
- #else
- #define IX_OSAL_ENSURE(c, str)
---- ixp_osal/os/linux/include/core/IxOsalOsAssert.h
-+++ ixp_osal/os/linux/include/core/IxOsalOsAssert.h
-@@ -47,11 +47,18 @@
- 
- #ifndef IxOsalOsAssert_H
- #define IxOsalOsAssert_H
-+#ifdef IX_OSAL_ENSURE_ON
- #define IX_OSAL_OS_ASSERT(c)    if(!(c)) \
-                                 { \
--                                    ixOsalLog (IX_OSAL_LOG_LVL_ERROR, IX_OSAL_LOG_DEV_STDOUT, "Assertion failure \n", 0, 0, 0, 0, 0, 0);\
-+                                    ixOsalLog (IX_OSAL_LOG_LVL_ERROR, IX_OSAL_LOG_DEV_STDOUT, "%s line %d: Assertion failure: %s\n", (int)__FILE__, __LINE__, (int)#c, 0, 0, 0);\
-                                     BUG(); \
-                                 }
-+#else
-+#define IX_OSAL_OS_ASSERT(c)    if(!(c)) \
-+                                { \
-+                                    BUG(); \
-+                                }
-+#endif
- 
- /* 
-  * Place holder.
diff --git a/net-misc/ixp4xx/files/2.1/40-yvasilev-oslinux.patch b/net-misc/ixp4xx/files/2.1/40-yvasilev-oslinux.patch
deleted file mode 100644
index 6c2228dded67..000000000000
--- a/net-misc/ixp4xx/files/2.1/40-yvasilev-oslinux.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
-+++ ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
-@@ -160,7 +160,7 @@ int ixNpe_dev_open (struct inode *inode,
- 	return -EEXIST;
-     }
- 
--    MOD_INC_USE_COUNT;   /* Increment use count to prevent premature rmmod-ing */
-+    /* MOD_INC_USE_COUNT; */  /* Increment use count to prevent premature rmmod-ing */
-     ixNpeDlSegmentedListHead = NULL;  /* Reset linked list which keeps track of Microcode fragments */
-     ixNpeDlSegmentedListTail = NULL;
-     ixNpeDlTotalBytesReadIn = 0;
-@@ -225,7 +225,7 @@ int ixNpe_dev_release (struct inode *ino
- 	kfree (temp);
-     }
- 
--    MOD_DEC_USE_COUNT;
-+    /* MOD_DEC_USE_COUNT; */
- 
-     return 0;
- }
diff --git a/net-misc/ixp4xx/files/2.1/41-oemod-Makefile.patch b/net-misc/ixp4xx/files/2.1/41-oemod-Makefile.patch
deleted file mode 100644
index 68bb33a2399b..000000000000
--- a/net-misc/ixp4xx/files/2.1/41-oemod-Makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- ixp400_xscale_sw/Makefile
-+++ ixp400_xscale_sw/Makefile
-@@ -297,9 +297,9 @@ endif
- else # IX_TARGET_OS == vxworks
- # linux compiler flags 
- MAKE_DEP_FLAG := -M
--LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mcpu=xscale -mtune=xscale
-+LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mtune=xscale
- 
--CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -mapcs-32 -mshort-load-bytes -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS)
-+CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -mapcs-32 -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS)
- ifndef IX_INCLUDE_MICROCODE
- CFLAGS += -DIX_NPEDL_READ_MICROCODE_FROM_FILE
- endif
-@@ -867,9 +867,11 @@ $(NPE_DAT) : $(NPE_CONVERTER)
- 
- ifeq ($(IX_HOST_OS),linux)
- ifndef IX_INCLUDE_MICROCODE
-+ifdef IX_BUILD_MICROCODE
- Makefile: $(NPE_CONVERTER) $(NPE_DAT)
- endif
- endif
-+endif
- 
- ################################################################
- # Rules to check that macros are defined.
-@@ -1319,6 +1321,10 @@ endif
- 
- ixp400.o : $(OBJ_DIR)/ixp400.o
- 
-+ixp400.ko : $(OBJ_DIR)/ixp400.ko
-+
-+ixp400_eth.ko : $(OBJ_DIR)/ixp400_eth.ko
-+
- ifndef IX_INCLUDE_MICROCODE
- $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE)
- 	$(LD) $(LDFLAGS) $^ -o $@
-@@ -1327,7 +1333,17 @@ $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OB
- 	$(LD) $(LDFLAGS) $^ -o $@
- endif
- 
-+$(OBJ_DIR)/ixp400_ial.o_shipped : $(OBJ_DIR)/ixp400.o
-+	mv $^ $@
- 
-+$(OBJ_DIR)/ixp400.ko : $(OBJ_DIR)/ixp400_ial.o_shipped
-+	cp Makefile.ixp400 $(OBJ_DIR)/Makefile
-+	$(MAKE) LINUX_SRC=$($(IX_TARGET)_KERNEL_DIR) CROSS_COMPILE=$(LINUX_CROSS_COMPILE) -C $(OBJ_DIR) ixp400.ko
-+
-+$(OBJ_DIR)/ixp400_eth.ko : $(IX_XSCALE_SW)/../ixp400_eth.c
-+	cp Makefile.ixp400_eth $(OBJ_DIR)/Makefile
-+	cp $(IX_XSCALE_SW)/../ixp400_eth.c $(OBJ_DIR)/ixp400_eth.c
-+	$(MAKE) LINUX_SRC=$($(IX_TARGET)_KERNEL_DIR) CROSS_COMPILE=$(LINUX_CROSS_COMPILE) OSAL_DIR=$(OSAL_DIR) -C $(OBJ_DIR) ixp400_eth.ko
- 
- ################################################################
- # clean - deletes everything that can be rebuilt
diff --git a/net-misc/ixp4xx/files/2.1/42-yvasilev-Makefile-ixp400.patch b/net-misc/ixp4xx/files/2.1/42-yvasilev-Makefile-ixp400.patch
deleted file mode 100644
index 3769e9cfe156..000000000000
--- a/net-misc/ixp4xx/files/2.1/42-yvasilev-Makefile-ixp400.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ixp400_xscale_sw/Makefile.ixp400
-+++ ixp400_xscale_sw/Makefile.ixp400
-@@ -0,0 +1,10 @@
-+obj-m := ixp400.o
-+ixp400-y := ixp400_ial.o
-+
-+PWD         := $(shell pwd)
-+
-+ixp400.ko:
-+	$(MAKE) V=1 -C $(LINUX_SRC) SUBDIRS=$(PWD) ARCH=arm modules
-+
-+clean:
-+	rm -f ixp400.ko
diff --git a/net-misc/ixp4xx/files/2.1/43-yvasilev-Makefile-ixp400_eth.patch b/net-misc/ixp4xx/files/2.1/43-yvasilev-Makefile-ixp400_eth.patch
deleted file mode 100644
index b53976d3a81a..000000000000
--- a/net-misc/ixp4xx/files/2.1/43-yvasilev-Makefile-ixp400_eth.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ixp400_xscale_sw/Makefile.ixp400_eth
-+++ ixp400_xscale_sw/Makefile.ixp400_eth
-@@ -0,0 +1,32 @@
-+obj-m := ixp400_eth.o
-+
-+PWD := $(shell pwd)
-+
-+CFLAGS =  -Wall \
-+          -DCONFIG_MODULES -DMODULES -O -I$(LINUX_SRC)/include/ \
-+          -I$(IX_XSCALE_SW)/src/include/ \
-+          -I$(OSAL_DIR)/ \
-+          -I$(OSAL_DIR)/os/linux/include/ \
-+          -I$(OSAL_DIR)/os/linux/include/modules/ \
-+          -I$(OSAL_DIR)/os/linux/include/modules/ioMem/ \
-+          -I$(OSAL_DIR)/os/linux/include/modules/core/ \
-+          -I$(OSAL_DIR)/os/linux/include/modules/bufferMgt/ \
-+          -I$(OSAL_DIR)/os/linux/include/core/  \
-+          -I$(OSAL_DIR)/os/linux/include/platforms/ \
-+          -I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ \
-+          -I$(OSAL_DIR)/os/linux/include/core/ \
-+          -I$(OSAL_DIR)/include/ \
-+          -I$(OSAL_DIR)/include/modules/ \
-+          -I$(OSAL_DIR)/include/modules/bufferMgt/ \
-+          -I$(OSAL_DIR)/include/modules/ioMem/ \
-+          -I$(OSAL_DIR)/include/modules/core/ \
-+          -I$(OSAL_DIR)/include/platforms/ \
-+          -I$(OSAL_DIR)/include/platforms/ixp400/ \
-+	  -I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ixp425/
-+export CFLAGS
-+
-+ixp400_eth.ko:
-+	$(MAKE) V=1 -C $(LINUX_SRC) SUBDIRS=$(PWD) ARCH=arm modules
-+
-+clean:
-+	rm -f ixp400_eth.ko
diff --git a/net-misc/ixp4xx/files/2.1/50-oemod-ixp400_eth.patch b/net-misc/ixp4xx/files/2.1/50-oemod-ixp400_eth.patch
deleted file mode 100644
index a51f89b99536..000000000000
--- a/net-misc/ixp4xx/files/2.1/50-oemod-ixp400_eth.patch
+++ /dev/null
@@ -1,171 +0,0 @@
---- ixp400_eth.c
-+++ ixp400_eth.c
-@@ -128,6 +128,7 @@ static int dev_max_count = 2; /* only NP
- static int dev_max_count = 3; /* all NPEs are used */
- #endif
- 
-+static int dev_max_count = 1;
- #ifndef CONFIG_IXP400_NAPI
- /* netdev_max_backlog: ideally /proc/sys/net/core/netdev_max_backlog, but any 
-  * value > 46 looks to work. This is used to control the maximum number of 
-@@ -157,7 +158,11 @@ MODULE_PARM(dev_max_count, "i");
- MODULE_PARM_DESC(dev_max_count, "Number of devices to initialize");
- 
- /* devices will be called ixp0 and ixp1 */
-+#ifdef IX_DEVICE_NAME_ETH
-+#define DEVICE_NAME "eth"
-+#else
- #define DEVICE_NAME "ixp"
-+#endif
- 
- /* boolean values for PHY link speed, duplex, and autonegotiation */
- #define PHY_SPEED_10    0
-@@ -347,6 +352,12 @@ static int dev_pmu_timer_init(void);
- extern void 
- ixEthTxFrameDoneQMCallback(IxQMgrQId qId, IxQMgrCallbackId callbackId);
- 
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+/* poll controller (needed for netconsole et al) */
-+static void
-+ixp425eth_poll_controller(struct net_device *dev);
-+#endif
-+
- /* Private device data */
- typedef struct {
-     spinlock_t lock;  /* multicast management lock */
-@@ -1838,7 +1849,11 @@ static inline void dev_eth_type_trans(un
-     skb->len -= header_len;
-    
-     /* fill the pkt arrival time (set at the irq callback entry) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-     skb->stamp = irq_stamp;
-+#else
-+    skb_set_timestamp(skb, &irq_stamp);
-+#endif
-  
-     /* fill the input device field */
-     skb->dev = dev;
-@@ -2028,6 +2043,16 @@ static void rx_cb(UINT32 callbackTag, IX
- 	skb->tail = skb->data + len;
- 	skb->len = len;
- 	
-+#ifndef __ARMEB__
-+	{
-+	    /* Byte swap all words containing data from the buffer. */
-+	    unsigned long *p = (unsigned long*)((unsigned)skb->data & ~0x3);
-+	    unsigned long *e = (unsigned long*)(((unsigned)skb->data + skb->len + 3) & ~0x3);
-+	    while (p < e)
-+		*p = ntohl(*p), ++p;
-+	}
-+#endif
-+	
- #ifdef DEBUG_DUMP
- 	skb_dump("rx", skb);
- #endif
-@@ -2418,6 +2443,16 @@ static int dev_hard_start_xmit(struct sk
- 	return 0;
-     }
- 
-+#ifndef __ARMEB__
-+    {
-+	/* Byte swap all words containing data from the buffer. */
-+	unsigned long *p = (unsigned long*)((unsigned)skb->data & ~0x3);
-+	unsigned long *e = (unsigned long*)(((unsigned)skb->data + skb->len + 3) & ~0x3);
-+	while (p < e)
-+	    *p = ntohl(*p), ++p;
-+    }
-+#endif
-+
- #ifdef DEBUG_DUMP
-     skb_dump("tx", skb);
- #endif
-@@ -3014,7 +3049,7 @@ static int phy_init(void)
- }
- 
- /* set port MAC addr and update the dev struct if successfull */
--int dev_set_mac_address(struct net_device *dev, void *addr)
-+static int set_mac_address(struct net_device *dev, void *addr)
- {
-     int res;
-     IxEthAccMacAddr npeMacAddr;
-@@ -3052,6 +3087,19 @@ int dev_set_mac_address(struct net_devic
-     return 0;
- }
- 
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+/*
-+ * Polling receive - used by netconsole and other diagnostic tools
-+ * to allow network i/o with interrupts disabled.
-+ * (stolen from 8139too.c by siddy)
-+ */
-+static void ixp425eth_poll_controller(struct net_device *dev)
-+{
-+        disable_irq(dev->irq);
-+        dev_qmgr_os_isr(dev->irq, dev, NULL);
-+        enable_irq(dev->irq);
-+}
-+#endif
- 
- /* 
-  *  TX QDISC
-@@ -3241,6 +3289,8 @@ static int __devinit dev_eth_probe(struc
- 	kmalloc(sizeof(struct semaphore), GFP_KERNEL);
-     if (!priv->maintenanceCheckThreadComplete)
-     {
-+	P_ERROR("%s: Failed to allocate maintenance semaphore %d\n",
-+		ndev->name, priv->port_id);
- 	goto error;
-     }
-     priv->lock = SPIN_LOCK_UNLOCKED;
-@@ -3265,8 +3315,11 @@ static int __devinit dev_eth_probe(struc
-     ndev->get_stats = dev_get_stats;
-     ndev->set_multicast_list = dev_set_multicast_list;
-     ndev->flags |= IFF_MULTICAST;
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+    ndev->poll_controller = ixp425eth_poll_controller;
-+#endif
- 
--    ndev->set_mac_address = dev_set_mac_address;
-+    ndev->set_mac_address = set_mac_address;
- 
- #ifdef CONFIG_IXP400_NAPI
-     ndev->poll = &dev_rx_poll;
-@@ -3347,7 +3400,11 @@ static int __devinit dev_eth_probe(struc
- 
- #if IS_KERNEL26
-     if (register_netdev(ndev))
-+    {
-+	P_ERROR("%s: Failed to register netdevice %d\n",
-+		ndev->name, priv->port_id);
-     	goto error;
-+    }
- #else
-     found_devices++;
- #endif /* IS_KERNEL26 */
-@@ -3357,6 +3414,8 @@ static int __devinit dev_eth_probe(struc
-     /* register EthAcc callbacks for this port */
-     if (dev_rxtxcallback_register(portId, (UINT32)ndev))
-     {
-+    	P_ERROR("%s: Failed to register callback %d\n",
-+		ndev->name, priv->port_id);
-     	goto error;
-     }
- 
-@@ -3380,6 +3439,7 @@ static int __devinit dev_eth_probe(struc
- 
- /* Error handling: enter here whenever error detected */
- error:
-+    P_ERROR("%s: dev_eth_probe fails\n", ndev->name);
-     TRACE;
- 
- #ifdef CONFIG_IXP400_ETH_QDISC_ENABLED
-@@ -3515,6 +3575,9 @@ static int __init ixp400_eth_init(void)
-     TRACE;
- 
-     P_INFO("Initializing IXP400 NPE Ethernet driver software v. " MOD_VERSION " \n");
-+#ifdef IX_OSAL_ENSURE_ON
-+    ixOsalLogLevelSet(IX_OSAL_LOG_LVL_ALL);
-+#endif
- 
-     TRACE;
- 
diff --git a/net-misc/ixp4xx/files/2.1/README b/net-misc/ixp4xx/files/2.1/README
deleted file mode 100644
index 8d2900e2d2df..000000000000
--- a/net-misc/ixp4xx/files/2.1/README
+++ /dev/null
@@ -1 +0,0 @@
-This patches are ripped from OE and Yuri Vasilevski
diff --git a/net-misc/ixp4xx/ixp4xx-2.1.ebuild b/net-misc/ixp4xx/ixp4xx-2.1.ebuild
deleted file mode 100644
index 97f730b8bad5..000000000000
--- a/net-misc/ixp4xx/ixp4xx-2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs linux-mod
-
-DESCRIPTION="kernel drivers for intel ixp4xx systems (like the NSLU2)"
-HOMEPAGE="http://www.intel.com/design/network/products/npfamily/ixp420.htm"
-SRC_URI="ftp://aiedownload.intel.com/df-support/9515/eng/IPL_ixp400AccessLibrary-2_1.zip
-	ftp://aiedownload.intel.com/df-support/9517/eng/IPL_ixp400NpeLibrary-2_1.zip
-	ftp://aiedownload.intel.com/df-support/9519/eng/GPL_ixp400LinuxEthernetDriverPatch-1_5.zip"
-
-LICENSE="ixp4xx"
-SLOT="0"
-KEYWORDS="-* arm"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}/ixp400_xscale_sw
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/2.1/*.patch
-}
-
-src_compile() {
-	cd ixp400_xscale_sw
-	local ix_target
-	[[ $(printf "#include <endian.h>\n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" | $(tc-getCPP) - | tail -n 1) == "little" ]] \
-		&& ix_target=linuxle \
-		|| ix_target=linuxbe
-	make \
-		LINUX_CROSS_COMPILE=${CHOST}- \
-		${ix_target}_KERNEL_DIR=${KERNEL_DIR} \
-		IX_XSCALE_SW=${PWD} \
-		IX_TARGET=${ix_target} \
-		IX_DEVICE=ixp42X \
-		IX_PLATFORM=ixdp42x \
-		COMPONENTS="qmgr npeMh npeDl ethAcc ethDB ethMii featureCtrl osServices oslinux" \
-		IX_INCLUDE_MICROCODE=1 \
-		ixp400.${KV_OBJ} ixp400_eth.${KV_OBJ} \
-		|| die "failed to build kernel modules"
-	cp lib/${ix_target}/ixp400.${KV_OBJ} lib/${ix_target}/ixp400_eth.${KV_OBJ} . || die
-}
-
-src_install() {
-	MODULE_NAMES="ixp400(kernel/drivers/ixp400:${S}) ixp400_eth(kernel/drivers/net:${S})"
-	linux-mod_src_install
-}
diff --git a/net-misc/ixp4xx/metadata.xml b/net-misc/ixp4xx/metadata.xml
deleted file mode 100644
index 7bf519a40201..000000000000
--- a/net-misc/ixp4xx/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>arm@gentoo.org</email>
-	<name>Gentoo Linux ARM Development</name>
-</maintainer>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/kumofs/Manifest b/net-misc/kumofs/Manifest
deleted file mode 100644
index 6a7ae11de622..000000000000
--- a/net-misc/kumofs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kumofs-0.4.13.tar.gz 534413 SHA256 18080ef4e3194b08a0370cfb66375bb8bcc0a8983ffacbe989310abe7fad68c3 SHA512 5ee02d43abb926f4b1d7f3b83cd7816319470de3cfedb7cd436807f400d7bc56a42944472be67042ffaf1e6006088f403eca1dffb91c642eaa54bdda971deec2 WHIRLPOOL 3c70235de43df43cb1a5143f515178d1fb0e419bbb8ef88ddf99643fad3fa1ea3549ab20de38db92658b04dd86cd37f5c40f6524cbce4d97512b514d646ed386
diff --git a/net-misc/kumofs/files/kumo-gateway.confd b/net-misc/kumofs/files/kumo-gateway.confd
deleted file mode 100644
index 8df9c177616b..000000000000
--- a/net-misc/kumofs/files/kumo-gateway.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/kumo-gateway: config file for /etc/init.d/kumo-gateway
-
-#KUMO_GATEWAY_OPTS="-m manager1 -p manager2 -t 11211"
-KUMO_GATEWAY_OPTS="-m ${HOSTNAME} -t 11211"
diff --git a/net-misc/kumofs/files/kumo-gateway.initd b/net-misc/kumofs/files/kumo-gateway.initd
deleted file mode 100644
index 8978be6ce569..000000000000
--- a/net-misc/kumofs/files/kumo-gateway.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-KUMO_GATEWAY_EXEC="${KUMO_GATEWAY_EXEC:-/usr/bin/kumo-gateway}"
-KUMO_GATEWAY_PID="${KUMO_GATEWAY_PID:-/var/run/kumo-gateway.pid}"
-
-depend() {
-	use net kumo-manager
-	after ntp-client ntpd rdate openrdate adjtimex hwclock
-	provide memcached
-}
-
-start() {
-	ebegin "Starting kumo-gateway"
-	start-stop-daemon --start --quiet --exec "${KUMO_GATEWAY_EXEC}" \
-		-- -d "${KUMO_GATEWAY_PID}" ${KUMO_GATEWAY_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping kumo-gateway"
-	start-stop-daemon --stop --quiet --pidfile "${KUMO_GATEWAY_PID}"
-	eend $?
-}
diff --git a/net-misc/kumofs/files/kumo-manager.confd b/net-misc/kumofs/files/kumo-manager.confd
deleted file mode 100644
index fc2b6f344300..000000000000
--- a/net-misc/kumofs/files/kumo-manager.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/kumo-manager: config file for /etc/init.d/kumo-manager
-
-#KUMO_MANAGER_HOSTNAME="${HOSTNAME}"
-
-#KUMO_MANAGER_OPTS="-p manager2"
-KUMO_MANAGER_OPTS=""
diff --git a/net-misc/kumofs/files/kumo-manager.initd b/net-misc/kumofs/files/kumo-manager.initd
deleted file mode 100644
index 7f86b079fccc..000000000000
--- a/net-misc/kumofs/files/kumo-manager.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-KUMO_MANAGER_HOSTNAME="${KUMO_MANAGER_HOSTNAME:-${HOSTNAME}}"
-KUMO_MANAGER_EXEC="${KUMO_MANAGER_EXEC:-/usr/bin/kumo-manager}"
-KUMO_MANAGER_PID="${KUMO_MANAGER_PID:-/var/run/kumo-manager.pid}"
-
-depend() {
-	use net
-	after ntp-client ntpd rdate openrdate adjtimex hwclock
-}
-
-start() {
-	ebegin "Starting kumo-manager"
-	start-stop-daemon --start --quiet --exec "${KUMO_MANAGER_EXEC}" \
-		-- -l "${KUMO_MANAGER_HOSTNAME}" -d "${KUMO_MANAGER_PID}" \
-		${KUMO_MANAGER_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping kumo-manager"
-	start-stop-daemon --stop --quiet --pidfile "${KUMO_MANAGER_PID}"
-	eend $?
-}
diff --git a/net-misc/kumofs/files/kumo-server.confd b/net-misc/kumofs/files/kumo-server.confd
deleted file mode 100644
index fccaf0812317..000000000000
--- a/net-misc/kumofs/files/kumo-server.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/kumo-server: config file for /etc/init.d/kumo-server
-
-#KUMO_SERVER_HOSTNAME="${HOSTNAME}"
-
-#KUMO_SERVER_OPTS="-m manager1 -p manager2 -s /var/lib/kumofs/kumodb.tch"
-KUMO_SERVER_OPTS="-m ${HOSTNAME} -s /var/lib/kumofs/kumodb.tch"
diff --git a/net-misc/kumofs/files/kumo-server.initd b/net-misc/kumofs/files/kumo-server.initd
deleted file mode 100644
index 117d0ec84d2b..000000000000
--- a/net-misc/kumofs/files/kumo-server.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-KUMO_SERVER_HOSTNAME="${KUMO_SERVER_HOSTNAME:-${HOSTNAME}}"
-KUMO_SERVER_EXEC="${KUMO_SERVER_EXEC:-/usr/bin/kumo-server}"
-KUMO_SERVER_PID="${KUMO_SERVER_PID:-/var/run/kumo-server.pid}"
-
-depend() {
-	use net kumo-manager
-	after ntp-client ntpd rdate openrdate adjtimex hwclock
-}
-
-start() {
-	ebegin "Starting kumo-server"
-	start-stop-daemon --start --quiet --exec "${KUMO_SERVER_EXEC}" \
-		-- -l "${KUMO_SERVER_HOSTNAME}" -d "${KUMO_SERVER_PID}" \
-		${KUMO_SERVER_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping kumo-server"
-	start-stop-daemon --stop --quiet --pidfile "${KUMO_SERVER_PID}"
-	eend $?
-}
diff --git a/net-misc/kumofs/kumofs-0.4.13.ebuild b/net-misc/kumofs/kumofs-0.4.13.ebuild
deleted file mode 100644
index d69a52e4517e..000000000000
--- a/net-misc/kumofs/kumofs-0.4.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-DESCRIPTION="a scalable and highly available distributed key-value store"
-HOMEPAGE="https://github.com/etolabo/kumofs"
-SRC_URI="mirror://github/etolabo/kumofs/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/tokyocabinet-1.4.10
-	>=dev-libs/msgpack-0.3.1
-	dev-libs/openssl
-	>=dev-ruby/msgpack-0.3.1
-	>=dev-lang/ruby-1.8.6
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	newinitd "${FILESDIR}/kumo-gateway.initd" kumo-gateway || die
-	newconfd "${FILESDIR}/kumo-gateway.confd" kumo-gateway || die
-	newinitd "${FILESDIR}/kumo-manager.initd" kumo-manager || die
-	newconfd "${FILESDIR}/kumo-manager.confd" kumo-manager || die
-	newinitd "${FILESDIR}/kumo-server.initd" kumo-server || die
-	newconfd "${FILESDIR}/kumo-server.confd" kumo-server || die
-
-	keepdir /var/lib/kumofs || die
-
-	dodoc AUTHORS ChangeLog NEWS NOTICE README README.md doc/doc.*.md || die
-}
diff --git a/net-misc/kumofs/metadata.xml b/net-misc/kumofs/metadata.xml
deleted file mode 100644
index 77fd3a544fee..000000000000
--- a/net-misc/kumofs/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">etolabo/kumofs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index fe79828c6778..9e5e7a2ff404 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,2 +1,3 @@
 DIST megatools-1.9.95.tar.gz 114825 SHA256 2e87b1ab12249f0168d7ed69a6f29213378dd0f77f516301f0de138d403e2423 SHA512 28ca49fdc4384f559f9f99b6cab78b03d4da1b2caa3637cf1420c037516496dd9cba4494211dd05e235bd1fc50e954a65813a6f2e0d6f5bbb532cd6897a37143 WHIRLPOOL 32901fa0f100661c79b48070ef1f8d7528d652d432a633911ad326cff967ef03ab3c935aa160bec5e8b9498d74c8385d51b731bf40bfdf27551fd2e4bc828e05
 DIST megatools-1.9.96.tar.gz 115043 SHA256 a517d1ffed585215199d7c19583e48121351ee00ed699e404886c959ced735e2 SHA512 40358ddd72c00939f6f36c22ecbe3fca23b88b0e9efb5a2b7193d93b56960bc2ecc5f284096b28cb05ff24918ee3a3a82ad48c96ab7edd6daf1f5850d154799e WHIRLPOOL d3ff18f6eb44c4bea39a33c2b3d1283a93cec43b636bc7d5d02978857c41bdcae67b9918d51ac13e0413e3902d86fa4ec849d0aed73083c416ac77c1a650d201
+DIST megatools-1.9.97.tar.gz 105211 SHA256 5868b911a916848b9d4f7e12c84837ea11418e42f6ffd0fdab9d0618d9358480 SHA512 bdc28b0d5abed23ef2b36c19d9b3572e776c293ff9e1b8cfc5966ae4a1107d554509bf136b4ceeb351cdfb3b0e094406d1ba5432c9a4572691b6ea16f6680552 WHIRLPOOL a3e19d18a7869040d6d3cc05064238536aaab805608edd79830d563efdf2fec4d7beeb35e7b1e24a9c8eb786c4b01e642641ce45e72962938de9e2235842beed
diff --git a/net-misc/megatools/megatools-1.9.97.ebuild b/net-misc/megatools/megatools-1.9.97.ebuild
new file mode 100644
index 000000000000..22bf7cd8e141
--- /dev/null
+++ b/net-misc/megatools/megatools-1.9.97.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 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
+
+DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
+HOMEPAGE="https://github.com/megous/megatools"
+SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="fuse introspection static-libs"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/openssl:0
+	net-misc/curl
+	fuse? ( sys-fs/fuse )
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-text/asciidoc"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--enable-docs-build
+		--disable-maintainer-mode
+		--disable-warnings
+		--disable-glibtest
+		$(use_enable static-libs static)
+		$(use_enable introspection)
+		$(use_with fuse)
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 19bc955a880f..578958d91433 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -3,3 +3,4 @@ DIST memcached-1.2.8.tar.gz 221285 SHA256 9e36702833a9213d607801a44325d108e6b86a
 DIST memcached-1.3.3.tar.gz 260203 SHA256 3728c714c3c0194a429f754d739067bea193d66359a03a63437428bf4a2cce84 SHA512 ce05d12b00fbb88d7020073591015ec918fb8e90476e2b1d652349520595416a65634a8d22cc5486a9d723b9fb938493145c8b70b9a3a31f426a6e55a9803eec WHIRLPOOL b4df09679deb9adb9fdf83b23e9d79f116e29d0c26f8f8c102f4fba3b01d939889ded347e98f977ee278072328aadd4079ba34053bbc680203bcc28aea63e519
 DIST memcached-1.4.17.tar.gz 326970 SHA256 d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458 SHA512 cf44500f81494efe8b27d2859d160e288260323d9c0ca6f0d0507c131257048012248e6a7639e410cec6765219d4595359d9335281eeb3b238306972a5bd859d WHIRLPOOL 2c9115630e0fd68d42e0771aea7d59f1d296b1f5ff4f2d586095ecd01ded6f4c60d0722a1ba63b926042e304b3e88521b2f862dffecec5c0145b96785c4b2b14
 DIST memcached-1.4.24.tar.gz 354917 SHA256 08a426c504ecf64633151eec1058584754d2f54e62e5ed2d6808559401617e55 SHA512 446676ae7b21d8d9246f38d3df06b167ea93a853f88ac70ae3a99b1a85a4de3d452ee266e77fac599660b9bc6e785bc89224f46e16ff6e216476d50e4706b9f6 WHIRLPOOL 269e920a0d5279786a4f4ef516b71fa7e95cacdf8627a2b692d2387a66d5d9a80618f190cf013bf070aff0f73d70d6e75dc4e3402fe8e64b372026be83170e3d
+DIST memcached-1.4.25.tar.gz 359709 SHA256 f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda SHA512 e037c3bbb68c4077f814f855663501af418ce3b1f8bc20f8e7eba3249aea378e55b3291457952fa4511779ec3702496fdaab5799edae7d59bc64eb6fd54ee14e WHIRLPOOL 213bb95d9b814e446dce31073701d997ac6b994bca655bf38eb7b8f552c4bd7e87bd36d5f9a802a965649306fe5e1ea3f093b4ce274119b23fe7aaf22a55f2ca
diff --git a/net-misc/memcached/memcached-1.4.25.ebuild b/net-misc/memcached/memcached-1.4.25.ebuild
new file mode 100644
index 000000000000..d6eb3e07eaa4
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.25.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	# Handled different upstream
+	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${FILESDIR}/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 7a5cd8d0a6f3..c7c7c446b379 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,4 +1,3 @@
-DIST minidlna-1.1.3.tar.gz 481789 SHA256 ed42d5cadf9488a95a0107341918879ef8ce4c650e19337688c46cdcd484bc4e SHA512 3b3c28ed17325a1d2c461c51c7958fcc7fd02b71332a952e06f0ad8bca04f8ff58a74bb3d221ad432282c7289953bd31c213c2703008fb36037c39a743001aa9 WHIRLPOOL 4ac0a4344feb026d483562d5711f3f3ce4f70d68d9b043ec54e7d3667c7b38e2d1b7df2cbb2a5c9d05d4afc29182fe65c95389530b187000e496902734bb498e
 DIST minidlna-1.1.4.tar.gz 494478 SHA256 9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314 SHA512 24c2d82222798278d60faa46c6d7b19e44a91868da869f7d2aa2bf3c68e343a6c2a323f67223ea69242919047b08f059ed9c7a49b0b516384244acd98b51db4e WHIRLPOOL 5f82dd2130086e90784b05d67037e9c40e20b539ddc1bfb3733910beee44578027d9c245aa1f6117ba05b3c039a2b32125ea561f71c63cf0e422664e7067007f
 DIST minidlna-1.1.5.tar.gz 488191 SHA256 8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa WHIRLPOOL 8ed8fd62fb063b042a234c8647fa05c65e4f1e331a66efae8f361002f5cedcd2706d777348332075e3263e0d8bbde7794dd84fc400dfe3a656e5d70952427669
 DIST minidlna-gentoo-artwork.patch.xz 49372 SHA256 37ae7228b07b7c81c8962c5dc88a41ed1691bdf1b019b654a9fc93ac1da0c7ce SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e WHIRLPOOL e243b9b6a002af5e3ee1bb196239790ff86724624ebccb34c84ac072426341db6b5f44e455d13657d5284220fe2688ddf3a2ec0212a7b86525eb02a6c080af80
diff --git a/net-misc/minidlna/files/minidlna-1.1.5.initd b/net-misc/minidlna/files/minidlna-1.1.5.initd
new file mode 100644
index 000000000000..c4cb33f0464c
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.5.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+: ${CONFIG:=/etc/minidlna.conf}
+: ${M_USER:=minidlna}
+: ${M_GROUP:=minidlna}
+
+name="MiniDLNA"
+
+pidfile="/run/minidlna/minidlna.pid"
+command="/usr/sbin/minidlnad"
+command_args="-P $pidfile -f $CONFIG"
+start_stop_daemon_args="--user ${M_USER}:${M_GROUP}"
+
+required_files="$CONFIG"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ "$M_USER" = "root" ]; then
+		eerror "It's not a good idea to run minidlna as root!"
+	fi
+
+	if yesno "$RESCAN"; then
+		command_args="$command_args -R"
+	fi
+
+	checkpath -q -d -m 0750 -o "${M_USER}:${M_GROUP}" "$(dirname "$pidfile")"
+}
diff --git a/net-misc/minidlna/minidlna-1.1.3.ebuild b/net-misc/minidlna/minidlna-1.1.3.ebuild
deleted file mode 100644
index 833a66685db8..000000000000
--- a/net-misc/minidlna/minidlna-1.1.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="netgear readynas"
-
-RDEPEND="dev-db/sqlite
-	media-libs/flac
-	media-libs/libexif
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/ffmpeg
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	local my_is_new="yes"
-	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
-		# created by above enewuser command w/ wrong group and permissions
-		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
-		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
-		# if user already exists, but /var/lib/minidlna is missing
-		# rely on ${D}/var/lib/minidlna created in src_install
-	fi
-}
-
-src_prepare() {
-	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
-		-e "/db_dir/s:/var/cache/:/var/lib/:" \
-		-i ${PN}.conf || die
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-db-path=/var/lib/${PN} \
-		--with-log-path=/var/log/${PN} \
-		--enable-tivo \
-		$(use_enable netgear) \
-		$(use_enable readynas)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins ${PN}.conf
-
-	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-1.1.2.initd ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
-	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
-	systemd_dotmpfilesd "${T}"/${PN}.conf
-
-	dodir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-
-	dodoc AUTHORS NEWS README TODO
-	doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
-	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
-	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
-	elog "cache is moved to /var/lib/minidlna."
-	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..877534edfdbf
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="netgear readynas"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	local my_is_new="yes"
+	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+		# created by above enewuser command w/ wrong group and permissions
+		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i ${PN}.conf || die
+
+	epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-db-path=/var/lib/${PN} \
+		--with-log-path=/var/log/${PN} \
+		--enable-tivo \
+		$(use_enable netgear) \
+		$(use_enable readynas)
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym /usr/sbin/${PN}d /usr/bin/${PN}
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
+	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+	systemd_dotmpfilesd "${T}"/${PN}.conf
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc AUTHORS NEWS README TODO
+	doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
index 0bd1b89c4017..0508d152835c 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
index 459b4ba58383..328015a2befd 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
@@ -15,13 +15,13 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="pam"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	pam? ( >=sys-auth/pambase-20080219.1 )"
 DEPEND="${RDEPEND}
-	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+	app-arch/xz-utils"
 
 FILECAPS=(
 	cap_net_bind_service usr/bin/r{cp,login,sh}
@@ -46,7 +46,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
-	./configure $(use pam && echo --without-pam) || die
+	./configure $(usex pam '' '--without-pam') || die
 
 	sed -i \
 		-e "s:-pipe -O2:${CFLAGS}:" \
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r9.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r9.ebuild
deleted file mode 100644
index deefa64d15e8..000000000000
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r9.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils pam toolchain-funcs
-
-PATCHVER="3"
-DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
-	mirror://gentoo/rexec-1.5.tar.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-DEPEND="${RDEPEND}
-	|| ( app-arch/xz-utils app-arch/lzma-utils )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	rm -rf rexec
-	mv ../rexec rexec
-
-	if [[ -n ${PATCHVER} ]] ; then
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-	fi
-
-	if tc-is-cross-compiler ; then
-		# Can't do runtime tests when cross-compiling
-		sed -i -e "s|./__conftest|: ./__conftest|" configure
-	fi
-}
-
-src_compile() {
-	local myconf
-	use pam || myconf="--without-pam"
-	tc-export CC
-	./configure ${myconf} || die
-
-	sed -i \
-		-e "s:-pipe -O2:${CFLAGS}:" \
-		-e "/^LDFLAGS=$/d" \
-		-e "s:-Wpointer-arith::" \
-		MCONFIG || die "could not sed MCONFIG"
-	emake || die
-}
-
-src_install() {
-	local b exe
-	insinto /etc/xinetd.d
-	for b in rcp rexec{,d} rlogin{,d} rsh{,d} ; do
-		if [[ ${b:0-1} == "d" ]] ; then
-			dosbin ${b}/${b} || die "dosbin ${b} failed"
-			dosym ${b} /usr/sbin/in.${b}
-			doman ${b}/${b}.8
-		else
-			dobin ${b}/${b} || die "dobin ${b} failed"
-			doman ${b}/${b}.1
-			[[ ${b} != "rexec" ]] \
-				&& fperms 4711 /usr/bin/${b}
-			if [[ ${b} != "rcp" ]]; then
-				newins "${FILESDIR}"/${b}.xinetd ${b}
-				newpamd "${FILESDIR}/${b}.pamd-pambase" ${b}
-			fi
-		fi
-	done
-	dodoc  README ChangeLog BUGS
-	newdoc rexec/README README.rexec
-}
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild
index 1f294d639946..4a77f2726181 100644
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
index 784318f73e57..a66b8445582d 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild
index d7a3f60d48e6..d653cc35f606 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild
index 0c4c40b78b15..142b77f2b136 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild
index a1f6ee2de5c7..71d980b47ab8 100644
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
index e8d71e396efc..e64e1994482e 100644
--- a/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
@@ -22,7 +22,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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 56f2495274ae..26b911524063 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,3 +1,2 @@
 DIST openvpn-2.3.10.tar.gz 1225636 SHA256 f8b0b5b92e35bbca1db1a7e6b49e04639e45634e9accd460459b40b2c99ec8f6 SHA512 13f7cfb8e5a7485f930d13830691a937da40b4cc881c403ab613132cb94aba0a30b1727debdfa1b8d7d761b447ccbcf0d1c2d56ca82f6a6ce7e2eec9642fd13f WHIRLPOOL ce52f9d89c0512a76ccc71a4c227e8f098ffdd00d4a0ed4518f35b1f86c53c638e2805e1b32e87c664ba7ceeb1a7e50875effa3c302a5e53e1b7143ac9a68685
 DIST openvpn-2.3.8.tar.gz 1214843 SHA256 532435eff61c14b44a583f27b72f93e7864e96c95fe51134ec0ad4b1b1107c51 SHA512 b619283d87eea2e47a2f0dfdbf0ffd1d10388fbdaadb33b43c7a2743748a4814f869fad6215d32fab156664d554ae94af456e7bf496890c68e6729b153d76db9 WHIRLPOOL 4868c735ca5e65b34f477457ea38eb6db45fae80563490d1e39ece9bf29b13976dd82d50d054da70c4ee146cb2e88e847bafc3f7ff47112d4494fa0f408d65d0
-DIST openvpn-2.3.9.tar.gz 1222797 SHA256 2c12fe9ea641ac1291e70322cc500641c84e5903dd4f40bf2eda7e9f209b2f9c SHA512 597ad93caf5e4489bfdc78413756af516cad88679460ebadbef91358c6ca505dd0d5c3bb508b463fd34008be80d37f464271db0beec8439619510d7cf3b3b000 WHIRLPOOL 81e06b9d27f8443a7e1ceb9037f4f84521e97e50805e134fa773219768f8e5af8d775f515a4a90f0450ea01ce90eab48e04f3d027e7be8e796388af26e057752
diff --git a/net-misc/openvpn/files/openvpn-2.3.10-fix-libressl.patch b/net-misc/openvpn/files/openvpn-2.3.10-fix-libressl.patch
new file mode 100644
index 000000000000..35e5b367645d
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.3.10-fix-libressl.patch
@@ -0,0 +1,36 @@
+From 9dfc2309c6b4143892137844197f5f84755f6580 Mon Sep 17 00:00:00 2001
+From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
+Date: Sun, 10 Jan 2016 14:44:35 +0100
+Subject: [PATCH] Fix build with libressl
+
+Signed-off-by: Niels Ole Salscheider <niels_ole@salscheider-online.de>
+Acked-by: Steffan Karger <steffan.karger@fox-it.com>
+Message-Id: <1452433475-16779-1-git-send-email-niels_ole@salscheider-online.de>
+URL: http://article.gmane.org/gmane.network.openvpn.devel/10975
+Signed-off-by: Gert Doering <gert@greenie.muc.de>
+---
+ src/openvpn/ssl_openssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
+index d2f40e7..e390f4d 100644
+--- a/src/openvpn/ssl_openssl.c
++++ b/src/openvpn/ssl_openssl.c
+@@ -358,7 +358,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx)
+ 
+   ASSERT (ctx);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+   /* OpenSSL 1.0.2 and up */
+   cert = SSL_CTX_get0_certificate (ctx->ctx);
+ #else
+@@ -393,7 +393,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx)
+     }
+ 
+ cleanup:
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+   SSL_free (ssl);
+ #endif
+   return;
diff --git a/net-misc/openvpn/openvpn-2.3.10-r1.ebuild b/net-misc/openvpn/openvpn-2.3.10-r1.ebuild
new file mode 100644
index 000000000000..57bc92cf9b8c
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.10-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib flag-o-matic user systemd
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+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"
+IUSE="examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			polarssl? ( ssl !libressl )
+			pkcs11? ( ssl )
+			!plugins? ( !pam !down-root )"
+
+DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+	)
+	pam? ( virtual/pam )
+	ssl? (
+		!polarssl? (
+			!libressl? ( >=dev-libs/openssl-0.9.7:* )
+			libressl? ( dev-libs/libressl )
+		)
+		polarssl? ( >=net-libs/polarssl-1.3.8 )
+	)
+	lzo? ( >=dev-libs/lzo-1.07 )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-libressl.patch
+}
+
+src_configure() {
+	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+	local myconf
+	use polarssl && myconf="--with-crypto-library=polarssl"
+	econf \
+		${myconf} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable lzo) \
+		$(use_enable pkcs11) \
+		$(use_enable plugins) \
+		$(use_enable iproute2) \
+		$(use_enable socks) \
+		$(use_enable pam plugin-auth-pam) \
+		$(use_enable down-root plugin-down-root) \
+		$(use_enable systemd)
+}
+
+src_install() {
+	default
+	find "${ED}/usr" -name '*.la' -delete
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# dodoc does not supportly support directory traversal, #15193
+		insinto /usr/share/doc/${PF}/examples
+		doins -r sample contrib
+	fi
+
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
+	systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
+}
+
+pkg_postinst() {
+	# Add openvpn user so openvpn servers can drop privs
+	# Clients should run as root so they can change ip addresses,
+	# dns information and other such things.
+	enewgroup openvpn
+	enewuser openvpn "" "" "" openvpn
+
+	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
+		ewarn "WARNING: The openvpn init script has changed"
+		ewarn ""
+	fi
+
+	elog "The openvpn init script expects to find the configuration file"
+	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+	elog ""
+	elog "To create more VPNs, simply create a new .conf file for it and"
+	elog "then create a symlink to the openvpn init script from a link called"
+	elog "openvpn.newconfname - like so"
+	elog "   cd /etc/openvpn"
+	elog "   ${EDITOR##*/} foo.conf"
+	elog "   cd /etc/init.d"
+	elog "   ln -s openvpn openvpn.foo"
+	elog ""
+	elog "You can then treat openvpn.foo as any other service, so you can"
+	elog "stop one vpn and start another if you need to."
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+
+	einfo ""
+	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
+	einfo "They can now be emerged via app-crypt/easy-rsa."
+}
diff --git a/net-misc/openvpn/openvpn-2.3.8-r1.ebuild b/net-misc/openvpn/openvpn-2.3.8-r1.ebuild
deleted file mode 100644
index 3b291c6400f9..000000000000
--- a/net-misc/openvpn/openvpn-2.3.8-r1.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
-
-inherit multilib flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-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"
-IUSE="examples down-root iproute2 libressl +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
-			polarssl? ( ssl !libressl )
-			pkcs11? ( ssl )
-			!plugins? ( !pam !down-root )"
-
-DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	pam? ( virtual/pam )
-	ssl? (
-		!polarssl? (
-			!libressl? ( >=dev-libs/openssl-0.9.7:* )
-			libressl? ( dev-libs/libressl )
-		)
-		polarssl? ( >=net-libs/polarssl-1.2.10 )
-	)
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-src_configure() {
-	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	local myconf
-	use polarssl && myconf="--with-crypto-library=polarssl"
-	econf \
-		${myconf} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable socks) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root) \
-		$(use_enable systemd)
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample contrib
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
-	systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	einfo ""
-	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
-	einfo "They can now be emerged via app-crypt/easy-rsa."
-}
diff --git a/net-misc/openvpn/openvpn-2.3.9.ebuild b/net-misc/openvpn/openvpn-2.3.9.ebuild
deleted file mode 100644
index 7a2c3fa285cc..000000000000
--- a/net-misc/openvpn/openvpn-2.3.9.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-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"
-IUSE="examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
-			polarssl? ( ssl !libressl )
-			pkcs11? ( ssl )
-			!plugins? ( !pam !down-root )"
-
-DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	pam? ( virtual/pam )
-	ssl? (
-		!polarssl? (
-			!libressl? ( >=dev-libs/openssl-0.9.7:* )
-			libressl? ( dev-libs/libressl )
-		)
-		polarssl? ( >=net-libs/polarssl-1.2.10 )
-	)
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-src_configure() {
-	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	local myconf
-	use polarssl && myconf="--with-crypto-library=polarssl"
-	econf \
-		${myconf} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable socks) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root) \
-		$(use_enable systemd)
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample contrib
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
-	systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	einfo ""
-	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
-	einfo "They can now be emerged via app-crypt/easy-rsa."
-}
diff --git a/net-misc/proxyper/Manifest b/net-misc/proxyper/Manifest
deleted file mode 100644
index 2a278a23afb1..000000000000
--- a/net-misc/proxyper/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST proxyper341a-linux-x86-uclibc.tar.gz 183522 SHA256 cbfa67d8b46270306e4dedcf2f58a9d8023a09495c9533302c6ac3bf558f600d SHA512 55474bcded2621c014c4cc26a3d85650a2d1627f8e06bcb4de0a90eec4d7f437846ff561a5696b662aaa69c50e5363b81b7562e2a1aad12a46f243ae51eeb4ca WHIRLPOOL 6cc54d2b0c16bf8ff7a1aced9e89cdc7a18a644faff579f4394a04931f3d96c204285532ea53f5f00fa97b96adb1c092edc3771390210c430ae9fe01173f7663
-DIST proxyper347a-linux-x86-uclibc.tar.gz 180907 SHA256 a473a87d27c21d67412e3e47233837f308a23635b8050b3a14485523b19b713e SHA512 fb8ea1b3104fa9fa77ec116cec925ee066c6b2454e3378a510be2a1af73814e1f5e6e191818a4fdd50c3aa0a7eb66dd1767bb62f3f4f3757b4249ab30a9e5a79 WHIRLPOOL 9fcbbd49a69adb24264da4e3a38d413e45d47ade920bef3e4fc452bd237da6ab1cce6308709f3435244dca8cc650268c5bc9fd01c96a4e46b85074b75fdd9a15
diff --git a/net-misc/proxyper/files/proxyper.init b/net-misc/proxyper/files/proxyper.init
deleted file mode 100644
index 6dea049631aa..000000000000
--- a/net-misc/proxyper/files/proxyper.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting distributed.net personal proxy"
-	start-stop-daemon --start --quiet --pidfile /opt/proxyper/rc5desproxy.pid --exec /opt/proxyper/proxyper -- -detach
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distributed.net personal proxy"
-	start-stop-daemon --stop --quiet --pidfile /opt/proxyper/rc5desproxy.pid
-	eend $?
-}
diff --git a/net-misc/proxyper/metadata.xml b/net-misc/proxyper/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-misc/proxyper/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-misc/proxyper/proxyper-341a.ebuild b/net-misc/proxyper/proxyper-341a.ebuild
deleted file mode 100644
index f01d3a4653d1..000000000000
--- a/net-misc/proxyper/proxyper-341a.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="distributed.net personal proxy"
-HOMEPAGE="http://www.distributed.net"
-SRC_URI="http://http.distributed.net/pub/dcti/${PN}/${PN}${PV}-linux-x86-uclibc.tar.gz"
-LICENSE="distributed.net GPL-2"
-SLOT="0"
-KEYWORDS="-alpha -ppc -sparc x86"
-IUSE=""
-DEPEND=""
-RDEPEND="net-dns/host"
-
-S=${WORKDIR}/${PN}${PV}-linux-x86-uclibc
-
-RESTRICT="mirror"
-
-QA_PRESTRIPPED="opt/proxyper/proxyper"
-
-src_install() {
-	local DESTDIR=/opt/proxyper
-	exeinto ${DESTDIR}
-	doexe proxyper || die
-
-	# don't clobber an already existing ini file!
-	insinto ${DESTDIR}
-	if [ ! -f ${DESTDIR}/proxyper.ini ]
-	then
-		doins proxyper.ini || die
-	else
-		newins ${DESTDIR}/proxyper.ini proxyper.ini || die
-	fi
-
-	dodoc ChangeLog.txt
-	dohtml manual.html
-
-	newinitd "${FILESDIR}"/proxyper.init proxyper
-}
-
-pkg_postinst() {
-	einfo "Don't forget to modify the config file"
-	einfo "located in /opt/proxyper/proxyper.ini"
-	einfo "It's recommend to reading the manual first :-)"
-}
-
-pkg_postrm() {
-	local DESTDIR="/opt/proxyper"
-	if [ -d ${DESTDIR} ]; then
-		einfo "All files have not been removed from ${DESTDIR}"
-	fi
-}
diff --git a/net-misc/proxyper/proxyper-347a.ebuild b/net-misc/proxyper/proxyper-347a.ebuild
deleted file mode 100644
index 9776b112df59..000000000000
--- a/net-misc/proxyper/proxyper-347a.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="distributed.net personal proxy"
-HOMEPAGE="http://www.distributed.net"
-SRC_URI="http://http.distributed.net/pub/dcti/${PN}/${PN}${PV}-linux-x86-uclibc.tar.gz"
-
-LICENSE="distributed.net GPL-2"
-SLOT="0"
-KEYWORDS="-alpha -ppc -sparc ~x86"
-
-RDEPEND="net-dns/host"
-
-S=${WORKDIR}/${PN}${PV}-linux-x86-uclibc
-
-RESTRICT="mirror"
-
-QA_PRESTRIPPED="opt/proxyper/proxyper"
-
-src_install() {
-	local DESTDIR=/opt/proxyper
-	exeinto ${DESTDIR}
-	doexe proxyper
-
-	# don't clobber an already existing ini file!
-	insinto ${DESTDIR}
-	if [ ! -f ${DESTDIR}/proxyper.ini ]
-	then
-		doins proxyper.ini
-	else
-		newins ${DESTDIR}/proxyper.ini proxyper.ini
-	fi
-
-	dodoc ChangeLog.txt
-	dohtml manual.html
-
-	newinitd "${FILESDIR}"/proxyper.init proxyper
-}
-
-pkg_postinst() {
-	einfo "Don't forget to modify the config file"
-	einfo "located in /opt/proxyper/proxyper.ini"
-	einfo "It's recommend to reading the manual first :-)"
-}
-
-pkg_postrm() {
-	local DESTDIR="/opt/proxyper"
-	if [ -d ${DESTDIR} ]; then
-		einfo "All files have not been removed from ${DESTDIR}"
-	fi
-}
diff --git a/net-misc/r8168/r8168-8.041.00-r1.ebuild b/net-misc/r8168/r8168-8.041.00-r1.ebuild
new file mode 100644
index 000000000000..b32b2e2e9ab6
--- /dev/null
+++ b/net-misc/r8168/r8168-8.041.00-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info linux-mod eutils
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="http://www.realtek.com.tw"
+SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0003-${P}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+CONFIG_CHECK="!R8169"
+
+ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_prepare() {
+	default
+
+	if kernel_is -ge 4 5; then
+		sed -i 's/NETIF_F_ALL_CSUM/NETIF_F_CSUM_MASK/g' src/r8168_n.c || die
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README
+}
diff --git a/net-misc/r8168/r8168-8.041.00.ebuild b/net-misc/r8168/r8168-8.041.00.ebuild
deleted file mode 100644
index 382e7b036143..000000000000
--- a/net-misc/r8168/r8168-8.041.00.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
-
-inherit linux-mod eutils
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="http://www.realtek.com.tw"
-SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0003-${P}.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-CONFIG_CHECK="!R8169"
-
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README
-}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 55d6795be93d..bffbf64a2594 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -2,3 +2,4 @@ DIST radvd-1.15.tar.gz 185528 SHA256 ba2e16bf0b2ac0030aacb0927304603f7ebbd317fdf
 DIST radvd-1.9.8.tar.gz 176288 SHA256 645ccf1c9b16e769ff4179813712e580e2c8786d64a888d8afa1e296c057c1c1 SHA512 25ffa2fe1289ee826432ade3846aa5008e34ff9f0cbe954bf44ebae22198de59b40b7b4a70d19c74117b3280a7ca6a4bf740536f4a08e0bf169e760748548971 WHIRLPOOL 228182cb6fdc6065a728f679ee6d93286c48f186b209b6ff8d553f06317d0e799687c5abf0179cda5c42d2ca72ca32bdacbc31e0a14a06d18316a6538eb09017
 DIST radvd-2.10.tar.gz 202426 SHA256 b41867c5b0375f786bebbd3fc88776d41927aa392eeba954e4b88f8ec7e8f13e SHA512 cfc34ad414bd07e22519982f8c3fa75cb27eab54131d0af09d6dd5fbb69da3de26fda776593e1a4e2735b63fc7cc2224663665854895d8be459f43ba4012fa26 WHIRLPOOL 5689d137313e75e30f370637bc92f4e242f2a4e2675b0ee34f1824a66e7efcf4ad683e121375623b62f015dd59a664511f2dbcff229c70a9d55c083dc7fef98f
 DIST radvd-2.11.tar.gz 202596 SHA256 80ad60b15689e9591a5af393a57a1d93304deeff2e46482f0fd98046c00622f8 SHA512 35fc641b81cc76de677c8e55a61c8b28d9167d8f40a3fa7adf2a254293ca2d7856ca2c8f6d3bdba391bf873345d3019c0f572ee166eaba011ae874b176c85d4b WHIRLPOOL 058ecf265881963e44267945349e56f1b5bb402b8e4605bd852a8e3ced00419e0028eee70028819433bbc7d596f938d94fef1145ea615c66a975feb9fe4aa56c
+DIST radvd-2.12.tar.gz 210605 SHA256 6b81211e9027e008306ffdcb48948b0035f6e0f3bfcbf0a2a39b1b13f6b9c3fa SHA512 1703b90f2990a1fe2113b5ae1b564ebb25b9106ac13c2268f78aaea804263ca7cc33976fe30fd52f01a91283f66114b37200747d8178c4e1985035361e6143d9 WHIRLPOOL a10351d758397d527cef3e739f6783beb3090175868948b13e365dd1adee671a8cc821bbe8c3bfc6ba8e8622be886567bee68d3460d6220c0b14dffcf35f1b37
diff --git a/net-misc/radvd/radvd-2.12.ebuild b/net-misc/radvd/radvd-2.12.ebuild
new file mode 100644
index 000000000000..a6d0c0aa0d7c
--- /dev/null
+++ b/net-misc/radvd/radvd-2.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd user eutils readme.gentoo
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux test"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+
+	# force ownership of radvd user and group (bug #19647)
+	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/var/run/radvd/radvd.pid \
+		--disable-silent-rules \
+		$(use_with test check)
+}
+
+src_install() {
+	default
+
+	dohtml INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd  "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuratoion ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/rygel/rygel-0.28.2-r1.ebuild b/net-misc/rygel/rygel-0.28.2-r1.ebuild
index 54a4b2209581..ff237a34c2f0 100644
--- a/net-misc/rygel/rygel-0.28.2-r1.ebuild
+++ b/net-misc/rygel/rygel-0.28.2-r1.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/sks/sks-1.1.5-r1.ebuild b/net-misc/sks/sks-1.1.5-r1.ebuild
deleted file mode 100644
index f304141e86cd..000000000000
--- a/net-misc/sks/sks-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib user readme.gentoo systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="optimize test"
-DOC_CONTENTS="To get sks running, first build the database,
-start the databse, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-DEPEND="dev-lang/ocaml
-	dev-ml/cryptokit
-	sys-libs/db:4.8"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
-		-e 's:-Werror-implicit-function-declaration::g' \
-		Makefile bdb/Makefile || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-
-	epatch "${FILESDIR}/${P}-eddsa.patch"
-	epatch "${FILESDIR}/${P}-disable-warn-error-a.patch"
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}"/sks-db.service
-	systemd_dounit "${FILESDIR}"/sks-recon.service
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.5-r2.ebuild b/net-misc/sks/sks-1.1.5-r2.ebuild
deleted file mode 100644
index 4aa095cb09ef..000000000000
--- a/net-misc/sks/sks-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib user readme.gentoo systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize test"
-DOC_CONTENTS="To get sks running, first build the database,
-start the databse, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-DEPEND="dev-lang/ocaml
-	dev-ml/cryptokit
-	sys-libs/db:4.8"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
-		-e 's:-Werror-implicit-function-declaration::g' \
-		Makefile bdb/Makefile || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-
-	epatch "${FILESDIR}/${P}-eddsa.patch"
-	epatch "${FILESDIR}/${P}-disable-warn-error-a.patch"
-	epatch "${FILESDIR}/${P}-curve25519.patch"
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}"/sks-db.service
-	systemd_dounit "${FILESDIR}"/sks-recon.service
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.5-r3.ebuild b/net-misc/sks/sks-1.1.5-r3.ebuild
new file mode 100644
index 000000000000..f7a6c13baa71
--- /dev/null
+++ b/net-misc/sks/sks-1.1.5-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib user readme.gentoo systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the databse, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+DEPEND=">=dev-lang/ocaml-4.0
+	dev-ml/camlp4
+	dev-ml/cryptokit
+	sys-libs/db:4.8"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
+		-e 's:-Werror-implicit-function-declaration::g' \
+		Makefile bdb/Makefile || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+
+	epatch "${FILESDIR}/${P}-eddsa.patch"
+	epatch "${FILESDIR}/${P}-disable-warn-error-a.patch"
+	epatch "${FILESDIR}/${P}-curve25519.patch"
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/socat/socat-1.7.3.1.ebuild b/net-misc/socat/socat-1.7.3.1.ebuild
index 00b6ebc4561c..9cd2b8157e9b 100644
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ b/net-misc/socat/socat-1.7.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="
diff --git a/net-misc/tor/tor-0.2.7.6.ebuild b/net-misc/tor/tor-0.2.7.6.ebuild
index 478d6aedc9f4..3bb801768fd2 100644
--- a/net-misc/tor/tor-0.2.7.6.ebuild
+++ b/net-misc/tor/tor-0.2.7.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
 
 DEPEND="
diff --git a/net-misc/vinagre/vinagre-3.18.2.ebuild b/net-misc/vinagre/vinagre-3.18.2.ebuild
index 960bfcd02d42..98a20b69536f 100644
--- a/net-misc/vinagre/vinagre-3.18.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.18.2.ebuild
@@ -12,7 +12,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.18.1.ebuild b/net-misc/vino/vino-3.18.1.ebuild
index bee9b3a4915d..0d88f3691d0f 100644
--- a/net-misc/vino/vino-3.18.1.ebuild
+++ b/net-misc/vino/vino-3.18.1.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 gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/whois/whois-5.2.11.ebuild b/net-misc/whois/whois-5.2.11.ebuild
index ef16fcefa640..b6ac6d823530 100644
--- a/net-misc/whois/whois-5.2.11.ebuild
+++ b/net-misc/whois/whois-5.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/yaydl/Manifest b/net-misc/yaydl/Manifest
deleted file mode 100644
index 29f2a6178393..000000000000
--- a/net-misc/yaydl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yaydl-1.5.2.tar.gz 13933 SHA256 f2ee58aad1b6ab458fb3e9ff21f195af17dbfea4237642a998d89996b0449cc0 SHA512 3b490acdf881ca0eceaec8371bf0d75ad69ba82cacc4c36026683443237e517ff2223555e2431cdfb0dffdcd4de9452726ee967ff28868fea0eb19cb646ee926 WHIRLPOOL 522a89c4d3fc0bb1975bb8d77d5512db8ee53bed928167828d27d76b5f06726dbcf8487c3c6c4c5370f9f10725c14012c467cd10c12f82fac7bb7cb4420d6787
diff --git a/net-misc/yaydl/metadata.xml b/net-misc/yaydl/metadata.xml
deleted file mode 100644
index ad9f6a248c5f..000000000000
--- a/net-misc/yaydl/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="soundextract">Extract the soundtracks of the downloaded videos</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/yaydl/yaydl-1.5.2.ebuild b/net-misc/yaydl/yaydl-1.5.2.ebuild
deleted file mode 100644
index 0b99a27632f3..000000000000
--- a/net-misc/yaydl/yaydl-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
-
-DESCRIPTION="Yet Another Youtube DownLoader which is downloading more than youtube"
-HOMEPAGE="http://pdes-net.org/x-haui/"
-SRC_URI="http://pdes-net.org/x-haui/scripts/perl/yaydl_youtubedownloader/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="encode soundextract"
-
-DEPEND=""
-RDEPEND="
-	dev-lang/perl
-	dev-perl/LWP-UserAgent-Determined
-	dev-perl/MP3-Info
-	dev-perl/Term-ProgressBar
-	dev-perl/URI
-	encode? (
-		|| (
-			virtual/ffmpeg[encode]
-			media-video/mplayer[encode,mp3,xvid]
-			)
-		)
-	soundextract? (
-		|| (
-			virtual/ffmpeg[encode,mp3]
-			(
-				media-video/mplayer
-				media-sound/lame
-				)
-			)
-		)"
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	dodoc changelog README
-}
-
-pkg_postinst() {
-	elog "${PN} is supporting a lot of video websites."
-	elog "Look at ${HOMEPAGE} for more information."
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 1e8986689b4a..a941def4fbaf 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2016.01.01.tar.gz 1874602 SHA256 732f37c99d71b4239d72d61dd32214b5a5a618671fb0629c8f8deb28209a172c SHA512 fdb022bed426250e5ee1c2bcc1354dd195c0f9793ca479ca8ca4cfe2f71e07ba100b0dbcda2fb9f310308ab130587d06b16a6a86f9036f0d196b317d2e5b5e92 WHIRLPOOL 152e709ba15264c35a89644ea0d4793bb47c82b317e54043ccfff72e40bdf95e42d76605e801233632d3863537a945cfb9ecc2f75245171b8de31b51ce6af801
-DIST youtube-dl-2016.02.01.tar.gz 1931170 SHA256 cac97ffda989b5783b7b05dd04cdb9f602089163d4c0dbeb55fc749899422613 SHA512 04db834328056402b2a91e9e244fa74abb4a7782fcea489c9ae7b6669f96ebc2d13cff576b02ccbbdfe3d6914c90ebc2b728334422a0ae0e454b1e03dd9db2b1 WHIRLPOOL 04c731813b50770864504f13b18cf493639975a27de0e10faad20e90f8d800228e4792924c5a7ca1b0e99df5729422e9a6209253159af63f5ab07e8118c87af2
-DIST youtube-dl-2016.02.10.tar.gz 1943121 SHA256 386cfc2128eebbedf2c4ffdb41537aede509436cdb6b6ef596da4eece376d023 SHA512 1242fd72705726334b1651a55d6406065145ace16d8f23d4cc25f729a2efc5db098a5de1beba68cf924e51bab6fa70745ae958a539421c168b3fd4c636076614 WHIRLPOOL 5813233d1955099f2a6b0fc897e7a06881f04a79cbf4de5ec54ed2c94dc24ea1f52a8aec9c06a1d67c054875d9bdcd7ce101f38392a8b4e428199530360200dc
+DIST youtube-dl-2016.02.13.tar.gz 1951048 SHA256 8bb5cb62aad23fd3b049d9ffac76af6d76af8c18d68da3a3b9f602adaca1d534 SHA512 5f453835e2829b74a1dce141180cfab33cb8e3ad8404f0b866495c7421d3e938a3ce374bcc7f4b11c52ac37e26a6e34692e7c147824f447e5f826253d32b1a47 WHIRLPOOL 132c175650f47fdf4d0b17a1c5d36b5dd1a183594193c328eb94eda58a6da6819689bb7fe732606e9c5f901ab3896a0a712f534cb29cf4355a925e9290441dc0
+DIST youtube-dl-2016.02.22.tar.gz 1971515 SHA256 14cf17af94a23d451c1c8d2fcc8ee072ee99746d6bc7487c91043498599d630a SHA512 9b1e5bf5cfe8aef0dd55093c046669358b7efc01d0a89abd8a75a4f3dd132dec90b74f1e7bddadf22d4ea21a91168f4962752739c9acd9c232c6757c2307054c WHIRLPOOL 45690a4b1e1e0233d3217d481b9c078b3a4833eaa9857bc762eab4d2c6f663f7bcdbf7a1e065d52b555a6194572cff1e0bcafaf687381153f1e4c3b74c0da361
diff --git a/net-misc/youtube-dl/youtube-dl-2016.02.01.ebuild b/net-misc/youtube-dl/youtube-dl-2016.02.13.ebuild
index 5db7401e49ee..5db7401e49ee 100644
--- a/net-misc/youtube-dl/youtube-dl-2016.02.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.02.13.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2016.02.10.ebuild b/net-misc/youtube-dl/youtube-dl-2016.02.22.ebuild
index 5db7401e49ee..5db7401e49ee 100644
--- a/net-misc/youtube-dl/youtube-dl-2016.02.10.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.02.22.ebuild
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
index ec312feff165..88c529b2d7f9 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-nds/389-ds-base/389-ds-base-1.3.4.7-r2.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.4.7-r2.ebuild
new file mode 100644
index 000000000000..0166bf8b82ae
--- /dev/null
+++ b/net-nds/389-ds-base/389-ds-base-1.3.4.7-r2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOMAKE="1.9"
+MY_P=${P/_alpha/.a}
+MY_P=${MY_P/_rc/.rc}
+
+inherit user eutils multilib flag-o-matic autotools
+
+DESCRIPTION="389 Directory Server (core librares and daemons )"
+HOMEPAGE="http://port389.org/"
+SRC_URI="http://directory.fedoraproject.org/sources/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux"
+
+COMMON_DEPEND="
+	sys-libs/db:5.3
+	>=dev-libs/cyrus-sasl-2.1.19
+	>=net-analyzer/net-snmp-5.1.2
+	>=dev-libs/icu-3.4:=
+	dev-libs/nss[utils]
+	dev-libs/nspr
+	dev-libs/svrcore
+	dev-libs/openssl:0=
+	dev-libs/libpcre:3
+	>=dev-perl/perl-mozldap-1.5.3
+	dev-perl/NetAddr-IP
+	net-nds/openldap
+	sys-libs/pam
+	sys-libs/zlib
+	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )
+	sys-apps/sed"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-dirsrv )
+	virtual/perl-Time-Local
+	virtual/perl-MIME-Base64"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup dirsrv
+	enewuser dirsrv -1 -1 -1 dirsrv
+}
+
+src_prepare() {
+	#0001-Ticket-47840-add-configure-option-to-disable-instanc.patch
+	epatch "${FILESDIR}/${P}-no-instance-script.patch"
+
+	#0001-Ticket-48448-dirsrv-start-stop-fail-in-certain-shell.patch
+	epatch "${FILESDIR}/${P}-shell-corrections.patch"
+
+	# as per 389 documentation, when 64bit, export USE_64
+	use amd64 && export USE_64=1
+
+	# This will be changed in 1.3.5.X
+	sed -i -e 's/nobody/dirsrv/g' configure.ac || die "sed failed on configure.ac"
+	eautoreconf
+
+	append-lfs-flags
+}
+
+src_configure() {
+	local myconf=""
+
+	use auto-dn-suffix && myconf="${myconf} --enable-auto-dn-suffix"
+
+	# for 1.3.5.X, will add --enable-gcc-security
+	econf \
+		$(use_enable debug) \
+		$(use_enable pam-passthru) \
+		$(use_enable ldapi) \
+		$(use_enable autobind) \
+		$(use_enable dna) \
+		$(use_enable bitwise) \
+		$(use_enable presence) \
+		$(use_with kerberos) \
+		$(use_enable debug) \
+		--enable-maintainer-mode \
+		--enable-autobind \
+		--with-fhs \
+		--with-openldap \
+		--with-db-inc=/usr/include/${CHOST}/db5.3/ \
+		--sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		$myconf
+
+		# This relies on bug https://fedorahosted.org/389/ticket/48447
+		#--without-initddir \
+}
+
+src_compile() {
+	default
+	if use doc; then
+		doxygen slapi.doxy || die "cannot run doxygen"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# remove redhat style init script
+	rm -rf "${D}"/etc/rc.d || die
+	# Needs a config option to remove this.
+	rm -rf "${D}"/etc/default || die
+
+	# and install gentoo style init script
+	# Get these merged upstream
+	newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds
+	newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
+
+	# cope with libraries being in /usr/lib/dirsrv
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
+
+	if use doc; then
+		cd "${S}" || die
+		docinto html/
+		dodoc -r docs/html/.
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "If you are planning to use 389-ds-snmp (ldap-agent),"
+	elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf"
+	elog "adding proper 'server' entries, and adding the lines below to"
+	elog " => /etc/snmp/snmpd.conf"
+	elog
+	elog "master agentx"
+	elog "agentXSocket /var/agentx/master"
+	elog
+	elog "To start 389 Directory Server (LDAP service) at boot:"
+	elog
+	elog "    rc-update add 389-ds default"
+	elog
+	elog "If you are upgrading from previous 1.2.6 release candidates"
+	elog "please see:"
+	elog "http://directory.fedoraproject.org/wiki/Subtree_Rename#warning:_upgrade_from_389_v1.2.6_.28a.3F.2C_rc1_.7E_rc6.29_to_v1.2.6_rc6_or_newer"
+	echo
+}
diff --git a/net-nds/389-ds-base/389-ds-base-1.3.4.7.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.4.7.ebuild
deleted file mode 100644
index e29a0c917109..000000000000
--- a/net-nds/389-ds-base/389-ds-base-1.3.4.7.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WANT_AUTOMAKE="1.9"
-MY_P=${P/_alpha/.a}
-MY_P=${MY_P/_rc/.rc}
-
-inherit user eutils multilib flag-o-matic autotools
-
-DESCRIPTION="389 Directory Server (core librares and daemons )"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux"
-
-ALL_DEPEND="
-	=sys-libs/db-5*:*
-	>=dev-libs/cyrus-sasl-2.1.19
-	>=net-analyzer/net-snmp-5.1.2
-	>=dev-libs/icu-3.4:=
-	dev-libs/nss[utils]
-	dev-libs/nspr
-	dev-libs/svrcore
-	dev-libs/openssl:0=
-	dev-libs/libpcre:3
-	>=dev-perl/perl-mozldap-1.5.3
-	dev-perl/NetAddr-IP
-	net-nds/openldap
-	sys-libs/pam
-	sys-libs/zlib
-	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )"
-
-DEPEND="${ALL_DEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )
-	sys-apps/sed"
-RDEPEND="${ALL_DEPEND}
-	selinux? ( sec-policy/selinux-dirsrv )
-	virtual/perl-Time-Local
-	virtual/perl-MIME-Base64"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup dirsrv
-	enewuser dirsrv -1 -1 -1 dirsrv
-}
-
-src_prepare() {
-	#0001-Ticket-47840-add-configure-option-to-disable-instanc.patch
-	epatch "${FILESDIR}/${P}-no-instance-script.patch"
-
-	#0001-Ticket-48448-dirsrv-start-stop-fail-in-certain-shell.patch
-	epatch "${FILESDIR}/${P}-shell-corrections.patch"
-
-	# as per 389 documentation, when 64bit, export USE_64
-	use amd64 && export USE_64=1
-
-	# This will be changed in 1.3.5.X
-	sed -i -e 's/nobody/dirsrv/g' configure.ac || die "sed failed on configure.ac"
-	eautoreconf
-
-	append-lfs-flags
-}
-
-src_configure() {
-	local myconf=""
-
-	use auto-dn-suffix && myconf="${myconf} --enable-auto-dn-suffix"
-
-	# for 1.3.5.X, will add --enable-gcc-security
-	econf \
-		$(use_enable debug) \
-		$(use_enable pam-passthru) \
-		$(use_enable ldapi) \
-		$(use_enable autobind) \
-		$(use_enable dna) \
-		$(use_enable bitwise) \
-		$(use_enable presence) \
-		$(use_with kerberos) \
-		$(use_enable debug) \
-		--enable-maintainer-mode \
-		--enable-autobind \
-		--with-fhs \
-		--with-openldap \
-		--with-db-inc=/usr/include/${CHOST}/db5.3/ \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		$myconf
-
-		# This relies on bug https://fedorahosted.org/389/ticket/48447
-		#--without-initddir \
-}
-
-src_compile() {
-	default
-	if use doc; then
-		doxygen slapi.doxy || die "cannot run doxygen"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	# for build free-ipa require winsync-plugin
-	# Freeipa no longer uses winsync. Please see AD trust.
-	doins ldap/servers/plugins/replication/winsync-plugin.h
-	doins ldap/servers/plugins/replication/repl-session-plugin.h
-
-	# remove redhat style init script
-	rm -rf "${D}"/etc/rc.d || die
-	# Needs a config option to remove this.
-	rm -rf "${D}"/etc/default || die
-
-	# and install gentoo style init script
-	# Get these merged upstream
-	newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds
-	newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
-
-	# cope with libraries being in /usr/lib/dirsrv
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
-
-	if use doc; then
-		cd "${S}" || die
-		docinto html/
-		dodoc -r docs/html/.
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "If you are planning to use 389-ds-snmp (ldap-agent),"
-	elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf"
-	elog "adding proper 'server' entries, and adding the lines below to"
-	elog " => /etc/snmp/snmpd.conf"
-	elog
-	elog "master agentx"
-	elog "agentXSocket /var/agentx/master"
-	elog
-	elog "To start 389 Directory Server (LDAP service) at boot:"
-	elog
-	elog "    rc-update add 389-ds default"
-	elog
-	elog "If you are upgrading from previous 1.2.6 release candidates"
-	elog "please see:"
-	elog "http://directory.fedoraproject.org/wiki/Subtree_Rename#warning:_upgrade_from_389_v1.2.6_.28a.3F.2C_rc1_.7E_rc6.29_to_v1.2.6_rc6_or_newer"
-	echo
-}
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index eae07cf8c555..05be2f0daba3 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -2,3 +2,4 @@ DIST QuiteRSS-0.16.2-src.tar.bz2 3645410 SHA256 794d0290048b713fe24e2db6967ac3f9
 DIST QuiteRSS-0.17.6-src.tar.bz2 3832771 SHA256 b14c715755ff6a1a4fa39b1d3efae893835fde07a23e69275fc12fa742cc8e7d SHA512 c6b16bfd7003e343768793a2d972ca9dfa9402c3ce923f0db501249b9f0826707763652ff6f7a37882e9151215245803b0dd6a25781ba5fa166c4594d59d847f WHIRLPOOL 1ae970d36c76f54bf92afd422fc33b5248f4b828c04df2b5705853ded45790ef1bb56711fdb1feec9eee3749abfaea4f569a1ae5ca6bbec1eb8238fd396800fe
 DIST quiterss-0.17.7.tar.gz 5356077 SHA256 5deeeb3fffba57dcc4d9f98d3be15b605549301462388107c45aba222889896c SHA512 ddee530789890fa4462f42fec139fd2dab3cff2f32f27dd49f8b8873ecf2f187731c92adc7804955e6f27cc7f399823f1847b62286aa12268deb8a5192977797 WHIRLPOOL bc7cd42f38a8d7c505af8abb566717bf66d0beef7a5cb709b78b27bce9ac048f5be66705df2eaf426b6669c46c87fbc61aea88b539314cec57226e194bee40fd
 DIST quiterss-0.18.2.tar.gz 3061821 SHA256 7c934c1e2a531662277164765fa4ddc18f691c6a5de3240fd2c2c5cfd95b4d75 SHA512 e55e6a4c52ce19c976e7a47007557d31471a520d896ceddffc6475a75ccef1541960311c175daeeb93a9a395fff33e8bbf6b7dee3e657c465b2c4a0fd91b6531 WHIRLPOOL cdf50c06e17fe20e6fe7f26500ca05f48cdefeaab4c6e3fb354407fe37f9b35051da4bf1e9fe2beea6156deaf9913dcce1ef404d33e6d62211edb6e8502702e6
+DIST quiterss-0.18.3.tar.gz 3331546 SHA256 12f80ae4fb3e4936a6c75ae4561168a17f0817fcd7c3629ec38533e839d89028 SHA512 6b2eadc5ad7beb085772d82fd1f4917e9c2206d44c573709c37e932934688dcdac4b2db7a4ce3f3b51afe8c27326676ecde4d3ee8173e68c2a4ed7bc02696fb5 WHIRLPOOL b725de0defe801bd33746c4f26a071571ba482476393d00ce9e223be7dca750d8420328141bbbd3a2a2421f33c74bfc8a8c8fc66d6958df266f8f1b89880a23f
diff --git a/net-news/quiterss/quiterss-0.18.3.ebuild b/net-news/quiterss/quiterss-0.18.3.ebuild
new file mode 100644
index 000000000000..3e826036f1f8
--- /dev/null
+++ b/net-news/quiterss/quiterss-0.18.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PLOCALES="ar bg cs de el_GR es fa fi fr gl hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
+inherit eutils l10n fdo-mime gnome2-utils qmake-utils
+
+DESCRIPTION="A Qt-based RSS/Atom feed reader"
+HOMEPAGE="https://quiterss.org"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug phonon +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND=">=dev-db/sqlite-3.10.0:3
+	dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
+	qt4? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtwebkit:4
+		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS CHANGELOG README.md )
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
+	}
+
+	default
+
+	# dedicated english locale file is not installed at all
+	rm "lang/${PN}_en.ts" || die
+
+	l10n_find_plocales_changes "lang" "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do my_rm_loc
+}
+
+src_configure() {
+	use qt4 && eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 \
+		$(usex phonon '' 'DISABLE_PHONON=1')
+	use qt5 && eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index 0554f11fa41f..b2ece1097ce4 100644
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PLOCALES="ar bg cs de el_GR es fa fi fr gl hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
+EAPI=6
+PLOCALES="ar bg cs de el_GR es fa fi fr gl he hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ th_TH tr uk vi zh_CN zh_TW"
 inherit eutils l10n fdo-mime gnome2-utils qmake-utils
 
 DESCRIPTION="A Qt-based RSS/Atom feed reader"
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="debug phonon +qt4 qt5"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND=">=dev-db/sqlite-3.10.0:3
 	dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
 	qt4? ( dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -48,7 +48,7 @@ src_prepare() {
 		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
 	}
 
-	epatch_user
+	default
 
 	# dedicated english locale file is not installed at all
 	rm "lang/${PN}_en.ts" || die
diff --git a/net-nntp/leafnode/leafnode-1.11.10.ebuild b/net-nntp/leafnode/leafnode-1.11.10.ebuild
index 916c82a228d7..123f631b0b32 100644
--- a/net-nntp/leafnode/leafnode-1.11.10.ebuild
+++ b/net-nntp/leafnode/leafnode-1.11.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://leafnode.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="ipv6"
 
 DEPEND=">=dev-libs/libpcre-3.9"
diff --git a/net-nntp/nzb/Manifest b/net-nntp/nzb/Manifest
index d270810c07cd..3765d885726d 100644
--- a/net-nntp/nzb/Manifest
+++ b/net-nntp/nzb/Manifest
@@ -1,2 +1 @@
-DIST nzb-0.2.tar.gz 44351 SHA256 df27606e8e016485a7e9cfb3aa7a2cea9f453d1f26901c02d53731ef0c816497 SHA512 3bfafa8a971a996661e542e72fb63f63530d7efd7e3814a87c3f822764837a151b1c0279bd718a3cafc925d759d8cf338537ba80618014b24a9b836da990f435 WHIRLPOOL 5ce9af8113e97a62e22983dd98cedb2910f4b3789a447c3579a76dc26b84d0647d0749a92632a63db963ee320b0c22859380b83e56018aec0b571d700114d461
 DIST nzb-0.3.tar.gz 47596 SHA256 29811cfc6bd3d972683b33b7410ddfcbfe829269e12894a7b2ab2392b9b2c050 SHA512 f0c7c3d2825a98439848b895074d5a8c66264d90f87b8e988ea21405c4a01546d8fda5024aefbc7c0e6ff7fb45b8f29202516fd20a375c1fc0e999595da95ee3 WHIRLPOOL 8ec6733c089447f502407cde57896f0d2489afa2bd378f4845efb9f5257a4958861f4f037cb9e398409d6ceca9a6bbe2e1fffd8fcb03d1baa2937df1d35102b9
diff --git a/net-nntp/nzb/nzb-0.2.ebuild b/net-nntp/nzb/nzb-0.2.ebuild
deleted file mode 100644
index 879a8b104623..000000000000
--- a/net-nntp/nzb/nzb-0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="A binary news grabber"
-HOMEPAGE="http://www.nzb.fi/"
-SRC_URI="mirror://sourceforge/nzb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-DOCS="ChangeLog"
-
-src_install() {
-	qt4-r2_src_install
-	doicon images/nzb.png
-	make_desktop_entry nzb
-}
diff --git a/net-nntp/nzbget/files/nzbget.initd b/net-nntp/nzbget/files/nzbget.initd
index e3cd15eafdcd..0ed98058fe1f 100644
--- a/net-nntp/nzbget/files/nzbget.initd
+++ b/net-nntp/nzbget/files/nzbget.initd
@@ -11,7 +11,7 @@ start() {
 	start-stop-daemon --quiet --start --user "${NZBGET_USER}" \
 		--group "${NZBGET_GROUP}" --exec /usr/bin/nzbget -- \
 		--configfile "${NZBGET_CONFIGFILE}" --daemon \
-		-- ${NZBGET_OPTS}
+		${NZBGET_OPTS}
 	eend $?
 }
 
@@ -19,7 +19,7 @@ stop() {
 	ebegin "Stopping ${RC_SVCNAME}"
 	start-stop-daemon --stop --exec /usr/bin/nzbget -- \
 		--configfile "${NZBGET_CONFIGFILE}" --daemon \
-		-- ${NZBGET_OPTS}
+		${NZBGET_OPTS}
 }
 
 reload() {
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index cba4afd594b7..80be64c7788e 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1 @@
 DIST deluge-1.3.12.tar.bz2 1772567 SHA256 565745b2a3f0567fc007dbdfeea2aa96a6bebd7dbdda2ec932a3017c66613c93 SHA512 bcb909f70d407ec766a609a1525f48b0f0ce18217049ff05dfd03b3681bdc021a446afa265b288181c644b1e47c710f41d17b1244c3b991818b947a51b97eb74 WHIRLPOOL 683e6d197ee617646ffc716738c58f479df5dc05cfc20d8295c283f9b98da309490ec582becf0d584c28a957d8bcbf1dc7b9ab4b06879d1fd338bc88a0bda29b
-DIST deluge-1.3.6.tar.bz2 1725202 SHA256 756a025d88752f39133aa34d8fc96d4ce216113919488d60098ee41f860a1f60 SHA512 22a8308c139e95190b3832ee9547e7c84a56cf1cc6f18ecebaf7af7997d73efe41664fd875e7e1753eb0b1e616f12e5e54f5fb2790261753b85f5512b8882e12 WHIRLPOOL f43a5ae5a94fc49cb76ee3561b18b9aeaff759c72a77d629170f4294e63c90f883e346eb0a5c75c0d13683fdf1848b07af2bfcd6432253cd40642735e50d10e1
diff --git a/net-p2p/deluge/deluge-1.3.12-r1.ebuild b/net-p2p/deluge/deluge-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..2f162e25277a
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.12-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 eutils systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="geoip gtk libnotify setproctitle sound webinterface"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-8.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-web-8.1[${PYTHON_USEDEP}]
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	setproctitle? ( dev-python/setproctitle[${PYTHON_USEDEP}] )
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+_distutils-r1_create_setup_cfg() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	:
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newinitd "${FILESDIR}"/deluged.init deluged
+	newconfd "${FILESDIR}"/deluged.conf deluged
+	systemd_dounit "${FILESDIR}"/deluged.service
+	systemd_dounit "${FILESDIR}"/deluge-web.service
+}
+
+pkg_postinst() {
+	elog
+	elog "If after upgrading it doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
index 4a1199b7e3ae..c0fec62210a1 100644
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-p2p/deluge/deluge-1.3.6.ebuild b/net-p2p/deluge/deluge-1.3.6.ebuild
deleted file mode 100644
index dd87373482e4..000000000000
--- a/net-p2p/deluge/deluge-1.3.6.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="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils eutils python systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE="geoip gtk libnotify setproctitle sound webinterface"
-
-DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
-	dev-python/setuptools
-	dev-util/intltool"
-RDEPEND="${DEPEND}
-	dev-python/chardet
-	dev-python/pyopenssl
-	dev-python/pyxdg
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	>=dev-python/twisted-core-8.1
-	>=dev-python/twisted-web-8.1
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		sound? ( dev-python/pygame )
-		dev-python/pygobject:2
-		>=dev-python/pygtk-2.12
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python )
-	)
-	setproctitle? ( dev-python/setproctitle )
-	webinterface? ( dev-python/mako )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	distutils_src_prepare
-	python_convert_shebangs -r 2 .
-	epatch "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-
-}
-
-src_install() {
-	distutils_src_install
-	newinitd "${FILESDIR}"/deluged.init deluged
-	newconfd "${FILESDIR}"/deluged.conf deluged
-	systemd_dounit "${FILESDIR}"/deluged.service
-	systemd_dounit "${FILESDIR}"/deluge-web.service
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	elog
-	elog "If after upgrading it doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/files/deluged.conf b/net-p2p/deluge/files/deluged.conf
index 0918f45fc7ff..21b375d5c97f 100644
--- a/net-p2p/deluge/files/deluged.conf
+++ b/net-p2p/deluge/files/deluged.conf
@@ -2,6 +2,7 @@
 # Change this to the user you want to run deluged as.
 # You may specify a group too, after a colon
 DELUGED_USER=""
+# DELUGED_UMASK="0002"
 # DELUGED_OPTS="-p 58846"
 DELUGEUI_START="false"
 DELUGEUI_OPTS="-u web"
diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index e60945df1558..e2eb2d12dde2 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -40,15 +40,16 @@ start() {
 	fi
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
-	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize "${DELUGED_OPTS}"
+	--name deluged --pidfile /run/deluged.pid --background --make-pidfile \
+	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
+	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize ${DELUGED_OPTS}
 	eend $?
 
 	
 	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Starting Deluge"
 		start-stop-daemon --start --background --pidfile \
-		/var/run/deluge.pid  --make-pidfile \
+		/run/deluge.pid  --make-pidfile \
 		--exec /usr/bin/deluge --user "${DELUGED_USER%:*}" \
 		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
 		eend $?
@@ -58,14 +59,14 @@ start() {
 stop() {
 	ebegin "Stopping Deluged"
 	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
-	--name deluged --pidfile /var/run/deluged.pid
+	--name deluged --pidfile /run/deluged.pid
 	eend $?
 
 
 	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Stopping Deluge"
 		start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
-		--name deluge --pidfile /var/run/deluge.pid
+		--name deluge --pidfile /run/deluge.pid
 		eend $?
 	fi
 }
diff --git a/net-p2p/imule/Manifest b/net-p2p/imule/Manifest
deleted file mode 100644
index 8b9cdfbb520c..000000000000
--- a/net-p2p/imule/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST 2015-03-22_nodes.dat 57832 SHA256 0c7f7f7afe875f1a1c5dc0bfaf960a9f24e51f1eeec42b8dc8a538c62362b7cb SHA512 fd1a1cf2f9f0084bb1e0a802c994308e62a58ebe14b3455b1e86c7b419dcbc206ef982a01ea163c5810d0f79a2388b4a1b4672e73f63a9034e8967d667c3a817 WHIRLPOOL 10ed68cadc4834aa0230679013436f8c91aa5240de1972a6619e357d99d63fdb606f781db341a171b79f03a50c80ef942159a5b0f8f3f095a2a62d6886dc8a36
-DIST iMule-2.3.2.3-src.tbz 13143310 SHA256 f5d1657ce34893b305cb1e8ec163274661926dc9116dccf0d41ce31f0693be43 SHA512 5db856db83e8300faa399922f05b552670a4c9947e3e778031f8904a1a91fe6b02e067bfa2f96883d16c74899d6b713bbd58210529071c0c71202134b41276c9 WHIRLPOOL 93c73028119875b4ec00278849ff11f1cdd0af32af02cac9b98d836f79bc84bb03df18096294c0316e04b39f87e44a973d93a17ad651f9156bac8c1888b006e8
diff --git a/net-p2p/imule/imule-2.3.2.3-r1.ebuild b/net-p2p/imule/imule-2.3.2.3-r1.ebuild
deleted file mode 100644
index f10db5a35436..000000000000
--- a/net-p2p/imule/imule-2.3.2.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WX_GTK_VER="2.8"
-inherit wxwidgets
-
-MY_PN="iMule"
-
-DESCRIPTION="P2P sharing software which connects through I2P and Kad networks"
-# New homepage has a few resources and a working nodes.dat file users need
-# in order to get iMule to work
-HOMEPAGE="http://echelon.i2p/imule"
-SRC_URI="https://dev.gentoo.org/~zlg/extra/net-p2p/imule/${MY_PN}-${PV}-src.tbz https://dev.gentoo.org/~zlg/extra/net-p2p/imule/2015-03-22_nodes.dat"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="webserver static-libs nls"
-RESTRICT="mirror"
-
-# wxGTK 2.8 is required; later versions result in failed compile
-# Other versions indicated are from the tarball's INSTALL file
-DEPEND="x11-libs/wxGTK:2.8
-	net-p2p/i2p
-	>=net-libs/libupnp-1.6.6
-	sys-devel/flex
-	sys-apps/texinfo
-	>=dev-libs/crypto++-5.1
-	!net-p2p/amule"
-RDEPEND="x11-libs/wxGTK:2.8 net-p2p/i2p"
-
-S="${WORKDIR}/${MY_PN}-${PV}-src"
-
-src_unpack() {
-	default
-	cp "${DISTDIR}"/2015-03-22_nodes.dat "${WORKDIR}"
-}
-
-src_configure() {
-	WX_GTK_VER="2.8" need-wxwidgets unicode
-	# Enabling imulecmd results in a compilation error.
-	econf --with-wx-config=${WX_CONFIG} \
-		--enable-imule-daemon \
-		--enable-alc \
-		--enable-alcc \
-		--enable-optimize \
-		--disable-debug \
-		$(use_enable nls) \
-		$(use_enable webserver) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	newins "${WORKDIR}"/2015-03-22_nodes.dat nodes.dat
-}
-
-pkg_postinst() {
-	elog "iMule will not function without a valid 'nodes.dat' file and"
-	elog "an I2P router running."
-	elog "A nodes.dat file can be found in /usr/share/imule. It can"
-	elog "be copied to ~/.iMule/nodes.dat for convenience."
-}
diff --git a/net-p2p/imule/imule-2.3.2.3.ebuild b/net-p2p/imule/imule-2.3.2.3.ebuild
deleted file mode 100644
index 13741da93b79..000000000000
--- a/net-p2p/imule/imule-2.3.2.3.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"
-WX_GTK_VER="2.8"
-inherit wxwidgets
-
-MY_PN="iMule"
-
-DESCRIPTION="P2P sharing software which connects through I2P and Kad network"
-# New homepage has a few resources and a working nodes.dat file users need
-# in order to get iMule to work
-HOMEPAGE="http://echelon.i2p/imule"
-SRC_URI="http://echelon.i2p/imule/${PV}/${MY_PN}-${PV}-src.tbz https://dev.gentoo.org/~zlg/extra/net-p2p/imule/2015-03-22_nodes.dat"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="webserver static-libs nls"
-
-# wxGTK 2.8 is required; later versions result in failed compile
-# Other versions indicated are from the tarball's INSTALL file
-DEPEND="x11-libs/wxGTK:2.8
-	net-p2p/i2p
-	>=net-libs/libupnp-1.6.6
-	sys-devel/flex
-	sys-apps/texinfo
-	>=dev-libs/crypto++-5.1"
-RDEPEND="x11-libs/wxGTK:2.8 net-p2p/i2p"
-
-S="${WORKDIR}/${MY_PN}-${PV}-src"
-
-src_configure() {
-	WX_GTK_VER="2.8" need-wxwidgets unicode
-	# Enabling imulecmd results in a compilation error.
-	econf --with-wx-config=${WX_CONFIG} \
-		--enable-imule-daemon \
-		--enable-alc \
-		--enable-alcc \
-		--enable-optimize \
-		--disable-debug \
-		$(use_enable nls) \
-		$(use_enable webserver) \
-		$(use_enable static-libs static)
-}
-
-pkg_postinst() {
-	elog "iMule will not function without a valid 'nodes.dat' file and"
-	elog "an I2P router running."
-	elog "The nodes.dat file can be found at http://echelon.i2p/imule."
-}
diff --git a/net-p2p/imule/metadata.xml b/net-p2p/imule/metadata.xml
deleted file mode 100644
index fd70f962e84d..000000000000
--- a/net-p2p/imule/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>java@gentoo.org</email>
-<name>Java</name>
-</maintainer>
-<longdescription>A P2P file-sharing application designed to work on top of the I2P or Kad network stacks.</longdescription>
-<use>
-<flag name="nls">Adds Native Language Support using GNU gettext.</flag>
-<flag name="static-libs">Builds a statically-linked application.</flag>
-<flag name="webserver">Enables a webserver to administer remotely.</flag>
-</use>
-</pkgmetadata>
diff --git a/net-p2p/linuxdcpp/Manifest b/net-p2p/linuxdcpp/Manifest
deleted file mode 100644
index 1dec68acefd6..000000000000
--- a/net-p2p/linuxdcpp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST linuxdcpp-1.0.3.tar.bz2 289891 SHA256 3b4eb6cf015f0fe8283508976b24dbb1cd4fb861116d4536f1055136c2442c71 SHA512 c0eb38b89b6a47a4a29ade90b3813e302b8c4dd8bea39770fce4e232ff17035ba355b36feb6b69195ba7c8448a69943ee61722e335ad514f426238fb8a089e79 WHIRLPOOL e6feb69c38020a13b2d37cc7dd51614946e2ba2642d7173e72d9d50af37cc510b8ac0f983c1bf68feab3e2d82027471ab8fc3beacbe96b680c87c889cdd88034
diff --git a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
deleted file mode 100644
index cde7f3832079..000000000000
--- a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-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=2
-
-# TODO: This needs to use the escons eclass.
-inherit eutils multiprocessing
-
-DESCRIPTION="Direct connect client, looks and works like famous DC++"
-HOMEPAGE="https://launchpad.net/linuxdcpp"
-SRC_URI="https://launchpad.net/linuxdcpp/1.0/${PV}/+download/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=gnome-base/libglade-2.4:2.0
-	>=x11-libs/gtk+-2.6:2
-	app-arch/bzip2
-	dev-libs/openssl"
-DEPEND="${RDEPEND}
-	media-libs/fontconfig
-	>=dev-util/scons-0.96
-	virtual/pkgconfig"
-
-src_prepare() {
-	# prevent scons installation of *txt files to wrong directory
-	sed -i 's/.*source = text_files.*//' SConstruct
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} debug=1"
-
-	scons ${myconf} -j$(makeopts_jobs) CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
-}
-
-src_install() {
-	# linuxdcpp does not install docs according to gentoos naming scheme, so do it by hand
-	dodoc Readme.txt Changelog.txt Credits.txt
-	rm "${S}"/*.txt
-
-	scons install PREFIX="/usr" FAKE_ROOT="${D}" || die "scons install failed"
-
-	doicon pixmaps/${PN}.png
-	make_desktop_entry ${PN} ${PN}
-}
-
-pkg_postinst() {
-	elog
-	elog "After adding first directory to shares you might need to restart linuxdcpp."
-	elog
-}
diff --git a/net-p2p/linuxdcpp/metadata.xml b/net-p2p/linuxdcpp/metadata.xml
deleted file mode 100644
index 719d5127c379..000000000000
--- a/net-p2p/linuxdcpp/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="launchpad">linuxdcpp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-p2p/microdc/Manifest b/net-p2p/microdc/Manifest
deleted file mode 100644
index 9f5da18fe149..000000000000
--- a/net-p2p/microdc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST microdc-0.11.0.tar.gz 517879 SHA256 57e12a6cfdf1feb5c526f4bfc9b250bb25c652e1ed81db28c9db1ab64af67b7e SHA512 9b1ce566246792662d825d19041dbd82494746c3dd5656927a9f8c5898f47be19473833b07fe4ff84836f256e4db8c6ffc50903df94c8c6262d63a5833c937c4 WHIRLPOOL d8e817a83753201d6211cbe127c2418c233774de30827a13907540a3c58726f97afb0a48b6e4c83fa6cc76ed6fb1012febdb9a253faf87e4acd6fe978c698ade
diff --git a/net-p2p/microdc/metadata.xml b/net-p2p/microdc/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-p2p/microdc/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-p2p/microdc/microdc-0.11.0.ebuild b/net-p2p/microdc/microdc-0.11.0.ebuild
deleted file mode 100644
index 185bb022f167..000000000000
--- a/net-p2p/microdc/microdc-0.11.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="A small command-line based Direct Connect client"
-HOMEPAGE="http://www.nongnu.org/microdc/"
-SRC_URI="http://savannah.nongnu.org/download/microdc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-4
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf $(use_enable nls) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README doc/*
-}
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
index 45ff4d63b91b..dcf30ca42f7e 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
 
 RDEPEND="dev-lang/perl
 	dev-ml/camlp4:=
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 127d57363bf3..68a84f5d126c 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1 +1,2 @@
 DIST syncthing-0.12.18.tar.gz 4046127 SHA256 e0d1af4f29c9e2325507a7daf4bf97098c87c321a7e075125b66ddaa34b37eb4 SHA512 2f2351a983b3d384e9fe65c87d67b81f20fc20b7b43b8d2fab882131bd4e4119f0cf099571d617f22f0125c43224c653e93329392204f3e0ff6c6a3bba7d8263 WHIRLPOOL cfe491241e9ef4ebd19042a3cc3188771cf64d67c0faa29feda7da5980f86a38c1e284938074271e25bbfb881eca1ca56f237bf81a61be4d836287cbfab27eb2
+DIST syncthing-0.12.19.tar.gz 4047476 SHA256 5a7035029974fe0fb496d9f8af880a50bcc8499ff5eef7ee4ef48f08df37820e SHA512 89d2b34c5bb9772bcaad84caa03794cdcfeade8fef0b8abaeea6a1cccdc09167a690aa8b1dfadac81d9ac0e8a07c9be112af7f2e56f12f589b906c518c49a686 WHIRLPOOL c0589a5e6a4f090dee9f79bb199c901b3f0e75cf0f92c12851a9713cdf7e813c8a5564ce475000529d2a5edafb9861d1b820858cb6fa3bb5bf082ff5586da9b3
diff --git a/net-p2p/syncthing/files/syncthing.confd b/net-p2p/syncthing/files/syncthing.confd
new file mode 100644
index 000000000000..da3ac4d2bbf5
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing.confd
@@ -0,0 +1,24 @@
+# /etc/conf.d/syncthing: config file for /etc/init.d/syncthing
+
+# User and group as which to run
+#SYNCTHING_USER="syncthing"
+#SYNCTHING_GROUP="syncthing"
+
+# Configuration directory
+#SYNCTHING_HOMEDIR="/var/lib/syncthing"
+
+# Log file location
+#SYNCTHING_LOGFILE="/var/log/syncthing/syncthing.log"
+
+# umask used to create files
+# The default allows group access
+#SYNCTHING_UMASK=007
+
+# I/O nice level of syncthing
+#SYNCTHING_IONICE="0"
+
+# Nice level of syncthing
+#SYNCTHING_NICE="0"
+
+# Extra options for syncthing
+#SYNCTHING_OPTS=""
diff --git a/net-p2p/syncthing/files/syncthing.initd b/net-p2p/syncthing/files/syncthing.initd
new file mode 100755
index 000000000000..2acaf3420f3f
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SYNCTHING_USER=${SYNCTHING_USER:-syncthing}
+SYNCTHING_GROUP=${SYNCTHING_GROUP:-syncthing}
+SYNCTHING_HOMEDIR=${SYNCTHING_HOMEDIR:-/var/lib/syncthing}
+SYNCTHING_LOGFILE=${SYNCTHING_LOGFILE:-/var/log/syncthing/syncthing.log}
+SYNCTHING_UMASK=${SYNCTHING_UMASK:-007}
+SYNCTHING_IONICE=${SYNCTHING_IONICE:-0}
+SYNCTHING_NICE=${SYNCTHING_NICE:-0}
+
+description="Syncthing is an open, trustworthy and decentralized cloud storage system"
+command="/usr/bin/syncthing"
+command_args="-no-browser -home=${SYNCTHING_HOMEDIR} ${SYNCTHING_OPTS}"
+pidfile="/run/syncthing.pid"
+start_stop_daemon_args="--background \
+  --user ${SYNCTHING_USER} \
+  --group ${SYNCTHING_GROUP} \
+  --umask ${SYNCTHING_UMASK} \
+  --make-pidfile \
+  --ionice ${SYNCTHING_IONICE} \
+  --nicelevel ${SYNCTHING_NICE} \
+  --stdout ${SYNCTHING_LOGFILE} \
+  --stderr ${SYNCTHING_LOGFILE}"
+
+depend() {
+  need localmount net
+}
+
+start_pre() {
+  checkpath -q -d -o ${SYNCTHING_USER}:${SYNCTHING_GROUP} ${SYNCTHING_HOMEDIR}
+  checkpath -q -f -o ${SYNCTHING_USER}:${SYNCTHING_GROUP} ${SYNCTHING_LOGFILE}
+}
diff --git a/net-p2p/syncthing/files/syncthing.logrotate b/net-p2p/syncthing/files/syncthing.logrotate
new file mode 100644
index 000000000000..37c43209a120
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing.logrotate
@@ -0,0 +1,9 @@
+/var/log/syncthing/syncthing.log {
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        kill -0 $(</run/syncthing.pid) && \
+          /etc/init.d/syncthing restart > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/net-p2p/syncthing/metadata.xml b/net-p2p/syncthing/metadata.xml
index d0fd94ffdb2f..78bfd3011c54 100644
--- a/net-p2p/syncthing/metadata.xml
+++ b/net-p2p/syncthing/metadata.xml
@@ -2,14 +2,24 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>jvasquez1011@gmail.com</email>
-    <name>Jonathan Vasquez</name>
+    <email>sautier.louis@gmail.com</email>
+    <name>Louis Sautier</name>
+    <description>Proxied maintainer; set to assignee in all bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <maintainer type="person">
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <longdescription lang="en">
+	  Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized.
+	  Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
+  </longdescription>
   <upstream>
     <remote-id type="github">syncthing/syncthing</remote-id>
+    <bugs-to>https://github.com/syncthing/syncthing/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/net-p2p/syncthing/syncthing-0.12.19.ebuild b/net-p2p/syncthing/syncthing-0.12.19.ebuild
new file mode 100644
index 000000000000..a064c14f3257
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-0.12.19.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN="github.com/syncthing/syncthing"
+EGIT_COMMIT=v${PV}
+
+inherit golang-vcs-snapshot systemd user
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH="${S}:$(get_golibdir_gopath)"
+	cd src/${EGO_PN}
+	go run build.go -version "v${PV}" -no-upgrade || die "build failed"
+}
+
+# go test: -race is only supported on amd64 platforms
+# https://github.com/syncthing/syncthing/issues/2765
+#src_test() {
+#	cd src/${EGO_PN}
+#	go run build.go test || die "test failed"
+#}
+
+src_install() {
+	cd src/${EGO_PN}
+	doman man/*.[157] || die
+	dobin bin/*
+	dodoc README.md AUTHORS CONTRIBUTING.md
+	systemd_dounit "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}@.service
+	systemd_douserunit "${S}"/src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+}
diff --git a/net-p2p/wire/Manifest b/net-p2p/wire/Manifest
deleted file mode 100644
index 7624c108882c..000000000000
--- a/net-p2p/wire/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wire-1.0.2.tar.gz 98888 SHA256 264006a76b2696ef113e769fd466f68181aa066cde0294834eb583d18fe6d0d2 SHA512 6f768e0268be024c0ee43eb2dcc0a225d822610c71106cbf03274219b416334b12b6001b1eb4ee73969083c83a9a214364d5f25a0b25cb4ca0dd04d415352126 WHIRLPOOL 49e72f91bdf25f66d3b8a840aba411c3e2f90ac847545d107ea30a07ec87e309f7b679356036b6c3c3c4bdafc91b1668c02daebf6248141bf1e3bb164931dbd5
diff --git a/net-p2p/wire/metadata.xml b/net-p2p/wire/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-p2p/wire/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-p2p/wire/wire-1.0.2.ebuild b/net-p2p/wire/wire-1.0.2.ebuild
deleted file mode 100644
index c395e26d62db..000000000000
--- a/net-p2p/wire/wire-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Wire is the Wired command line client"
-HOMEPAGE="http://www.zankasoftware.com/wired/wire/"
-SRC_URI="http://www.zankasoftware.com/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND="( >=dev-libs/openssl-0.9.7d )
-		( >=sys-libs/readline-4.3 )"
-
-src_install() {
-	dobin run/wire || die "dobin failed"
-	dodoc INSTALL README
-	doman man/wire.1
-}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 91b6d7941aa2..f37bd62a40e1 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,5 @@
 DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
-DIST cups-filters-1.4.0.tar.xz 1373724 SHA256 0aa63f82a3feb5c46136b917722ee1565b4c1e2e533db4716f62d31e29c6579a SHA512 c1f8b45ef79747405cbe114fc35f14cf30d3a7f13753bbfb524cb2ce7c7e4f10a4af8cd1df978a231c119d0e893efed946b25183f8898253b5be72ed9c926963 WHIRLPOOL ebce525e81f2ce6b040b154111e71df49f341337073795a156ac20b502352f2711034a651e1910cde7266de2177f02dabcf9efd86ab1d2afc57140dd4a697d9e
 DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
 DIST cups-filters-1.6.0.tar.xz 1377952 SHA256 39e53db81df7aa951507c72ced52b9b0e9e4294c3f83e8b717fb42c03a557c97 SHA512 dd7671dbb13588829337e4ae4d533dc6c1e17f75ca240a6d43bb0a30a2453fffa9a1541d7b041024a6d4cbb939790802a8c3947cd319590fa37c7ce237232b9d WHIRLPOOL 297ec0aeebd336a583f410099711cd6449b7b765fb29099b1ba5fd2d6a4c5dd7fd2824eb7aa26ca59070d7b866a68966d609729a3f58c07e1e13011af7e7e33e
 DIST cups-filters-1.8.1.tar.xz 1372152 SHA256 4e7d8953f910b7a992471d641590964c20f26da5d94c10de932dde4f5c03e91e SHA512 9b254dbcc90df335b8162495f5c2846f77c8006128458e54753877d0b5e6b1d696ae28378b4b9a8275626d7f537651e1cb55aac67588ee5fa319898912dd9e08 WHIRLPOOL 7a41fdeed84ee1f0f18aa201633ce5e77040499bf7a2ac5cf324f45876ca2a8072ddf5b947d8ac6526839bcd15c351324d556967d4e303d6b96aaf5bd44c2ed3
+DIST cups-filters-1.8.2.tar.xz 1372508 SHA256 06d1c2a65e45d92d0e2dc854d13161d01072094efe4fadc23319700c9a259c69 SHA512 71cd08b7955a334fa04834e99365ac8e83d34ba71a4de8a4a3e7cf7fd50768332d1a0588b963b9301f5a88170d3c700c36cf596a45497032202f3e5f18f93f2e WHIRLPOOL eae8c0c7ec83d131e91d89ace89ad12b76ac323e44f395e83cdb39340c9228a1e9436b2ccbe2c32ac02b2b868bce204a28f48261f71d8a2fccd4b7cfaff27814
diff --git a/net-print/cups-filters/cups-filters-1.4.0.ebuild b/net-print/cups-filters/cups-filters-1.4.0.ebuild
deleted file mode 100644
index 52f9132f487a..000000000000
--- a/net-print/cups-filters/cups-filters-1.4.0.ebuild
+++ /dev/null
@@ -1,122 +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
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS="~arm64"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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}
-	dev-util/gdbus-codegen
-"
-
-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/cups-filters/cups-filters-1.8.2.ebuild b/net-print/cups-filters/cups-filters-1.8.2.ebuild
new file mode 100644
index 000000000000..ebd2d934821b
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.8.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 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 ~arm64 ~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 +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,utils,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}
+	dev-util/gdbus-codegen
+"
+
+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) \
+		$(use_enable foomatic) \
+		$(use_enable postscript ghostscript) \
+		--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
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	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
+
+	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/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest
index 608bff00ab1f..6c13a224b266 100644
--- a/net-print/cups-pk-helper/Manifest
+++ b/net-print/cups-pk-helper/Manifest
@@ -1,2 +1,2 @@
-DIST cups-pk-helper-0.2.4.tar.xz 149828 SHA256 d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3 SHA512 0e071cad5cb8177caefa973de754f015fca3f6bc291ff1f30b978be990f45e443ca91999a2c733aff616cd9a5fc3b4074e1e01a18dd049f6d9b629171587ba02 WHIRLPOOL 7b34eba1fd4fc26c81dafe1eb118e2aec7b6f955a3f0323866a732c85ae3046236e87deb7f6c0427c02bfaff6e823182f42909ac8b19817c6cb089e90127da32
 DIST cups-pk-helper-0.2.5.tar.xz 152620 SHA256 19221eed65a1e1498d396f3f99a783a95b21b4385e63b57a1f16e8728b8ca118 SHA512 9fc0af517755482dc3787ce87df389adee41b826c4ccca25df69474812523fa265c3dcf31fbc1a75c1b680b9b6490a9c358ac30aed7570fa98f5287f02a2be40 WHIRLPOOL b97000a948cdd82c46e83ab1e2be936068fc2eb28af13f672495c5827fe7ac7ddc4c5ac8df5fe146686aec386f513a2e36609727077254911a12162818003932
+DIST cups-pk-helper-0.2.6.tar.xz 162368 SHA256 959af8f2f5a2761e7e498b61c9caf25ae963335031eae9972d999e9a0d97a228 SHA512 33f1b6f58f4772148bd1cfb8163dacaffd3cc62f2d03731710c98b765ebb8b87541cb9cf43e886880134c32db91a43c7142b1556a0abdf1449068031b0d5fbd3 WHIRLPOOL eb1abb48ab5fb222a6f72ec049d44cc3fb8a8a32c2c1acbbc9a3d6cc5f2361634fa9825fd56b41db15cff7a102df5ff4b519e4fd463f244c5cf7c9b33eb7750a
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild
deleted file mode 100644
index 2e3a348c4c8e..000000000000
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/cups-pk-helper"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	net-print/cups
-	>=sys-auth/polkit-0.97"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	DOCS="AUTHORS HACKING NEWS README"
-
-	# Revert "Be stricter when validating printer names", bug #459596
-	epatch "${FILESDIR}/${P}-revert-stricter.patch"
-
-	# Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
-	rm -v src/cph-iface-mechanism.{c,h} || die
-}
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
new file mode 100644
index 000000000000..beaa57180cc2
--- /dev/null
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
@@ -0,0 +1,43 @@
+# 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="PolicyKit helper to configure cups with fine-grained privileges"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/cups-pk-helper"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30.0:2
+	net-print/cups
+	>=sys-auth/polkit-0.97
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/dbus
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	DOCS="AUTHORS HACKING NEWS README"
+
+	# Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
+	rm -v src/cph-iface-mechanism.{c,h} || die
+
+	gnome2_src_prepare
+}
diff --git a/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch b/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch
deleted file mode 100644
index d20e3484baea..000000000000
--- a/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From f00aee0b43c31e94087668b23b72e873c660de5e Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@suse.com>
-Date: Mon, 10 Dec 2012 09:44:31 +0000
-Subject: Revert "Be stricter when validating printer names"
-
-Apparently, this is way too strict. The lpadmin man page says:
-
-  CUPS allows printer names to contain any printable character except
-  SPACE, TAB, "/", or  "#".
-
-So the previous code was (mostly) correct.
-
-This reverts commit 7bf9cbe43ef8f648f308e4760f75c2aa6b61fa8e.
----
-diff --git a/src/cups.c b/src/cups.c
-index 96c2c20..09f0e7b 100644
---- a/src/cups.c
-+++ b/src/cups.c
-@@ -327,25 +327,23 @@ _cph_cups_is_printer_name_valid_internal (const char *name)
-         int i;
-         int len;
- 
--        /* Quoting http://www.cups.org/documentation.php/doc-1.1/sam.html#4_1:
--         *
--         *    The printer name must start with any printable character except
--         *    " ", "/", and "@". It can contain up to 127 letters, numbers, and
--         *    the underscore (_).
--         *
--         * The first part is a bit weird, as the second part is more
--         * restrictive. So we only consider the second part. */
--
-         /* no empty string */
-         if (!name || name[0] == '\0')
-                 return FALSE;
- 
-         len = strlen (name);
--        if (len > 127)
-+        /* no string that is too long; see comment at the beginning of the
-+         * validation code block */
-+        if (len > CPH_STR_MAXLEN)
-                 return FALSE;
- 
-+        /* only printable characters, no space, no /, no # */
-         for (i = 0; i < len; i++) {
--                if (!g_ascii_isalnum (name[i]) && name[i] != '_')
-+                if (!g_ascii_isprint (name[i]))
-+                        return FALSE;
-+                if (g_ascii_isspace (name[i]))
-+                        return FALSE;
-+                if (name[i] == '/' || name[i] == '#')
-                         return FALSE;
-         }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
deleted file mode 100644
index e68dc7113ef4..000000000000
--- a/net-proxy/dansguardian/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dansguardian-2.12.0.3.tar.bz2 577701 SHA256 c74e9a32b97f9a9a056fced3da23fe48fca2bc6aa9af670afe9a53dc819414f5 SHA512 37155ef4f1a6dd6bdd87f79c7199b77de49746e4bff0631c239a569c21bf26240cbc9eae5a2436653bfc3d170a664710af9d80c4cfac3082a0620caeaac6740b WHIRLPOOL 64f64161a3dbf48c122fbf341ac8a7b4892be2049d1ac05948e9aa8c4cb927efa6ce929404b60c43f67457268f3c432b0ff109fb333ffe8ab84bba0b528b52eb
diff --git a/net-proxy/dansguardian/dansguardian-2.12.0.3-r2.ebuild b/net-proxy/dansguardian/dansguardian-2.12.0.3-r2.ebuild
deleted file mode 100644
index 714780bc4f2a..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.12.0.3-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils user
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://www.${PN}.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="avast backtrace clamav commandline debug email +fancydm icap kaspersky +lfs logrotate ntlm orig-ip +pcre static-libs trickledm"
-
-RDEPEND="sys-libs/zlib
-	clamav? ( app-antivirus/clamav )
-	logrotate? ( app-admin/logrotate )
-	ntlm? ( virtual/libiconv )
-	pcre? ( >=dev-libs/libpcre-8.32 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-WIKI="http://contentfilter.futuragts.com/wiki/doku.php"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_configure() {
-	local debug
-	if use debug ; then
-		debug="$(use_with debug dgdebug)"
-	fi
-
-	econf \
-		$(use_enable avast avastd) \
-		$(use_enable backtrace segv-backtrace) \
-		$(use_enable clamav clamd) \
-		$(use_enable commandline) \
-		${debug} \
-		$(use_enable email) \
-		$(use_enable fancydm) \
-		$(use_enable icap) \
-		$(use_enable kaspersky kavd) \
-		$(use_enable lfs) \
-		--with-logdir=/var/log/${PN} \
-		$(use_enable ntlm) \
-		$(use_enable orig-ip) \
-		$(use_enable pcre) \
-		--with-piddir=/var/run \
-		--with-proxygroup=${PN} \
-		--with-proxyuser=${PN} \
-		$(use_enable static-libs static-zlib) \
-		$(use_enable trickledm)
-}
-
-src_install() {
-	default
-
-	# Edit config files for virus scanners chosen based on USE flags.
-	if use avast; then
-		sed -r -i -e 's/^#( *contentscanner *=.*avastdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
-	fi
-
-	if use clamav; then
-		sed -r -i -e 's/[ \t]+use dns/& clamd/' "${D}/etc/init.d/${PN}"
-		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
-	fi
-
-	if use commandline; then
-		sed -r -i -e 's/^#( *contentscanner *=.*commandlinescan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
-	fi
-
-	if use icap; then
-		sed -r -i -e 's/^#( *contentscanner *=.*icapscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
-	fi
-
-	if use kaspersky; then
-		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
-	fi
-
-	# Install Gentoo init script
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	# Install log rotation file.
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotate" ${PN}
-	else
-		exeinto /etc/cron.weekly
-		newexe data/scripts/logrotation ${PN}.cron
-	fi
-
-	keepdir /var/log/${PN}
-	fperms o-rwx /var/log/${PN}
-}
-
-pkg_postinst() {
-	local runas="${PN}:${PN}"
-
-	if [ -d "${ROOT}/var/log/${PN}" ] ; then
-		chown -R ${runas} "${ROOT}/var/log/${PN}"
-		chmod o-rwx "${ROOT}/var/log/${PN}"
-	fi
-
-	einfo "For assistance configuring ${PN}, visit the wiki at ${WIKI}"
-}
diff --git a/net-proxy/dansguardian/files/dansguardian.init b/net-proxy/dansguardian/files/dansguardian.init
deleted file mode 100644
index 1be86f757538..000000000000
--- a/net-proxy/dansguardian/files/dansguardian.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-depend() {
-        need net
-        use dns \
-                squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
-        #dansguardian could be used in conjuction with any of the above web proxies
-        provide dansguardian
-}
-
-start() {
-        ebegin "Starting DansGuardian"
-        start-stop-daemon --start --background --pidfile /var/run/dansguardian.pid --exec /usr/sbin/dansguardian --progress --quiet
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping DansGuardian"
-        start-stop-daemon --stop --pidfile /var/run/dansguardian.pid --exec /usr/sbin/dansguardian --progress --quiet
-        eend $?
-}
-
-reload() {
-        ebegin "Leaving current connections open. Reloading filter group config files."
-        /usr/sbin/dansguardian -g
-        eend $?
-}
diff --git a/net-proxy/dansguardian/files/dansguardian.logrotate b/net-proxy/dansguardian/files/dansguardian.logrotate
deleted file mode 100644
index 2fe8ad51204b..000000000000
--- a/net-proxy/dansguardian/files/dansguardian.logrotate
+++ /dev/null
@@ -1,14 +0,0 @@
-/var/log/dansguardian/access.log {
-  rotate 4
-  weekly
-  missingok
-  notifempty
-  nocreate
-  nocopy
-  nocopytruncate
-  nocompress
-
-  postrotate
-    /usr/sbin/dansguardian -r
-  endscript
-}
diff --git a/net-proxy/dansguardian/metadata.xml b/net-proxy/dansguardian/metadata.xml
deleted file mode 100644
index dee1ecef819d..000000000000
--- a/net-proxy/dansguardian/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>DansGuardian is an award winning Open Source web content filter which currently runs on Linux, FreeBSD, OpenBSD, NetBSD, Mac OS X, HP-UX, and Solaris. It filters the actual content of pages based on many methods including phrase matching, PICS filtering and URL filtering. It does not purely filter based on a banned list of sites like lesser totally commercial filters.</longdescription>
-	<use>
-		<flag name="avast">Enable support for the AvastD content scanner.</flag>
-		<flag name="backtrace">Enable logging a backtrace when a segmentation fault occurs.</flag>
-		<flag name="clamav">Enable support for the ClamD content scanner.</flag>
-		<flag name="commandline">Enable support for command-line content scanners.</flag>
-		<flag name="email">Enable support for email reporting functionality.</flag>
-		<flag name="fancydm">Enable support for the fancy download manager.</flag>
-		<flag name="icap">Enable support for ICAP AV server content scanner.</flag>
-		<flag name="kaspersky">Enable support for the Kaspersky AV daemon content scanner.</flag>
-		<flag name="lfs">Enable large file support on 32 bit systems.</flag>
-		<flag name="logrotate">Use app-admin/logrotate for rotating logs.</flag>
-		<flag name="ntlm">Enable support for the NTLM auth plugin.</flag>
-		<flag name="orig-ip">Enable support for checking the client's original destination IP address against HTTP request details when deployed as a transparent proxy (US-CERT VU#435052).</flag>
-		<flag name="trickledm">Enable support for the trickle download manager.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">dansguardian</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-proxy/haproxy/haproxy-1.5.15.ebuild b/net-proxy/haproxy/haproxy-1.5.15.ebuild
index 8d520b219de2..206b2a3bb073 100644
--- a/net-proxy/haproxy/haproxy-1.5.15.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
 
 DEPEND="pcre? ( dev-libs/libpcre
diff --git a/net-proxy/haproxy/haproxy-1.6.3.ebuild b/net-proxy/haproxy/haproxy-1.6.3.ebuild
index 3f896e807afd..5bf06c314d9f 100644
--- a/net-proxy/haproxy/haproxy-1.6.3.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="+crypt doc examples net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
 
 DEPEND="pcre? ( dev-libs/libpcre
diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest
deleted file mode 100644
index f4beb10fa83c..000000000000
--- a/net-proxy/ntlmaps/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ntlmaps-0.9.9.6.tar.gz 60760 SHA256 005c66a84f535951dc6ad558b301b7b49b96a3bbc56e3a83a553a5500e3f6a2a SHA512 0b0c80f3a32c523fdad47af2d0c7fa21d01124d014aafb2f7e9a00ba525685917b6c24572a25d5c294848f88fd6775a0e9c9e95014d91e35b86411c83f12adff WHIRLPOOL 66431212f20e5451992a2f788d7c8077dae95ee3cb97e956bd65862ce9c93fe2bea31e46cf34922fe5cbd99c6ea5780cfecd3fbadc128cbbd820c5c772f9371e
-DIST ntlmaps-0.9.9.tar.gz 55459 SHA256 6f955ef0a8f3e944df0a9b2d22e385ee4399fa4e16f4c30ccdcb6f4c92fdccd1 SHA512 53848de24d2b16e72b42af0a55c7e72356cfe0cbf9f90136ed8d6d72bf6293a3fd4c76e9fa47ddaaae865abec70c0b0a4cb4b510754a89bc422b657ffe51ac1e WHIRLPOOL 08a185f038ec20dd2a0992fb5ebb67c9c337db3f7949268837a5d31fa85212c226ee8a44cb1c4184fc96c27d0cc1ac1e90d22c1b1c4f3ca7d3c2db7ca8574c20
diff --git a/net-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch b/net-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch
deleted file mode 100644
index 02e90f2ccf9d..000000000000
--- a/net-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nru ntlmaps-0.9.9.orig/__init__.py ntlmaps-0.9.9/__init__.py
---- ntlmaps-0.9.9.orig/__init__.py	2004-11-10 01:27:05.000000000 +0200
-+++ ntlmaps-0.9.9/__init__.py	2005-02-24 13:07:56.601327735 +0200
-@@ -22,8 +22,7 @@
- 
- import os, sys
- 
--ntlmaps_dir = os.path.dirname(os.path.abspath(__file__))
--ntlmaps_libdir = ntlmaps_dir + '/lib'
-+ntlmaps_dir = '/usr/lib/ntlmaps'
- sys.path.append(ntlmaps_libdir)
- 
- del os, sys
-diff -Nru ntlmaps-0.9.9.orig/main.py ntlmaps-0.9.9/main.py
---- ntlmaps-0.9.9.orig/main.py	2005-02-01 04:45:02.000000000 +0200
-+++ ntlmaps-0.9.9/main.py	2005-02-24 13:11:46.762545214 +0200
-@@ -18,17 +18,17 @@
- # Free Software Foundation, Inc.,
- # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- #
--import __init__
--
- import sys
- 
-+sys.path.append('/usr/lib/ntlmaps')
-+
- import server, config, config_affairs
- 
- 
- #--------------------------------------------------------------
- # config affairs
- # look for default config name in lib/config.py
--conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/'))
-+conf = config.read_config('/etc/ntlmaps/server.cfg')
- 
- conf['GENERAL']['VERSION'] = '0.9.9'
- 
diff --git a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch
deleted file mode 100644
index bda0843e6c9f..000000000000
--- a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- __init__.py.old	2010-10-06 16:03:54.000000000 +0200
-+++ __init__.py	2010-10-06 16:05:38.000000000 +0200
-@@ -20,10 +20,3 @@
- # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- #
- 
--import os, sys
--
--ntlmaps_dir = os.path.dirname(os.path.abspath(__file__))
--ntlmaps_libdir = ntlmaps_dir + '/lib'
--sys.path.append(ntlmaps_libdir)
--
--del os, sys
---- main.py.old	2010-10-06 16:26:57.000000000 +0200
-+++ main.py	2010-10-06 16:27:29.000000000 +0200
-@@ -18,8 +18,6 @@
- # Free Software Foundation, Inc.,
- # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- #
--import __init__
--
- import sys
- 
- import server, config, config_affairs
-@@ -28,7 +26,7 @@
- #--------------------------------------------------------------
- # config affairs
- # look for default config name in lib/config.py
--conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/'))
-+conf = config.read_config('/etc/ntlmaps/server.cfg')
- 
- conf['GENERAL']['VERSION'] = '0.9.9.6'
- 
diff --git a/net-proxy/ntlmaps/files/ntlmaps.init b/net-proxy/ntlmaps/files/ntlmaps.init
deleted file mode 100644
index 0d0251660670..000000000000
--- a/net-proxy/ntlmaps/files/ntlmaps.init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PID_FILE="/var/run/ntlmaps.pid"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ntlmaps"
-	touch ${PID_FILE}
-	chown ntlmaps:ntlmaps ${PID_FILE}
-	cd /var/log/ntlmaps && \
-		start-stop-daemon --quiet --start --background --exec /usr/bin/python \
-			--make-pidfile --pidfile ${PID_FILE} --chuid ntlmaps -- /usr/bin/ntlmaps < /dev/null && \
-		sleep 1
-	eend $?
-}
-stop() {
-	ebegin "Stopping ntlmaps"
-	start-stop-daemon --stop --quiet --pidfile ${PID_FILE} && \
-		rm -f ${PID_FILE}
-	eend $?
-}
diff --git a/net-proxy/ntlmaps/files/ntlmaps.service b/net-proxy/ntlmaps/files/ntlmaps.service
deleted file mode 100644
index 163ab2623ed2..000000000000
--- a/net-proxy/ntlmaps/files/ntlmaps.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=NTLM proxy Authentication against MS proxy/web server
-Wants=network.target
-Before=network.target
-
-[Service]
-ExecStart=/usr/bin/ntlmaps
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/ntlmaps/metadata.xml b/net-proxy/ntlmaps/metadata.xml
deleted file mode 100644
index 27562f7f4e95..000000000000
--- a/net-proxy/ntlmaps/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <longdescription lang="en">
-		ntlmaps is a http/ftp/socks proxy server written in python that
-		implements samba-like ntlm authentication against a Microsoft Proxy
-		Server (which does not support 'normal' digest authentication).
-	</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">ntlmaps</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild
deleted file mode 100644
index c23b818c53c4..000000000000
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="NTLM proxy Authentication against MS proxy/web server"
-HOMEPAGE="http://ntlmaps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 x86"
-IUSE=""
-
-DEPEND="dev-lang/python"
-
-pkg_setup() {
-	enewgroup ntlmaps
-	enewuser ntlmaps -1 -1 -1 ntlmaps
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	sed -i -e 's/\r//' lib/*.py server.cfg *.txt doc/*.{txt,htm} || die 'Failed to convert line endings.'
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe main.py ntlmaps
-	insinto /usr/lib/ntlmaps
-	doins lib/*
-
-	dodoc *.txt doc/*.txt
-	dohtml doc/*
-
-	insopts -m0640 -g ntlmaps
-	insinto /etc/ntlmaps
-	doins server.cfg
-	newinitd "${FILESDIR}/ntlmaps.init" ntlmaps
-
-	diropts -m 0770 -g ntlmaps
-	keepdir /var/log/ntlmaps
-}
-
-pkg_preinst() {
-	#Remove the following lines sometime in December 2005
-	#Their purpose is to fix security bug #107766
-	if [ -f "${ROOT}/etc/ntlmaps/server.cfg" ]; then
-		chmod 0640 "${ROOT}/etc/ntlmaps/server.cfg"
-		chgrp ntlmaps "${ROOT}/etc/ntlmaps/server.cfg"
-	fi
-}
-
-pkg_prerm() {
-	einfo "Removing python compiled bytecode"
-	rm -f "${ROOT}"/usr/lib/ntlmaps/*.py?
-}
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild
deleted file mode 100644
index 0773811d7052..000000000000
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib systemd user python-r1
-
-DESCRIPTION="NTLM proxy Authentication against MS proxy/web server"
-HOMEPAGE="http://ntlmaps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ntlmaps
-	enewuser ntlmaps -1 -1 -1 ntlmaps
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	sed \
-		-e 's/\r//' \
-		-i lib/*.py server.cfg doc/*.{txt,htm} || die 'Failed to convert line endings.'
-}
-
-src_install() {
-	# Bug #351305, prevent file collision.
-	rm "${S}"/lib/utils.py || die
-
-	python_foreach_impl python_domodule lib/*.py
-
-	python_foreach_impl python_newscript main.py ntlmaps
-
-	python_foreach_impl python_optimize
-
-	dodoc doc/*.txt
-	dohtml doc/*.{gif,htm}
-
-	insopts -m0640 -g ntlmaps
-	insinto /etc/ntlmaps
-	doins server.cfg
-	newinitd "${FILESDIR}/ntlmaps.init" ntlmaps
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	diropts -m 0770 -g ntlmaps
-	keepdir /var/log/ntlmaps
-}
diff --git a/net-proxy/oops/Manifest b/net-proxy/oops/Manifest
deleted file mode 100644
index 112ff567b3b7..000000000000
--- a/net-proxy/oops/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST oops-1.5.23.tar.gz 473290 SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04 SHA512 5d33b19d6a48f3b38cffe7eb17ef0b0a00cc92cb1608a05f196ec747df51e318e8f0a82d1f0c2e254c16a7d97f640ed8bf30be62994f3b81d5ebd3cdc6358be3 WHIRLPOOL d2d9d1da409e91beb5e7761285b360dce3824f3defacc3c7f10305617bcdbd9e8807be645e74c268f4b8126ff330a7c49936ced06247c3bdc2190f8d194b4710
-DIST oops-1.5.24_pre20050503.patch.gz 101103 SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded SHA512 230fede3d76ebd35f404055605381555707aed4d3fdf53e5e5074c66500b55360e7546c3faa54466791f485a89e359c3e5576162eef6c17ca49c1006ebfddb0a WHIRLPOOL 6ae6284393ed53d3d083af6abca2b7a5cb2c80d0c02838f5d518f02de12a13122900e2dbe62532953bdd839430d94523d28a8abf555e463d25a807a75f692cff
diff --git a/net-proxy/oops/files/implicit-decl.patch b/net-proxy/oops/files/implicit-decl.patch
deleted file mode 100644
index 767814dd6a82..000000000000
--- a/net-proxy/oops/files/implicit-decl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nru oops-1.5.23.orig/src/hash.c oops-1.5.23/src/hash.c
---- oops-1.5.23.orig/src/hash.c	2001-01-28 14:34:43.000000000 +0200
-+++ oops-1.5.23/src/hash.c	2007-04-11 14:19:26.000000000 +0300
-@@ -1,4 +1,5 @@
- #include    <stdio.h>
-+#include    <string.h>
- #include    <strings.h>
- #include    "hash.h"
- 
diff --git a/net-proxy/oops/files/libpcreposix.patch b/net-proxy/oops/files/libpcreposix.patch
deleted file mode 100644
index 1648ecabb152..000000000000
--- a/net-proxy/oops/files/libpcreposix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nru oops-1.5.23.orig/configure.in oops-1.5.23/configure.in
---- oops-1.5.23.orig/configure.in	2007-11-20 22:47:27.000000000 +0200
-+++ oops-1.5.23/configure.in	2007-11-20 22:58:42.000000000 +0200
-@@ -454,14 +454,7 @@
-     AC_DEFINE(REGEX_H, <regex.h>)
-     ;;
-   pcre)
--		if test -r "/usr/lib/libpcreposix.a" -a -r "/usr/lib/libpcre.a"; then
--			LIBS="$LIBS /usr/lib/libpcreposix.a /usr/lib/libpcre.a"
--		elif test -r "/usr/local/lib/libpcreposix.a" -a -r "/usr/local/lib/libpcre.a"; then
--	    LIBS="$LIBS /usr/local/lib/libpcreposix.a /usr/local/lib/libpcre.a"
--		fi
--    if test "X`echo $CFLAGS | grep '\-I/usr/local/include'`" = "X"; then
--	CFLAGS="$CFLAGS -I/usr/local/include"
--    fi
-+    LIBS="$LIBS -lpcreposix"
-     AC_DEFINE(REGEX_H, <pcreposix.h>)
-     ;;
-   builtin)
diff --git a/net-proxy/oops/files/modules-as-needed.patch b/net-proxy/oops/files/modules-as-needed.patch
deleted file mode 100644
index 41703cd389ee..000000000000
--- a/net-proxy/oops/files/modules-as-needed.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru src/modules.orig/Makefile.in src/modules/Makefile.in
---- src/modules.orig/Makefile.in	2006-05-20 01:28:11.000000000 +0300
-+++ src/modules/Makefile.in	2006-05-20 01:29:11.827604500 +0300
-@@ -110,11 +110,11 @@
- 
- passwd_pgsql.so: passwd_sql.c ../modules.h ../oops.h
- 	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
--	${LD} $(SOFLAGS) $(LDFLAGS) $(LIBS) -o passwd_pgsql.so passwd_pgsql.o $(PGSQL_LIB)
-+	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_pgsql.so passwd_pgsql.o $(LIBS) $(PGSQL_LIB)
- 
- passwd_mysql.so: passwd_sql.c ../modules.h ../oops.h
- 	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
--	${LD} $(SOFLAGS) $(LDFLAGS) $(LIBS) -o passwd_mysql.so passwd_mysql.o $(MYSQL_LIB)
-+	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_mysql.so passwd_mysql.o $(LIBS) $(MYSQL_LIB)
- 
- passwd_pgsql.o: passwd_sql.c ../modules.h ../oops.h
- 	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
diff --git a/net-proxy/oops/files/oops-1.5.24-pthread-rwlock.patch b/net-proxy/oops/files/oops-1.5.24-pthread-rwlock.patch
deleted file mode 100644
index 2606af7330d5..000000000000
--- a/net-proxy/oops/files/oops-1.5.24-pthread-rwlock.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.c oops-1.5.23/src/lib/rwlock/rwlock.c
---- oops-1.5.23.orig/src/lib/rwlock/rwlock.c	2000-11-29 19:03:35.000000000 +0200
-+++ oops-1.5.23/src/lib/rwlock/rwlock.c	2006-09-06 00:30:36.000000000 +0300
-@@ -53,6 +53,8 @@
- #include <pthread.h>
- #include "rwlock.h"
- 
-+#if defined(OOPS_IMPLEMENT_RWLOCK)
-+
- /* maximum number of times a read lock may be obtained */
- #define	MAX_READ_LOCKS		(INT_MAX - 1)
- 
-@@ -375,4 +377,6 @@
- 	return(0);
- }
- 
-+#endif /* defined(OOPS_IMPLEMENT_RWLOCK) */
-+
- #endif /* _THREAD_SAFE || _PTHREADS || _REENTRANT */
-diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.h oops-1.5.23/src/lib/rwlock/rwlock.h
---- oops-1.5.23.orig/src/lib/rwlock/rwlock.h	2003-10-06 17:15:40.000000000 +0300
-+++ oops-1.5.23/src/lib/rwlock/rwlock.h	2006-09-06 00:29:46.000000000 +0300
-@@ -53,6 +53,7 @@
- 
- #if	!defined(PTHREAD_RWLOCK_INITIALIZER)
- #define	PTHREAD_RWLOCK_INITIALIZER	NULL
-+#define OOPS_IMPLEMENT_RWLOCK 1
- 
- struct	pthread_rwlock {
- 	pthread_mutex_t	lock;		/* monitor lock */
diff --git a/net-proxy/oops/files/oops-1.5.24-respect-flags.patch b/net-proxy/oops/files/oops-1.5.24-respect-flags.patch
deleted file mode 100644
index 67c814aea2f2..000000000000
--- a/net-proxy/oops/files/oops-1.5.24-respect-flags.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 0b9ac65..a68d7c1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -204,8 +204,6 @@ tm.__tm_gmtoff__ = tm.__tm_gmtoff__*2;
- AC_DEFINE(HAVE__GMTOFF__) AC_MSG_RESULT(yes)
- ],[AC_MSG_RESULT(no)])
- 
--LD=ld
--
- ##
- ##
- ##
-@@ -309,18 +307,18 @@ CXXCOMPFLAGS=-c
- CXXSOFLAGS=$SOFLAGS
- 
- case "$host_os" in
--irix*)    CFLAGS="-D_SGI_MP_SOURCE"
-+irix*)    EXTCFLAGS+="-D_SGI_MP_SOURCE"
- 	  ;;
--osf*)     CFLAGS="$CFLAGS -D_REENTRANT -DOSF"
-+osf*)     EXTCFLAGS+="$CFLAGS -D_REENTRANT -DOSF"
- 	  LIBS="-oldstyle_liblookup -lpthread $LIBS"
- 
- 	  ;;
--freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
-+freebsd*) EXTCFLAGS+="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
- 	  CXXSOFLAGS="-shared"
- 	  LIBS="$LEXLIB $LIBS"
- 	  if test "$large_files" = "yes" ; then
- 		## FreeBSD need no any special flags for 64bit files
--		CFLAGS="$CFLAGS -DWITH_LARGE_FILES"
-+		EXTCFLAGS+=" -DWITH_LARGE_FILES"
- 	  fi
- 	  if test "X$LIBGB_NAME" != "X" ; then
- 		LIBGB_NAME="$LIBGB_NAME -lstdc++"
-@@ -328,39 +326,38 @@ freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=204
-           rel=`uname -r`
-           case "$rel" in
-             4*)
--              CFLAGS="$CFLAGS -pthread"
-+              EXTCFLAGS+=" -pthread"
-               ;;
-             5*)
-               LIBS="-lc_r $LEXLIB $LIBS"
-               ;;
-             *)
--              CFLAGS="$CFLAGS -pthread"
-+              EXTCFLAGS+=" -pthread"
-               LIBS="-lc_r $LEXLIB $LIBS"
-               ;;
-           esac
- 	  RPATH_OPTION="-rpath"
- 	  ;;
--bsdi*)	  CFLAGS="$CFLAGS -pthread -DBSDOS"
-+bsdi*)	  EXTCFLAGS+=" -pthread -DBSDOS"
-           rel=`uname -r`
-           case "$rel" in
-             4*)
--              CFLAGS="$CFLAGS -pthread"
-+              EXTCFLAGS+=" -pthread"
-               ;;
-             5*)
-               LIBS="-lc_r $LEXLIB $LIBS"
-               ;;
-             *)
--              CFLAGS="$CFLAGS -pthread"
-+              EXTCFLAGS+=" -pthread"
-               LIBS="-lc_r $LEXLIB $LIBS"
-               ;;
-           esac
- 	  LIBS="$LEXLIB $LIBS"
- 	  CXX=g++
- 	  ;;
--gnu*|linux*)   CFLAGS="$CFLAGS -D_REENTRANT -DLINUX"
--	  CXX=g++
-+gnu*|linux*)   EXTCFLAGS+=" -D_REENTRANT -DLINUX"
- 	  if test "$pthread_in" = "pthreads" ; then
--		CFLAGS="$CFLAGS -D_MIT_POSIX_THREADS"
-+		EXTCFLAGS+=" -D_MIT_POSIX_THREADS"
- 		LIBS="-lpthreads $LEXLIB -ldb $LIBS"
- 		echo Probably you have MIT-threads. If yes, swich to LinuxThreads.
- 	  else
-@@ -369,11 +366,11 @@ gnu*|linux*)   CFLAGS="$CFLAGS -D_REENTRANT -DLINUX"
- 	  if test "$large_files" = "yes" ; then
- 		## Linux ext2fs does'nt support large files yet.
- 		AC_MSG_RESULT(Warning: Linux ext2fs doesn't support large files.)
--		CFLAGS="$CFLAGS -DWITH_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_FILE_OFFSET64"
-+		EXTCFLAGS+=" -DWITH_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_FILE_OFFSET64"
- 	  fi
- 	  RPATH_OPTION="-rpath"
- 	  ;;
--solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
-+solaris*) EXTCFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
- 	  if test "X$LIBDB_REAL_PATH" != "X" ; then
- 	  	LIBDB_NAME="-R$LIBDB_REAL_PATH $LIBDB_NAME"
- 	  fi
-@@ -390,7 +387,7 @@ solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
- 				LIBGB_NAME="$LIBGB_NAME -lstdc++"
- 	  		fi
- 			;;
--		*)	CFLAGS="$CFLAGS -mt"
-+		*)	EXTCFLAGS+="-mt"
- 			SUNPRO_CC_VER=`CC -V 2>&1 | sed 's/.*C++ //' | sed 's/\..*//'`
- 			if test "$SUNPRO_CC_VER" = "5" ; then
- 			    CXX="CC -compat=4 -w -fast -xO3 -DNO_MEMBER_TEMPLATES=1"
-@@ -407,14 +404,14 @@ solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
- 			;;
- 	  esac
- 	  if test "$large_files" = "yes" ; then
--		CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DWITH_LARGE_FILES"
-+		EXTCFLAGS=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DWITH_LARGE_FILES"
- 	  fi
- 	  ;;
- aix4*)    AC_DEFINE(MODULES)
- 	  LIBS="$LIBS -ldl $LEXLIB"
-           SOFLAGS=-G
-           case "$CC" in
--          gcc*)   CFLAGS="-D_THREAD_SAFE $CFLAGS"
-+          gcc*)   EXTCFLAGS+=" -D_THREAD_SAFE $CFLAGS"
- 		  CXX=g++
-                   LIBS="$LIBS -lpthreads -lc_r"
-                   ;;
-@@ -424,7 +421,7 @@ aix4*)    AC_DEFINE(MODULES)
-                   ;;
- 	  esac
-           if test "$large_files" = "yes" ; then
--		CFLAGS="$CFLAGS -D_LARGE_FILES -D_LARGE_FILE_API -DWITH_LARGE_FILES"
-+		EXTCFLAGS+=" -D_LARGE_FILES -D_LARGE_FILE_API -DWITH_LARGE_FILES"
- 	  fi
- 	  ;;
- esac
-@@ -432,14 +429,14 @@ esac
- if test "X$MYSQL_PATH" != "X" ; then
-     LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
-     AC_DEFINE(HAVE_MYSQL)
--    CFLAGS="$CFLAGS -I$MYSQL_PATH/include"
-+    CFLAGS+=" -I$MYSQL_PATH/include"
-     MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
- fi
- 
- if test "X$PGSQL_PATH" != "X" ; then
-     LIBS="$LIBS -L$PGSQL_PATH/lib -lpg"
-     AC_DEFINE(HAVE_PGSQL)
--    CFLAGS="-I$PGSQL_PATH/include $LIBS"
-+    CFLAGS+="-I$PGSQL_PATH/include $LIBS"
-     PGSQL_LIB="-L$PGSQL_PATH/lib -lpg"
- fi
- 
-@@ -601,7 +598,7 @@ if test "X$LIBDB_PATH" != "X" ; then
-     esac
- fi
- 
--CFLAGS="$CFLAGS $LIBDB_INCL"
-+EXTCFLAGS+=" $LIBDB_INCL"
- 
- AC_MSG_CHECKING(for GigaBASE)
- if test "$LIBGB_PATH" = "no" ; then
-@@ -653,7 +650,7 @@ elif test -r "/usr/local/lib/libz.a"; then
-     AC_DEFINE(HAVE_ZLIB)
-     AC_MSG_RESULT(/usr/local/lib/libz.a)
-     if test "X`echo $CFLAGS | grep '\-I/usr/local/include'`" = "X"; then
--	CFLAGS="$CFLAGS -I/usr/local/include"
-+	EXTCFLAGS+=" -I/usr/local/include"
-     fi
- elif test -r "/usr/lib/libz.a"; then
-     LIBZ_NAME="/usr/lib/libz.a"
-@@ -689,7 +686,7 @@ EOF
- 	res=`./confmain`
-     fi
-     if test "$res" = "yes"; then
--	    CFLAGS="$CFLAGS -export-dynamic"
-+	    EXTCFLAGS+=" -export-dynamic"
- 	    AC_MSG_RESULT(yes)
-     else
- 	    AC_MSG_RESULT(no)
-@@ -698,7 +695,7 @@ fi
- rm -f confmain*
- 
- echo $CC
--echo $CFLAGS
-+echo $EXTCFLAGS
- echo $LIBS
- 
- if test "${enable_oops_user+set}" != set; then
-@@ -728,8 +725,6 @@ AC_SUBST(MOD_EXT)
- AC_SUBST(OPT_MODS)
- AC_SUBST(STATIC_MODULES)
- AC_SUBST(CHOWN)
--AC_SUBST(LD)
--AC_SUBST(LDFLAGS)
- AC_SUBST(VER)
- AC_SUBST(LIBGB_PATH)
- AC_SUBST(LIBGB_NAME)
-@@ -795,6 +790,7 @@ AC_SUBST(LIBDB_INCL)
- AC_SUBST(LIBZ_NAME)
- AC_SUBST(EXTRASRC)
- AC_SUBST(EXTLDFLAGS)
-+AC_SUBST(EXTCFLAGS)
- 
- AC_DEFINE_UNQUOTED(OOPS_HOME, "$oops_prefix/oops")
- AC_DEFINE_UNQUOTED(OOPS_SBINDIR, "$oops_sbindir")
-diff --git a/src/Makefile.in b/src/Makefile.in
-index b366c2f..0ac6aff 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1,6 +1,4 @@
--CC = @CC@
--CXX = @CXX@
--LDFLAGS = @LDFLAGS@
-+EXTCFLAGS = @EXTCFLAGS@
- EXTLDFLAGS = @EXTLDFLAGS@
- INSTALL = @INSTALL@ @SETOWNER@
- INSTALL_DATA = @INSTALL@ -m 644 @SETOWNER@
-@@ -29,13 +27,13 @@ EXTRAOBJS = $(EXTRASRC:.c=.o)
- 
- #CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
- 
--CFLAGS = @CFLAGS@ -fPIE @DEFS@
-+CFLAGS += -fPIE @DEFS@
- 
- VER=@VER@
- OOPSPATH=@prefix@/oops
- 
- .c.o:
--	${CC} -c ${CFLAGS} ${CDEFS} $<
-+	${CC} -c ${CFLAGS} ${EXTCFLAGS} ${CDEFS} $<
- 
- all:	extras modules oops
- 
-@@ -45,7 +43,7 @@ modules::
- 	cd modules; $(MAKE)
- 
- oops:	${OBJS}
--	${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
-+	${CXX} ${CFLAGS} ${EXTCFLAGS} ${OBJS} ${EXTLDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
- 
- mkinstalldirs:
- 	../mkinstalldirs ${OOPSPATH} \
-@@ -150,7 +148,7 @@ version.h:	version
- 		echo "#define VERSION \""`cat version`"\""> version.h
- 
- lex.yy.o: lex.yy.c y.tab.h oops.h
--	${CC} ${CFLAGS} ${CDEFS} -c lex.yy.c
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c lex.yy.c
- 
- lex.yy.c: parser.l
- 	@LEX@ parser.l
-@@ -159,13 +157,13 @@ y.tab.c: parser.y
- 	@YACC@ -d parser.y
- 
- y.tab.o: y.tab.c oops.h
--	${CC} ${CFLAGS} ${CDEFS} -c y.tab.c
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c y.tab.c
- 
- malloc.o: malloc.c
--	${CC} ${CFLAGS} ${CDEFS} -DEBUG -c malloc.c
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -DEBUG -c malloc.c
- 
- gnu_regex.o: gnu_regex.c
--	${CC} ${CFLAGS} -DREGEX -c gnu_regex.c
-+	${CC} ${CFLAGS} ${EXTCFLAGS} -DREGEX -c gnu_regex.c
- 
- clean:
- 	rm -f *o lex.yy.c  y.tab.[ch] version.h oops DEADJOE
-diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
-index d8e3c50..60c6b73 100644
---- a/src/modules/Makefile.in
-+++ b/src/modules/Makefile.in
-@@ -1,9 +1,4 @@
--CC = @CC@
--CXX = @CXX@
- LIBS = @LIBS@
--CFLAGS = @CFLAGS@ -fPIC @DEFS@
--LDFLAGS = @LDFLAGS@
--LD = @LD@
- SOFLAGS = @SOFLAGS@
- OPT_MODS = @OPT_MODS@
- CXXCOMPFLAGS = @LIBGB_INCL@ @CXXCOMPFLAGS@
-@@ -15,27 +10,30 @@ LIBDB_NAME = @LIBDB_NAME@
- MYSQL_LIB = @MYSQL_LIB@
- PGSQL_LIB = @PGSQL_LIB@
- EXTRASRC = @EXTRASRC@
-+EXTCFLAGS = @EXTCFLAGS@
-+
-+CFLAGS += -fPIC @DEFS@
- 
- .SUFFIXES:	.c .cpp .o .so
- 
- EXTRAOBJS = $(EXTRASRC:%c=../%o)
- 
- .c.o:
--	${CC} ${CFLAGS} ${LIBDB_INCL} ${CDEFS} -c $<
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${CDEFS} -c $<
- #
- .o.so:
- 	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
- 
- .c.so:
--	${CC} ${CFLAGS} ${LIBDB_INCL} ${SOFLAGS} ${CDEFS} -c $<
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${SOFLAGS} ${CDEFS} -c $<
- 	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $(<:.c=.o) $(LIBS)
- 
- .cpp.o:
--	${CXX} ${CFLAGS} ${SOFLAGS} ${CDEFS} $(CXXCOMPFLAGS) $< -o $*.a
-+	${CXX} ${CFLAGS} ${EXTCFLAGS} ${SOFLAGS} ${CDEFS} $(CXXCOMPFLAGS) $< -o $*.a
- 	mv $*.a $*.o
- 
- .cpp.so:
--	${CXX} ${CFLAGS} ${CXXSOFLAGS} ${CDEFS} $< @LIBGB_PATH@ @LIBGB_NAME@ $(LIBS) -o $@
-+	${CXX} ${CFLAGS} ${EXTCFLAGS} ${CXXSOFLAGS} ${CDEFS} $< @LIBGB_PATH@ @LIBGB_NAME@ $(LIBS) -o $@
- 
- all:	log_dummy.@MOD_EXT@ \
- 	err.@MOD_EXT@ \
-@@ -97,30 +95,30 @@ custom_log.@MOD_EXT@:	custom_log.c ../modules.h ../oops.h
- #berkeley_db_api.@MOD_EXT@:	berkeley_db_api.c ../modules.h ../oops.h
- 
- berkeley_db_api.o:	berkeley_db_api.c ../modules.h ../oops.h
--	${CC} ${CFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
- 
- berkeley_db_api.so: berkeley_db_api.c ../modules.h ../oops.h
--	${CC} ${CFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
- 	${LD} $(SOFLAGS) $(LDFLAGS) -L $(LIBDB_PATH)/lib berkeley_db_api.o -o berkeley_db_api.so $(LIBS) $(LIBDB_NAME) 
- 
- gigabase_db_api.@MOD_EXT@:	gigabase_db_api.cpp ../modules.h ../oops.h
- 
- oopsctl: oopsctl.c ../modules.h ../config.h  ../oops.h
--	${CC} ${CFLAGS} ${CDEFS} oopsctl.c ${EXTRAOBJS} ${LIBS} -o oopsctl
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} oopsctl.c ${EXTRAOBJS} ${LIBS} -o oopsctl
- 
- passwd_pgsql.so: passwd_sql.c ../modules.h ../oops.h
--	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
- 	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_pgsql.so passwd_pgsql.o $(LIBS) $(PGSQL_LIB)
- 
- passwd_mysql.so: passwd_sql.c ../modules.h ../oops.h
--	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
- 	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_mysql.so passwd_mysql.o $(LIBS) $(MYSQL_LIB)
- 
- passwd_pgsql.o: passwd_sql.c ../modules.h ../oops.h
--	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
- 
- passwd_mysql.o: passwd_sql.c ../modules.h ../oops.h
--	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
-+	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
- 
- 
- clean:
diff --git a/net-proxy/oops/files/oops-1.5.24-textrel.patch b/net-proxy/oops/files/oops-1.5.24-textrel.patch
deleted file mode 100644
index 432a86d07435..000000000000
--- a/net-proxy/oops/files/oops-1.5.24-textrel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru oops-1.5.23.orig/src/Makefile.in oops-1.5.23/src/Makefile.in
---- oops-1.5.23.orig/src/Makefile.in	2006-03-06 22:14:53.000000000 +0200
-+++ oops-1.5.23/src/Makefile.in	2006-03-06 22:17:58.954199750 +0200
-@@ -29,7 +29,7 @@
- 
- #CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
- 
--CFLAGS = @CFLAGS@ @DEFS@
-+CFLAGS = @CFLAGS@ -fPIE @DEFS@
- 
- VER=@VER@
- OOPSPATH=@prefix@/oops
-diff -Nru oops-1.5.23.orig/src/modules/Makefile.in oops-1.5.23/src/modules/Makefile.in
---- oops-1.5.23.orig/src/modules/Makefile.in	2006-03-06 22:14:52.000000000 +0200
-+++ oops-1.5.23/src/modules/Makefile.in	2006-03-06 22:18:21.967638000 +0200
-@@ -1,7 +1,7 @@
- CC = @CC@
- CXX = @CXX@
- LIBS = @LIBS@
--CFLAGS = @CFLAGS@ @DEFS@
-+CFLAGS = @CFLAGS@ -fPIC @DEFS@
- LDFLAGS = @LDFLAGS@
- LD = @LD@
- SOFLAGS = @SOFLAGS@
diff --git a/net-proxy/oops/files/oops-1.5.24_pre20050503+db-5.0.patch b/net-proxy/oops/files/oops-1.5.24_pre20050503+db-5.0.patch
deleted file mode 100644
index 190944828ee8..000000000000
--- a/net-proxy/oops/files/oops-1.5.24_pre20050503+db-5.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: oops-1.5.23/src/modules/berkeley_db_api.c
-===================================================================
---- oops-1.5.23.orig/src/modules/berkeley_db_api.c
-+++ oops-1.5.23/src/modules/berkeley_db_api.c
-@@ -283,7 +283,7 @@ int	rc;
-     dbp->set_bt_compare(dbp, my_bt_compare);
-     dbp->set_pagesize(dbp, OOPS_DB_PAGE_SIZE);
-     rc = dbp->open(dbp,
--        #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0
-+        #if DB_VERSION_MAJOR > 4 || DB_VERSION_MINOR > 0
-         NULL,
-         #endif
-         dbname,
diff --git a/net-proxy/oops/files/oops.cfg b/net-proxy/oops/files/oops.cfg
deleted file mode 100644
index 3dc96fad2331..000000000000
--- a/net-proxy/oops/files/oops.cfg
+++ /dev/null
@@ -1,654 +0,0 @@
-##
-#  nameservers. Multiple nameserver entries are allowed.
-## 
-
-nameserver 127.0.0.1
-
-##
-#  Ports and address to use for HTTP and ICP
-##
-
-#bind		ip_addr|hostname
-http_port	3128
-icp_port	3130
-
-##
-## Change euid to that user
-##
-## WARNING: if you use userid, then you will not be able to open new sockets on
-##	    reserved (< 1024) ports and will not be able to return to original userid.
-##
-userid	oops
-
-##
-## Change root directory. If don't know exactly what are you doing -
-## leave commented.
-#chroot		???
-
-##
-#  Logfile - just debug output
-#  When used in form 'filename [{N S}] [[un]buffered]'
-#  will be rotated automatically (up to N files up to S bytes in size)
-##
-logfile		/var/log/oops/oops.log
-#logfile	/usr/oops/logs/oops.log { 3 1m } unbuffered
-
-##
-#  Accesslog - the same as for squid. Re rotating - see note for logfile
-##
-accesslog	/var/log/oops/oops.access
-#accesslog	/usr/oops/logs/access.log
-
-##
-#  Pidfile. for kill -1 `cat oops.pid` and for locking.
-##
-pidfile		/var/run/oops/oops.pid
-
-##
-# Statistics file - once per minute flush some statistics to this file
-##
-statistics	/var/log/oops/oops_statfile
-
-##
-#  icons - where to find link.gif, dir.gif, binary.gif and so on (for 
-#  ftp lists). If omitted - name of running host will be used. But
-#  using explicit names is better way.
-##
-
-#icons-host	ss5.paco.net
-#icons-port	80
-#icons-path	icons
-
-##
-#  When total object volume in memory grow over this (this mean
-#  that cachable data from network came faster then we can save on disk)
-#  drop objects (without attempt to save on disk).
-##
-mem_max		64m
-
-##
-#  Hint, how much cached objects keep in memory.
-#  When total amount become larger then this limit - start
-#  swaping cachable objects to disk
-##
-lo_mark		8m
-
-##
-# start random early drop when number of clients reach some level.
-# this can protect you against attacks and against situation when
-# oops cant handle too much connections. By default - 0 (or no limits).
-##
-#start_red	0
-
-##
-# refuse any connection when number of already connected clients reach some
-# level. By default - 0 (or no limits).
-##
-#refuse_at	0
-
-##
-#  if document contain no Expires: then expire after (in days)
-#  ftp-expire-value - expire time for ftp (in days)
-##
-default-expire-value    7
-ftp-expire-value	7
-
-##
-# Maximum expite time - doc will not keep in cache more then
-# this number of days (except if defaiult-expire-value used for this documeny)
-##
-max-expire-value        30
-
-##
-# in which proportion time passed since last document modification
-# will accounted in expire time. For example, if last-modified-factor=5
-# and there was passed 10 days since document modification, then expiration
-# will be setted to 2 days in future (but no nore then max-expire-value)
-##
-last-modified-factor	5
-
-##
-# If you want not cache replies without Last-Modified:
-# uncomment next line.
-##
-#dont_cache_without_last_modified
-
-#  run expire every ( in hours )
-##
-default-expire-interval 1
-
-##
-#  icp_timeout - how long to wait icp reply from peer (in ms, e.g 1000 = 1sec)
-##
-icp_timeout	1000
-
-##
-#  start disk cache cleanup when free space will be (in %%)
-#  As on the very large storages 1% is large space (1% from 9G is
-#  90M), then on such storages you can set both disk-low-free and
-#  disk-ok-free to 0. Oops will start cleanup if it have less then 256
-#  free blocks(1M), and stop when it reach 512 bree blocks(2M).
-##
-disk-low-free	3
-
-##
-#  stop disk cache cleanup when free space will be (in %%)
-##
-disk-ok-free	5
-
-##
-#  Force_http11 - turn on http/1.1 for each request to document server
-#  This option required if module 'vary' used.
-##
-force_http11
-
-##
-#  Always check document freshness, even it is not stale or expired
-#  This force Oops behave like squid - first check cached doc, then send
-##
-#always_check_freshness
-
-##
-#  If user-requestor aborted connection to proxy, but there was received more
-#  then some percent ot the document - then continue.
-#  default value - 75%
-##
-force_completion 75
-
-##
-#  maximum size of the object we will cache
-##
-maxresident	1m
-
-insert_x_forwarded_for	yes
-insert_via		yes
-
-##
-#  If host have several interfaces or aliases, use exactly
-#  this name when connecting to server:
-##
-#connect-from	proxy.paco.net
-
-##
-#	ACLs - currently: urlregex, urlpath, usercharset
-#		port, dstdom, dstdom_regex, src_ip, time
-#		each acl can be loaded from file.
-##
-#acl	CACHEABLECGI	urlregex	http://www\.topping\.com\.ua/cgi-bin/pingstat\.cgi\?072199131826
-#acl	WWWPACO		urlregex	www\.paco\.net
-#acl	NO_RLH		urlregex	zipper
-#acl	REWRITEPORTS	urlregex	(www.job.ru|www.sale.ru)
-#acl	REWRITEHOSTS	urlregex	(www.asm.ru|zipper\.paco)
-#acl	WINUSER		usercharset	windows-1251
-#acl	DOSUSER		usercharset	ibm866
-#acl	UNIXUSER	usercharset	koi8-r
-#acl	RUS		dstdom		ru su
-#acl	UKR		dstdom		ua
-#acl	BADPORTS	port		[0:79],110,138,139,513,[6000:6010]
-#acl	BADDOMAIN	dstdom		baddomain1.com baddomain2.com
-#acl	BADDOMREGEX	dstdom_regex	baddomain\.((com)|(org))
-#acl	LOCAL_NETWORKS	src_ip		include:/etc/oops/acl_local_networks
-#acl	BADNETWORKS	src_ip		192.168.10/24
-#acl	WORKTIME	time		Mon,Tue:Fri 0900:1800
-#acl	HTMLS		content_type	text/html
-#acl	USERS		username	joe
-acl	ADMINS		src_ip		127.0.0.1
-acl	PURGE		method		PURGE
-
-##
-#	acl_deny [!]ACL [!]ACL ...
-#	deny access for combined acl
-##
-acl_deny PURGE !ADMINS
-
-##
-#  Never cache objects with URL, containing...
-##
-stop_cache	?
-stop_cache	cgi-bin
-
-##
-#	stop_cache_acl [!]ACL [!]ACL ...
-#	Stop cache using ACL
-##
-#stop_cache_acl	WWWPACO
-
-##
-#	refresh_pattern ACLNAME min percent max
-#	'min' and 'max' are limits between Expite time will be assigned
-#	Iff document have no expire: header and have Last-Modified: header
-#	we will use 'percent' to estimate how far in the future document will
-#	be expired.
-##
-#refresh_pattern	CACHEABLECGI	20 50% 200
-#refresh_pattern	WWWPACO		0 0% 0
-
-##
-#	bind_acl {hostname|ip} [!]ACL [!]ACL ...
-#	bind to given address when connecting to server
-#	if request match ACLNAME
-##
-#bind_acl	outname1 RUS
-#bind_acl	outname2 UKR
-
-##
-#  Always check document freshness, but now on acl basis.
-# You can have several such lines.
-## This example will force to check freshness only for html documents.
-#always_check_freshness_acl	HTMLS
-
-##
-# line 'parent ....' will force all connections (except to destinations
-# in local-domain or local-networks) go through parent host
-##
-#parent		proxy.paco.net 3128
-
-##
-# parent_auth	login:password
-# if your parent require login/password from your proxy
-##
-#parent_auth	login:password
-
-# ICP peer's
-#peer		proxy.paco.net	3128         3130 {
-##              ^^^ peer name   ^http port   ^icp port
-##		icp port can be 0, in which case we assume this is non-icp
-##		proxy. We assume that non-icp peer act like parent which
-##		answer MISS all th etime. If this peer refused connection
-##		then it goes down for 60 seconds - it doesn't take part in
-##		any peer-related decisions.
-#		sibling ;
-## if this peer require login/password from your proxy
-#		my_auth	my_login:my_password;
-## we will send requests for these domains
-#		allow	dstdomain * ;
-## we will NOT send requests for these domains
-#		deny	dstdomain * ;
-## we will send only requests matched to this acl
-#		peer_access	[!]ACL1 [!]ACL2
-## if (and only if) peer is not icp-capable, then , in case of fail we
-## leave failed peer alone for the down_timeout interval (in seconds).
-## Then we will try again
-#		down_timeout	60 ;
-#}
-
-#peer		proxy.gu.net	80 3130 {
-#		parent ;
-#		allow	dstdomain * ;
-#		deny	dstdomain paco.net odessa.ua ;
-#}
-
-##
-#  Never use "parent" when connecting to server in these domains
-##
-local-domain	odessa.ua od.ua
-local-domain	odessa.net paco.net netsy.net netsy.com te.net.ua
-
-local-networks	195.114.128/19 10/8 192.168/16
-
-#
-# Groups
-#
-
-group	main	{
-##
-#	You can describe group ip adresses here, or using src_ip acl's
-#	with networks_acl directive.
-#	networks_acl always have higher preference (checked first) and
-#	are checked in the order of appearance.
-#	If host wil not fall in any networks_acl - we check in networks.
-#       networks are ordered by masklen - longest masks(most specific networks)
-#	are checked first.
-##
-
-#Next line enables redirection features and transparent proxying
-	redir_mods	fastredir transparent;
-#Change this next line to list the IP's of everyone in this group	
-	networks	195.114.128/19 127/8 195.5.40.93/32 ;
-	
-#	networks_acl	LOCAL_NETWORKS !BAD_NETWORKS ;
-	badports	[0:79],110,138,139,513,[6000:6010] ;
-	miss		allow;
-##
-# denytime - when deny access to proxy server for this group
-##
-#	denytime	Sat,Sun		0642:1000
-#	denytime	Mon,Thu:Fri,Sun	0900:2100
-##
-# Authentication modules for this group (seprated by space)
-##
-#	auth_mods	passwd_file;
-
-##
-# URL-Redirector (porno, ad. filtering) modules for this group (separate by
-# space)
-##
-#	redir_mods	redir;
-
-
-##
-# limit whole group to 8Kbytes per sec
-##
-#	bandwidth	8k;
-
-##
-# limit each host 8Kbytes per sec
-##
-#	per_ip_bw	8k;
-
-##
-# limit connections number from each host
-#
-#	per_ip_conn	8;
-
-##
-# limit request rate from this group (requests per second). This is crude,
-# and must be used as last resort
-##
-#	maxreqrate	100;
-
-##
-# icp acl ...
-##
-#	icp {
-#		allow	dstdomain * ;
-#	}
-
-##
-# http acl
-##
-	http {
-##
-# http acls can be in form 'allow dstdomain domainname domainname ... domainname ;
-#               or in form 'allow dstdomain include:filename ;
-#		            where filename - name of the file, which contain
-#				  domainnames (one per line, # - comment line);
-#           the same rules for 'deny'
-##
-		allow	dstdomain * ;
-	}
-}
-
-group	world	{
-	networks	0/0;
-	badports	[0:79],110,138,139,513,[6000:6010];
-	http {
-		deny	dstdomain * ;
-	}
-	icp {
-		deny	dstdomain * ;
-	}
-}
-
-##
-#  Storage section
-#  Change this for your own situation. Oops can work without
-#  storages (using only in-memory cache).
-##
-
-##
-#  Storage description (can be several)
-#  path - filename of storage. can be raw device (be carefull!)
-#  size - size (of storage file). Can be smthng like 100k or 200m or 4g
-#  Size used only durig format process (oops -z).
-##
-
-storage {
-	path /var/lib/oops/storage/oops_storage ;
-#	Size of the storage. Can be in bytes or 'auto'. Auto is
-#	usefull for pre-created storages or disk slices.
-#	NOTE: 'size auto' won't work for Linux on disk slices.
-#	To use large ( > 2G ) files run configure with --enable-large-files
-
-	size 100m ;
-
-#	You have to use 'offset' in the case your raw device (or slice)
-#	require that. For example if you use entire disk as storage
-#	under AIX and Soalris/Sparc - you have to skip first block
-#	which contain disk label (that is storage will start from
-#	next 512 sector.
-#	offset	512;
-}
-
-#storage {
-#	path /usr/oops/storages/oops_storage1 ;
-#	size 600m ;
-#}
-
-module lang {
-
-	default_charset eng	
-
-	# Recode tables and other charset stuff
-	CharsetRecodeTable windows-1251 /etc/oops/tables/koi-win.tab
-	CharsetRecodeTable ISO-8859-5 /etc/oops/tables/koi-iso.tab
-	CharsetRecodeTable ibm866 /etc/oops/tables/koi-alt.tab
-	CharsetAgent windows-1251 AIR_Mosaic IWENG/1 MSIE WinMosaic (Windows (WinNT;
-	CharsetAgent windows-1251 (Win16; (Win95; (Win98; (16-bit) Opera/3.0
-	CharsetAgent ibm866 DosLynx Lynx2/OS/2
-}
-
-module err {
-	# error reporting module
-
-	# template
-	template /etc/oops/err_template.html
-
-	# Language to use when generate Error messages
-	lang eng 
-}
-
-module passwd_file {
-	# password proxy-authentication module
-	#
-	# default realm, scheme and passwd file
-	# the only thing you really want to change is 'file' and 'template'
-	# you don't have to reconfigure oops if you only
-	# change content passwd file or template: oops authomatically
-	# reload file
-
-	realm		oops
-	scheme		Basic
-	file		/etc/oops/passwd
-	template	/etc/oops/auth_template.html
-}
-
-module passwd_pgsql {
-	# proxy authentication using postgresql
-	# "Ivan B. Yelnikov" <bahek@khspu.ru>
-	#
-	# host - host where database live,
-	# user,password - login and password for database access
-	# database - database name
-	# select - file with request body
-	# template - file with html doc which user will receive
-	#	     during authentication
-        scheme          Basic
-        realm           oops
-        host            <host address/name>
-        user            <database_user>
-        password        <user_password>
-        database        <database_name>
-        select          /etc/oops/select.sql
-        template        /etc/oops/auth_template.html
-}
-
-module passwd_mysql {
-	# proxy authentication usin mysql
-	# "Ivan B. Yelnikov" <bahek@khspu.ru>
-	#
-	# look passwd_pgsql description
-	#
-        scheme          Basic
-        realm           oops
-        host            <host address/name>
-        user            <database_user>
-        password        <user_password>
-        database        <database_name>
-        select          /etc/oops/select.sql
-        template        /etc/oops/auth_template.html
-}
-
-module redir {
-	# file - regex rules.
-	# each line consist of one or two fields (separated with white space)
-	# 1. regular expression
-	# 2. redirect-location
-	# if requested (by client) url match regex then
-	# if we have redirect-url then we send '302 Moved Temporary' to
-	# 	redirect-location
-	# if we have no redirect-location (i.e. we have no 2-nd field)
-	# 	then we send template.html (%R will be substituted by rule)
-	#    or some default message if we have no template.
-	# you don't have to reconfigure oops each time
-	# you edit rules or template, they will be reloaded authomatically
-
-	file		/etc/oops/redir_rules
-	template	/etc/oops/redir_template.html
-##	mode control will redir rewrite url or send Location: header
-##	with new location. Values are 'rewrite' or 'bounce'
-#	mode		rewrite
-
-	# This module can process requests which come on http_port
-	# and/or on different port. For example, you wish oops
-	# bind on two ports - 3128 and 3129, and all requests which come on
-	# port 3129 must pass through filters, and requests which come on port
-	# 3128 (common http_port) - not. Then you have to uncomment next line
-	# myport 3129
-	# which means exactly: bind oops to additional port 3129 and process
-	# requests which come on this port.
-	# myport can be in the next form:
-	# myport [{hostname|ip_addr}:]port
-}
-
-module oopsctl {
-	# path to oopsctl unix socket
-	socket_path	/var/run/oops/oopsctl
-	# time to auto-refresh page (seconds)
-        html_refresh    300
-}
-
-##
-## This module hadnle 'Vary' header - it was written to better support
-## Russian Apache
-##
-module	vary {
-	user-agent	by_charset
-	accept-charset	ignore
-}
-
-##
-## WWW -accelerator. To use - add word accel to
-## redir_mods line for
-## the group 'world' description
-## You will find more description of this module in supplied accel_maps file
-##
-#module	accel {
-# myport can have next form:
-# myport [{hostname|ip_addr}:]port ...
-#	myport			80
-##
-# allow access to proxy through accel module.
-# Deny will stop proxy through accel completely, regardless
-# of any other access rules
-##
-#	proxy_requests		deny
-#
-##
-#	File with maps and other config directives
-#	Checked once per minute. No need to restart oops if maps changed
-##
-#	file			/etc/oops/accel_maps
-#}
-
-##
-## Transparent proxy. To use - add word 'transparent' into
-## redir_mods line for your group.
-## in the your local (or any other) group description
-##
-#module	transparent {
-# myport can have next form:
-# myport [{hostname|ip_addr}:]port ...
-#	myport			3128
-#}
-
-##
-## %h -			remote ip address
-## %A -			local ip address
-## %d -			ip address of source (peer or document server)
-## %l -			remote logname from identd (not suported now)
-## %U -			remote user (from 'Authorization' header)
-## %u -			remote user (from proxy-auth)
-## %{format}t -		time with optional {format} (for strftime)
-## %t -			time with standard format %d/%b/%Y:%T %Z
-## %r -			request line
-## %s -			status code
-## %b -			bytes received
-## %{header}i -		value of header in request
-## %m -			HIT/MISS
-## %k -			hierarchy (DIRECT/NONE/...)
-##
-## directive buffered can be followed by size of the buffer,
-## like 'buffered 32000'
-##
-#module customlog {
-#	path	/usr/local/oops/logs/access_custom1
-#	format	"%h %l %u %t \"%r\" %>s %b"
-#  squid httpd mode log emulation
-#	format	"%h %u %l %t \"%r\" %s %b %m:%k"
-#	buffered
-#	path	/usr/local/oops/logs/access_custom2
-#	format	"%h->%A %l %u [%t] \"%r\" %s %b \"%{User-Agent}i\""
-#}
-
-module	berkeley_db {
-    ##
-    #  dbhome - directory where all DB indexes reside. Use full path
-    #	    this directory must exist.
-    #  dbname - filename for index file. Use just filename (no full path)
-    ##
-
-	dbhome	/var/lib/oops/db
-	dbname	dburl
-
-    ##
-    #  This parameter specifies internal cache size of BerkeleyDB.
-    #  Increase this parameter for best performance (if you have a lot of memory).
-    #  For example:  db_cache_mem	64m
-    #  Default and minimum value:	4m
-    #
-    #  This memory pool is not part of memory pool, specified by mem_max parameter.
-    #  WARNING: the amount of RAM used by oops will be increased by the value of
-    #  this parameter.
-    ##
-    #db_cache_mem	4m
-
-}
-
-#module	gigabase_db {
-#    This module enable GigaBASE as database engine.
-#    You can use berkeley_db or gigabase_db, not both.
-#    Also, important notice - indexes created with different modules
-#    are not compatible.
-#    ##
-#    #  dbhome - directory where all DB indexes reside. Use full path
-#    #	    this directory must exist.
-#    #  dbname - filename for index file. Use just filename (no full path)
-#    ##
-#
-#	dbhome	/var/lib/oops/db
-#	dbname	gdburl
-#
-#    ##
-#    #  This parameter specifies internal cache size of BerkeleyDB.
-#    #  Increase this parameter for best performance (if you have a lot of memory).
-#    #  For example:  db_cache_mem	64m
-#    #  Default and minimum value:	4m
-#    #
-#    #  This memory pool is not part of memory pool, specified by mem_max parameter.
-#    #  WARNING: the amount of RAM used by oops will be increased by the value of
-#    #  this parameter.
-#    ##
-#    #db_cache_mem	4m
-#
-#}
diff --git a/net-proxy/oops/files/oops.initd b/net-proxy/oops/files/oops.initd
deleted file mode 100644
index fec45e6afda4..000000000000
--- a/net-proxy/oops/files/oops.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting oops"
-	/usr/sbin/oopsctl start &> /dev/null
-	eend $?
-}
-
-status() {
-	if service_started "${myservice}"; then
-		/usr/sbin/oopsctl stat
-	fi
-	return 0
-}
-
-stop() {
-	ebegin "Stopping oops"
-	/usr/sbin/oopsctl stop &> /dev/null
-	eend $?
-}
diff --git a/net-proxy/oops/files/rotate-logs.patch b/net-proxy/oops/files/rotate-logs.patch
deleted file mode 100644
index 236aa4b60926..000000000000
--- a/net-proxy/oops/files/rotate-logs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru oops-1.5.23.orig/src/rotate_logs.c oops-1.5.23/src/rotate_logs.c
---- oops-1.5.23.orig/src/rotate_logs.c	2001-08-31 15:30:30.000000000 +0200
-+++ oops-1.5.23/src/rotate_logs.c	2009-07-12 12:47:56.000000000 +0200
-@@ -32,7 +32,7 @@
-     if ( !num ) {
- 	/* if no number of logs configured just reopen file */
- 	close(fb->fd);
--	fb->fd = open(name, O_WRONLY|O_APPEND|O_CREAT);
-+	fb->fd = open(name, O_WRONLY|O_APPEND|O_CREAT, 0660);
- 	return;
- 
-     }
diff --git a/net-proxy/oops/metadata.xml b/net-proxy/oops/metadata.xml
deleted file mode 100644
index cd038965d831..000000000000
--- a/net-proxy/oops/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription>An advanced multithreaded caching web proxy</longdescription>
-</pkgmetadata>
diff --git a/net-proxy/oops/oops-1.5.24_pre20050503-r4.ebuild b/net-proxy/oops/oops-1.5.24_pre20050503-r4.ebuild
deleted file mode 100644
index daad5346c82a..000000000000
--- a/net-proxy/oops/oops-1.5.24_pre20050503-r4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs autotools user
-
-MY_P="${PN}-1.5.23"
-
-DESCRIPTION="An advanced multithreaded caching web proxy"
-HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/"
-SRC_URI="http://zipper.paco.net/~igor/oops/${MY_P}.tar.gz
-	mirror://gentoo/${P}.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-libs/libpcre
-	>=sys-libs/db-3"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup oops
-	enewuser oops -1 -1 /var/lib/oops oops
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}.patch"
-	epatch "${FILESDIR}/${P/_*}-textrel.patch"
-	epatch "${FILESDIR}/${P/_*}-pthread-rwlock.patch"
-	epatch "${FILESDIR}/modules-as-needed.patch"
-	epatch "${FILESDIR}/implicit-decl.patch"
-	epatch "${FILESDIR}/libpcreposix.patch"
-	epatch "${FILESDIR}/rotate-logs.patch"
-	epatch "${FILESDIR}/${P}+db-5.0.patch"
-	sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/oops \
-		--enable-oops-user=oops \
-		--sysconfdir=/etc/oops \
-		--sbindir=/usr/sbin \
-		--with-regexp=pcre \
-		--localstatedir=/var/run/oops \
-		--enable-large-files \
-		--with-zlib=-lz \
-		|| die "configure problem"
-
-	sed -i -e '/STRERROR_R/d' src/config.h.in
-	sed -i \
-		-e "s|OOPS_LIBDIR = /usr/$(get_libdir)/oops|OOPS_LIBDIR = ${D}/usr/$(get_libdir)/oops|" \
-		-e "s|OOPS_SBINDIR = /usr/sbin|OOPS_SBINDIR = ${D}/usr/sbin|" \
-		-e "s|OOPS_SYSCONFDIR = /etc/oops|OOPS_SYSCONFDIR = ${D}/etc/oops|" \
-		-e "s|OOPS_LOCALSTATEDIR = /var/run/oops|OOPS_LOCALSTATEDIR = ${D}/var/run/oops|" \
-		-e "s|OOPSPATH=/usr/oops|OOPSPATH=${D}/usr/oops|" \
-		src/Makefile
-	sed -i \
-		-e "s|^\(LDFLAGS *= *\)${LDFLAGS}|\1$(raw-ldflags)|" \
-		src/modules/Makefile #modules makefile use ld directly
-}
-
-src_install() {
-	dodir /usr/sbin
-	einstall || die "install problem"
-
-	newinitd "${FILESDIR}/oops.initd" oops
-	diropts -m0750 -o root -g oops
-	dodir /etc/oops
-	insinto /etc/oops
-	doins "${FILESDIR}/oops.cfg"
-
-	diropts -m0755 -o oops -g oops
-	keepdir /var/run/oops
-	diropts -m0770 -o oops -g oops
-	keepdir /var/log/oops
-	keepdir /var/lib/oops/storage
-	keepdir /var/lib/oops/db
-
-	# cleanups
-	rm -rf "${D}/usr/oops"
-	rm -rf "${D}/usr/lib/oops/modules"
-}
-
-pkg_postinst() {
-	#Set proper owner/group if installed from binary package
-	chgrp oops "${ROOT}/etc/oops"
-	chown -R oops:oops "${ROOT}/var/run/oops" "${ROOT}/var/log/oops" "${ROOT}/var/lib/oops"
-}
diff --git a/net-proxy/oops/oops-1.5.24_pre20050503-r5.ebuild b/net-proxy/oops/oops-1.5.24_pre20050503-r5.ebuild
deleted file mode 100644
index e14de892a7f0..000000000000
--- a/net-proxy/oops/oops-1.5.24_pre20050503-r5.ebuild
+++ /dev/null
@@ -1,112 +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 toolchain-funcs autotools user
-
-MY_P="${PN}-1.5.23"
-
-DESCRIPTION="An advanced multithreaded caching web proxy"
-HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/"
-SRC_URI="http://zipper.paco.net/~igor/oops/${MY_P}.tar.gz
-	mirror://gentoo/${P}.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libpcre
-	>=sys-libs/db-3"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup oops
-	enewuser oops -1 -1 /var/lib/oops oops
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}.patch"
-	epatch "${FILESDIR}/${P/_*}-textrel.patch"
-	epatch "${FILESDIR}/${P/_*}-pthread-rwlock.patch"
-	epatch "${FILESDIR}/modules-as-needed.patch"
-	epatch "${FILESDIR}/implicit-decl.patch"
-	epatch "${FILESDIR}/libpcreposix.patch"
-	epatch "${FILESDIR}/rotate-logs.patch"
-	epatch "${FILESDIR}/${P}+db-5.0.patch"
-	epatch "${FILESDIR}/${P/_*}-respect-flags.patch"
-	sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/oops \
-		--enable-oops-user=oops \
-		--sysconfdir=/etc/oops \
-		--sbindir=/usr/sbin \
-		--with-regexp=pcre \
-		--localstatedir=/run/oops \
-		--enable-large-files \
-		--with-zlib=-lz \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getCC)"
-
-	sed -i -e '/STRERROR_R/d' src/config.h.in || die
-	sed -i \
-		-e "s|OOPS_LIBDIR = /usr/$(get_libdir)/oops|OOPS_LIBDIR = ${D}/usr/$(get_libdir)/oops|" \
-		-e "s|OOPS_SBINDIR = /usr/sbin|OOPS_SBINDIR = ${D}/usr/sbin|" \
-		-e "s|OOPS_SYSCONFDIR = /etc/oops|OOPS_SYSCONFDIR = ${D}/etc/oops|" \
-		-e "s|OOPS_LOCALSTATEDIR = /var/run/oops|OOPS_LOCALSTATEDIR = ${D}/run/oops|" \
-		-e "s|OOPSPATH=/usr/oops|OOPSPATH=${D}/usr/oops|" \
-		src/Makefile || die
-	sed -i \
-		-e "s|^\(LDFLAGS *= *\)${LDFLAGS}|\1$(raw-ldflags)|" \
-		src/modules/Makefile || die #modules makefile use ld directly
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getCC)" \
-		RANLIB=":" \
-		STRIP=":"
-}
-
-src_install() {
-	dodir /usr/sbin
-	einstall || die "install problem"
-
-	newinitd "${FILESDIR}/oops.initd" oops
-	diropts -m0750 -o root -g oops
-	dodir /etc/oops
-	insinto /etc/oops
-	doins "${FILESDIR}/oops.cfg"
-
-	diropts -m0755 -o oops -g oops
-	keepdir /run/oops
-	diropts -m0770 -o oops -g oops
-	keepdir /var/log/oops
-	keepdir /var/lib/oops/storage
-	keepdir /var/lib/oops/db
-
-	# cleanups
-	rm -rf "${D}/usr/oops"
-	rm -rf "${D}/usr/lib/oops/modules"
-}
-
-pkg_postinst() {
-	#Set proper owner/group if installed from binary package
-	chgrp oops "${ROOT}/etc/oops"
-	chown -R oops:oops "${ROOT}/run/oops" "${ROOT}/var/log/oops" "${ROOT}/var/lib/oops"
-}
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 8158acb71acc..4bbf6118077f 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,7 +1,8 @@
 DIST squid-3.5.10.tar.xz 2297452 SHA256 736e69fbddd6e985d2f85c995526f0a2bc4294c46dfb6737c0ccf09274a458b3 SHA512 b577cf90ccc240ae7be42df36cb592399a5f43b7a38df47f3df404aa4b6fb8ceaf568696251376fbc5e30686e6d5b77942852fb94e79d71676aaf35ffde17d21 WHIRLPOOL d422fcbf6d274fa4535c7bb2b8845e1f2f0d5ea42776a6ec517a34ceb87947b01c5412bec332fd634ed2fcef77e7de64fb138ef044fecfd00f3073c71c25513a
 DIST squid-3.5.11.tar.xz 2298436 SHA256 c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf SHA512 7d7557f949d7a5995eff4745f6bf58d3c4899b882828a83332e269c4396de8470d7847d76701f383fd889cf7990b8d5c9ace6d557d00a9dd4a8d326f9b116c09 WHIRLPOOL 47acb40ecdaee9ce166e8db0da8a9642125a6af8306b3fd47e29c2edb7e96242a9535f1dfb028310334863fe914458c8b3d6f0f0f9c26c1c44cf4fdea0b2ed02
 DIST squid-3.5.12.tar.xz 2299644 SHA256 8bc83f3869f7404aefb10883109e28443255cf6dde50a13904c7954619707a42 SHA512 2620f2b560df58c9a6ca5be38e91e7b67ee04a5a28de133ecd0fed232094570c453690a08a4835ad59ebf1cd002a6e6d7c7c4ea502b6d719d74f97111a5302d1 WHIRLPOOL 758c5f9d0a7dd8c87052008ec994966263f6fc956fdd9a254977f79bc2cccabe22e1dda6c6119f4e411ecec8ace9af8a5b86430ceccc075481e46955cc69dd25
-DIST squid-3.5.13.tar.xz 2379460 SHA256 e75d94671895270272883187296f17e26954bf00a090c97bfea8a4fc264a5b40 SHA512 ed2d2d42956fe949b0452a212f3573182aef708e1135d61f067a741b012be39143145a709941540c77ed275439f2c1e3aecb2adaa5c9cadd4a6062c7659fca6d WHIRLPOOL 91ff26aecc2e68ad8fc5782b4d2064d8dd33cc1e01ac9b2d260d3e0456069697f4e341546de4363d69b2cf5062033d2987aca5998d50668afd35781ab14d47f2
+DIST squid-3.5.14.tar.xz 2315320 SHA256 79ec4cdd4f965314e6db8e3f6ddcebf2d24518edd790a68e0bd4d0a7735ace1b SHA512 0b500dbe36fb9cd487e6954244bad7fbebd2bd6af442d1c5f7ebf9c73d846a1b1c061b035afa3bf34709e41e0fef4c8023f0d1114e21b794591ee49fe8843a1f WHIRLPOOL 1c89b4aa961aa8c6b3c8f68662f506432b5f54922f49749d7977708f186bb4a842ef7182190c0ad403f4d3b0ac670d940044556db60dbcffae04dcb9b5b35738
+DIST squid-3.5.15.tar.xz 2315628 SHA256 9cfce3231c7b3b33816fc54414d8720a51ac5e723663e0685a8bb995b9f450d2 SHA512 b5a6b4bc94d007f475419123b7ff4cdf7d47a024b859d2f7de0952115285114f06fd389fc6f463c21a1ce7d41e06227972bd802bafd2704cf0814afdee893dde WHIRLPOOL a8c73ac1a9a36b405cfb2d804ad51e673ffc812e561860f5b2775b468fcebc84834842ae4f55d4be928936f1750ea54b54d788149758a362282e1287696fe094
 DIST squid-3.5.6.tar.xz 2291152 SHA256 cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5 SHA512 f6c2550cdb5b2f3317105c986caddf06d010bffa0c61d065cffcde72e5bc30c4608486c79c4b25418dfb9f0a8d7ef1d2fabb6b07d1f0262a19fafc945af98bef WHIRLPOOL 863c6f73c3c26737d98cbff15afa5b6630310226ee9ec10a3e38f646b1416137e998f9bb1e5b492e5871129aed3c98e729b3a757d35088162e671d310a887336
 DIST squid-3.5.7.tar.xz 2294580 SHA256 ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699 SHA512 13757da759c1a64fe13d451cff40c4ae30b18c2939f6971b4ef25e24b771ea973e3357f05ec89fccff51acc9e2c77418880b05f6020d58b7633141b928aaf349 WHIRLPOOL 9ce722647f6144ae5192a0a177d5d085252039eed3a7cbdf1fcb638c32097bf21710db71044448fc98bdba7c15daefb79dee5912b4d0c41cbc0e0b0fda695ee1
 DIST squid-3.5.8.tar.xz 2295644 SHA256 f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62 SHA512 df371934b141fd0e57223ef2a801b71ae2c88c918e1ebd17a82105d33a8f6d439da65cd6437b42a3857f0d64ce461ea31d01299d452ede3650a44cf6826e16e1 WHIRLPOOL 9ca3f07b3068a439299b30e8be924208bc36e336f7929c593563bf6dadf9eaaa051c213e34eafc1ec6db43540b61367bd666c7c172e370d600aa6823779bd192
diff --git a/net-proxy/squid/squid-3.5.12.ebuild b/net-proxy/squid/squid-3.5.12.ebuild
index ac91f032739f..5b0235252739 100644
--- a/net-proxy/squid/squid-3.5.12.ebuild
+++ b/net-proxy/squid/squid-3.5.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/net-proxy/squid/squid-3.5.13.ebuild b/net-proxy/squid/squid-3.5.14.ebuild
index f92b88f09c41..f92b88f09c41 100644
--- a/net-proxy/squid/squid-3.5.13.ebuild
+++ b/net-proxy/squid/squid-3.5.14.ebuild
diff --git a/net-proxy/squid/squid-3.5.15.ebuild b/net-proxy/squid/squid-3.5.15.ebuild
new file mode 100644
index 000000000000..f92b88f09c41
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.15.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid
+	enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		--with-ltdl-includedir=/usr/include \
+		--with-ltdl-libdir=/usr/$(get_libdir) \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
+		echo
+	fi
+}
diff --git a/net-proxy/sshproxy/Manifest b/net-proxy/sshproxy/Manifest
deleted file mode 100644
index 9033dc555390..000000000000
--- a/net-proxy/sshproxy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sshproxy-0.6.0_beta2.tar.gz 131958 SHA256 c36fbd22d1315f290a9bfefa176bc29c82e0bf450a75a1bd0a09cfa54b08363c SHA512 74e3de94c7fa6fc0b1202e0fc98b4ada150864c8a8c2cac6148c58db82a670680036055717a27ca291d4e8eb7c76929c4ac27b88f905ce624e01e58f257e1ffd WHIRLPOOL 8a8e13c585d3c34fb8e2f5244e6f03fe8485975fa36d9d2c2978655b11a9dd318c05bd9bb3a38130f997d527decbfc47fae067bef4076f1875307e516f603569
diff --git a/net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch b/net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch
deleted file mode 100644
index 765bd9d5bdf9..000000000000
--- a/net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff -Nru sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/getscript.py sshproxy-0.6.0_beta2/lib/get_client_scripts/getscript.py
---- sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/getscript.py	2008-01-28 01:44:29.000000000 +0200
-+++ sshproxy-0.6.0_beta2/lib/get_client_scripts/getscript.py	2009-07-23 10:34:01.000000000 +0300
-@@ -22,7 +22,7 @@
- from sshproxy import get_class
- from sshproxy.util import chanfmt
- 
--pssh = """#!/bin/bash
-+spssh = """#!/bin/bash
- 
- PROXY_PORT=${SSHPROXY_PORT:-%(port)d}
- PROXY_HOST=${SSHPROXY_HOST:-%(ip_addr)s}
-@@ -32,7 +32,7 @@
- exec ssh -tp $PROXY_PORT $PROXY_USER@$PROXY_HOST -- "$@"
- """
- 
--pscp = """#!/bin/bash
-+spscp = """#!/bin/bash
- 
- PROXY_PORT=${SSHPROXY_PORT:-%(port)s}
- PROXY_HOST=${SSHPROXY_HOST:-%(ip_addr)s}
-@@ -79,26 +79,26 @@
- class Server(base_class):
-     def add_cmdline_options(self, parser):
-         base_class.add_cmdline_options(self, parser)
--        parser.add_option("", "--get-pssh", dest="action",
--                help="display pssh client script.",
-+        parser.add_option("", "--get-spssh", dest="action",
-+                help="display spssh client script.",
-                 action="store_const",
--                const="get_pssh",
-+                const="get_spssh",
-                 )
--        parser.add_option("", "--get-pscp", dest="action",
--                help="display pscp client script.",
-+        parser.add_option("", "--get-spscp", dest="action",
-+                help="display spscp client script.",
-                 action="store_const",
--                const="get_pscp",
-+                const="get_spscp",
-                 )
- 
--    def opt_get_pssh(self, options, *args):
-+    def opt_get_spssh(self, options, *args):
-         user = self.pwdb.get_client().username
-         ip_addr, port = self.ip_addr, self.port
--        self.chan.send(pssh % locals())
-+        self.chan.send(spssh % locals())
- 
--    def opt_get_pscp(self, options, *args):
-+    def opt_get_spscp(self, options, *args):
-         user = self.pwdb.get_client().username
-         ip_addr, port = self.ip_addr, self.port
--        self.chan.send(pscp % locals())
-+        self.chan.send(spscp % locals())
- 
- 
- 
-diff -Nru sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/__init__.py sshproxy-0.6.0_beta2/lib/get_client_scripts/__init__.py
---- sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/__init__.py	2008-01-28 01:44:29.000000000 +0200
-+++ sshproxy-0.6.0_beta2/lib/get_client_scripts/__init__.py	2009-07-23 10:32:34.000000000 +0300
-@@ -21,11 +21,11 @@
- 
- __plugin_name__ = "Get Client Scripts"
- __description__ = """
--    This plugin allows clients to download the pssh and
--    pscp wrapper scripts with special options on the ssh 
-+    This plugin allows clients to download the spssh and
-+    spscp wrapper scripts with special options on the ssh 
-     command line:
--      ssh -tp 2242 user@sshproxy -- --get-pssh
--      ssh -tp 2242 user@sshproxy -- --get-pscp
-+      ssh -tp 2242 user@sshproxy -- --get-spssh
-+      ssh -tp 2242 user@sshproxy -- --get-spscp
- """
- 
- def __init_plugin__():
-diff -Nru sshproxy-0.6.0_beta2.orig/misc/acl.db sshproxy-0.6.0_beta2/misc/acl.db
---- sshproxy-0.6.0_beta2.orig/misc/acl.db	2008-01-28 01:44:29.000000000 +0200
-+++ sshproxy-0.6.0_beta2/misc/acl.db	2009-07-23 10:30:30.000000000 +0300
-@@ -78,13 +78,13 @@
- # options ######################################################
- 
- # opt_list_sites is to allow or deny the use of the --list-sites option:
--#  $ pssh --list-sites
-+#  $ spssh --list-sites
- opt_list_sites:
-     # guests group members can't see the list of allowed sites (they're blind)
-     client.group != "guests"
- 
--# opt_get_pkey controls the option --get-pkey of pssh:
--#  $ pssh --get-pkey root@host
-+# opt_get_pkey controls the option --get-pkey of spssh:
-+#  $ spssh --get-pkey root@host
- opt_get_pkey:
-     # only admins can get the public key of a site login
-     "admin" in split(client.groups)
-diff -Nru sshproxy-0.6.0_beta2.orig/README sshproxy-0.6.0_beta2/README
---- sshproxy-0.6.0_beta2.orig/README	2008-01-28 01:44:29.000000000 +0200
-+++ sshproxy-0.6.0_beta2/README	2009-07-23 10:23:21.000000000 +0300
-@@ -95,9 +95,9 @@
-     root@remote-site # exit
-     me@myhost $
- 
--Here is the same with the pssh shell wrapper::
-+Here is the same with the spssh shell wrapper::
- 
--    me@myhost $ pssh remote-site
-+    me@myhost $ spssh remote-site
-     root@remote-site #
-     ... doing some administration commands ...
-     root@remote-site # exit
-@@ -105,7 +105,7 @@
- 
- You can also execute remote commands::
- 
--    me@myhost $ pssh remote-site uname -a
-+    me@myhost $ spssh remote-site uname -a
-     nova.wallix.com
-     me@myhost $
- 
-@@ -114,9 +114,9 @@
-     me@myhost $ scp /etc/issue me@proxy:root@remote-site:/etc/issue.new
-     me@myhost $
- 
--And the same with the pscp shell wrapper::
-+And the same with the spscp shell wrapper::
- 
--    me@myhost $ pscp /etc/issue remote-site:/etc/issue.new
-+    me@myhost $ spscp /etc/issue remote-site:/etc/issue.new
-     me@myhost $
-  
- 
-diff -Nru sshproxy-0.6.0_beta2.orig/setup.py sshproxy-0.6.0_beta2/setup.py
---- sshproxy-0.6.0_beta2.orig/setup.py	2008-01-28 01:44:29.000000000 +0200
-+++ sshproxy-0.6.0_beta2/setup.py	2009-07-23 10:22:31.000000000 +0300
-@@ -74,7 +74,7 @@
-       url=url,
-       download_url='%sdownload/sshproxy-%s.tar.gz' % (url, version),
-       packages=['sshproxy'],
--      scripts=['bin/sshproxyd', 'bin/sshproxy-setup', 'bin/pssh', 'bin/pscp'],
-+      scripts=['bin/sshproxyd', 'bin/sshproxy-setup', 'bin/spssh', 'bin/spscp'],
-       long_description=long_description,
-       data_files=data_files,
-       classifiers=classifiers,
-diff -Nru sshproxy-0.6.0_beta2.orig/sshproxy/server.py sshproxy-0.6.0_beta2/sshproxy/server.py
---- sshproxy-0.6.0_beta2.orig/sshproxy/server.py	2008-01-28 01:44:29.000000000 +0200
-+++ sshproxy-0.6.0_beta2/sshproxy/server.py	2009-07-23 10:30:44.000000000 +0300
-@@ -308,8 +308,8 @@
- 
-     def parse_cmdline(self, args):
-         usage = u"""
--        pssh [options]
--        pssh [user@site [cmd]]
-+        spssh [options]
-+        spssh [user@site [cmd]]
-         """
-         parser = OptionParser(self.chan, usage=usage)
-         # add options from a mapping or a Registry callback
diff --git a/net-proxy/sshproxy/files/sshproxy.ini b/net-proxy/sshproxy/files/sshproxy.ini
deleted file mode 100644
index c37cb374b3d2..000000000000
--- a/net-proxy/sshproxy/files/sshproxy.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sshproxy]
-max_connections = 0
-client_db = ini_db
-pkey_id = sshproxy@%HOSTNAME%
-plugin_dir = /usr/lib/sshproxy
-plugin_list = ini_db
-port = 2242
-logger_conf = /usr/share/sshproxy/logger.conf
-cipher_type = blowfish
-log_dir = /var/log/sshproxy
-acl_db = ini_db
-site_db = ini_db
-listen_on = 
-auto_add_key = no
-
-[blowfish]
-secret = %BLOWFISH_SECRET%
-
-[client_db.ini]
-file = /var/lib/sshproxy/client.db
-
-[acl_db.ini]
-file = /var/lib/sshproxy/acl.db
-
-[site_db.ini]
-db_path = /var/lib/sshproxy/site.db
diff --git a/net-proxy/sshproxy/files/sshproxyd.confd b/net-proxy/sshproxy/files/sshproxyd.confd
deleted file mode 100644
index a6f715df09d4..000000000000
--- a/net-proxy/sshproxy/files/sshproxyd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/sshproxyd: config file for /etc/init.d/sshproxyd
-
-# Where is your sshproxy.ini file stored?
-SSHPROXYD_CONFDIR="/etc/sshproxy"
-
-# What user runs the proxy?
-SSHPROXYD_USER="sshproxy"
diff --git a/net-proxy/sshproxy/files/sshproxyd.initd b/net-proxy/sshproxy/files/sshproxyd.initd
deleted file mode 100644
index 52dd72a771ee..000000000000
--- a/net-proxy/sshproxy/files/sshproxyd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	use logger mysql
-}
-
-start() {
-	ebegin "Starting SSH Proxy daemon"
-	start-stop-daemon --start --background \
-		--pidfile /var/run/sshproxyd.pid --exec /usr/bin/sshproxyd -- \
-		--daemon --user ${SSHPROXYD_USER:-sshproxy} \
-		--config-dir ${SSHPROXYD_CONFDIR:-/etc/sshproxy} \
-		--pid /var/run/sshproxyd.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping SSH Proxy daemon"
-	start-stop-daemon --quiet --stop --pidfile /var/run/sshproxyd.pid
-	eend $?
-}
diff --git a/net-proxy/sshproxy/metadata.xml b/net-proxy/sshproxy/metadata.xml
deleted file mode 100644
index 563dd784f3bf..000000000000
--- a/net-proxy/sshproxy/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription>
-sshproxy is a pure python implementation of an ssh proxy. It allows users to connect to remote sites without having to remember
-or even know the password or key of the remote sites. There are 2 possible scenarios which could possibly interest you.
-
-   Scenario 1: Team mode
-If you're in charge of a lot of remote sites, and your company has several administrators to do some remote administration tasks,
-then no user will ever need to know the password or key of the servers he administrates. When an employee quits your company,
-you just have to delete his entry in the proxy database, and he will never be able to connect to the remote site.
-
-   Scenario 2: Forwarding mode
-You want to allow some people to connect through your firewall to a range of server inside your DMZ or LAN, but you don't want to
-open one port for each server. What you can do is open the sshproxy port and setup the password database to proxy each
-external user to it's own desktop, or create groups of users allowed to connect to your DMZ servers.
-</longdescription>
-<use>
-	<flag name="client-only">Install only the client wrappers</flag>
-</use>
-</pkgmetadata>
diff --git a/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r2.ebuild b/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r2.ebuild
deleted file mode 100644
index 9a1feec905b8..000000000000
--- a/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r2.ebuild
+++ /dev/null
@@ -1,197 +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=1
-
-inherit distutils-r1 eutils user
-
-DESCRIPTION="sshproxy is an ssh gateway to apply ACLs on ssh connections"
-HOMEPAGE="http://sshproxy-project.org/"
-SRC_URI="http://sshproxy-project.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="client-only mysql minimal"
-# mysql: install the mysql_db backend driver
-# minimal: do not install extra plugins
-# client-only: install only the client wrappers
-
-DEPEND="!client-only? (
-		>=dev-python/paramiko-1.6.3[${PYTHON_USEDEP}]
-		mysql? ( >=dev-python/mysql-python-1.2.0[${PYTHON_USEDEP}] )
-	)"
-RDEPEND="${DEPEND}
-		net-misc/openssh"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	enewgroup sshproxy
-	enewuser sshproxy -1 -1 /var/lib/sshproxy sshproxy
-}
-
-src_prepare() {
-	# avoid conflicts with net-misc/putty and net-misc/pssh
-	# by renaming pscp and pssh scripts (#248193 and #278794)
-	epatch "${FILESDIR}"/${P}-rename-wrappers.patch
-	sed -i -e 's/pscp/spscp/g;s/pssh/spssh/g' doc/* && \
-		mv bin/pssh bin/spssh && \
-		mv bin/pscp bin/spscp && \
-		mv doc/pscp.1 doc/spscp.1 && \
-		mv doc/pssh.1 doc/spssh.1 || die "failed to rename pscp or pssh files"
-	ewarn "For avoiding conflicts with net-misc/putty and net-misc/pssh,"
-	ewarn "pscp and pssh scripts have been renamed as spscp respectively spssh."
-
-	sed -i -e 's/if paramiko.__version_info__ < (1, 6, 3):/if False:/g' "${S}"/sshproxy/__init__.py || die 'Sed failed.'
-}
-
-src_install () {
-	dobin bin/spscp
-	dobin bin/spssh
-
-	if ! use client-only; then
-		distutils-r1_src_install
-
-		diropts -o sshproxy -g sshproxy -m0750
-		keepdir /var/lib/sshproxy
-		keepdir /var/log/sshproxy
-
-		# Create a default sshproxy.ini
-		dodir /etc/sshproxy
-		insopts -o root -g sshproxy -m0600
-		insinto /etc/sshproxy
-		doins "${FILESDIR}/sshproxy.ini"
-		local BLOWFISH_SECRET=$(printf "%04hX%04hX%04hX%04hX\n" ${RANDOM} ${RANDOM} ${RANDOM} ${RANDOM})
-		sed -i -e "s/%BLOWFISH_SECRET%/${BLOWFISH_SECRET}/" \
-			-e "s/%HOSTNAME%/${HOSTNAME}/" \
-			"${D}/etc/sshproxy/sshproxy.ini"
-
-		insopts -o sshproxy -g sshproxy -m0600
-		rm -rf "${D}/usr/lib/sshproxy/spexpect"
-		if use minimal; then
-			local p
-			for p in acl_funcs console_extra logusers; do
-				rm -rf "${D}/usr/lib/sshproxy/${p}"
-			done
-		else
-			keepdir /var/log/sshproxy/logusers
-			{   # initialize a reasonable value for the logusers plugin
-				echo
-				echo "[logusers]"
-				echo "logdir = /var/log/sshproxy/logusers"
-				echo
-			} >> "${D}/etc/sshproxy/sshproxy.ini"
-		fi
-
-		# init/conf files for sshproxy daemon
-		newinitd "${FILESDIR}/sshproxyd.initd" sshproxyd
-		newconfd "${FILESDIR}/sshproxyd.confd" sshproxyd
-
-		# install manpages
-		doman doc/spscp.1
-		doman doc/spssh.1
-		if ! use client-only; then
-			doman doc/sshproxy.ini.5
-			doman doc/sshproxy-setup.8
-			doman doc/sshproxyd.8
-		fi
-
-		if use mysql; then
-			insinto /usr/share/sshproxy/mysql_db
-			doins misc/mysql_db.sql
-			doins misc/sshproxy-mysql-user.sql
-		else
-			rm -rf "${D}/usr/lib/sshproxy/mysql_db"
-			sed -i -e 's/[ \t]\+mysql//' \
-				"${D}/etc/init.d/sshproxyd" || die 'Sed failed.'
-		fi
-	fi
-}
-
-pkg_postinst () {
-	echo
-	einfo "Don't forget to set the following environment variables"
-	einfo "   SSHPROXY_HOST (default to localhost)"
-	einfo "   SSHPROXY_PORT (default to 2242)"
-	einfo "   SSHPROXY_USER (default to \$USER)"
-	einfo "for each sshproxy user."
-	if ! use client-only; then
-		distutils_pkg_postinst
-
-		echo
-		einfo "If this is your first installation, run"
-		einfo "   emerge --config =${CATEGORY}/${PF}"
-		einfo "to initialize the backend and configure sshproxy."
-		echo
-		einfo "There is no need to install sshproxy on a client machine."
-		einfo "You can connect to a SSH server using this proxy by running"
-		einfo "   ssh -tp PROXY_PORT PROXY_USER@PROXY_HOST -- REMOTE_USER@REMOTE_HOST"
-	fi
-}
-
-pkg_config() {
-	if [[ -d "${ROOT}/usr/lib/sshproxy/mysql_db" ]]; then
-		local PASSWD=$(printf "%04hX%04hX%04hX%04hX\n" ${RANDOM} ${RANDOM} ${RANDOM} ${RANDOM})
-		local SHARE="${ROOT}/usr/share/sshproxy/mysql_db"
-		local DB_HOST DB_PORT
-		read -p "Enter the MySQL host (default localhost): " DB_HOST
-		[[ -n "${DB_HOST}" ]] || DB_HOST=localhost
-		read -p "Enter the MySQL port (default 3306): " DB_PORT
-		[[ -n "${DB_PORT}" ]] || DB_PORT=3306
-
-		ewarn "When prompted for a password, enter your MySQL root password"
-		ewarn
-
-		if mysql -h ${DB_HOST} -P ${DB_PORT} -u root -p <<EOF ; then
-CREATE DATABASE sshproxy;
-USE sshproxy;
-$(sed -e "s/sshproxypw/${PASSWD}/g" "${SHARE}/sshproxy-mysql-user.sql")
-$(<"${SHARE}/mysql_db.sql")
-EOF
-
-			{
-				echo
-				echo "[client_db.mysql]"
-				echo "host = ${DB_HOST}"
-				echo "password = ${PASSWD}"
-				echo "db = sshproxy"
-				echo "user = sshproxy"
-				echo "port = ${DB_PORT}"
-				echo
-				echo "[acl_db.mysql]"
-				echo "host = ${DB_HOST}"
-				echo "password = ${PASSWD}"
-				echo "db = sshproxy"
-				echo "user = sshproxy"
-				echo "port = ${DB_PORT}"
-				echo
-				echo "[site_db.mysql]"
-				echo "host = ${DB_HOST}"
-				echo "password = ${PASSWD}"
-				echo "db = sshproxy"
-				echo "user = sshproxy"
-				echo "port = ${DB_PORT}"
-			} >> "${ROOT}/etc/sshproxy/sshproxy.ini"
-
-			sed -i -e 's/^\(\(acl\|client\|site\)_db = \)ini_db/\1mysql_db/g' \
-				"${ROOT}/etc/sshproxy/sshproxy.ini"
-			grep -q "^plugin_list .* mysql_db" \
-				"${ROOT}/etc/sshproxy/sshproxy.ini" || \
-					sed -i -e 's/^\(plugin_list = .*\)$/\1 mysql_db/g' \
-						"${ROOT}/etc/sshproxy/sshproxy.ini"
-		else
-			ewarn "Failed to create MySQL database!"
-			ewarn "If the database already existed and you want to replace it,"
-			ewarn "hit Ctrl-C now and drop the old database by running the command:"
-			ewarn "    /usr/bin/mysqladmin -h ${DB_HOST} -P ${DB_PORT} -u root -p drop sshproxy"
-			read -p "Hit Ctrl-C to stop the procedure or Enter to continue " key
-		fi
-	fi
-
-	INITD_STARTUP="/etc/init.d/sshproxyd start" chroot "${ROOT}" \
-		sshproxy-setup -u sshproxy -c /etc/sshproxy
-}
diff --git a/net-voip/vidyodesktop/Manifest b/net-voip/vidyodesktop/Manifest
index c4cd5bf5e246..809b8e2494e4 100644
--- a/net-voip/vidyodesktop/Manifest
+++ b/net-voip/vidyodesktop/Manifest
@@ -1,4 +1,6 @@
 DIST VidyoDesktopInstaller-ubuntu-TAG_VD_3_3_0_027.deb 8956880 SHA256 e8461c384d5dc95c705414b1746cc52abb43b7ca933fc850bd02b3313d79cb35 SHA512 2a0cda8e6638da161d0d5a8591025849720763648f87387c887c9962dbc4d47b86ff7634d0e382bdd68d4744a113e4941a9bcbf40908f99826bbfac5ad85ba7f WHIRLPOOL dd74e290d4eb1d70c7b4d23cf3fe895c8f17c34455bdaf413bb26a3b583c7343603d99c200794ce8bf33ea7a19f017078a3e4cfb7fe28a895d035ceb83c32745
 DIST VidyoDesktopInstaller-ubuntu-TAG_VD_3_3_0_127.deb 8956874 SHA256 6d4c6f3b6abcde2c569b2589ab384ee1dc42d5d7448e15f2e4ed04bfa18b0a0d SHA512 e2931f3a04547dd2155da576de58cd398527e4cd3e4ef67fbcbf3916264bdd93dbad3b8eb815f90c495a1472bbc4c5a95a07f5026ddddddf714e8061da14503a WHIRLPOOL 8f37cbb33fb359909ce7ddc315c73bc0154bf4521556396b16ac73d41d6de65d93c79ca442649f19322251a440823b6c101342c7c194b81524bf5fa5c5e2ae0d
+DIST VidyoDesktopInstaller-ubuntu-TAG_VD_3_5_4_010.deb 9935926 SHA256 a707d8c83650a044570b263f283631ce6ebb404b53a4685a2f91f683fda0b502 SHA512 20268771818b1d64250cf45deeb0ad135ac89c27ebb063c2aafe1860ede1f5e3f9b828c17410a466b565288fdf43ebf71aa758ef31dab06ef910f320c5c5dac1 WHIRLPOOL 94d7797467d7c20a2b91bd93b8fe0a62639fe64e32188d4ca19f383b949727689a4858a79f4a1c480d8f115e056814d6802b5e0fae142af324a012c921c30776
 DIST VidyoDesktopInstaller-ubuntu64-TAG_VD_3_3_0_027.deb 9440382 SHA256 ac19b3995d31274e33d9b72db665cb86b475e07028c1ba0aa9ece220c84fae10 SHA512 30923904e74aabfefdad0c0cebfa956559e605830f417bc4dfc9ab5f7f50d029f6fe70a3f81f04e3418e7f0f4d3f4d885f1ce50fb0fc416b22061c4512a16a73 WHIRLPOOL 4351021f8e1aa1c6eb6529c33a3f1e62e697ed5b2bc9245d340686661633a0dd3556542087dbf777a707266f253f2d2689d7f1f665b98adc2eb04b6376af9401
 DIST VidyoDesktopInstaller-ubuntu64-TAG_VD_3_3_0_127.deb 9440364 SHA256 b8bd260d46557cad78a9392efd9b7f975a53adf6fb9ccc165c38c233405def1a SHA512 bed7e221a910432246b40bd73d157e3e44ab89ec4263d54b86422320c1d7ef01de2931958c1dc94ad489f2aeb9cef295eb29ebeeb8ac7ee885e0ac861f477d08 WHIRLPOOL 52e757ad8de37dd934e0739ea6b59454e769ee3d89ec8c41093c90e8f69cfe0097d530dc6c8aed4427bd2ab2ebfba3f389408e606ee2885f77669dc267f3596f
+DIST VidyoDesktopInstaller-ubuntu64-TAG_VD_3_5_4_010.deb 10393194 SHA256 9c5ab8293b6888336bc8d7a6d8b6d097f40efd201966c18cfd983f8adf58627c SHA512 82db8acbbf7c99a8fb4e4cb967c059a51936e893b05a9001ceb3461b39bb93dafd0a46c2281720d533114b183289afce14254bae2fca260965ca2957d9a46dce WHIRLPOOL 3339298fb91536bafb10610cb3898a68e560c7b38d2951e3dd6166b8ef6d91ee97e728189cdc3d15992ea95d73f7c355defd5439da9a913d7bf00c2b4bc81744
diff --git a/net-voip/vidyodesktop/vidyodesktop-3.5.4.010.ebuild b/net-voip/vidyodesktop/vidyodesktop-3.5.4.010.ebuild
new file mode 100644
index 000000000000..0a811d7a3126
--- /dev/null
+++ b/net-voip/vidyodesktop/vidyodesktop-3.5.4.010.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator unpacker
+
+DESCRIPTION="Enterprise video conferencing platform"
+HOMEPAGE="http://www.vidyo.com/"
+SRC_URI="
+	amd64? ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu64-TAG_VD_$(replace_all_version_separators _).deb )
+	x86?   ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu-TAG_VD_$(replace_all_version_separators _).deb )
+"
+
+LICENSE="Vidyo-EULA"
+SLOT="0"
+RESTRICT="mirror strip"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	/opt/vidyo/VidyoDesktop/RenderCheck
+	/opt/vidyo/VidyoDesktop/VidyoDesktopInstallHelper
+	/opt/vidyo/VidyoDesktop/VidyoDesktop
+"
+
+DEPEND=""
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/libffi
+	sys-apps/util-linux
+	sys-libs/glibc
+	sys-devel/gcc
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glu
+	media-libs/libpng
+	media-libs/mesa
+	net-dns/libidn
+	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/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+"
+
+src_install() {
+	cp -a opt "${D}"
+	doicon usr/share/pixmaps/vidyo_icon.png
+	dodoc opt/vidyo/VidyoDesktop/license.txt
+	rm "${D}opt/vidyo/VidyoDesktop/license.txt"
+	exeinto /opt/bin
+	doexe usr/bin/VidyoDesktop
+	make_desktop_entry VidyoDesktop VidyoDesktop vidyo_icon 'AudioVideo;Network;'
+}
diff --git a/net-wireless/ap-utils/Manifest b/net-wireless/ap-utils/Manifest
deleted file mode 100644
index 1863342f60a3..000000000000
--- a/net-wireless/ap-utils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ap-utils-1.4.tar.bz2 367750 SHA256 bc0e8606560421ac048a819458d51837d40ddf66dac82615455a6249ac91535a SHA512 e6836f501732f332e30fc1e38c4bf4e10b561e8a32918d11a935241cd514549f5f806ce260854a130c8631b8bf8019cee0df5df2c0b45b6994471aa9f03fa038 WHIRLPOOL 42b3abfc368e148e97fecf93f7e4565d72f969054c1de52c88528b683ce5756a61158ccdb048d8469528c2d4bd06288c89d9a35a5f0e4d5e53adf873bcc8f429
-DIST ap-utils-1.5.tar.bz2 409480 SHA256 f01d068650f0f05c5b3753147ee0a5d3dfc07732c9788bb295683e66415a325d SHA512 ca875e0ce3d2e1c118f820483e649d419aff29c50db5c9ad88f19063f6d0f6ec1bae2e69339ea8dbded6ad4a7dcda81c78d45566ed058669acfb391499d4f3d9 WHIRLPOOL cb68458e7478447a432c3274059eeec2979b7b326357459088bbef1ef2bc79c5cb6f22dbd0c58397f201bce4e5a751982274a1b52b01265bdb35efed87f5664b
diff --git a/net-wireless/ap-utils/ap-utils-1.4.ebuild b/net-wireless/ap-utils/ap-utils-1.4.ebuild
deleted file mode 100644
index 11d953dfd25a..000000000000
--- a/net-wireless/ap-utils/ap-utils-1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-IUSE="nls"
-
-DESCRIPTION="Wireless Access Point Utilities for Unix"
-HOMEPAGE="http://ap-utils.polesye.net/"
-SRC_URI="mirror://sourceforge/ap-utils/${P}.tar.bz2"
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-DEPEND=">=sys-devel/bison-1.34"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-ppc-fix.diff
-}
-
-src_compile() {
-	econf --build=${CHOST} `use_enable nls` || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc ChangeLog NEWS README THANKS TODO
-}
diff --git a/net-wireless/ap-utils/ap-utils-1.5.ebuild b/net-wireless/ap-utils/ap-utils-1.5.ebuild
deleted file mode 100644
index 482895702110..000000000000
--- a/net-wireless/ap-utils/ap-utils-1.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-IUSE="nls"
-
-DESCRIPTION="Wireless Access Point Utilities for Unix"
-HOMEPAGE="http://ap-utils.polesye.net/"
-SRC_URI="ftp://linux.zhitomir.net/ap-utils/ap-utils-1.5.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-1.34"
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/net-wireless/ap-utils/files/ap-utils-1.4-ppc-fix.diff b/net-wireless/ap-utils/files/ap-utils-1.4-ppc-fix.diff
deleted file mode 100644
index 4b0dc577f60f..000000000000
--- a/net-wireless/ap-utils/files/ap-utils-1.4-ppc-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aur ap-utils-1.4-orig/lib/wlan.c ap-utils-1.4/lib/wlan.c
---- ap-utils-1.4-orig/lib/wlan.c	2003-10-31 12:15:00.000000000 -0500
-+++ ap-utils-1.4/lib/wlan.c	2004-02-24 23:00:25.214209480 -0500
-@@ -140,6 +140,7 @@
-     _("Short"), _("Long")};
-     short __rates[4] = { 2, 4, 11, 22 };
-     int i, c = 0;
-+    char ch;
-     unsigned int ap_regdomain;
- 
-     if (ap_type == ATMEL12350) {
-@@ -508,10 +509,10 @@
- 		i++;
- 	    }
- 	    if (m_essid) {
--		c = strlen(domain);
-+		c = ch = strlen(domain);
- 		varbinds[i].oid = operESSIDLength;
- 		varbinds[i].len_oid = sizeof(operESSIDLength);
--		varbinds[i].value = (char *)&c;
-+		varbinds[i].value = (char *)&ch;
- 		varbinds[i].len_val = 1;
- 		varbinds[i].type = INT_VALUE;
- 		i++;
diff --git a/net-wireless/ap-utils/metadata.xml b/net-wireless/ap-utils/metadata.xml
deleted file mode 100644
index ba712d7f8ec2..000000000000
--- a/net-wireless/ap-utils/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">ap-utils</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
index e4819fdf8013..1e38413c5954 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/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/rfswitch/Manifest b/net-wireless/rfswitch/Manifest
deleted file mode 100644
index b6eb0619f138..000000000000
--- a/net-wireless/rfswitch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rfswitch-1.3.tar.gz 11719 SHA256 def90905fa317be81a6d7abb5c239483f9f6f9b561958570ea05b1d6350b202a SHA512 29270b99d99688e6ac438af5626e0d193e73c27fb6b8d35a607c7facbb70b3b77d547a70889827c2b9412721bd9780464c589a2b1cce27a2f87aa88012bdb10b WHIRLPOOL 9fda6844b8110aaa5b5191b0d0eccf7db31aaea79c22001973a17ac757f7c14a87c6b4a19cdc9e4cc0ce654341c9addd49dc6acbb0a73147f77711f12a12af39
diff --git a/net-wireless/rfswitch/metadata.xml b/net-wireless/rfswitch/metadata.xml
deleted file mode 100644
index ffb99b235790..000000000000
--- a/net-wireless/rfswitch/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">rfswitch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/rfswitch/rfswitch-1.3.ebuild b/net-wireless/rfswitch/rfswitch-1.3.ebuild
deleted file mode 100644
index fae046c0fa93..000000000000
--- a/net-wireless/rfswitch/rfswitch-1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit linux-mod
-
-DESCRIPTION="Drivers for software based wireless radio switches"
-HOMEPAGE="http://rfswitch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="modules"
-
-MODULE_NAMES="av5100(net/wireless:)
-			  pbe5(net/wireless:)"
-MODULESD_AV5100_DOCS="README"
-
-# Use the in-kernel ipw2100 modules
-CONFIG_CHECK="~IPW2100"
-ERROR_IPW2100="${P} requires support for ipw2100 (CONFIG_IPW2100)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	convert_to_m Makefile
-
-	sed -i \
-		-e '/depmod/d' \
-		-e '/include.*Rules.*make/d' \
-		Makefile || die
-
-	sed -i -e 's:&proc_root:NULL:' {av5100,pbe5}.c || die #270269
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc ISSUES README
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild
index 6398e7a0eb8b..1ecb0e39f48c 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )"
 
diff --git a/profiles/arch/alpha/package.mask b/profiles/arch/alpha/package.mask
index 579547f4d9cf..986cea8ddcdd 100644
--- a/profiles/arch/alpha/package.mask
+++ b/profiles/arch/alpha/package.mask
@@ -2,12 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# Tobias Klausmann <klausman@gentoo.org> (03 Oct 2015)
-# Hangs/spins-on-cpu with any program on alpha.
-# Upstream bug: https://sourceware.org/bugzilla/show_bug.cgi?id=19061
-# Gentoo bug: 562128
->=sys-devel/gdb-7.10
-
 # Alexey Shvetsov <alexxy@gentoo.org> (21 May 2012)
 # Need deps pecl-apc and pecl-uploadprogress bug #416897
 >=www-apps/drupal-7.14
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index fdeefa480bb2..80bf7d52a50f 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Tobias Klausmann <klausman@gentoo.org> 04 Feb 2016
 # sys-cluster/ceph is not broken per se, but a maintenance burden.
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index d939613ef647..00d84c22e8dc 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
 # James Le Cuirot <chewi@gentoo.org) (30 Jan 2016)
 # scrollview requires SWT, which is currently unsupported on ARM.
 app-text/tesseract scrollview
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index a69a3ed8633e..fbb652ec815a 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,12 +4,20 @@
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Jeroen Roovers <jer@gentoo.org> (16 Aug 2015)
 # Bundles luajit which has not been ported to HPPA (bug #554376)
 app-text/texlive-core luajittex
 dev-texlive/texlive-basic luajittex
 
-# Jeroen Roovers <jer@gentoo.org> (3 Jul 2015) 
+# Jeroen Roovers <jer@gentoo.org> (3 Jul 2015)
 # net-libs/nghttp2 fails to compile (bug #552898)
 net-libs/nghttp2 cxx
 
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 2da16cb4e9f3..6eba8fc962ca 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Pacho Ramos <pacho@gentoo.org> (31 Jan 2016)
 # Missing keywords, bug #560382
 media-video/ffmpeg snappy
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 6d9c43cbba4a..d1b47b673518 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Mike Frysinger <vapier@gentoo.org> 21 Feb 2016
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Mike Frysinger <vapier@gentoo.org> (17 Dec 2015)
 # The tlsdate seccomp logic is open-coded and doesn't support this arch yet.
 net-misc/tlsdate seccomp
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 8182905f0236..3b78200ca32f 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -2,6 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
+# Patrick Lauer (20 Feb 2015)
+# Missing keywords on deps
+net-libs/ortp zrtp
+
 # Pacho Ramos <pacho@gentoo.org> (15 Nov 2015)
 # Missing keywords
 media-sound/rhythmbox upnp-av
diff --git a/profiles/arch/sh/package.use.mask b/profiles/arch/sh/package.use.mask
index 25415b690aff..1a55dbcbb0bb 100644
--- a/profiles/arch/sh/package.use.mask
+++ b/profiles/arch/sh/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Mike Frysinger <vapier@gentoo.org> 21 Feb 2016
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015)
 # Not tested
 net-mail/dovecot lz4
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 9f4d02f129c2..d0bf6deed29b 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -2,6 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
+# Pacho Ramos <pacho@gentoo.org> (20 Feb 2016)
+# Missing keywords, bug #551580
+app-office/planner eds
+
 # Pacho Ramos <pacho@gentoo.org> (31 Jan 2016)
 # Missing keywords, bug #560382
 media-video/ffmpeg snappy
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 159d592cf63c..6b71e56ea27a 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -191,7 +191,6 @@ video_cards_newport
 
 # Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
 # Unmask the flags for PHP that are available only on x86
--sybase
 -frontbase
 # Shared with amd64
 -oci8
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 90d8b73d3877..795184dfd0d5 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -5,6 +5,14 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Michael Palimaka <kensington@gentoo.org (17 Feb 2016)
+# Needs unsable media-libs/opencv
+media-gfx/nomacs qt5
+
+# Sergey Popov <pinkbyte@gentoo.org> (15 Feb 2016)
+# Mask monitoring capabilities of Ganeti on stable branches
+app-emulation/ganeti monitoring
+
 # Ian Delaney <idella4@gentoo.org> (04 Jan 2016)
 # on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
 # media-libs/libcaca wasn't stabilized in the past, but now
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 266f2f717ab3..3127dad1461b 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -272,7 +272,6 @@ coreaudio
 
 # Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
 # Mask the flags for PHP that are available only on x86
-sybase
 frontbase
 # Shared with amd64
 oci8
diff --git a/profiles/package.mask b/profiles/package.mask
index 4a10b028d030..8255604d9bf5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,9 +30,77 @@
 
 #--- END OF EXAMPLES ---
 
-# Mike Gilbert <floppym@gentoo.org> (02 Feb 2016)
-# Fails to build, will fix it later.
-=sys-libs/efivar-0.22
+# Patrick Lauer <patrick@gentoo.org> (22 Feb 2016)
+# Inactive upstream, build failures, obsoleted by rakudo/perl6
+dev-lang/niecza
+dev-lang/niecza-bin
+
+# Eray Aslan <eras@gentoo.org> (22 Feb 2016)
+# Mask experimental software
+=mail-mta/postfix-3.2*
+
+# James Le Cuirot <chewi@gentoo.org> (21 Feb 2016)
+# No revdeps, no release since 2007, and upstream have even moved the
+# download to a hidden OldFiles directory in the parent SourceForge
+# project. Removal in 30 days.
+dev-java/xsd2jibx
+
+# James Le Cuirot <chewi@gentoo.org> (19 Feb 2016)
+# Upstream EOL is December 2016. We would rather focus on other things
+# than support it until then. Removal in 30 days.
+www-servers/tomcat:6
+
+# Michael Palimaka <kensington@gentoo.org> (19 Feb 2016)
+# Superceded by other filesharing systems. Dead upstream. Unmaintained.
+# Masked for removal in 30 days. Bug 314359.
+net-p2p/gift
+net-p2p/gift-ares
+net-p2p/gift-fasttrack
+net-p2p/gift-gnutella
+net-p2p/gift-openft
+net-p2p/giftcurs
+sec-policy/selinux-gift
+
+# Michael Sterrett <mr_bones_@gentoo.org> (18 Feb 2016)
+# Now part of games-emulation/sdlmame
+# Masked for removal on 20160319
+games-emulation/sdlmess
+games-emulation/sdlmametools
+
+# Michael Palimaka <kensington@gentoo.org> (18 Feb 2016)
+# Fails to build. Dead upstream.
+# Masked for removal in 30 days. Bug 574248.
+dev-util/vdkbuilder
+
+# Michael Palimaka <kensington@gentoo.org> (18 Feb 2016)
+# Fails to build. Dead upstream. Use net-misc/connman-gtk instead.
+# Masked for removal in 30 days. Bug 502552.
+gnome-extra/connman-gnome
+
+# Michael Palimaka <kensington@gentoo.org> (18 Feb 2016)
+# Fails to build with recent kernels. Dead upstream.
+# Use kernel driver VIDEO_GO7007 instead.
+# Masked for removal in 30 days. Bug 482120.
+media-tv/wis-go7007
+
+# Michael Palimaka <kensington@gentoo.org> (18 Feb 2016)
+# Fails to build with recent kernels. Dead upstream.
+# Masked for removal in 30 days. Bug 488128.
+media-video/stk11xx
+
+# Yixun Lan <dlan@gentoo.org> (16 Feb 2016)
+# Mask early development version, leave only upstream stable version
+>=sys-cluster/ceph-10
+
+# Sergey Popov <pinkbyte@gentoo.org> (15 Feb 2016)
+# Security mask, wrt bug #519730
+<app-emulation/ganeti-2.11.6-r2
+
+# Alexis Ballier <aballier@gentoo.org> (15 Feb 2016)
+# Breaks some of its reverse dependencies.
+# Bug 574788
+>=media-video/ffmpeg-3.0
+>=media-video/mplayer-1.3.0
 
 # Michael Palimaka <kensington@gentoo.org> (12 Feb 2016)
 # Fails to build. No revdeps. Masked for removal in 30 days.
@@ -125,16 +193,6 @@ app-cdr/webcdwriter
 # Now part of eselect-java. Removal in 30 days.
 app-eselect/eselect-maven
 
-# Michael Sterrett <mr_bones_@gentoo.org> (20 Jan 2016)
-# Buggy and no updates in 9 years.
-# Masked for removal on 20160219
-games-roguelike/slashem
-
-# Michael Sterrett <mr_bones_@gentoo.org> (20 Jan 2016)
-# Upstream went away.  No updates in 8 years.
-# Masked for removal on 20160219
-games-strategy/attal
-
 # Sergey Popov <pinkbyte@gentoo.org> (20 Jan 2016)
 # Mask new versions of Boost - they are known to cause breakages
 ~dev-util/boost-build-1.60.0
@@ -191,174 +249,17 @@ www-apache/mod_auth_pgsql
 dev-perl/ExtUtils-Constant
 
 # Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Cannot be downloaded either mirrored, bug #561142. Removal in a month
-games-fps/ut2004-alienswarm
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Cannot be downloaded either mirrored, bug #561150. Removal in a month
-games-rpg/sacred-gold
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Cannot be downloaded either mirrored, bug #561154. Removal in a month
-games-strategy/coldwar
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Cannot be downloaded either mirrored, bug #561176. Removal in a month
-net-misc/ixp4xx
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Obsolete and dead, bug #561622. Removal in a month.
-app-misc/ompload
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Security issues, too hard to maintain, bug #561952. Removal in a month.
-app-crypt/truecrypt
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
 # Not useful anymore, bug #562998. Removal in a month.
 app-editors/xmlcopyeditor
 
 # Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Opensource version dead for ages, it was replaced by a closed source one,
-# bug #563334. Removal in a month.
-dev-db/flamerobin
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Dead and obsolete for years, bug #563900. Removal in a month.
-gnome-extra/zeitgeist-extensions
-dev-python/python-geoclue
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead, it includes multiple hacks currently and has pending bugs
-# to resolve, bug #564048. Removal in a month.
-net-dns/host
-net-misc/proxyper
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead, buggy, doesn't work with wxGTK:3.0, bug #564052. Removal in
-# a month.
-sci-visualization/extrema
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead, doesn't work with wxGTK:3.0, bug #564092. Removal in a
-# month.
-media-gfx/comical
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead, doesn't work with wxGTK:3.0, bug #564094. Removal in a
-# month.
-media-sound/miniaudicle
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead, buggy, doesn't work with wxGTK:3.0, bug #564102. Removal in
-# a month.
-net-p2p/imule
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
 # Doesn't work at all, bug #564106. Removal in a month.
 media-gfx/fr0st
 
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Nothing need this old and broken packages, bug #565014. Removal in a
-# month.
-dev-php/pecl-syck
-dev-libs/syck
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Obsolete version, nobody willing to package newer version and nothing
-# needs it in the tree, bug #565206. Removal in a month.
-net-libs/libmapi
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Nothing needs this old dummy package, bug #566774. Removal in a month.
-gnome-extra/at-spi
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead, doesn't work with libsigc++-2.6, bug #568788. Removal in a
-# month.
-app-misc/granule
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead, nothing needs it, will break with next snakeoil version,
-# bug #569202. Removal in a month,
-app-portage/maintainer-helper
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Upstream dead for ages, they rely on old libs also, bug #565654. Removal
-# in a month.
-gnome-extra/gdesklets-core
-x11-plugins/desklet-Genesis
-x11-plugins/desklet-ImageSlideShow
-x11-plugins/desklet-Mouse
-x11-plugins/desklet-SlideShow
-x11-plugins/desklet-WeeklyCalendar
-x11-plugins/desklet-ftb
-x11-plugins/desklet-iCalendarEvent
-x11-plugins/desklet-justanicon
-
-# Patrice Clement <monsieurp@gentoo.org> (06 Jan 2016)
-# Struts 2 and friends suffer from a lack of interest. These ebuilds are
-# outdated, riddled with CVEs (about 5 currently opened in Bugzilla) and some
-# of them do not compile at all. Time to see them off.
-# Masked for removal in 30 days. See bug #540888.
-dev-java/struts-plugins
-dev-java/struts-xwork
-dev-java/struts-core
-dev-java/struts
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #514778. Removal in a month.
-media-sound/mimd
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #514826. Removal in a month.
-sys-cluster/gfs-kernel
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Unmaintained, security issues, bug #515272. Removal in a month.
-net-misc/italc
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #515904. Removal in a month.
-media-sound/sweep
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Unmaintained, fails to build, relies on deprecated libs, bug #515912.
-# Removal in a month.
-x11-misc/dragbox
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Unfetchable, mirror-restricted, bug #521442. Removal in a month.
-sci-chemistry/gopenmol
-
 # Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
 # Unbuildable for a long time, bug #522916. Removal in a month.
 net-im/silc-server
 
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Buggy and completely obsolete, bug #527488. Removal in a month.
-x11-misc/alltray
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, dead since 2005, bug #528050. Removal in a month.
-net-irc/asuka
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #528854. Removal in a month.
-dev-ada/aunit
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #529434. Removal in a month.
-app-emulation/aranym
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Multiple bugs and buggy ebuild, bug #533170. Removal in a month.
-net-proxy/ntlmaps
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# microdc2 should be used instead, bug #533782. Removal in a month.
-net-p2p/microdc
-
 # NP-Hardass <NP-Hardass@gentoo.org> (05 Feb 2016)
 # Security issues bug #536334. Remove this entry in a month.
 <net-nds/389-ds-base-1.3.2.22
@@ -370,428 +271,14 @@ net-nds/389-admin
 app-admin/389-admin-console
 www-apps/389-dsgw
 
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #536418. Removal in a month.
-dev-ada/xmlada
-dev-ada/adadoc
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #536632. Removal in a month.
-dev-util/piklab
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #537520. Removal in a month.
-dev-ada/florist
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Unmaintained, security issues, bug #537528. Removal in a month
-app-admin/usermin
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Obsolete versions, updated ones living in Sabayon overlay, bug #538142.
-# Removal in a month.
-app-admin/rigo
-app-misc/magneto-loader
-kde-misc/magneto-kde
-x11-misc/magneto-gtk
-x11-misc/magneto-gtk3
-sys-apps/rigo-daemon
-sys-apps/magneto-core
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #542928. Removal in a month.
-net-misc/kumofs
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #543210. Removal in a month.
-media-sound/phasex
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #545090. Removal in a month.
-x11-misc/bmpanel
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Unmaintained, obsolete, bug #545450. Removal in a month.
-sys-cluster/xgridagent
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, upstream dead many years ago, bug #545692. Removal in a
-# month.
-media-sound/muine
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #547290. Removal in a month.
-sys-cluster/pacemaker-gui
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #547652. Removal in a month.
-media-video/hwdecode-demos
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, nothing in the tree needs this, bug #549686. Removal in a
-# month.
-app-i18n/xsim
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Buggy, upstream dead for years, bug #550800. Removal in a month.
-games-action/poopmup
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Dead upstream since 2009, nothing in the tree needs it anymore, bug
-# #551354. Removal in a month.
-net-proxy/sshproxy
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #551894. Removal in a month.
-dev-python/Djblets
-dev-util/reviewboard
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Security issues, bug #553604. Removal in a month.
-net-mail/checkpw
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #555556. Removal in a month.
-app-i18n/scim-canna
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Fails to build, bug #555840. Removal in a month.
-app-misc/lcd-stuff
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Upstream dead for ages, doesn't build, bug #558274. Removal in a month.
-net-wireless/ap-utils
-
-# Pacho Ramos <pacho@gentoo.org> (06 Jan 2016)
-# Those packages were meant to use on a PDA, no upsteam commits to git since
-# 3 years to most project parts. No releases, bug #560482. Removal in a
-# month.
-x11-libs/libmatchbox
-x11-misc/matchbox-panel-manager
-x11-plugins/matchbox-applet-input-manager
-x11-plugins/matchbox-applet-startup-monitor
-x11-plugins/matchbox-applet-volume
-x11-plugins/matchbox-desktop-image-browser
-x11-plugins/matchbox-desktop-xine
-x11-wm/matchbox-common
-x11-wm/matchbox-desktop
-x11-wm/matchbox-panel
-x11-wm/matchbox-window-manager
-x11-themes/matchbox-themes-extra
-x11-wm/matchbox
-x11-misc/matchbox-keyboard
-
-# Matthias Maier <tamiko@gentoo.org> (06 Jan 2016)
-# Obsolete package, nowadays bundled with media-sound/quodlibet
-# Masked for removal in 30 days
-media-plugins/quodlibet-plugins
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Upstream dead, ignores cflags, nothing need it in the tree
-# bug #438940. Removal in a month
-net-libs/libbt
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Broken in many ways, nobody willing to fix and maintain it.
-# bug #443728. Removal in a month
-app-laptop/prey
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Upstream dead for a long time, doesn't work on amd64, bug #445776
-# Removal in a month.
-net-p2p/wire
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Incompatible with current services API, bug #446940
-# Removal in a month.
-media-sound/shell-fm
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Dead, doesn't build, use multimon-ng instead, bug #448742
-# Removal in a month.
-app-misc/multimon
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Doesn't support current gnutls, nothing in the tree needs
-# this old lib, bug #456306. Removal in a month.
-net-libs/libdexter
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Doesn't build with current kernels, the support is included
-# in that kernels without this extra package, bug #463566
-# Removal in a month.
-app-accessibility/speakup
-app-accessibility/speechd-up
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, bug #465208. Removal in a month.
-app-misc/usbirboy
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails with tcl/tk-8.6, nothing in the tree needs this
-# bug #467444. Removal in a month
-dev-tcltk/tcl-sql
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-#
-# Tom Wijsman <TomWij@gentoo.org> (18 Sep 2013)
-# Temporarily masked due to QA issue during attempts to unbundle dependencies;
-# we need to check the jar contents to check for differences, especially the
-# stax dependency seems to be problematic in this regard but we'll check all of
-# them to ensure that unbundling doesn't hurt some missed functionality.
-# Bug #471942 tracks the progress of these unbundling efforts.
-#
-# Removal in a month
-app-admin/ec2-api-tools
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Broken and completely old versions because this needs a maintainer
-# to take care of bumping it soon enough, bug #472170
-sys-kernel/vserver-sources
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Upstream dead for a long time, no compatible then with current ffmpeg
-# versions and neither with libav, bug #474352. Removal in a month
-media-video/winki
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Not compatible with libav, upstream dead for ages, please use other
-# downloaders like youtube-dl, bug #474370. Removal in a month.
-net-misc/yaydl
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Not compatible with libav, upstream stopped caring about fix and taking
-# care of its security issues long time ago. bug #474388. Removal in a
-# month.
-www-apps/gallery
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Doesn't work with current twisted, bug #486810. Removal in a month.
-media-video/coherence
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# MSN died long time ago, this are not needed then. bug #489552. Removal in
-# a month.
-media-libs/libmimic
-media-plugins/gst-plugins-mimic
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, bug #491292. Removal in a month.
-media-sound/giada
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Doesn't work properly (#519732), doesn't build (#503246). Removal in a
-# month.
-net-proxy/dansguardian
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Cannot be download, license is incorrect, bug #505752. Removal in a month.
-games-strategy/coldwar-demo
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Cannot be downloaded, mirror restricted, bug #506860. Removal in a month.
-games-fps/quake1-movies
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Dead for ages, its functionality was merged in bluez-5 long time ago.
-# Nobody needs it in the tree, bug #507486. Removal in a month.
-app-mobilephone/obexd
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Not compatible with python3, nothing in the tree needs this old lib, bug
-# #513424. Removal in a month
-sys-libs/libtrash
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# No updates since 2005, doesn't build, bug #513996. Removal in a month.
-net-proxy/oops
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Doesn't build, bug #514018. Removal in a month.
-net-wireless/rfswitch
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Not compatible with current GC lib, bug #514046. Removal in a month.
-dev-scheme/bigloo
-dev-scheme/hop
-app-text/skribe
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, bug #514058. Removal in a month.
-net-libs/libopkele
-www-apache/mod_auth_openid
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, bug #514078. Removal in a month.
-dev-util/exmap
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, unmaintained, bug #514122. Removal in a month.
-x11-misc/growl-for-linux
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Missing deps, doesn't run, bug #514436. Removal in a month.
-x11-misc/bbsload
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, bug #514596. Removal in a month.
-dev-scheme/schemik
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, bug #514602. Removal in a month.
-app-crypt/shishi
-
-# Pacho Ramos <pacho@gentoo.org> (05 Jan 2016)
-# Fails to build, bug #514634. Removal in a month.
-app-arch/torrentzip
-
-# Patrice Clement <monsieurp@gentoo.org> (05 Jan 2016)
-# According to its maintainer. this project is slowly dying 
-# and there's no activity occuring on mailing lists / git repo.
-# Masked for removal. See bug 570836.
-www-client/uzbl
-
 # Andrey Grozin <grozin@gentoo.org> (04 Jan 2016)
 # Needs a bump and substantial ebuild rewrite
 =sci-mathematics/reduce-20110414-r1
 
-# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
-# Fails to build, bug #368873. Removal in a month
-x11-misc/xoo
-
-# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
-# Fails to build, bug #368913. Removal in a month
-media-video/cxfe
-
-# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
-# Fails to build, bug #369053. Removal in a month
-media-sound/freewheeling
-
-# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
-# Fails to build, bug #369769. Removal in a month
-media-sound/gqmpeg
-
-# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
-# Obsolete lib, nothing needs it, bug #380193
-# Removal in a month
-x11-libs/libsexy
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Nothing requires this obsolete versions, bug #249418
-# Removal in a month.
-=dev-db/sqlite-2*
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Fails to build in multiple ways, bug #250055
-# Removal in a month.
-dev-ada/adasockets
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Security issues, without maintainer, upstream dead, bug #261194
-# Removal in a month.
-net-dns/noip-updater
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Tests fail, the version was superseeded by Dino package
-# long time ago but it lack maintainer to do the work.
-# Removal in a month. bug #297952
-dev-util/cocom
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Fails to build, bug #298686
-# Removal in a month
-dev-ada/booch_components
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Unresolved security issues, bug #324017
-# Removal in a month.
-sys-libs/nss-db
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Doesn't work, bug #330329
-# Removal in a month.
-net-dialup/capisuite
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Does not respect LDFLAGS, nothing requires it, bug #334627
-# Removal in a month.
-app-admin/showconsole
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Fails to build, bug #348418
-# Removal in a month.
-dev-ada/gtkada
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Upstream died long time ago, replaced by eiskaltdcpp
-# bug #364057 . Removal in a month.
-net-p2p/linuxdcpp
-
-# Patrice Clement <monsieurp@gentoo.org> (01 Jan 2016)
-# Project dead: upstream deprecated it a while ago.
-# Masked for removal in 30 days. See bug #429444.
-dev-python/pyltxml
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, bug #567092
-# Removal in a month.
-net-misc/gip
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, bug #568796
-# Removal in a month.
-media-sound/gnomoradio
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, bug #568796
-# Removal in a month.
-app-office/passepartout
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, multiple bugs
-# with current ffmpeg versions, bug #568796
-# Removal in a month.
-media-video/bombono-dvd
-
 # Victor Ostorga <vostorga@gentoo.org> (30 Dec 2015)
 # Mask this liferea version because upstream released it broken
 =net-news/liferea-1.10.17
 
-# Justin Lecher <jlec@gentoo.org> (29 Dec 2015)
-# Fails to build and test runs
-# No reverse deps
-# #370021, #478614, #513964
-sci-libs/libbufr
-
-# Mikle Kolyada <zlogene@gentoo.org> (26 Dec 2015)
-# Dead upstream (last activity in 2003)
-# Nothing in the tree depends on it
-# Masked for removal
-dev-perl/SpeedyCGI
-
-# Manuel Rüger <mrueg@rueg.eu> (24 Dec 2015)
-# Effectively unmaintained, multiple bugs
-# Bug 288611,358013,413987,468186,480854,528750,548480,566226
-# Masked for removal in 30 days.
-media-tv/xawtv
-
-# Patrick Lauer <patrick@gentoo.org> (20 Dec 2015)
-# Mask TOFU release that doesn't work #567768 and friends
-=app-crypt/gkeys-gen-0.1-r1
-
-# Patrick Lauer <patrick@gentoo.org> (20 Dec 2015)
-# Ebuild uninstallable #557090
-=app-crypt/gkeys-0.1-r1
-
-# Brian Evans <grknight@gentoo.org> (17 Dec 2015)
-# "The drizzle project is long dead, it should be removed,
-# along with dev-php/pecl-drizzle", by grknight
-# in Bug #501060
-# Try 2 acked by idella4
-# Masked for removal in 30 days.
-dev-db/drizzle
-dev-php/pecl-drizzle
-
 # Fabian Groffen <grobian@gentoo.org> (11 Dec 2015)
 # Release candidates for Exim 4.87
 =mail-mta/exim-4.87_rc2
@@ -806,10 +293,6 @@ dev-php/pecl-drizzle
 # Masked until we deal with SSLv3, bug #567554
 =dev-libs/libressl-2.3*
 
-# Robin H. Johnson <robbat2@gentoo.org> (04 Dec 2015)
-# Much early testing needed
->=sys-cluster/ceph-9
-
 # Brian Evans <grknight@gentoo.org> (02 Dec 2015)
 # All current targets are masked.
 <dev-php/pecl-taint-1.99.99
@@ -820,11 +303,6 @@ dev-php/pecl-drizzle
 dev-lang/php:5.4
 ~virtual/httpd-php-5.4
 
-# Justin Lecher <jlec@gentoo.org> (12 Nov 2015)
-# deprecated version of the plugin. 
-# sci-chemistry/pymol includes the newer version
-sci-chemistry/pymol-apbs-plugin
-
 # Brian Evans <grknight@gentoo.org> (11 Nov 2015)
 # Mask latest xdebug{,-client} beta versions
 # Upstream keeps changing the tarballs causing Manifest errors.
@@ -832,17 +310,6 @@ sci-chemistry/pymol-apbs-plugin
 >=dev-php/xdebug-2.4.0_beta1
 >=dev-php/xdebug-client-2.4.0_beta1
 
-# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
-# Vulnerable package CVE-2014-{1932,1933}
-# Bug: 507982
-dev-python/imaging
-
-# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
-# Compatibility virtual for transition from
-# dev-python/imaging to dev-python/pillow
-# obsolete now #508266
-virtual/python-imaging
-
 # Michał Górny <mgorny@gentoo.org> (30 Oct 2015)
 # Uses unsafe ioctls that could result in data corruption. Upstream
 # is working on replacing them in the wip/dedup-syscall branch.
@@ -1323,12 +790,6 @@ net-wireless/madwifi-ng
 # bluetooth-sendto breakage.
 >=app-mobilephone/obexd-0.47
 
-# Ralph Sennhauser <sera@gentoo.org> (18 Jul 2012)
-# Unmaintained, multiple vulnarabilities. #351626
-# A more recent source build maintained by the community is available in the
-# seden overlay. A more recent binary is available in the java-overlay.
-<=dev-util/eclipse-sdk-3.5.1-r1
-
 # Robin H. Johnson <robbat2@gentoo.org> (09 Feb 2012)
 # Needs to be slotted better
 =dev-libs/yaz-4*
diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc
index 4e9218257749..9a4890117525 100644
--- a/profiles/prefix/linux/profile.bashrc
+++ b/profiles/prefix/linux/profile.bashrc
@@ -3,10 +3,29 @@
 #
 # # Remember, bash treats floats like strings..
 
+get_libc_vers_min() {
+	if [[ -x /usr/bin/ldd ]] ; then
+		/usr/bin/ldd --version \
+			| head -n1 \
+			| grep -o ") 2\.[0-9]\+" \
+			| cut -d. -f2
+		return
+	elif [[ -x /lib/libc.so.6 || -x /lib64/libc.so.6 ]] ; then
+		{
+			/lib/libc.so.6 || /lib64/libc.so.6
+		} 2>/dev/null \
+			| head -n1 \
+			| grep -o 'version 2\.[0-9]\+' \
+			| cut -d. -f2
+		return
+	fi
+	echo "0"
+}
+
 if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == unpack ]]; then
     # Since 2.3 > 2.12 in numerical terms, just compare 2.X to 2.Y, will break
     # if >=3.0 is ever released
-    VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 )
+    VERS=$(get_libc_vers_min)
     if [[ $VERS -lt 12 ]]; then # compare host glibc 2.x to 2.12
         ewarn "Your host glibc is too old; disabling automatic fortify. bug 289757"
         EPATCH_EXCLUDE+=" 10_all_gcc-default-fortify-source.patch" # <=gcc-4.5*
@@ -15,11 +34,11 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == unpack ]]; then
 fi
 
 if [[ ${EBUILD_PHASE} == setup ]]; then
-    VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 )
+    VERS=$(get_libc_vers_min)
     if [[ $VERS -lt 6 && "${CFLAGS} " != *'gnu89-inline '* ]]; then # compare host glibc 2.x to 2.6
         einfo "Your host glibc is too old; enabling -fgnu89-inline compiler flag. bug 473524"
         CFLAGS="${CFLAGS} -fgnu89-inline" # for C only
     fi  
 fi
 
-# vim: set syn=sh expandtab ts=4:
+# vim: set syn=sh:
diff --git a/profiles/prefix/sunos/solaris/5.10/package.mask b/profiles/prefix/sunos/solaris/5.10/package.mask
index a83bee128f1a..815fec895a62 100644
--- a/profiles/prefix/sunos/solaris/5.10/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/package.mask
@@ -2,7 +2,3 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-
-# Fabian Groffen <grobian@gentoo.org> (05 Feb 2016)
-# Needs strpcpy, bug #573902
-=app-portage/portage-utils-0.60
diff --git a/profiles/prefix/sunos/solaris/5.9/package.mask b/profiles/prefix/sunos/solaris/5.9/package.mask
index b60977b54a01..e7c2db43a698 100644
--- a/profiles/prefix/sunos/solaris/5.9/package.mask
+++ b/profiles/prefix/sunos/solaris/5.9/package.mask
@@ -3,10 +3,6 @@
 # $Id$
 
 
-# Fabian Groffen <grobian@gentoo.org> (05 Feb 2016)
-# Needs strpcpy, bug #573902
-=app-portage/portage-utils-0.60
-
 # Jeremy Olexa <darkside@gentoo.org> (26 Aug 2008)
 # Requires that pthread.h defines pthread_atfork() but it doesn't on Solaris 9
 # SPARC.
diff --git a/profiles/prefix/sunos/solaris/package.use.mask b/profiles/prefix/sunos/solaris/package.use.mask
index e2d19911340f..96305d86126f 100644
--- a/profiles/prefix/sunos/solaris/package.use.mask
+++ b/profiles/prefix/sunos/solaris/package.use.mask
@@ -3,6 +3,11 @@
 # $Id$
 
 
+# Fabian Groffen <grobian@gentoo.org> (23 Feb 2016)
+# luajit doesn't compile due to relocation problems
+~app-text/texlive-core-2015 luajittex
+~dev-texlive/texlive-basic-2015 luajittex
+
 # Fabian Groffen <grobian@gentoo.org> (16 Jan 2016)
 # GNU attr isn't supported
 dev-libs/glib xattr
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index df42c41006b9..af58b2ebe19e 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -9,3 +9,9 @@ move dev-python/socksipy dev-python/PySocks
 move x11-apps/ardesia x11-misc/ardesia
 slotmove <sci-libs/libint-2 0 1
 slotmove >=sci-libs/libint-2 0 2
+move dev-ml/pa_test dev-ml/ppx_assert
+move dev-ml/custom_printf dev-ml/ppx_custom_printf
+move sci-mathematics/csdp sci-libs/coinor-csdp
+move dev-perl/ImageInfo dev-perl/Image-Info
+move dev-perl/ImageSize dev-perl/Image-Size
+move media-tv/xbmc media-tv/kodi
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index 96e69cfbc981..6ae18ef87063 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,4 +1,5 @@
 DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
+DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
 DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/ros-meta/audio_common/audio_common-0.2.11.ebuild b/ros-meta/audio_common/audio_common-0.2.11.ebuild
new file mode 100644
index 000000000000..618c77ecf99b
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.2.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_capture
+	dev-ros/audio_common_msgs
+	dev-ros/audio_play
+	dev-ros/sound_play
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/Manifest b/ros-meta/pr2_common/Manifest
index 315057b9ab13..9e8fbda709dd 100644
--- a/ros-meta/pr2_common/Manifest
+++ b/ros-meta/pr2_common/Manifest
@@ -1,4 +1,5 @@
 DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
 DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
 DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
 DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/ros-meta/pr2_common/pr2_common-1.11.14.ebuild b/ros-meta/pr2_common/pr2_common-1.11.14.ebuild
new file mode 100644
index 000000000000..3befd2ea38b1
--- /dev/null
+++ b/ros-meta/pr2_common/pr2_common-1.11.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pr2_msgs
+	dev-ros/pr2_dashboard_aggregator
+	dev-ros/pr2_description
+	dev-ros/pr2_machine
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot_model/Manifest b/ros-meta/robot_model/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/ros-meta/robot_model/Manifest
+++ b/ros-meta/robot_model/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/ros-meta/robot_model/robot_model-1.11.9.ebuild b/ros-meta/robot_model/robot_model-1.11.9.ebuild
new file mode 100644
index 000000000000..66cc2947b067
--- /dev/null
+++ b/ros-meta/robot_model/robot_model-1.11.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Packages for modeling various aspects of robot information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/collada_parser
+	dev-ros/collada_urdf
+	dev-ros/joint_state_publisher
+	dev-ros/kdl_parser
+	dev-ros/urdf
+	dev-ros/urdf_parser_plugin
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/rosbridge_suite/Manifest b/ros-meta/rosbridge_suite/Manifest
index 901d1ece339e..a5ef02bce087 100644
--- a/ros-meta/rosbridge_suite/Manifest
+++ b/ros-meta/rosbridge_suite/Manifest
@@ -1 +1,2 @@
 DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
+DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
diff --git a/ros-meta/rosbridge_suite/rosbridge_suite-0.7.14.ebuild b/ros-meta/rosbridge_suite/rosbridge_suite-0.7.14.ebuild
new file mode 100644
index 000000000000..90f4ccec34cf
--- /dev/null
+++ b/ros-meta/rosbridge_suite/rosbridge_suite-0.7.14.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="JSON API to ROS functionality for non-ROS programs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosapi
+	dev-ros/rosbridge_library
+	dev-ros/rosbridge_server
+	"
+DEPEND=""
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
index c81650d6bafe..a19b2676a124 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -1,4 +1,2 @@
-DIST cpl-6.3.1.tar.gz 2981414 SHA256 457d54d01cf356e9898fb2f226f057099a481e183a2eaabd34a7b4c865e10089 SHA512 b597968978ca87048b25ee7fd8ff6ebb483e1fd4c6c4fb515720bf468fe67e7b8a25cc9bf7141c18520ba37dcde9654bd5b46d9adcacba8b51780ff671bcdf76 WHIRLPOOL 1f5c224daaa79c689196cfdf2825574881f060d0e5c2ea6c48937a33c5feaec404f30c5f0abf48d352f0240255accdec1223a9c7b11b93b410f1d5e38a8c7e96
-DIST cpl-6.4.1.tar.gz 3013536 SHA256 03ded24eb87a57023b20e51a7a46d0f807c6dd9ea9c3286fe45f94e26cab4193 SHA512 5925f2bc5bf3828e6cfca78636bb2bb3d08f1b75ca8a16b8279b40bf5f57096d4ba7444aa28c0c354ae0755e2524ef0e56a23d2c87a23b7a9f52560667ce8bab WHIRLPOOL 7eb3be12692d2f72ba5211d001da4bc5d830daa1fd6059d15591c3987131fc54081120adb1519677b46274d71a91c7b1507174bab62be29589f9af0a0d122b19
 DIST cpl-6.4.2.tar.gz 3165143 SHA256 848dbbc581670b32eeb3d87a7c3c10c9d3969f0fcbe7daf8ba18ef0081cbc793 SHA512 636ce549f23862a111fd88e97878eff8b86c88e8e2e800533b2f34f219f6b6ea3f03bd9de6ce9606c3787d0a61fb66a6bd92087d24c57c47e5a26e31eb362a11 WHIRLPOOL 7368e323c4f00af8fc684ba1448eec20f229df310b9cd66f0fe046dd6900a195c04fbc1c78dd31600651c8e7911f49517a37ddb4ba89df235fadb5c0e1a0cb81
-DIST cpl-6.4.tar.gz 3012686 SHA256 af3024bccf70632df613a6aff475d3614983cdac31211614fb0412217af0b79f SHA512 26170c144cd72c7b597286458fdbb5c91ebdfff4362d095b47035a8569f930ff5956ffd6b7f86ea066d8dbd6b78ae0569eba5ce6a5c6a20381478e188161ead8 WHIRLPOOL be59b8c9347a701573da97a6e142d725332a6c9f3de291eb6982706cae33d14c0f1edb23a3467a656e1378558e3292c8deba19f2a17a901fe6217f974a229c54
+DIST cpl-6.6.1.tar.gz 3082051 SHA256 16cd1c5a165526423d5dd7999f9080e1fa143fc38778329744cf59fd24e1bb84 SHA512 261cd092b3d0f1865f2e1aca0760232497cfe85b92f61601b22d81619147cad17c427791adad5a863acb3febcfe78590c8f8d10de1d626f4b90302326f936064 WHIRLPOOL ea7c5f7792da54a46eec9f3a8e040c2598b8ec95a9aeccc8451e77aa9773c2ccdf3113e91f2f6f2c21782ab31293922a6195e0df7da30a369a1396328ace5251
diff --git a/sci-astronomy/cpl/cpl-6.3.1.ebuild b/sci-astronomy/cpl/cpl-6.3.1.ebuild
deleted file mode 100644
index 199b8dbea2da..000000000000
--- a/sci-astronomy/cpl/cpl-6.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_OPT_USE=gasgano
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils java-pkg-opt-2 autotools-utils
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gasgano static-libs threads"
-
-RDEPEND="
-	>=sci-astronomy/wcslib-4.8.4
-	>=sci-libs/cfitsio-3.310
-	>=sci-libs/fftw-3.1.2
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
-	"${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
-)
-
-src_prepare() {
-	# bug 422455 and remove cpu chcking
-	sed -i \
-		-e '/AM_C_PROTOTYPES/d' \
-		-e '/CPL_CHECK_CPU/d' \
-		configure.ac libcext/configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-ltdl-install
-		--without-included-ltdl
-		--with-cfitsio="${EPREFIX}/usr"
-		--with-wcs="${EPREFIX}/usr"
-		--with-fftw="${EPREFIX}/usr"
-		$(use_enable doc maintainer-mode)
-		$(use_enable threads)
-	)
-	if use gasgano; then
-		myeconfargs+=(
-			--enable-gasgano
-			--with-gasgano="${EPREFIX}/usr"
-			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
-			--with-java="$(java-config -O)"
-		)
-	else
-		myeconfargs+=( --disable-gasgano )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo html)
-}
-
-src_install() {
-	autotools-utils_src_install all $(use doc && echo install-html)
-}
diff --git a/sci-astronomy/cpl/cpl-6.4.1.ebuild b/sci-astronomy/cpl/cpl-6.4.1.ebuild
deleted file mode 100644
index 36da138b840c..000000000000
--- a/sci-astronomy/cpl/cpl-6.4.1.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
-
-JAVA_PKG_OPT_USE=gasgano
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils java-pkg-opt-2 autotools-utils
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gasgano static-libs threads"
-
-RDEPEND="
-	sci-astronomy/wcslib:0=
-	>=sci-libs/cfitsio-3.310:0=
-	sci-libs/fftw:3.0=
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
-	"${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
-)
-
-src_prepare() {
-	# bug 422455 and remove cpu chcking
-	sed -i \
-		-e '/AM_C_PROTOTYPES/d' \
-		-e '/CPL_CHECK_CPU/d' \
-		configure.ac libcext/configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-ltdl-install
-		--without-included-ltdl
-		--with-cfitsio="${EPREFIX}/usr"
-		--with-wcs="${EPREFIX}/usr"
-		--with-fftw="${EPREFIX}/usr"
-		$(use_enable doc maintainer-mode)
-		$(use_enable threads)
-	)
-	if use gasgano; then
-		myeconfargs+=(
-			--enable-gasgano
-			--with-gasgano="${EPREFIX}/usr"
-			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
-			--with-java="$(java-config -O)"
-		)
-	else
-		myeconfargs+=( --disable-gasgano )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo html)
-}
-
-src_install() {
-	autotools-utils_src_install all $(use doc && echo install-html)
-}
diff --git a/sci-astronomy/cpl/cpl-6.4.ebuild b/sci-astronomy/cpl/cpl-6.4.ebuild
deleted file mode 100644
index d714c53386ef..000000000000
--- a/sci-astronomy/cpl/cpl-6.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
-
-JAVA_PKG_OPT_USE=gasgano
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils java-pkg-opt-2 autotools-utils
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gasgano static-libs threads"
-
-RDEPEND="
-	>=sci-astronomy/wcslib-4.8.4
-	>=sci-libs/cfitsio-3.310
-	>=sci-libs/fftw-3.1.2
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
-	"${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
-)
-
-src_prepare() {
-	# bug 422455 and remove cpu chcking
-	sed -i \
-		-e '/AM_C_PROTOTYPES/d' \
-		-e '/CPL_CHECK_CPU/d' \
-		configure.ac libcext/configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-ltdl-install
-		--without-included-ltdl
-		--with-cfitsio="${EPREFIX}/usr"
-		--with-wcs="${EPREFIX}/usr"
-		--with-fftw="${EPREFIX}/usr"
-		$(use_enable doc maintainer-mode)
-		$(use_enable threads)
-	)
-	if use gasgano; then
-		myeconfargs+=(
-			--enable-gasgano
-			--with-gasgano="${EPREFIX}/usr"
-			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
-			--with-java="$(java-config -O)"
-		)
-	else
-		myeconfargs+=( --disable-gasgano )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo html)
-}
-
-src_install() {
-	autotools-utils_src_install all $(use doc && echo install-html)
-}
diff --git a/sci-astronomy/cpl/cpl-6.6.1.ebuild b/sci-astronomy/cpl/cpl-6.6.1.ebuild
new file mode 100644
index 000000000000..6fbc159b10d0
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-6.6.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_OPT_USE=gasgano
+
+inherit autotools java-pkg-opt-2
+
+DESCRIPTION="ESO common pipeline library for astronomical data reduction"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gasgano static-libs threads"
+
+RDEPEND="
+	sci-astronomy/wcslib:0=
+	sci-libs/cfitsio:0=
+	sci-libs/fftw:3.0=
+	gasgano? ( sci-astronomy/gasgano )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.1-use-system-ltdl.patch
+)
+
+src_prepare() {
+	default
+	# remove cpu chcking
+	sed -e '/CPL_CHECK_CPU/d' \
+		-i configure.ac libcext/configure.ac || die
+	# search for shared libs, not static
+	sed -e 's/\.a/\.so/g' \
+		-i m4/cpl.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		--disable-ltdl-install
+		--without-included-ltdl
+		--with-cfitsio="${EPREFIX}/usr"
+		--with-wcs="${EPREFIX}/usr"
+		--with-fftw="${EPREFIX}/usr"
+		$(use_enable doc maintainer-mode)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+	)
+	if use gasgano; then
+		myeconfargs+=(
+			--enable-gasgano
+			--with-gasgano="${EPREFIX}/usr"
+			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
+			--with-java="$(java-config -O)"
+		)
+	else
+		myeconfargs+=( --disable-gasgano )
+	fi
+	econf ${myeconfargs[@]}
+}
+
+src_compile() {
+	default
+	use doc && emake html
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+	use doc && emake install-html
+}
diff --git a/sci-astronomy/cpl/files/cpl-6.6.1-use-system-ltdl.patch b/sci-astronomy/cpl/files/cpl-6.6.1-use-system-ltdl.patch
new file mode 100644
index 000000000000..37ef2b550eda
--- /dev/null
+++ b/sci-astronomy/cpl/files/cpl-6.6.1-use-system-ltdl.patch
@@ -0,0 +1,41 @@
+use system libtdl from libtool instead of bundled one
+see http://www.flameeyes.eu/autotools-mythbuster/libtool/plugins.html
+bicatali@gentoo.org
+
+--- cpl-7.0.orig/configure.ac	2012-06-04 18:38:01.000000000 +0100
++++ cpl-7.0/configure.ac	2012-06-04 22:14:23.000000000 +0100
+@@ -60,8 +60,9 @@
+ AC_ENABLE_STATIC(yes)
+ AC_ENABLE_SHARED(yes)
+ 
+-AC_LIBLTDL_CONVENIENCE
+-AC_PROG_LIBTOOL
++LT_INIT([dlopen])
++LT_CONFIG_LTDL_DIR([libltdl])
++AC_LIB_LTDL
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+ AC_SUBST(LIBTOOL_DEPS)
+@@ -131,7 +135,6 @@
+ CPL_CONFIG_FUNC
+ 
+ # Configure subpackages
+-AC_CONFIG_SUBDIRS(libltdl)
+ 
+ if test ! x$"cpl_cv_with_system_cext" = xyes; then
+         AC_CONFIG_SUBDIRS([libcext])
+--- cpl-7.0.orig/Makefile.am
++++ cpl-7.0/Makefile.am
+@@ -25,11 +25,10 @@
+ DISTCLEANFILES = *~
+ 
+ if GASGANO_SUPPORT
+-libltdl = libltdl
+ cpljava = cpljava
+ endif
+ 
+-SUBDIRS = $(libltdl) $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
++SUBDIRS = $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
+ 
+ HTML_SUBDIRS = 
+ 
diff --git a/sci-astronomy/ds9-bin/Manifest b/sci-astronomy/ds9-bin/Manifest
index 92356f55d034..e92ba63261fe 100644
--- a/sci-astronomy/ds9-bin/Manifest
+++ b/sci-astronomy/ds9-bin/Manifest
@@ -1,5 +1,5 @@
-DIST ds9.linux.7.1.tar.gz 11894986 SHA256 0f5db29ef4978e20452f89e11445a83990f3fb5a4739efda16b182d801925d0d SHA512 3061e4d9ae706a514fe3e9b72bf94113fee9ae3ad4a98355d4b03d0c6fb47b355c14f214875e133f83674cd6ecefd22549251a4480bce4f25fd617c6770b1cc5 WHIRLPOOL 999d0fb66e5215058f5af169c500ca8b36476ded870c3d5b998d39152f22b41bd3a0c73cfbd1aeb61fcb4204c974eb7a04ce96e99befbc16ba431fc6de672016
 DIST ds9.linux.7.2.tar.gz 11947450 SHA256 a8adbc5cca40700210ed86b53d8aa9eae2fbb29f7a8bd2a2a04b086a091724d8 SHA512 e85029625d981b2a3152dc61fab0ac11ac1bafd64705efc9788a4c3cffb14ddfe1e24635e6e38d0ba26643aa8e5e2f0290f2ecef8949f9eb4065e53af802de85 WHIRLPOOL 0d34d3d8fc17ce9310cbe18830f21cb99ea9a2d8c11fc7b9f94c4fc83e7cd7ada638794e8f632f831498242fe3917981450f653e236ca3c3c7fe8b9186ec05f9
-DIST ds9.linux64.7.1.tar.gz 12450619 SHA256 6c53df6231b1f28ce68e5dbe91c58f8d600466981d9daa8435d5eed1dc460b76 SHA512 992cce4c9f15216a6410674d93fd9f8a2d450b1d8dc66c45fcc6db14941c50619d42c4980e164495043c95f95358feed05c645a9e2fab4d35b21bf3afee1934e WHIRLPOOL 2ae5df35e12197632eaa8118c2e3b4240312e570eb9464bd6d5d02ad5b0a8584fd67f121a9d4157599cca83deaa302ecc6f36850e47c79596dadb31729083ac6
+DIST ds9.linux.7.4.tar.gz 12066575 SHA256 04c454eb6a3bf3cfcfef5ea078d2c99fac1833c0e391ce4a9b0eb76fe88cb6f7 SHA512 f56b6ca4ff67cd7163bba300500e1fa55a58185a09c0e41a33fd8f33f8aa393e07e58cb1bd48c39f558f0038180ee38129f3ad421743cdadddc3115f00c0cf64 WHIRLPOOL 35cc5269e2c793fb2eb56a6449603976597ab5164fd356ce5540501f201b3844a8dc845444db62eb8bf36a761ebc54a5e9cb065041ec79ca5d82cc3dc34c6155
 DIST ds9.linux64.7.2.tar.gz 12683459 SHA256 34b01e1b25673d15e8ec01c05ce629cc2699fe4b9ec071c7ef95e82f5f5594e4 SHA512 af9368d05e94ab43dff9dcc0c791333ccd7865e7666238c46cb216176caeb12188363b45380c97af0cef0d1802ea26acdda7f1562dc168536dd9ddac6d7ebb97 WHIRLPOOL 42a58b7a764946b35e4133bf2b83e091fe20bb13a968efb0d18ef5d3b09f0c39a6fd80266e3f9623317536309736fcd9857edfd43b0f2509486963ea47b9262a
+DIST ds9.linux64.7.4.tar.gz 12555299 SHA256 55b0c6a3d1e8957b2abd007ef90378ce426a715aa033b47b576e907748924500 SHA512 dee66842b088881cee7dfcacb3cb220a71ef70ca3258afbe7ce7911a930c274fe5fc09487c4e54d2855179c80d940bf2e57a9b8a59ea0909ccc3213c92d81a65 WHIRLPOOL c7cc55f7f9ca1b54f81e38cf59f2fb674fb78d7110e165fbed13bc011623fcf22866a9082015e1e33c09ce9c6f513e608a7001b719a8d26977db92d5046c0a82
 DIST ds9.png.tar 10240 SHA256 a1a7c64b3de0374e04e06e7d7154d110bb518a6f5f95fd46e0a5a85ed5e1aa71 SHA512 c7d52733c63adcac00de652ac4be7a19e7a6497cf24cc6f7f78f0a9583cc94ce9c81e567af3c34f9124e15ee089abbd735c49b6cf8f2dcf6ea3cce6ed2c7302f WHIRLPOOL 055f4acf36c9e7994d7d17e3b151d65da1790a53a5d12d20714a942c7718a02e0aff138040c3566581a82023a4fd51870744ff82edf4eeeaefdc062927a099f6
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.1.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.1.ebuild
deleted file mode 100644
index b49c0fcf1ae2..000000000000
--- a/sci-astronomy/ds9-bin/ds9-bin-7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Data visualization application for astronomical FITS images"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/ds9.png.tar
-	amd64? ( http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.${PV}.tar.gz )
-	x86? ( http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/xpa"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_PRESTRIPPED="usr/bin/ds9"
-QA_PREBUILT="usr/bin/ds9"
-
-src_install () {
-	dobin ds9
-	doicon ds9.png
-	make_desktop_entry ds9 "SAOImage DS9" ds9
-}
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild
new file mode 100644
index 000000000000..7dbfbb558fe2
--- /dev/null
+++ b/sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Data visualization application for astronomical FITS images"
+HOMEPAGE="http://ds9.si.edu/site/Home.html"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/ds9.png.tar
+	amd64? ( http://ds9.si.edu/download/linux64/ds9.linux64.${PV}.tar.gz )
+	x86? ( http://hea-www.harvard.edu/RD/ds9/download/linux/ds9.linux.${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/xpa"
+
+DEPEND=""
+S="${WORKDIR}"
+
+QA_PRESTRIPPED="usr/bin/ds9"
+QA_PREBUILT="usr/bin/ds9"
+
+src_install () {
+	dobin ds9
+	doicon ds9.png
+	make_desktop_entry ds9 "SAOImage DS9" ds9
+}
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index 35d10e631736..556e7a14e31f 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,2 +1,2 @@
 DIST esorex-3.10.2.tar.gz 817875 SHA256 9a295754452b3e84fe2bc3674aaaf2e93354d2ad16781cb3f4c3f37ca0214e1e SHA512 6f6f663bd74d61f3612a13fb39e17c984f8ed88d9dd175951b385d9797433b19a6e276841b23b61881cec8702eb8d74061549a922acf939a9a5e98c8016d1ecb WHIRLPOOL cb900ecad2067498c9865cfbd3db4d80f0f2907ea18e8eb3ab5d07aaea2a184520a480ad62cf591a30abbe51023f8f8384139ca67fdd05d3a35cde837f730967
-DIST esorex-3.10.tar.gz 817307 SHA256 72ff1d26a45d7e926b1f4f74f1f286c8feb142dba7b0b5bb717c6286644f9494 SHA512 985a906418488fec46fc939bf64b40330ae829771860a36a40240b703f6f6f89f3da6701ee4ceb8c6d2c0b478004596dce4dbc11389937e75ef02d9ecb4c3d16 WHIRLPOOL ef368d35f5145b5626c88d6d4af7249889cce1ef901c67318d1f06f9baa7a0411c87917969261c0a268a06e5fd0dafd30701f49394cb82671f8c9ce282bc4768
+DIST esorex-3.12.tar.gz 649290 SHA256 b99a11a93942543fd6c4e96975fa9f45e0e2c36412093c1be6ac37e545f1fd50 SHA512 02547d44cf93c570b2be6f429215efee95a2ef91a26b45fd0a5bfea3ec00837e04972f801c3c00a892eb8bb24b2e3aa8a854b4093844cfae0aed3bf0f396eac6 WHIRLPOOL 8c22a6afb7bd8ccabc5e6bc2b42bb414a4a0a0dada41c15686949e20d2bbdc5f473107221ecb5222b4b5d06db42af786d812a861076c93743612bca05ee5833f
diff --git a/sci-astronomy/esorex/esorex-3.10-r2.ebuild b/sci-astronomy/esorex/esorex-3.10-r2.ebuild
deleted file mode 100644
index 4a159be9b90c..000000000000
--- a/sci-astronomy/esorex/esorex-3.10-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AT_NO_RECURSIVE=1
-
-inherit autotools-utils
-
-DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=sci-astronomy/cpl-6.3:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
-	"${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
-	"${FILESDIR}"/${PN}-3.10-fix-autotools.patch
-	"${FILESDIR}"/${PN}-3.10-generate-manpage.patch
-	"${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
-	"${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
-	"${FILESDIR}"/${PN}-3.10-cpl60_compat.patch
-)
-
-export CPLDIR="${EPREFIX}/usr"
-
-src_install() {
-	autotools-utils_src_install
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-astronomy/esorex/esorex-3.12.ebuild b/sci-astronomy/esorex/esorex-3.12.ebuild
new file mode 100644
index 000000000000..8c718315b1d0
--- /dev/null
+++ b/sci-astronomy/esorex/esorex-3.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=sci-astronomy/cpl-6.3:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
+	"${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
+	"${FILESDIR}"/${PN}-3.10-generate-manpage.patch
+	"${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
+	"${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
+)
+
+export CPLDIR="${EPREFIX}/usr"
+
+src_prepare() {
+	default
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_install() {
+	default
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-astronomy/gasgano/Manifest b/sci-astronomy/gasgano/Manifest
index 25330f65aee9..f0ccf9cecf7b 100644
--- a/sci-astronomy/gasgano/Manifest
+++ b/sci-astronomy/gasgano/Manifest
@@ -1,3 +1,3 @@
 DIST VLT-PRO-ESO-19000-1932-V4.pdf 818369 SHA256 d370d6a57bed3cb7e47bb322e4cde5e314d37c6110e5370ea3099d241355ed68 SHA512 272da18caee1bb1b5228df76a7f09411120be39a4b421b79d48e0bfc09972f250322a718bf380d7a83c3a528151260139efdcd8d2482c6a36ad45d727d93cce1 WHIRLPOOL f13320ab0beaf5302eab56882ba7a8185543254e05cd1dada10a2fbc1652f45f74a20f326e703d9837d9abdee7499dbdfb7bdf1bd963f84937c6c24c3823b3f3
-DIST gasgano-2.4.3.tar.gz 4985401 SHA256 d7873fb7b5429a8711e10c080f0377b8aa10600c700ac8b6c3023c5f808e5fe5 SHA512 1376bbd75754fbb68353c67da73f25a22e6af6a83be1ac5f263743eacaf9339b853e2b17e52580c1a3434e8d60a9a4bcbf8136d492fd722e554f2d81a5199c2c WHIRLPOOL 249a322a39924c7dea1a41ffcd441eafd0cf159e630c4cce715d9dd868705994c07340d3c3603b80dc2d80a1e870560450e65d5366477f4f53cdf1bc4712990f
 DIST gasgano-2.4.5.tar.gz 8676773 SHA256 0ef5ca420b0e9e1f29df001d34a832746f58d77da7790f2da767457df12d816d SHA512 fab93f5240808129d432000ea47c3d3b9b0520c43baea2858459a4e9e6cbe75deb8df73199d716c62b71a11147844f09ea89a065b467ae1086d6f3fe41cdc53d WHIRLPOOL 69d76b68f5adf80a368bff13eb3bcbd8e76b54990695743bc62481ffd64513b1e9f169f4c3e167ae30e387fad578f00e5e9142b6c06d92a58d854d1ccad13ca8
+DIST gasgano-2.4.8.tar.gz 9211627 SHA256 437a5d276123c8b5441d295004f89455f11cff8d62774c70e377dabf75dec13f SHA512 94fbc9721077b15d2ec06e296d1503a0e33cb845c831a4102740b84d600bc900324ec5293b9a977df0956bd02cd5adf9cc62989be860417e8014e97ead41967c WHIRLPOOL fbbd776a8adc5fa4079369c75bef4b90d04320685e5ae5495581f775895bb50ff0e5f0d11075e8605c7bcf732053b87c882ef0d2ca092f0dbdb6d1c771084d0a
diff --git a/sci-astronomy/gasgano/gasgano-2.4.3-r2.ebuild b/sci-astronomy/gasgano/gasgano-2.4.3-r2.ebuild
deleted file mode 100644
index 489e2c3bc0ab..000000000000
--- a/sci-astronomy/gasgano/gasgano-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils java-pkg-2
-
-PDOC=VLT-PRO-ESO-19000-1932-V4
-
-DESCRIPTION="ESO astronomical data file organizer"
-HOMEPAGE="http://www.eso.org/sci/software/gasgano/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz
-	doc? ( ${HOMEPAGE}/${PDOC}.pdf )"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND="
-	>=virtual/jre-1.6
-	dev-java/gnu-regexp
-	dev-java/junit
-	dev-java/jal"
-
-src_prepare() {
-	sed -i \
-		-e "s:^BASE=\`pwd\`:BASE=${EPREFIX}/usr/share/${PN}:" \
-		-e 's:$BASE/share/:$BASE/lib/:g' \
-		bin/gasgano || die
-}
-
-src_install() {
-	dobin bin/*
-	java-pkg_dojar share/*.jar
-	insinto /usr/share/${PN}
-	doins -r config
-	make_desktop_entry gasgano "Gasgano FITS Organizer"
-	use doc && newdoc "${DISTDIR}"/${PDOC}.pdf user-manual.pdf
-}
diff --git a/sci-astronomy/gasgano/gasgano-2.4.8.ebuild b/sci-astronomy/gasgano/gasgano-2.4.8.ebuild
new file mode 100644
index 000000000000..dff09aaae6c1
--- /dev/null
+++ b/sci-astronomy/gasgano/gasgano-2.4.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils java-pkg-2
+
+PDOC=VLT-PRO-ESO-19000-1932-V4
+
+DESCRIPTION="ESO astronomical data file organizer"
+HOMEPAGE="http://www.eso.org/sci/software/gasgano/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz
+	doc? ( ${HOMEPAGE}/${PDOC}.pdf )"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND="
+	>=virtual/jre-1.7
+	dev-java/gnu-regexp
+	dev-java/junit
+	dev-java/jal"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:^BASE=\`pwd\`:BASE=${EPREFIX}/usr/share/${PN}:" \
+		-e 's:$BASE/share/:$BASE/lib/:g' \
+		bin/gasgano || die
+}
+
+src_install() {
+	dobin bin/*
+	java-pkg_dojar share/*.jar
+	insinto /usr/share/${PN}
+	doins -r config
+	make_desktop_entry gasgano "Gasgano FITS Organizer"
+	use doc && newdoc "${DISTDIR}"/${PDOC}.pdf user-manual.pdf
+}
diff --git a/sci-astronomy/stiff/Manifest b/sci-astronomy/stiff/Manifest
index 223909631733..fd1d10692904 100644
--- a/sci-astronomy/stiff/Manifest
+++ b/sci-astronomy/stiff/Manifest
@@ -1 +1 @@
-DIST stiff-2.1.3.tar.gz 1043999 SHA256 64ad8aa64cb82c4d96cfa54335016260a6f264d9b7cdaf175a247476233e8aad SHA512 f5b9d4c1fb3db68d8422b357f0005e188259d021977dfa777ec999356e0f73d083cc9e04ffd16655582883d2b7dd38f7888006f086d12412ce13a9c5084a7359 WHIRLPOOL 97436148dadb5237a91d817b9040c5eb67857eea63a3f7728fa24588354861418c150a16b27385db973166e8bb86cf39fd273116c043b2b1a9c57bc78b5162a1
+DIST stiff-2.4.0.tar.gz 1074161 SHA256 f4e85146c17fe8dcf160d12dc6df08bbd9212bb8444162b2e6ebf03f7513a992 SHA512 c8a293a2d1771b21d8af1194f9a2f582eca1a363964e76b78319c9cc2407332ef5e31dc74c0d10b9d5c7b6ae18ebd35ee59c53ad31c5f3966fabcd03948cadf6 WHIRLPOOL aa3b0d4ee6e2fc7d1fd90d19c815985ddb520c3fe37da6ec7c631675f5277b1d75b72a776a64631beedc57b934899c86eebbdc0b7c54925eb153cff65146e805
diff --git a/sci-astronomy/stiff/files/stiff-configure.patch b/sci-astronomy/stiff/files/stiff-configure.patch
deleted file mode 100644
index 15b8d9aa3010..000000000000
--- a/sci-astronomy/stiff/files/stiff-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure.ac.orig	2009-03-10 12:34:36.000000000 +0000
-+++ configure.ac	2009-07-28 17:26:22.000000000 +0100
-@@ -21,40 +21,14 @@
- 
- # Include macros
- #sinclude(acx_pthread.m4)
--sinclude(acx_prog_cc_optim.m4)
- 
- # Display pakage and version number
- AC_MSG_RESULT([*********** Configuring:  $PACKAGE $VERSION ($date) **********])
- 
--# Initialize the list of compilers to consider
--cclist="cc gcc"
--
--# Backup and reset the input CFLAGS and LDFLAGS
--mycflags="$CFLAGS"
--CFLAGS=""
--myldflags="$LDFLAGS"
--LDFLAGS=""
--
--# Provide special option for the Linux Intel C compiler
--AC_MSG_CHECKING([for Linux Intel C compiler mode])
--AC_ARG_ENABLE(icc,
--	[AC_HELP_STRING([--enable-icc],
--	[Enable special mode for compilation with the Intel compiler \
--(off by default)])],
--        use_icc="yes"
--        cclist="icc $cclist"
--	AC_MSG_RESULT([yes]),
--        use_icc="no"
--	AC_MSG_RESULT([no]))
--
--# Checks for programs.
--# GCC is chosen last because it is likely to yield less optimized code
--AC_PROG_CC([$cclist])
- # C Compiler: Check that it is ANSI C
- AM_PROG_CC_STDC
- # C Compiler: Check that it is POSIX-compliant
- AC_ISC_POSIX
--ACX_PROG_CC_OPTIM
- AC_PROG_AWK
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-@@ -107,19 +81,9 @@
- 
- # Link with gprof option
- if test "$use_gprof" = "yes"; then
--  if test "$use_icc" = "yes"; then
--    CFLAGS="$CFLAGS -pq"
--  else
--    CFLAGS="$CFLAGS -pg"
--  fi
-   use_static="no"
- fi
- 
--# Static linking option
--if test "$use_static" = "yes"; then
--  LDFLAGS="-static -shared-libgcc $LDFLAGS"
--fi
--
- # Override automatic CFLAGS and LDFLAGS with those of user
- #if test -n "$mycflags"; then
- #CFLAGS="$mycflags"
diff --git a/sci-astronomy/stiff/stiff-2.1.3.ebuild b/sci-astronomy/stiff/stiff-2.1.3.ebuild
deleted file mode 100644
index 4aecbf3fa5e8..000000000000
--- a/sci-astronomy/stiff/stiff-2.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Converts astronomical FITS images to the TIFF format"
-HOMEPAGE="http://www.astromatic.net/software/stiff"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc threads"
-
-RDEPEND="media-libs/tiff
-	virtual/jpeg
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable threads)
-}
-
-src_install () {
-	default
-	use doc && dodoc doc/*
-}
diff --git a/sci-astronomy/stiff/stiff-2.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0.ebuild
new file mode 100644
index 000000000000..195aa2fe5837
--- /dev/null
+++ b/sci-astronomy/stiff/stiff-2.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Converts astronomical FITS images to the TIFF format"
+HOMEPAGE="http://www.astronomatic.net/software/stiff"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc threads"
+
+RDEPEND="
+	media-libs/tiff:0=
+	virtual/jpeg:0
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable threads)
+}
+
+src_install () {
+	default
+	use doc && dodoc doc/stiff.pdf
+}
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 43af518dc698..c70ed802fb5f 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,4 +1,2 @@
-DIST wcslib-4.21.tar.bz2 1865628 SHA256 530eb67e432ce0d881f91e9b08734a346a98cee06233433da79ad0c7d5f144ae SHA512 0fdd7b6cb234565e2dc3b619ec219918103c7a14916294004c12c709be803b10f064fa01c9647a46d2588d4f880ed7db6e65758b510d1a556b3b46f7bc836cdd WHIRLPOOL daaa3ba60cab0aac0619d317ea338f8d734a6d924c49d806a509560e6cd89a896f4594d48e760997d1289d2639c6a81b8802f65a2d95a3cd82efa533476a354a
-DIST wcslib-4.22.tar.bz2 1866676 SHA256 afafdf772cb0fe97ae886cbf512fb114d842ca358cce7df9fa93449d1b556950 SHA512 9288314d842a9b54536b5f512900933e2ac307ef81003172fa511c8334f430161f28084309cde7ad2d94d39020eacec33cf8944d30d78abb51f3e7ff01be2bc4 WHIRLPOOL 629bbca2672d0d9ac03696deadfcea155c912c14ef115defac48966c41714ae692fe5cd60587a733ce691612bea9f48d212587dd0a2327739839328b90eae399
-DIST wcslib-4.23.tar.bz2 1876150 SHA256 baf0fc85fb290e8a575eab4b7046517818a12754a0f01da74db9483467dde5a2 SHA512 cc82818b1aa88d325b72c5a7967b688060c9d0bfd6ba4fef39c0e9dab00bab547282b1c301dafb1331156c69e6266ef80c39f0dc44b894a977d2b2b3cafb9c87 WHIRLPOOL 90ca6e91511371c4e791b7e31b395a6cfda29d1f613176282960896170651b7d5ca7b215254befab1021b18e03e283a88820a248c9c4e6e07edef1bed3adca03
 DIST wcslib-4.25.1.tar.bz2 2027340 SHA256 1e5127513c2f402a30daa280f5b4f6da53e73484cbc8085868bc432f807c8495 SHA512 0ed9eeb4b84d2f022394a1ccd04db8a62cb4593d43c5c12e0034f27a12d52cc8c8bf4b14f5d30f71e933682809e3dac5377be1c69bfc6321f6d96b91f6f1da3c WHIRLPOOL 75785c8687cfad92ba6d33444757005c13346188a46913b38afb66997676bae5284e27ccd7f348e88a9d14b6c27d522a06d37e744a5a258e76ef3ed73cefb262
+DIST wcslib-5.14.tar.bz2 2221717 SHA256 4d3f12d2636bb75488eaaa3ed435d7664d2c26a73a67ac1f7d5f3e530f39e37f SHA512 431693cffcc7a9f2b29040a34f7dbac2f3360b094a42467f7378523c15260ffb3c0ad330e07077a40bf694956fae2371550d6583580f0bcc16ec47f9fbc5bc28 WHIRLPOOL 2acf5040b4960c001b7076189c1da4dd6b327257295dcdfa8a89d553a93f0980b0e62d66aec244a9cc8af70cc62b0497362839f26bb6cc6517e219ba55b73e93
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index a59976236bf8..f74e78465e2d 100644
--- a/sci-astronomy/wcslib/metadata.xml
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -19,5 +19,8 @@
     <flag name="pgplot">
     Builds PGBSOX routines, needs <pkg>sci-libs/pgplot</pkg> library
   </flag>
+    <flag name="tools">
+    Builds and installs extra command line utilities for WCS checking
+  </flag>
   </use>
 </pkgmetadata>
diff --git a/sci-astronomy/wcslib/wcslib-4.21.ebuild b/sci-astronomy/wcslib/wcslib-4.21.ebuild
deleted file mode 100644
index f8d333a25e19..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.21.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
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0/4"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran fits pgplot static-libs"
-
-RDEPEND="
-	fits? ( sci-libs/cfitsio:0= )
-	pgplot? ( sci-libs/pgplot:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/COPYING\*//' GNUmakefile || die
-}
-
-src_configure() {
-	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable static-libs static)
-		$(use_enable fortran)
-	)
-	# hacks because cfitsio and pgplot directories are hard-coded
-	if use fits; then
-		myconf+=(
-			--with-cfitsioinc="${EPREFIX}/usr/include"
-			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-cfitsio )
-	fi
-	if use pgplot; then
-		myconf+=(
-			--with-pgplotinc="${EPREFIX}/usr/include"
-			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-pgplot )
-	fi
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	# nasty makefile, debugging means full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install () {
-	default
-	# static libs are same as shared (compiled with PIC)
-	# so they are not compiled twice
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	use doc || rm -r \
-		"${ED}"/usr/share/doc/${PF}/html \
-		"${ED}"/usr/share/doc/${PF}/*.pdf
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.22.ebuild b/sci-astronomy/wcslib/wcslib-4.22.ebuild
deleted file mode 100644
index 3b29c1c5ba8c..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.22.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
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0/4"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran fits pgplot static-libs"
-
-RDEPEND="
-	fits? ( sci-libs/cfitsio:0= )
-	pgplot? ( sci-libs/pgplot:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/COPYING\*//' GNUmakefile || die
-}
-
-src_configure() {
-	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable static-libs static)
-		$(use_enable fortran)
-	)
-	# hacks because cfitsio and pgplot directories are hard-coded
-	if use fits; then
-		myconf+=(
-			--with-cfitsioinc="${EPREFIX}/usr/include"
-			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-cfitsio )
-	fi
-	if use pgplot; then
-		myconf+=(
-			--with-pgplotinc="${EPREFIX}/usr/include"
-			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-pgplot )
-	fi
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	# nasty makefile, debugging means probably full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install () {
-	default
-	# static libs are same as shared (compiled with PIC)
-	# so they are not compiled twice
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	use doc || rm -r \
-		"${ED}"/usr/share/doc/${PF}/html \
-		"${ED}"/usr/share/doc/${PF}/*.pdf
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.23.ebuild b/sci-astronomy/wcslib/wcslib-4.23.ebuild
deleted file mode 100644
index 3b29c1c5ba8c..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.23.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
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0/4"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran fits pgplot static-libs"
-
-RDEPEND="
-	fits? ( sci-libs/cfitsio:0= )
-	pgplot? ( sci-libs/pgplot:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/COPYING\*//' GNUmakefile || die
-}
-
-src_configure() {
-	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable static-libs static)
-		$(use_enable fortran)
-	)
-	# hacks because cfitsio and pgplot directories are hard-coded
-	if use fits; then
-		myconf+=(
-			--with-cfitsioinc="${EPREFIX}/usr/include"
-			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-cfitsio )
-	fi
-	if use pgplot; then
-		myconf+=(
-			--with-pgplotinc="${EPREFIX}/usr/include"
-			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-pgplot )
-	fi
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	# nasty makefile, debugging means probably full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install () {
-	default
-	# static libs are same as shared (compiled with PIC)
-	# so they are not compiled twice
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	use doc || rm -r \
-		"${ED}"/usr/share/doc/${PF}/html \
-		"${ED}"/usr/share/doc/${PF}/*.pdf
-}
diff --git a/sci-astronomy/wcslib/wcslib-5.14.ebuild b/sci-astronomy/wcslib/wcslib-5.14.ebuild
new file mode 100644
index 000000000000..e05fe6f96880
--- /dev/null
+++ b/sci-astronomy/wcslib/wcslib-5.14.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2
+
+DESCRIPTION="Astronomical World Coordinate System transformations library"
+HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
+SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
+
+SLOT="0/5"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran fits pgplot static-libs +tools"
+
+RDEPEND="
+	fits? ( sci-libs/cfitsio:0= )
+	pgplot? ( sci-libs/pgplot:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable fortran)
+		$(use_enable tools utils)
+	)
+	# hacks because cfitsio and pgplot directories are hard-coded
+	if use fits; then
+		myconf+=(
+			--with-cfitsioinc="${EPREFIX}/usr/include"
+			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		myconf+=( --without-cfitsio )
+	fi
+	if use pgplot; then
+		myconf+=(
+			--with-pgplotinc="${EPREFIX}/usr/include"
+			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		myconf+=( --without-pgplot )
+	fi
+	econf ${myconf[@]}
+	sed -i -e 's/COPYING\*//' GNUmakefile || die
+}
+
+src_compile() {
+	# nasty makefile, debugging means probably full rewrite
+	emake -j1
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install () {
+	default
+	# static libs share the same symbols as shared (i.e. compiled with PIC)
+	# so they are not compiled twice
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
+	use doc || rm -r \
+		"${ED}"/usr/share/doc/${PF}/html \
+		"${ED}"/usr/share/doc/${PF}/*.pdf
+}
diff --git a/sci-astronomy/wcstools/Manifest b/sci-astronomy/wcstools/Manifest
index f2f342485a1c..3eaca9b180e8 100644
--- a/sci-astronomy/wcstools/Manifest
+++ b/sci-astronomy/wcstools/Manifest
@@ -1 +1,2 @@
 DIST wcstools-3.8.7.tar.gz 961222 SHA256 8e4140fc6d691a0555d5aaa41dbe0253c2edc5775f4a8eebc9667933091b1c28 SHA512 f076c31dd64dad0bda77ec5ae2483035617b69378cfdcf286084c83677c7cb35788769de62f17459e65198107ce534fdee3e38403dd6a44f9881a7631f107187 WHIRLPOOL ca73eeba30c378a3a25621a9371d24683dd3933821cbaf4d5a445e72c63d3ac60af93ca69933f9ec9747b404d67658fdfdcf99f0713357acaa223ffd29c03204
+DIST wcstools-3.9.2.tar.gz 8523655 SHA256 481fe357cf755426fb8e25f4f890e827cce5de657a4e5044d4e31ce27bef1c8b SHA512 b9030cdcaf3f87ab761362a2b8c4a76557694ec4e683371a05e8d58823179d320a2859e883c4ca2c3d65d5adb70ad1ac859587f4c210cd315ced26288fbe107a WHIRLPOOL 257e54e5c545a0584c9ff52f2e3298db73f7d1b4e8d71e0621db18aed8f138dbb0093773883351cbb56ea8a35998ec3b0a2b8e7fc5334dc8d2ebb1c3c4410af4
diff --git a/sci-astronomy/wcstools/files/Makefile.am b/sci-astronomy/wcstools/files/Makefile.am
new file mode 100644
index 000000000000..46abf6d39ae0
--- /dev/null
+++ b/sci-astronomy/wcstools/files/Makefile.am
@@ -0,0 +1,73 @@
+SUBDIRS = libwcs
+INCLUDES = -I$(top_srcdir)/libwcs
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = wcstools.pc
+
+bin_SCRIPTS = wcstools
+
+EXTRA_DIST = wcstools COPYING Readme NEWS Programs
+
+bin_PROGRAMS = \
+	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
+	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
+	keyhead skycoor subpix xy2sky wcshead conpix gettab newfits getfits \
+	imstack imextract sumpix wcsremap getcol wcsgetdate imfill imsmooth imresize \
+	fileroot filename filext char2sp sp2char wcscrlf isnum isrange isfits \
+	isfile simpos bincat
+
+# these ones don't need libwcs
+wcscrlf_SOURCES = crlf.c
+filename_SOURCES = filename.c
+filedir_SOURCES = filedir.c
+fileroot_SOURCES = fileroot.c
+filext_SOURCES = filext.c
+isrange_SOURCES = isrange.c
+
+LDADD = $(top_builddir)/libwcs/libwcstools.la
+
+bincat_SOURCES = bincat.c
+getcol_SOURCES = getcol.c
+wcsgetdate_SOURCES = getdate.c
+gethead_SOURCES = gethead.c
+getfits_SOURCES = getfits.c
+getpix_SOURCES = getpix.c
+gettab_SOURCES = gettab.c
+imcat_SOURCES = imcat.c
+imsize_SOURCES = imsize.c
+imstar_SOURCES = imstar.c
+imwcs_SOURCES = imwcs.c
+immatch_SOURCES = immatch.c
+scat_SOURCES = scat.c
+setpix_SOURCES = setpix.c
+skycoor_SOURCES = skycoor.c
+sumpix_SOURCES = sumpix.c
+xy2sky_SOURCES = xy2sky.c
+simpos_SOURCES = simpos.c
+
+addpix_SOURCES = addpix.c
+char2sp_SOURCES = char2sp.c
+conpix_SOURCES = conpix.c
+cphead_SOURCES = cphead.c
+delwcs_SOURCES = delwcs.c
+delhead_SOURCES = delhead.c
+edhead_SOURCES = edhead.c
+fixpix_SOURCES = fixpix.c
+i2f_SOURCES = i2f.c
+imfill_SOURCES = imfill.c
+imresize_SOURCES = imresize.c
+imsmooth_SOURCES = imsmooth.c
+imhead_SOURCES = imhead.c
+imrot_SOURCES = imrot.c
+imstack_SOURCES = imstack.c
+imextract_SOURCES = imextract.c
+isfile_SOURCES = isfile.c
+isnum_SOURCES = isnum.c
+keyhead_SOURCES = keyhead.c
+newfits_SOURCES = newfits.c
+wcsremap_SOURCES = remap.c
+sethead_SOURCES = sethead.c
+sky2xy_SOURCES = sky2xy.c
+sp2char_SOURCES = sp2char.c
+subpix_SOURCES = subpix.c
+wcshead_SOURCES = wcshead.c
diff --git a/sci-astronomy/wcstools/files/Makefile.libwcs.am b/sci-astronomy/wcstools/files/Makefile.libwcs.am
new file mode 100644
index 000000000000..5905aa3d7955
--- /dev/null
+++ b/sci-astronomy/wcstools/files/Makefile.libwcs.am
@@ -0,0 +1,17 @@
+lib_LTLIBRARIES = libwcstools.la
+libwcstools_la_SOURCES = \
+	imsetwcs.c imgetwcs.c matchstar.c findstar.c daoread.c wcscon.c \
+	fitswcs.c wcsinit.c wcs.c ty2read.c webread.c tmcread.c \
+	gscread.c gsc2read.c ujcread.c uacread.c ubcread.c ucacread.c \
+	sdssread.c tabread.c binread.c ctgread.c actread.c catutil.c \
+	skybotread.c imrotate.c fitsfile.c imhfile.c \
+	hget.c hput.c imio.c dateutil.c imutil.c \
+	worldpos.c tnxpos.c zpxpos.c dsspos.c platepos.c \
+	sortstar.c platefit.c iget.c fileutil.c \
+	wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c poly.c
+
+wcsdir = $(includedir)/wcs
+wcs_HEADERS = \
+	wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
+
+noinst_HEADERS = fitsfile1.h wcscat1.h
diff --git a/sci-astronomy/wcstools/files/configure.ac b/sci-astronomy/wcstools/files/configure.ac
new file mode 100644
index 000000000000..3a46108cd304
--- /dev/null
+++ b/sci-astronomy/wcstools/files/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([wcstools], [3.9.x] , [http://tdc-www.harvard.edu/wcstools/])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_HEADERS([config.h])
+
+AC_PROG_CC
+LT_INIT([disable-static])
+AC_CHECK_LIB([m], [sin])
+AC_CONFIG_FILES([libwcs/Makefile Makefile wcstools.pc])
+AC_OUTPUT
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
new file mode 100644
index 000000000000..27a912f5a902
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Fix uninitialized value for haspm in RASortStars()
+ This fixes a crash with 'imstar -s'.
+--- a/libwcs/sortstar.c
++++ b/libwcs/sortstar.c
+@@ -417,6 +417,8 @@
+ 	hasnum = 1;
+     if (spra != NULL && spdec != NULL)
+ 	haspm = 1;
++    else
++	haspm = 0;
+     if (sx != NULL && sy != NULL)
+ 	hasxy = 1;
+     else
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
new file mode 100644
index 000000000000..57bb8cb99324
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix some compiler warnings.
+--- a/imcat.c
++++ b/imcat.c
+@@ -1778,7 +1778,7 @@
+ 		if (refcat == UCAC2 || refcat == UCAC3 || refcat == UCAC4) {
+ 		    nim = gc[i] / 1000;
+ 		    nct = gc[i] % 1000;
+-		    sprintf (temp, "  ni  nc", nim, nct);
++		    sprintf (temp, "  ni%i  nc%i", nim, nct);
+ 		    strcat (headline, temp);
+ 		    }
+ 		else if (gcset)
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
new file mode 100644
index 000000000000..694c0720ab93
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
@@ -0,0 +1,69 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix several bugs that appear in during the mayhem tests.
+Bug: http://bugs.debian.org/715682
+Bug: http://bugs.debian.org/715755
+Bug: http://bugs.debian.org/715905
+Bug: http://bugs.debian.org/715956
+Bug: http://bugs.debian.org/715957
+--- a/getfits.c
++++ b/getfits.c
+@@ -108,6 +108,7 @@
+ 		usage ("Right ascension given but no declination");
+ 	    else {
+ 		strcpy (rastr, *av);
++		ac--;
+ 		strcpy (decstr, *++av);
+ 		ra0 = str2ra (rastr);
+ 		dec0 = str2dec (decstr);
+--- a/getpix.c
++++ b/getpix.c
+@@ -83,6 +83,7 @@
+     char *crange;       /* Column range string */
+     char *rstr;
+     char *dstr = NULL;
++    char rastr[32], decstr[32];
+     char *cstr;
+     int systemp;
+     int i;
+--- a/bincat.c
++++ b/bincat.c
+@@ -156,7 +156,7 @@
+ 	    if (ac < 3)
+ 		usage((char)0, "3 arguments needed for center coordinate");
+ 	    else {
+-		strcpy (rastr, *++av);
++		strcpy (rastr, *av);
+ 		ac--;
+ 		strcpy (decstr, *++av);
+ 		setcenter (rastr, decstr);
+--- a/cphead.c
++++ b/cphead.c
+@@ -137,7 +137,7 @@
+ 		    break;
+ 	
+ 		case 'w': /* Copy entire WCS */
+-		    nkwd1 = 87;
++		    nkwd1 = 236;
+ 		    if (nkwd + nkwd1 > maxnkwd) {
+ 			maxnkwd = nkwd + nkwd1 + 32;
+ 			kwdnew = (char **) calloc (maxnkwd, sizeof (void *));
+@@ -148,7 +148,7 @@
+ 			free (kwd);
+ 			kwd = kwdnew;
+ 			}
+-		    for (ikwd = nkwd; i < nkwd+nkwd1; i++) {
++		    for (ikwd = nkwd; ikwd < nkwd+nkwd1+32; ikwd++) {
+ 			kwd[ikwd] = (char *) calloc (32, 1);
+ 			}
+ 		    strcpy (kwd[nkwd], "RA");
+--- a/filext.c
++++ b/filext.c
+@@ -80,7 +80,7 @@
+ 		    ext = ext + 1;
+ 		}
+ 	    }
+-	printf ("%s\n", ext);
++	printf ("%s\n", (ext)?ext:"");
+ 	}
+ 
+     return (0);
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
new file mode 100644
index 000000000000..7c666c1277b3
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
@@ -0,0 +1,69 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Spellfixes to make lintian happy
+--- a/libwcs/fitsfile.c
++++ b/libwcs/fitsfile.c
+@@ -1583,7 +1583,7 @@
+ 	if (!access (filename, 0)) {
+ 	    fd = open (filename, O_WRONLY);
+ 	    if (fd < 3) {
+-		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writeable\n", filename);
++		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writable\n", filename);
+ 		return (0);
+ 		}
+ 	    }
+@@ -1622,7 +1622,7 @@
+ 	if (!access (filename, 0)) {
+ 	    fd = open (filename, O_WRONLY);
+ 	    if (fd < 3) {
+-		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writeable\n",
++		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writable\n",
+ 			 filename);
+ 		return (0);
+ 		}
+@@ -1884,7 +1884,7 @@
+     if (!access (filename, 0)) {
+ 	fdout = open (filename, O_WRONLY);
+ 	if (fdout < 3) {
+-	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writeable\n", filename);
++	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writable\n", filename);
+ 	    return (0);
+ 	    }
+ 	}
+@@ -1970,7 +1970,7 @@
+     if (!access (filename, 0)) {
+ 	fd = open (filename, O_WRONLY);
+ 	if (fd < 3) {
+-	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writeable\n", filename);
++	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writable\n", filename);
+ 	    return (0);
+ 	    }
+ 	}
+@@ -2072,7 +2072,7 @@
+     if (ext != NULL)
+ 	*ext = cext;
+     if (fd < 3) {
+-	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writeable\n", filename);
++	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writable\n", filename);
+ 	return (-1);
+ 	}
+ 
+--- a/libwcs/imhfile.c
++++ b/libwcs/imhfile.c
+@@ -896,7 +896,7 @@
+     if (!access (hdrname, 0)) {
+ 	fd = open (hdrname, O_WRONLY);
+ 	if (fd < 3) {
+-	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", hdrname);
++	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", hdrname);
+ 	    return (0);
+ 	    }
+ 	}
+@@ -993,7 +993,7 @@
+     if (!access (pixname, 0)) {
+ 	fd = open (pixname, O_WRONLY);
+ 	if (fd < 3) {
+-	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", pixname);
++	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", pixname);
+ 	    return (0);
+ 	    }
+ 	}
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
new file mode 100644
index 000000000000..4ec5993cb5f5
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
@@ -0,0 +1,36 @@
+Author: Ole Streicher <olebole@debian.net>
+Description: Fix overlappong buffers in sprintf
+ In sprintf, overlapping buffers lead to undefined behaviour.
+ This causes different results on Debian and Ubuntu.
+--- a/imstar.c
++++ b/imstar.c
+@@ -818,7 +818,7 @@
+ 	    sprintf (headline, "%7.2f %7.2f %6.2f  %d",
+ 		    sx[i],sy[i],smag[i],sp[i]);
+ 	    if (iswcs (wcs))
+-		sprintf (headline, "%s %s %s", headline, rastr, decstr);
++		sprintf (headline + strlen(headline), " %s %s", rastr, decstr);
+ 	    if (wfile)
+ 		fprintf (fd, "%s\n", headline);
+ 	    else
+@@ -827,14 +827,14 @@
+ 	else {
+ 	    sprintf (headline, "%3d %s %s %6.2f", i+1,rastr,decstr,smag[i]);
+ 	    if (wcs->nxpix < 100.0 && wcs->nypix > 100.0)
+-		sprintf (headline, "%s  %5.2f %5.2f %d",
+-		headline, sx[i],sy[i], sp[i]);
++		sprintf (headline + strlen(headline), "  %5.2f %5.2f %d",
++		sx[i],sy[i], sp[i]);
+ 	    else if (wcs->nxpix < 1000.0 && wcs->nypix < 1000.0)
+-		sprintf (headline, "%s  %6.2f %6.2f %d",
+-		headline, sx[i],sy[i], sp[i]);
++		sprintf (headline + strlen(headline), "  %6.2f %6.2f %d",
++		sx[i],sy[i], sp[i]);
+ 	    else
+-		sprintf (headline, "%s  %7.2f %7.2f %d",
+-		headline, sx[i],sy[i], sp[i]);
++		sprintf (headline + strlen(headline), "  %7.2f %7.2f %d",
++		sx[i],sy[i], sp[i]);
+ 	    if (wfile)
+ 		fprintf (fd, "%s\n", headline);
+ 	    else
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
new file mode 100644
index 000000000000..4ebc20609b6f
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: If a unrecoverable error occurred, abort() instead of exit()
+ to allow the user for tracing the problem.
+--- a/libwcs/poly.c
++++ b/libwcs/poly.c
+@@ -43,7 +43,7 @@
+ void	qerror(char *msg1, char *msg2)
+   {
+   fprintf(stderr, "\n> %s%s\n\n",msg1,msg2);
+-  exit(-1);
++  abort();
+   }
+ 
+ 
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
new file mode 100644
index 000000000000..f8de3da5ad01
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
@@ -0,0 +1,20 @@
+Author: Ole Streicher <olebole@debian.net>
+Description: Increase c*type and ptype field string lengths
+ This is needed to allow C1TYPE='RA---TAN-SIP'
+Bug: https://bugs.launchpad.net/ubuntu/+source/saods9/+bug/1458333
+--- a/libwcs/wcsinit.c
++++ b/libwcs/wcsinit.c
+@@ -399,11 +399,11 @@
+ 	}
+ 
+     /* World coordinate system reference coordinate information */
+-    if (hgetsc (hstring, "CTYPE1", &mchar, 16, ctype1)) {
++    if (hgetsc (hstring, "CTYPE1", &mchar, 9, ctype1)) {
+ 
+ 	/* Read second coordinate type */
+ 	strcpy (ctype2, ctype1);
+-	if (!hgetsc (hstring, "CTYPE2", &mchar, 16, ctype2))
++	if (!hgetsc (hstring, "CTYPE2", &mchar, 9, ctype2))
+ 	    twod = 0;
+ 	else
+ 	    twod = 1;
diff --git a/sci-astronomy/wcstools/files/wcstools.pc.in b/sci-astronomy/wcstools/files/wcstools.pc.in
new file mode 100644
index 000000000000..c8eb8b094a0a
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: World Coordinate System Library and Tools
+Version: @PACKAGE_VERSION@
+URL: http://tdc-www.harvard.edu/wcstools/
+Libs: -L${libdir} -lwcstools
+Libs.private: -lm
+Cflags: -I${includedir}/wcs
+
diff --git a/sci-astronomy/wcstools/wcstools-3.9.2.ebuild b/sci-astronomy/wcstools/wcstools-3.9.2.ebuild
new file mode 100644
index 000000000000..b228fed5c0b4
--- /dev/null
+++ b/sci-astronomy/wcstools/wcstools-3.9.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 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 eutils autotools-utils multilib
+
+DESCRIPTION="World Coordinate System library for astronomical FITS images"
+HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DOCS=( Readme Programs NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/wcstools-3.9.2-compiler_warnings.patch
+	"${FILESDIR}"/wcstools-3.9.2-mayhem.patch
+	"${FILESDIR}"/wcstools-3.9.2-RASortStars.patch
+	"${FILESDIR}"/wcstools-3.9.2-spelling.patch
+	"${FILESDIR}"/wcstools-3.9.2-sprintf.patch
+	"${FILESDIR}"/wcstools-3.9.2-use_abort.patch
+	"${FILESDIR}"/wcstools-3.9.2-wcsinit_crash.patch
+)
+
+src_prepare() {
+	einfo "Copying gentoo autotools files"
+	local f
+	for f in "${FILESDIR}"/{configure.ac,wcstools.pc.in,Makefile.am}; do
+		cp ${f} "${S}"/ || die
+	done
+	cp "${FILESDIR}"/Makefile.libwcs.am "${S}"/libwcs/Makefile.am || die
+	# avoid colliding with fixdos, getdate and remap from other packages
+	sed -i \
+		-e 's/getdate/wcsgetdate/' \
+		-e 's/crlf/wcscrlf/' \
+		-e 's/remap/wcsremap/' \
+		-e "s/3.... Programs/${PV} Programs/" \
+		wcstools || die
+	autotools-utils_src_prepare
+}
+
+src_test() {
+	einfo "Testing various wcstools programs"
+	./newfits -a 10 -j 248 41 -p 0.15 test.fits || die "test newfits failed"
+	./sethead test.fits A=1 B=1 ||  die "test sethead failed"
+	[[ "$(./gethead test.fits RA)" == "16:32:00.0000" ]] \
+		|| die "test gethead failed"
+	rm test.fits
+}
+
+src_install() {
+	autotools-utils_src_install
+	doman man/man1/*
+	newdoc libwcs/NEWS NEWS.libwcs
+	newdoc libwcs/Readme Readme.libwcs
+
+}
+
+pkg_postinst() {
+	elog "The following execs have been renamed to avoid colliding"
+	elog "with other packages:"
+	elog " getdate -> wcsgetdate"
+	elog " crlf    -> wcscrlf"
+	elog " remap   -> wcsremap"
+}
diff --git a/sci-biology/primer3/Manifest b/sci-biology/primer3/Manifest
index 19da14fe3f93..8bae5d075fea 100644
--- a/sci-biology/primer3/Manifest
+++ b/sci-biology/primer3/Manifest
@@ -1,2 +1,3 @@
 DIST primer3-2.3.5.tar.gz 1655871 SHA256 e0c06a36dc384f656835a8d5ecb4b5069493b7dd98775b38a233863ab591c54b SHA512 e64c27eea0258af913304963254494d6c874e7776b09a14ee9a273f1a3cdfa908acf92b78affc0102f06df17effbf011181c60d97ebd0a645044df7a28b41fec WHIRLPOOL 321069f568fad409b31f2fd4caa36f1128523383f5b294dffc68d57a67489ee2ac17d53bedd8e36df9b688c43c06c91f47bdaf81b4fda6597d916ea06643e666
+DIST primer3-2.3.7.tar.gz 1658090 SHA256 9e37a301d2ca9e5034c9a9d4afcb3e90041f6cc44c658b63598d0ccfcb176e5e SHA512 f227f80d395cb682a9d65e0ac3afdcacb8385d66e721b9163fda939a9c788a7c6907273f6223782702b48d7df66ea2331114f6303fcd29e3b3c50a2717da2fa7 WHIRLPOOL a092cb3a117f4d70178266ea9ae9205df567c8d18d4dbff3b5279860b22f9e4cce5484393771f37ce16a9f6e5ff4e5a51d66f9c0f35bf5cfce84a18225e3bfd8
 DIST primer3-src-2.3.6.tar.gz 1667573 SHA256 2ff54faf957f0d7e4c79d9536fa1027b028bc5e4c6005f142df42ef85562ecd4 SHA512 671b420f3bc9b6b9972e19a757925ada170e5f8c0e3e8a90630a48e6cde44abc0e1e09b9ea90129f94b58f835e30440f3d91c14fb4b796fd94eb478b2ca28ead WHIRLPOOL 61bbc676c38b1b96806c9ac54d130aae936a5406213759613a3be76016cdd4ebf76c5a54d1ceffc7bd2634829d9aef9d64f87cc85289793b40ab031e01a5917f
diff --git a/sci-biology/primer3/primer3-2.3.7.ebuild b/sci-biology/primer3/primer3-2.3.7.ebuild
new file mode 100644
index 000000000000..9a129f5663b0
--- /dev/null
+++ b/sci-biology/primer3/primer3-2.3.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Primer Design for PCR reactions"
+HOMEPAGE="http://primer3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3.4-buildsystem.patch )
+
+src_prepare() {
+	default
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile || die
+	fi
+
+	tc-export CC CXX AR RANLIB
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test () {
+	emake -C test | tee "${T}"/test.log
+	grep -q "\[FAILED\]" && die "test failed. See "${T}"/test.log"
+}
+
+src_install () {
+	dobin src/{long_seq_tm_test,ntdpal,oligotm,primer3_core}
+	dodoc src/release_notes.txt example
+	insinto /opt/primer3_config
+	doins -r src/primer3_config/* primer3*settings.txt
+	docinto html
+	dodoc primer3_manual.htm
+}
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index 42575eae5e6f..3afe7ef9ac49 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -1,4 +1,2 @@
-DIST rebase-1510.tar.xz 90412200 SHA256 0a33a34003c95f65d8ec8bbf11907bccad47d0bdddc39030a663df5ef2922f87 SHA512 c76b42df5a5bc64a951693b35a8664195a0fb1b84bdd64f80e8986a705ca1279e51c324153a83272ecb9b3dfb3fd565cb43c2b25c9e37655767c278e6320590e WHIRLPOOL 238841844c19ad028147a4a5a366a219e405b1ae1d0ae79767775518a0ecdabe37948a260724e4053af183ad00799c60da21d57dae84cdc6859e19a04aac314a
-DIST rebase-1511.tar.xz 95276416 SHA256 e8b0686ad02d15d833febf5f353cb66febfccb730fb7e92968b05739d8d4a494 SHA512 b7998763a092389be8d5eb4b9c59a7297859d4f03be6a4c3933288d5407fe1b64268d6fb03b7df0604ad0801991937ee345c2f932c9621ea7bab4d68c9c59261 WHIRLPOOL 53ce94b77fb5b1557b790bad48064066833f6800ebef29a33f80e3fa6b8dbf0666443dc0301521e88d4e9f38579011edc37979f12b95cd84ea8afb07f7e8ffc7
 DIST rebase-1601.tar.xz 99890720 SHA256 de0f7dd6cf831c52434e7434491b9c738c41aab51c8f8d91b243569f25209eb8 SHA512 a6e3faf7fc2eaf475605ed72db7f1cfdc4ba8c280f1650f723c5a664090ed64e7ac014012042c466d65edea8b2767bbcb0f38c3d5b69dbdb35e89cf0685c92ad WHIRLPOOL f06338c0d6ef59d7ac792f6f7fc48338b73d659614c0694109152fd33606174be6741cb662478f38e37e9622118de27c3c30c537b741b49e218f64973fe2c783
 DIST rebase-1602.tar.xz 101007300 SHA256 26257dc10a6aba54024772956ae03e8530d4b2176db60dcc386427196a936d0b SHA512 7a00a11019124a835ef3d328c33cc4ab9d59665b3c929cf02a44bc09de8ca53185b939057705ee6ce79eeddc9ca9b8246582895b949dd38abe9066a380e3a2c9 WHIRLPOOL fac62146ab6ff09895cc9e4ece2b4869910c90c342051c5446085267585362adcc8a30af66a58d068d86c3eb6e7a37ceb32224a69114aa629a62a958fae09ed0
diff --git a/sci-biology/rebase/rebase-1510.ebuild b/sci-biology/rebase/rebase-1510.ebuild
deleted file mode 100644
index 0088b50aa25b..000000000000
--- a/sci-biology/rebase/rebase-1510.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
-
-MY_PV=${PV#1}
-
-DESCRIPTION="A restriction enzyme database"
-HOMEPAGE="http://rebase.neb.com"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emboss minimal"
-
-RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="binchecks strip"
-
-src_compile() {
-	if use emboss; then
-		echo; einfo "Indexing Rebase for usage with EMBOSS."
-		mkdir REBASE || die
-		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
-				-protofile proto.${MY_PV} -equivalences \
-				|| die "Indexing Rebase failed."
-		echo
-	fi
-}
-
-src_install() {
-	if ! use minimal; then
-		insinto /usr/share/${PN}
-		doins withrefm.${MY_PV} proto.${MY_PV}
-	fi
-	newdoc REBASE.DOC README
-	if use emboss; then
-		insinto /usr/share/EMBOSS/data/REBASE
-		doins REBASE/embossre.{enz,ref,sup}
-		insinto /usr/share/EMBOSS/data
-		doins REBASE/embossre.equ
-	fi
-}
diff --git a/sci-biology/rebase/rebase-1511.ebuild b/sci-biology/rebase/rebase-1511.ebuild
deleted file mode 100644
index 1bfa8ba6880d..000000000000
--- a/sci-biology/rebase/rebase-1511.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
-
-MY_PV=${PV#1}
-
-DESCRIPTION="A restriction enzyme database"
-HOMEPAGE="http://rebase.neb.com"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emboss minimal"
-
-RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="binchecks strip"
-
-src_compile() {
-	if use emboss; then
-		echo; einfo "Indexing Rebase for usage with EMBOSS."
-		mkdir REBASE || die
-		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
-				-protofile proto.${MY_PV} -equivalences \
-				|| die "Indexing Rebase failed."
-		echo
-	fi
-}
-
-src_install() {
-	if ! use minimal; then
-		insinto /usr/share/${PN}
-		doins withrefm.${MY_PV} proto.${MY_PV}
-	fi
-	newdoc REBASE.DOC README
-	if use emboss; then
-		insinto /usr/share/EMBOSS/data/REBASE
-		doins REBASE/embossre.{enz,ref,sup}
-		insinto /usr/share/EMBOSS/data
-		doins REBASE/embossre.equ
-	fi
-}
diff --git a/sci-calculators/orpie/orpie-1.5.2-r1.ebuild b/sci-calculators/orpie/orpie-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..862d8dd5df40
--- /dev/null
+++ b/sci-calculators/orpie/orpie-1.5.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A fullscreen RPN calculator for the console"
+HOMEPAGE="http://pessimization.com/software/orpie/"
+SRC_URI="http://pessimization.com/software/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-ml/gsl-ocaml
+	sys-libs/ncurses:0=
+	|| ( <dev-lang/ocaml-4.02 dev-ml/camlp4 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.1-ocaml311.patch"
+	"${FILESDIR}/${P}-nogsl.patch"
+	"${FILESDIR}/${PN}-1.5.1-orpierc.patch"
+	"${FILESDIR}/${PN}-1.5.1-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" Makefile.in || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_compile() {
+	# TODO: fix missing edges in dependency graph
+	emake -j1
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc doc/manual.pdf
+		docinto html/
+		dodoc doc/manual.html
+	fi
+}
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index a23c0745196c..a397d4423e41 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,2 +1,2 @@
-DIST coot-0.8.2.tar.gz 15772937 SHA256 2f5961ded7f2cf06b887560afe964c239aba94f9c4bf8a2a80b3ca4fbc471eee SHA512 a323608df7b63f22eb2d1ac679fc047bba9fe23fe6366ae1d6ae29ca00a567aafb3d29840878e8c5123421037e26b6463f0bb845ef28dcbb4f3647cda2f74575 WHIRLPOOL d84d23aa49404dce63649bd6c5f8149e95ad5776ec4fa6ebdfcf44ebabef56c3a29376da7a1d5f8ee6f8013158a7f5c74f5bd74066036ca750bc3ff7de084791
 DIST coot-0.8.2-greg-data.tar.gz 8677037 SHA256 d936795853406f3c2a3dfd6f37a07a7df677e96b2d023d9302668aa49b7f06cb SHA512 28396a5fa64af61e8932b565c6593ed27c4708e6a59158d62c94005bea9fa8c46562b6caba97011209a40705e5ec6711b949138dd8a23bb954df2ab4dfa9bb33 WHIRLPOOL cb85234ece76314661bcfa424904224ac554c41fc63655857f3ba1bd2f0bf8e457c55dd1f42ffecffb9a8582ff759277b0fb9a40ca2393bf47b6a09fdd04ce1e
+DIST coot-0.8.2.tar.gz 15772937 SHA256 2f5961ded7f2cf06b887560afe964c239aba94f9c4bf8a2a80b3ca4fbc471eee SHA512 a323608df7b63f22eb2d1ac679fc047bba9fe23fe6366ae1d6ae29ca00a567aafb3d29840878e8c5123421037e26b6463f0bb845ef28dcbb4f3647cda2f74575 WHIRLPOOL d84d23aa49404dce63649bd6c5f8149e95ad5776ec4fa6ebdfcf44ebabef56c3a29376da7a1d5f8ee6f8013158a7f5c74f5bd74066036ca750bc3ff7de084791
diff --git a/sci-chemistry/coot/coot-0.8.2-r1.ebuild b/sci-chemistry/coot/coot-0.8.2-r1.ebuild
index 81ed1e84cba2..420edbbf65cd 100644
--- a/sci-chemistry/coot/coot-0.8.2-r1.ebuild
+++ b/sci-chemistry/coot/coot-0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ MY_S_P=${MY_S2_P}-${PR/r/revision-}
 MY_PV=${PV}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
+DESCRIPTION="Crystallographic Object-Oriented Toolkit"
 HOMEPAGE="https://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/"
 SRC_URI="
 	http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz
diff --git a/sci-chemistry/gopenmol/Manifest b/sci-chemistry/gopenmol/Manifest
deleted file mode 100644
index 087c602229b0..000000000000
--- a/sci-chemistry/gopenmol/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gopenmol-3.00-linux.tar.gz 29615195 SHA256 314494a751f65c28d015fee854d2ee347fecbca6ccf31bb7e04db7eda6a16a23 SHA512 e28fb607fcfdd543f4e62d3d1bf8ba789bafda608bb6a16e534bfd48bb4f2e2741a9fa98b7ead25db7d5572bb92064c73ba59987b0c3c3193477c3735babefd3 WHIRLPOOL eed5015c81b2c6e4cb14faf3f3176b979a3e79d1bb014dbd10fd606de0452f502b004b4bcb85e5cea57191ed782b3f9afeee5027c155d48370f8960cbca12d75
diff --git a/sci-chemistry/gopenmol/files/3.00-impl-dec.patch b/sci-chemistry/gopenmol/files/3.00-impl-dec.patch
deleted file mode 100644
index e1d66c7aaa5d..000000000000
--- a/sci-chemistry/gopenmol/files/3.00-impl-dec.patch
+++ /dev/null
@@ -1,80 +0,0 @@
- density/density.c    | 1 +
- utility/g94cub2pl.c  | 1 +
- utility/gamess2plt.c | 1 +
- utility/gcube2plt.c  | 1 +
- utility/jaguar2plt.c | 1 +
- vss/vssmod.c         | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/density/density.c b/density/density.c
-index 130a48e..ee218c5 100755
---- a/density/density.c
-+++ b/density/density.c
-@@ -13,6 +13,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <malloc.h>
-+#include <stdlib.h>
- 
- #define VERBOSE    0
- #define BUFF_LEN 500
-diff --git a/utility/g94cub2pl.c b/utility/g94cub2pl.c
-index e773ab2..94fbcfd 100755
---- a/utility/g94cub2pl.c
-+++ b/utility/g94cub2pl.c
-@@ -315,6 +315,7 @@ which can be read by gOpenMol or SCARECROW.
- #include <sys/types.h>
- #include <malloc.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #define BUFF_LEN        256
- #define BOHR_RADIUS     0.52917715  /* conversion constant */
-diff --git a/utility/gamess2plt.c b/utility/gamess2plt.c
-index 3f6108e..5da481d 100755
---- a/utility/gamess2plt.c
-+++ b/utility/gamess2plt.c
-@@ -86,6 +86,7 @@ which can be read by gOpenMol or SCARECROW.
- #include <sys/types.h>
- #include <malloc.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #define BUFF_LEN        256
- #define BOHR_RADIUS     0.52917715  /* conversion constant */
-diff --git a/utility/gcube2plt.c b/utility/gcube2plt.c
-index c5f7b5e..711bad3 100755
---- a/utility/gcube2plt.c
-+++ b/utility/gcube2plt.c
-@@ -306,6 +306,7 @@ which can be read by gOpenMol or SCARECROW.
- #include <sys/types.h>
- #include <malloc.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #define BUFF_LEN        256
- #define BOHR_RADIUS     0.52917715  /* conversion constant */
-diff --git a/utility/jaguar2plt.c b/utility/jaguar2plt.c
-index 657128c..96d6ac1 100755
---- a/utility/jaguar2plt.c
-+++ b/utility/jaguar2plt.c
-@@ -26,6 +26,7 @@ fastes running coordinate.
- #include <sys/types.h>
- #include <malloc.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #define BUFF_LEN        256
- #define BOHR_RADIUS     0.52917715  /* conversion constant */
-diff --git a/vss/vssmod.c b/vss/vssmod.c
-index 957d2e5..9d73978 100755
---- a/vss/vssmod.c
-+++ b/vss/vssmod.c
-@@ -20,6 +20,7 @@ C- for the potentials
- #include <math.h>
- #include <string.h>
- #include <malloc.h>
-+#include <stdlib.h>
- 
- #define LINE_LEN 80
- #define BUFF_LEN 500
diff --git a/sci-chemistry/gopenmol/files/3.00-include-config-for-plugins.patch b/sci-chemistry/gopenmol/files/3.00-include-config-for-plugins.patch
deleted file mode 100644
index a8602d07a03e..000000000000
--- a/sci-chemistry/gopenmol/files/3.00-include-config-for-plugins.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gOpenMol-3.00.orig/src/plugins/Makefile	2005-12-02 19:38:08.000000000 -0800
-+++ gOpenMol-3.00/src/plugins/Makefile	2005-12-02 19:37:29.000000000 -0800
-@@ -8,6 +8,8 @@
- #          Coded by: Eero Häkkinen
- ##############################################################################
- 
-+include config.mk
-+
- build-all: build FORCE ;
- 
- all install install-local uninstall: FORCE
diff --git a/sci-chemistry/gopenmol/files/3.00-multilib.patch b/sci-chemistry/gopenmol/files/3.00-multilib.patch
deleted file mode 100644
index 9ca263808622..000000000000
--- a/sci-chemistry/gopenmol/files/3.00-multilib.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/src/config.mk.ac b/src/config.mk.ac
-index b1061d9..374bc77 100755
---- a/src/config.mk.ac
-+++ b/src/config.mk.ac
-@@ -18,7 +18,7 @@ gomroot          = $(libdir)/$(gomsubdir)
- gomdataroot      = $(datadir)/$(gomsubdir)
- gombindir        = $(gomroot)/bin
- gomincdir        = $(includedir)/$(gomsubdir)
--gomlibdir        = $(gomroot)/bin
-+gomlibdir        = $(gomroot)/GENTOOLIBDIR
- # Tcl/Tk entries.
- TCL_LIBRARY      = @TCL_LIBRARY@
- TK_LIBRARY       = @TK_LIBRARY@
-diff --git a/src/plugins/Makefile b/src/plugins/Makefile
-index bb9af64..cf8a97d 100755
---- a/src/plugins/Makefile
-+++ b/src/plugins/Makefile
-@@ -22,7 +22,7 @@ all install install-local uninstall: FORCE
- build compile clean clean-libs clean-objs: FORCE
- 	-@for dir in *; do \
- 	    if test -f "$$dir/Makefile"; then \
--		( cd "$$dir" && $(MAKE) $(MFLAGS) $@ ) ;\
-+		( cd "$$dir" && $(MAKE) $(MFLAGS) $@ ) || exit 1;\
- 	    fi ;\
- 	done
- 
-diff --git a/src/plugins/config.mk.ac b/src/plugins/config.mk.ac
-index 03e3f6b..eb30ea8 100755
---- a/src/plugins/config.mk.ac
-+++ b/src/plugins/config.mk.ac
-@@ -11,7 +11,7 @@ gomdataroot      = ${datadir}/${gomsubdir}
- gombindir        = ${gomroot}/bin
- gomincdir        = ${gomsrcdir}/include/gomlib
- #INS gomincdir        = ${includedir}/${gomsubdir}
--gomlibdir        = ${gomroot}/bin
-+gomlibdir        = ${gomroot}/GENTOOLIBDIR
- gomsrcdir        = @abs_top_srcdir@
- gombltdir        = @abs_top_builddir@
- #INS gomsrcdir        = ${gomroot}/src
-diff --git a/src/plugins/rules.mk b/src/plugins/rules.mk
-index d41ed47..da133c6 100755
---- a/src/plugins/rules.mk
-+++ b/src/plugins/rules.mk
-@@ -43,12 +43,12 @@ $(LIBRARY): $(libdeps)
- 	@$(RM) alldeps.dT
- 
- link-CC: FORCE
--	$(GOM_LINK_CC) $(PLUG_CFLAGS) -o $(LIBRARY) $(OBJECTS) \
--	    $(PLUG_LDFLAGS) $(PLUG_LIBS) $(GOM_LINKFLAGS)
-+	$(GOM_LINK_CC) $(GOM_LINKFLAGS) $(PLUG_CFLAGS) -o $(LIBRARY) $(OBJECTS) \
-+	    $(PLUG_LDFLAGS) $(PLUG_LIBS)
- 
- link-CXX: FORCE
--	$(GOM_LINK_CXX) $(PLUG_CXXFLAGS) -o $(LIBRARY) $(OBJECTS) \
--	    $(PLUG_LDFLAGS) $(PLUG_LIBS) $(GOM_LINKFLAGS)
-+	$(GOM_LINK_CXX) $(GOM_LINKFLAGS) $(PLUG_CXXFLAGS) -o $(LIBRARY) $(OBJECTS) \
-+	    $(PLUG_LDFLAGS) $(PLUG_LIBS)
- 
- # Rule to compile the source files.
- # First make:
-diff --git a/src/unix/make/install.mk b/src/unix/make/install.mk
-index 3018946..98c061a 100755
---- a/src/unix/make/install.mk
-+++ b/src/unix/make/install.mk
-@@ -36,7 +36,7 @@ mkinstalldirs: mkinstalldirs-local mkinstalldirs-shared FORCE ;
- mkinstalldirs-local: FORCE
- 	$(MKDIR_P) '$(gomroot)' || test -d '$(gomroot)'
- 	@$(set_show); set -e; \
--	for dir in bin src/plugins src/unix; do \
-+	for dir in bin lib src/plugins src/unix; do \
- 	    dir='$(gomroot)'/$$dir; \
- 	    $$show $(MKDIR_P) "$$dir"; \
- 	    $(MKDIR_P) "$$dir" || test -d "$$dir"; \
-diff --git a/src/unix/make/utility.mk.ac b/src/unix/make/utility.mk.ac
-index 21ad59d..ee25ac7 100755
---- a/src/unix/make/utility.mk.ac
-+++ b/src/unix/make/utility.mk.ac
-@@ -47,8 +47,7 @@ BINARIES_F   = ambera2b$(EXEEXT) \
-                xmol2bamber$(EXEEXT) \
-                xplor2charmm$(EXEEXT) \
-                gridasc2plt$(EXEEXT) \
--               gridbin2plt$(EXEEXT) \
--               icon8$(EXEEXT)
-+               gridbin2plt$(EXEEXT)
- 
- BINARIES_JAR = xvibs.jar
- 
-@@ -76,13 +75,13 @@ $(OBJECTS_C):
- 	$(CC) -c $? $(CPPFLAGS) $(CFLAGS)
- 
- $(BINARIES_C):
--	$(CC) -o $@ $? $(CPPFLAGS) $(CFLAGS) $(STD_LIBS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o $@ $? $(CPPFLAGS) $(CFLAGS) $(STD_LIBS)
- 
- $(BINARIES_CXX):
--	$(CXX) -o $@ $? $(CPPFLAGS) $(CXXFLAGS) $(STD_LIBS) $(LDFLAGS)
-+	$(CXX) $(LDFLAGS) -o $@ $? $(CPPFLAGS) $(CXXFLAGS) $(STD_LIBS)
- 
- $(BINARIES_F):
--	$(F77) -o $@ $? $(FFLAGS) $(STD_LIBS) $(LDFLAGS)
-+	$(F77) $(LDFLAGS) -o $@ $? $(FFLAGS) $(STD_LIBS)
- 
- $(BINARIES_JAR):
- 	cp $? $@
diff --git a/sci-chemistry/gopenmol/files/3.00-tcl8.6.patch b/sci-chemistry/gopenmol/files/3.00-tcl8.6.patch
deleted file mode 100644
index a4c3bce12468..000000000000
--- a/sci-chemistry/gopenmol/files/3.00-tcl8.6.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- src/graphics/g_Mmain.c | 2 +-
- src/parser/p_parser.c  | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/graphics/g_Mmain.c b/src/graphics/g_Mmain.c
-index b9bb340..f044568 100755
---- a/src/graphics/g_Mmain.c
-+++ b/src/graphics/g_Mmain.c
-@@ -487,7 +487,7 @@ int gomp_Mmain(int argc, const char *argv[])
-     {
-         Tcl_Interp  *interp;
-         interp = gomp_GetTclInterp();
--        sprintf(Temp,"'%s' problems creating the Tk window",interp->result);
-+        sprintf(Temp,"'%s' problems creating the Tk window",Tcl_GetStringResult(interp));
-         gomp_PrintERROR(Temp);
-         return(1);
-     }
-diff --git a/src/parser/p_parser.c b/src/parser/p_parser.c
-index c9fd8ce..62eb05c 100755
---- a/src/parser/p_parser.c
-+++ b/src/parser/p_parser.c
-@@ -809,8 +809,8 @@ int          gomp_TclRunScript()
-     if(value != (const char *)NULL) {
-         code = Tcl_EvalFile(interp , value);
-         if(code != TCL_OK) {
--            if(*interp->result != (char)NULL) {
--                gomp_PrintERROR(interp->result);
-+            if(*Tcl_GetStringResult(interp) != (char)NULL) {
-+                gomp_PrintERROR(Tcl_GetStringResult(interp));
-                 return(1);
-             }
-         }
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
deleted file mode 100644
index 1a50d785d368..000000000000
--- a/sci-chemistry/gopenmol/gopenmol-3.00-r2.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
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python
-
-DESCRIPTION="Tool for the visualization and analysis of molecular structures"
-HOMEPAGE="http://www.csc.fi/gopenmol/"
-SRC_URI="${HOMEPAGE}/distribute/${P}-linux.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-lang/tk
-	dev-tcltk/bwidget
-	media-libs/freeglut
-	virtual/jpeg
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/gOpenMol-${PV}/src"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-include-config-for-plugins.patch \
-		"${FILESDIR}"/${PV}-multilib.patch
-
-	sed \
-		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
-		-i config.mk.ac plugins/config.mk.ac || die
-	sed "/GOM_TEMP/s:^.*$:GOM_TEMP=\"${EPREFIX}/tmp/:g" -i ../environment.txt || die
-}
-
-src_compile() {
-	default
-
-	# Plugins and Utilities are not built by default
-	cd "${S}"/plugins && emake
-	cd "${S}"/utility && emake
-}
-
-src_install() {
-	einstall
-
-	cd "${S}"/plugins && einstall
-	cd "${S}"/utility && einstall
-
-	dosym ../$(get_libdir)/gOpenMol-${PV}/bin/${PN} /usr/bin/${PN}
-
-	dodoc "${ED}"/usr/share/gOpenMol-${PV}/{docs/*,README*} || die
-
-	dodir /usr/share/doc/${PF}/html
-	mv -T "${ED}"/usr/share/gOpenMol-${PV}/help "${ED}"/usr/share/doc/${PF}/html || die
-	mv "${ED}"/usr/share/gOpenMol-${PV}/utility "${ED}"/usr/share/doc/${PF}/html || die
-
-	rm -rf \
-		"${ED}"/usr/$(get_libdir)/gOpenMol-${PV}/{src,install} \
-		"${ED}"/usr/share/gOpenMol-${PV}/{docs,README*,COPYRIGHT} || die
-
-	cat >> "${T}"/20${PN} <<- EOF
-	GOM_ROOT="${EPREFIX}"/usr/$(get_libdir)/gOpenMol-${PV}/
-	GOM_DATA="${EPREFIX}"/usr/share/gOpenMol-${PV}/data
-	GOM_HELP="${EPREFIX}"/usr/share/doc/${PVR}/html
-	GOM_DEMO="${EPREFIX}"/usr/share/gOpenMol-${PV}/demo
-	EOF
-
-	doenvd "${T}"/20${PN}
-}
-
-pkg_postinst() {
-	einfo "Run gOpenMol using the rungOpenMol script."
-}
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r3.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r3.ebuild
deleted file mode 100644
index b936d437e5a0..000000000000
--- a/sci-chemistry/gopenmol/gopenmol-3.00-r3.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1
-
-DESCRIPTION="Tool for the visualization and analysis of molecular structures"
-HOMEPAGE="http://www.csc.fi/gopenmol/"
-SRC_URI="${HOMEPAGE}/distribute/${P}-linux.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-lang/tk
-	dev-tcltk/bwidget
-	media-libs/freeglut
-	virtual/jpeg
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-S="${WORKDIR}/gOpenMol-${PV}/src"
-
-src_prepare() {
-	cd ..
-	epatch \
-		"${FILESDIR}"/${PV}-include-config-for-plugins.patch \
-		"${FILESDIR}"/${PV}-multilib.patch \
-		"${FILESDIR}"/${PV}-tcl8.6.patch \
-		"${FILESDIR}"/${PV}-impl-dec.patch
-
-	sed \
-		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
-		-i src/{config.mk.ac,plugins/config.mk.ac} || die
-	sed "/GOM_TEMP/s:^.*$:GOM_TEMP=\"${EPREFIX}/tmp/:g" -i environment.txt || die
-}
-
-src_compile() {
-	default
-
-	# Plugins and Utilities are not built by default
-	cd "${S}"/plugins && emake
-	cd "${S}"/utility && emake
-}
-
-src_install() {
-	einstall
-
-	cd "${S}"/plugins && einstall
-	cd "${S}"/utility && einstall
-
-	dosym ../$(get_libdir)/gOpenMol-${PV}/bin/${PN} /usr/bin/${PN}
-
-	dodoc "${ED}"/usr/share/gOpenMol-${PV}/{docs/*,README*} || die
-
-	dodir /usr/share/doc/${PF}/html
-	mv -T "${ED}"/usr/share/gOpenMol-${PV}/help "${ED}"/usr/share/doc/${PF}/html || die
-	mv "${ED}"/usr/share/gOpenMol-${PV}/utility "${ED}"/usr/share/doc/${PF}/html || die
-
-	rm -rf \
-		"${ED}"/usr/$(get_libdir)/gOpenMol-${PV}/{src,install} \
-		"${ED}"/usr/share/gOpenMol-${PV}/{docs,README*,COPYRIGHT} || die
-
-	cat >> "${T}"/20${PN} <<- EOF
-	GOM_ROOT="${EPREFIX}"/usr/$(get_libdir)/gOpenMol-${PV}/
-	GOM_DATA="${EPREFIX}"/usr/share/gOpenMol-${PV}/data
-	GOM_HELP="${EPREFIX}"/usr/share/doc/${PVR}/html
-	GOM_DEMO="${EPREFIX}"/usr/share/gOpenMol-${PV}/demo
-	EOF
-
-	doenvd "${T}"/20${PN}
-}
-
-pkg_postinst() {
-	einfo "Run gOpenMol using the rungOpenMol script."
-}
diff --git a/sci-chemistry/gopenmol/metadata.xml b/sci-chemistry/gopenmol/metadata.xml
deleted file mode 100644
index 8937bad0b175..000000000000
--- a/sci-chemistry/gopenmol/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/pymol-apbs-plugin/Manifest b/sci-chemistry/pymol-apbs-plugin/Manifest
deleted file mode 100644
index 8d2bd3861103..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pymol-apbs-plugin-0_p15.py 104351 SHA256 c5a259ddc1931f1ec4efe0ffc3ae9e9ac4a84a28c83a4f93a06ebb7c1bef0c1d SHA512 1bfba44aed8ca03300430e00b6b2a3297bda5820b06a7a8914e5396c6720005ea5acaebc07bdf5d27d82f563afb8210e59af145422c7cacab92160f6f22874e1 WHIRLPOOL a0737250151503b431aa302c3ca175088b068a5aaf7e55c6673a9dd077d28ff7f58f40d2080426484a704ecc4e43f2845ae0d9ef6b5fc3ad850fff5bdffe36c0
-DIST pymol-apbs-plugin-0_p18.py 108766 SHA256 ec09c5a0903ac965cc29fcf0a3c1999bd939f9791d037915596092698855d12c SHA512 e736c2852851014eb412dcb573ee177f57dd9dd163673d5c7df1240f0f9c21fdc4277c647ba2a9e510d1cf8e53fabc6671da5a5b90b989cbcfc0835552c4ffdb WHIRLPOOL 3b418afc7198752e7d3578574238756c9a992b6c7c3a16d474a7d5363533d91cedc8300033f60666605efae478a2606b9b5e1a6e6b74aed8a0ec46842b8b02ac
-DIST pymol-apbs-plugin-2.1_p24.py 113049 SHA256 d51bb1bbbf641777ee36713c0c47696d7906179e42cac8cdd0e8e156ef081c9f SHA512 49141ea7e4a3a3430d342fb4fbb497d522ce6485c6d9e3527414519574eab7b8218fe240f26920013676528c40059a46341d58153bfe9d05bf747ead926b2cfd WHIRLPOOL 17a4f9ed9670b9a7f82395a9cf1ad465635f840b7389c10ad8c8eae3262c3696383bbacadf5aee9fed817eff7370008cc85a1666896fed56dffb0163e4c3d7e1
-DIST pymol-apbs-plugin-2.1_p26.py 113086 SHA256 552242b4f5b47f298eeb0616e0d51924b4a7649dc8a16e4809e923dbcb97738d SHA512 3561d077875a1880d6badccf835db3d17e0c45416accd6127cbef7c550711908b47ccb392563e3d29ecb7d6527c098584eeabb6490d1033720ed7efe751d0fb0 WHIRLPOOL dccd32b0193e74e505d69922b441323fb24b0ba30aa85f4d69b94663ab406a57b772985ca2c56146e2c4b929f73b321095c3ae2caf95f297f14d8b31671f475e
diff --git a/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch b/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch
deleted file mode 100644
index c3675cf4c0d0..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch
+++ /dev/null
@@ -1,176 +0,0 @@
---- pymol-apbs-plugin-2.1_p26.py.orig        2013-08-16 20:29:27.000000000 -0400
-+++ pymol-apbs-plugin-2.1_p26.py        2013-08-16 20:31:35.000000000 -0400
-@@ -560,7 +560,8 @@
-         # Set up the Main page
-         page = self.notebook.add('Main')
-         group = Pmw.Group(page,tag_text='Main options')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         self.selection = Pmw.EntryField(group.interior(),
-                                         labelpos='w',
-                                         label_text='Selection to use: ',
-@@ -606,7 +607,8 @@
-         page = self.notebook.add('Configuration')
- 
-         group = Pmw.Group(page,tag_text='Dielectric Constants')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column=0, row=0)
-         self.interior_dielectric = Pmw.EntryField(group.interior(),labelpos='w',
-                                    label_text = 'Protein Dielectric:',
-@@ -625,7 +627,8 @@
-             #entry.pack(side='left',fill='both',expand=1,padx=4) # side-by-side
-             entry.pack(fill='x',expand=1,padx=4,pady=1) # vertical
-         group = Pmw.Group(page,tag_text='Other')
--        group.pack(fill='both',expand=1, padx=4, pady=5)
-+        #group.pack(fill='both',expand=1, padx=4, pady=5)
-+        group.grid(padx=4, pady=5, sticky=(N, S, E, W))
-         group.grid(column=1, row=1,columnspan=4)
-         self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w',
-                                               label_text = 'Maximum Memory Allowed (MB):',
-@@ -683,7 +686,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text='Ions')
--        group.pack(fill='both',expand=1, padx=4, pady=5)
-+        #group.pack(fill='both',expand=1, padx=4, pady=5)
-+        group.grid(padx=4, pady=5, sticky=(N, S, E, W))
-         group.grid(column=0, row=1, )
-         self.ion_plus_one_conc = Pmw.EntryField(group.interior(),
-                                                 labelpos='w',
-@@ -742,7 +746,8 @@
-             entry.pack(fill='x',expand=1,padx=4)
- 
-         group = Pmw.Group(page,tag_text = 'Coarse Mesh Length')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 1, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_coarse_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -757,7 +762,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text = 'Fine Mesh Length')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 2, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_fine_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -772,7 +778,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text = 'Grid Center')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 3, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_center_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -786,7 +793,8 @@
-             getattr(self,'grid_center_%s'%coord).pack(fill='x', expand=1, padx=4, pady=1)
- 
-         group = Pmw.Group(page,tag_text = 'Grid Points')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 4, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_points_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -804,7 +812,8 @@
-         page.grid_columnconfigure(5,weight=1)
-         page = self.notebook.add('Program Locations')
-         group = Pmw.Group(page,tag_text='Locations')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         def quickFileValidation(s):
-             if s == '': return Pmw.PARTIAL
-             elif os.path.isfile(s): return Pmw.OK
-@@ -867,7 +876,8 @@
-         
-         page = self.notebook.add('Temp File Locations')
-         group = Pmw.Group(page,tag_text='Locations')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         self.pymol_generated_pqr_filename = Pmw.EntryField(group.interior(),
-                                                            labelpos = 'w',
-                                                            label_pyclass = FileDialogButtonClassFactory.get(self.setPymolGeneratedPqrFilename),
-@@ -915,17 +925,20 @@
-         page = self.notebook.add('Visualization (1)')
-         group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=1)
-         self.visualization_group_1 = group
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
- 
-         page = self.notebook.add('Visualization (2)')
-         group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=2)
-         self.visualization_group_2 = group
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
- 
-         # Create a couple of other empty pages
-         page = self.notebook.add('About')
-         group = Pmw.Group(page, tag_text='About PyMOL APBS Tools')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         text = """This plugin integrates PyMOL (http://PyMOL.org/) with APBS (http://www.poissonboltzmann.org/apbs/).
- 
- Documentation may be found at
-@@ -2158,7 +2171,8 @@
-             self.update_buttonbox = Pmw.ButtonBox(self.mm_group.interior(), padx=0)
-             self.update_buttonbox.pack(side=LEFT)
-             self.update_buttonbox.add('Update',command=self.refresh)
--            self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            #self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            self.mm_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.ms_group = Pmw.Group(self.interior(),tag_text='Molecular Surface')
-             self.ms_buttonbox = Pmw.ButtonBox(self.ms_group.interior(), padx=0)
-@@ -2209,7 +2223,8 @@
-             bars = (self.mol_surf_low,self.mol_surf_middle,self.mol_surf_high)
-             Pmw.alignlabels(bars)
-             for bar in bars: bar.pack(side=LEFT)
--            self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.ms_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.fl_group = Pmw.Group(self.interior(),tag_text='Field Lines')
-             self.fl_buttonbox = Pmw.ButtonBox(self.fl_group.interior(), padx=0)
-@@ -2224,7 +2239,8 @@
-                                   text = """Follows same coloring as surface.""",
-                                   )
-             label.pack()
--            self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            #self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            self.fl_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.pi_group = Pmw.Group(self.interior(),tag_text='Positive Isosurface')
-             self.pi_buttonbox = Pmw.ButtonBox(self.pi_group.interior(), padx=0)
-@@ -2243,7 +2259,8 @@
-                                             entryfield_validate = {'validator' : 'real', 'min':0}
-                                             )
-             self.pos_surf_val.pack(side=LEFT)
--            self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.pi_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.ni_group = Pmw.Group(self.interior(),tag_text='Negative Isosurface')
-             self.ni_buttonbox = Pmw.ButtonBox(self.ni_group.interior(), padx=0)
-@@ -2262,7 +2279,8 @@
-                                             entryfield_validate = {'validator' : 'real', 'max':0}
-                                             )
-             self.neg_surf_val.pack(side=LEFT)
--            self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.ni_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
- 
- 
diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml
deleted file mode 100644
index 41a45ae4e27c..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/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 type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">pymolapbsplugin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
deleted file mode 100644
index 8609778501ce..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
deleted file mode 100644
index 11596fe54cbf..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild
deleted file mode 100644
index 627780c1ff39..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
deleted file mode 100644
index 6d3aac6c9c49..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tcltk8.6.patch
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		cd "${BUILD_DIR}" || die
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			${P}.py > apbs_tools.py || die
-
-		python_moduleinto pmg_tk/startup
-		python_domodule apbs_tools.py
-		python_optimize
-	}
-	python_foreach_impl installation
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
deleted file mode 100644
index f943d5d50e3d..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tcltk8.6.patch
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		cd "${BUILD_DIR}" || die
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			${P}.py > apbs_tools.py
-
-		python_moduleinto pmg_tk/startup
-		python_domodule apbs_tools.py || die
-		python_optimize
-	}
-	python_foreach_impl installation
-}
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
index 7e90fedff06d..4b1c62b1063d 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
@@ -12,7 +12,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.18.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild
index cd38ed611d49..693439fe6b8d 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.18.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
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 0d946b21997f..317397c04871 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,2 +1 @@
-DIST ViSP-2.10.0.tar.gz 20745399 SHA256 1c8a37cadd0012526be9ceaa182eb21fb0d45aac622a1f0f2d255225e85797aa SHA512 485bad6aea1dddf51c1edd162e22f5f00205947b67b57843207902ea3b97b683828031338282861be495d66cc79bde3a7af09c075aa9c6b783652d5d3bd4f9ef WHIRLPOOL d3d7e29076231fd581346f7de37ef49afed22f48198673d08268b1a298121d8a9bd8a9bc6e34cf2a5655cf45575599b09c5cb56e78961340122ca6f95ee275e3
 DIST visp-3.0.0.tar.gz 22938301 SHA256 cac5c79b00ca9bc2eeaeacffdc6e3c6f88ee101ec16f729ad3058d37092bf05f SHA512 4ba522731ffbbb55082dc9e0cfecb6bd42ad0abff88d95bd7d33f233a9159139ddef032e087a03b261c8ee2d6bc0cf4807819a27fae11ea91ec0482038acecdc WHIRLPOOL ded182caea33af0393e2e545808f03626aaf9a5929a11781953518722a5b8fbeca9d24dafd55d789ab9a71c6005eb0491c80d76285434c61f7d67f9fac9751ed
diff --git a/sci-libs/ViSP/ViSP-2.10.0-r1.ebuild b/sci-libs/ViSP/ViSP-2.10.0-r1.ebuild
deleted file mode 100644
index 20247c423bb4..000000000000
--- a/sci-libs/ViSP/ViSP-2.10.0-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
-
-inherit cmake-utils
-
-DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
-SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="
-	+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre
-	ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
-"
-
-RDEPEND="
-	coin? ( media-libs/coin virtual/opengl )
-	dmtx? ( media-libs/libdmtx )
-	ffmpeg? ( virtual/ffmpeg )
-	gsl? ( sci-libs/gsl )
-	ieee1394? ( media-libs/libdc1394 )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack )
-	!qt4? ( motif? ( media-libs/SoXt ) )
-	ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) )
-	png? ( media-libs/libpng:0= )
-	qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
-	usb? ( virtual/libusb:1 )
-	v4l? ( media-libs/libv4l )
-	X? ( x11-libs/libX11 )
-	xml? ( dev-libs/libxml2 )
-	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
-	virtual/pkgconfig
-	test? ( sci-misc/ViSP-images )
-	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
-	demos? ( sci-misc/ViSP-images )"
-REQUIRED_USE="
-	ffmpeg? ( opencv )
-	ois? ( ogre )
-	qt4? ( coin )
-	motif? ( coin )
-"
-PATCHES=(
-	"${FILESDIR}/opencv.patch"
-	"${FILESDIR}/opencv3.patch"
-	"${FILESDIR}/ffmpeg.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_DEMOS=$(usex demos ON OFF)"
-		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
-		"-DUSE_COIN=$(usex coin ON OFF)"
-		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
-		"-DUSE_DMTX=$(usex dmtx ON OFF)"
-		"-DUSE_FFMPEG=$(usex ffmpeg ON OFF)"
-		"-DUSE_GSL=$(usex gsl ON OFF)"
-		"-DUSE_LAPACK=$(usex lapack ON OFF)"
-		"-DUSE_LIBJPEG=$(usex jpeg ON OFF)"
-		"-DUSE_LIBPNG=$(usex png ON OFF)"
-		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
-		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ois ON OFF)"
-		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=$(usex qt4 ON OFF)"
-		"-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)"
-		"-DUSE_V4L2=$(usex v4l ON OFF)"
-		"-DUSE_X11=$(usex X ON OFF)"
-		"-DUSE_XML2=$(usex xml ON OFF)"
-		"-DUSE_ZBAR=$(usex zbar ON OFF)"
-		"-DUSE_ZLIB=$(usex zlib ON OFF)"
-		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
-		"-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake visp_doc
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use tutorials ; then
-		dodoc -r tutorial
-		docompress -x /usr/share/doc/${PF}/tutorial
-	fi
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/html/*
-}
diff --git a/sci-libs/ViSP/ViSP-3.0.0.ebuild b/sci-libs/ViSP/ViSP-3.0.0.ebuild
index 0f25727c2d93..da5a12e5673e 100644
--- a/sci-libs/ViSP/ViSP-3.0.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.0.0.ebuild
@@ -53,7 +53,7 @@ REQUIRED_USE="
 "
 
 S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${P}-opencv.patch" )
+PATCHES=( "${FILESDIR}/${P}-opencv.patch" "${FILESDIR}/${P}-ffmpeg3.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sci-libs/ViSP/files/ViSP-3.0.0-ffmpeg3.patch b/sci-libs/ViSP/files/ViSP-3.0.0-ffmpeg3.patch
new file mode 100644
index 000000000000..8fd3c8b1edb3
--- /dev/null
+++ b/sci-libs/ViSP/files/ViSP-3.0.0-ffmpeg3.patch
@@ -0,0 +1,78 @@
+Index: visp-3.0.0/modules/io/src/video/vpFFMPEG.cpp
+===================================================================
+--- visp-3.0.0.orig/modules/io/src/video/vpFFMPEG.cpp
++++ visp-3.0.0/modules/io/src/video/vpFFMPEG.cpp
+@@ -180,7 +180,7 @@ bool vpFFMPEG::openStream(const char *fi
+       if (pFrameRGB == NULL)
+         return false;
+       
+-      numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
++      numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
+     }
+     
+     else if (color_type == vpFFMPEG::GRAY_SCALED)
+@@ -194,7 +194,7 @@ bool vpFFMPEG::openStream(const char *fi
+       if (pFrameGRAY == NULL)
+         return false;
+       
+-      numBytes = avpicture_get_size (PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
++      numBytes = avpicture_get_size (AV_PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
+     }  
+ 
+     /*
+@@ -211,10 +211,10 @@ bool vpFFMPEG::openStream(const char *fi
+   }
+   
+   if (color_type == vpFFMPEG::COLORED)
+-    avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
++    avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
+   
+   else if (color_type == vpFFMPEG::GRAY_SCALED)
+-    avpicture_fill((AVPicture *)pFrameGRAY, buffer, PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
++    avpicture_fill((AVPicture *)pFrameGRAY, buffer, AV_PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
+   
+   streamWasOpen = true;
+ 
+@@ -231,10 +231,10 @@ bool vpFFMPEG::openStream(const char *fi
+ bool vpFFMPEG::initStream()
+ {
+   if (color_type == vpFFMPEG::COLORED)
+-    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
++    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+   
+   else if (color_type == vpFFMPEG::GRAY_SCALED)
+-    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
++    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
+ 
+   int ret = av_seek_frame(pFormatCtx, (int)videoStream, 0, AVSEEK_FLAG_ANY) ;
+   if (ret < 0 )
+@@ -703,7 +703,7 @@ bool vpFFMPEG::openEncoder(const char *f
+   pCodecCtx->time_base.den = framerate_encoder;
+   pCodecCtx->gop_size = 10; /* emit one intra frame every ten frames */
+   pCodecCtx->max_b_frames=1;
+-  pCodecCtx->pix_fmt = PIX_FMT_YUV420P;
++  pCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P;
+ 
+   /* open it */
+ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53,35,0) // libavcodec 53.35.0
+@@ -726,15 +726,15 @@ bool vpFFMPEG::openEncoder(const char *f
+   outbuf_size = 100000;
+   outbuf = new uint8_t[outbuf_size];
+ 
+-  numBytes = avpicture_get_size (PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
++  numBytes = avpicture_get_size (AV_PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
+   picture_buf = new uint8_t[numBytes];
+-  avpicture_fill((AVPicture *)pFrame, picture_buf, PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
++  avpicture_fill((AVPicture *)pFrame, picture_buf, AV_PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
+ 
+-  numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
++  numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
+   buffer = new uint8_t[numBytes];
+-  avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
++  avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
+ 
+-  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
++  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, AV_PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
+   
+   encoderWasOpened = true;
+ 
diff --git a/sci-libs/ViSP/files/ffmpeg.patch b/sci-libs/ViSP/files/ffmpeg.patch
deleted file mode 100644
index 5c81d0505095..000000000000
--- a/sci-libs/ViSP/files/ffmpeg.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: ViSP-2.10.0/src/video/vpFFMPEG.cpp
-===================================================================
---- ViSP-2.10.0.orig/src/video/vpFFMPEG.cpp
-+++ ViSP-2.10.0/src/video/vpFFMPEG.cpp
-@@ -184,7 +184,7 @@ bool vpFFMPEG::openStream(const char *fi
-       if (pFrameRGB == NULL)
-         return false;
-       
--      numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-+      numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-     }
-     
-     else if (color_type == vpFFMPEG::GRAY_SCALED)
-@@ -198,7 +198,7 @@ bool vpFFMPEG::openStream(const char *fi
-       if (pFrameGRAY == NULL)
-         return false;
-       
--      numBytes = avpicture_get_size (PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
-+      numBytes = avpicture_get_size (AV_PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
-     }  
- 
-     /*
-@@ -215,10 +215,10 @@ bool vpFFMPEG::openStream(const char *fi
-   }
-   
-   if (color_type == vpFFMPEG::COLORED)
--    avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-+    avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-   
-   else if (color_type == vpFFMPEG::GRAY_SCALED)
--    avpicture_fill((AVPicture *)pFrameGRAY, buffer, PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
-+    avpicture_fill((AVPicture *)pFrameGRAY, buffer, AV_PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
-   
-   streamWasOpen = true;
- 
-@@ -235,10 +235,10 @@ bool vpFFMPEG::openStream(const char *fi
- bool vpFFMPEG::initStream()
- {
-   if (color_type == vpFFMPEG::COLORED)
--    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
-+    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
-   
-   else if (color_type == vpFFMPEG::GRAY_SCALED)
--    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
-+    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
- 
-   int ret = av_seek_frame(pFormatCtx, (int)videoStream, 0, AVSEEK_FLAG_ANY) ;
-   if (ret < 0 )
-@@ -707,7 +707,7 @@ bool vpFFMPEG::openEncoder(const char *f
-   pCodecCtx->time_base.den = framerate_encoder;
-   pCodecCtx->gop_size = 10; /* emit one intra frame every ten frames */
-   pCodecCtx->max_b_frames=1;
--  pCodecCtx->pix_fmt = PIX_FMT_YUV420P;
-+  pCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P;
- 
-   /* open it */
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53,35,0) // libavcodec 53.35.0
-@@ -730,15 +730,15 @@ bool vpFFMPEG::openEncoder(const char *f
-   outbuf_size = 100000;
-   outbuf = new uint8_t[outbuf_size];
- 
--  numBytes = avpicture_get_size (PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
-+  numBytes = avpicture_get_size (AV_PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
-   picture_buf = new uint8_t[numBytes];
--  avpicture_fill((AVPicture *)pFrame, picture_buf, PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
-+  avpicture_fill((AVPicture *)pFrame, picture_buf, AV_PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
- 
--  numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-+  numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-   buffer = new uint8_t[numBytes];
--  avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-+  avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
- 
--  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-+  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, AV_PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-   
-   encoderWasOpened = true;
- 
diff --git a/sci-libs/ViSP/files/opencv.patch b/sci-libs/ViSP/files/opencv.patch
deleted file mode 100644
index c8cafe0a5c97..000000000000
--- a/sci-libs/ViSP/files/opencv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ViSP-2.10.0/CMakeLists.txt
-===================================================================
---- ViSP-2.10.0.orig/CMakeLists.txt
-+++ ViSP-2.10.0/CMakeLists.txt
-@@ -1450,7 +1450,7 @@ if(USE_OPENCV)
-       list(APPEND VISP_EXTERN_LIBRARIES ${OpenCV_LIBS})

-     endif()

-     list(APPEND VISP_EXTERN_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS})

--    #LIST(APPEND VISP_EXTERN_LIBRARIES ${OpenCV_LIBS})

-+    LIST(APPEND VISP_EXTERN_LIBRARIES ${OpenCV_LIBRARIES})

-     #MESSAGE("OpenCV_INCLUDE_DIRS = ${OpenCV_INCLUDE_DIRS}")

-     #MESSAGE("OpenCV_LIBS = ${OpenCV_LIBS}")

-     #MESSAGE("OpenCV_LIB_DIR = ${OpenCV_LIB_DIR}")

diff --git a/sci-libs/ViSP/files/opencv3.patch b/sci-libs/ViSP/files/opencv3.patch
deleted file mode 100644
index 8f7f9ee269cd..000000000000
--- a/sci-libs/ViSP/files/opencv3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: ViSP-2.10.0/src/key-point/vpKeyPoint.h
-===================================================================
---- ViSP-2.10.0.orig/src/key-point/vpKeyPoint.h
-+++ ViSP-2.10.0/src/key-point/vpKeyPoint.h
-@@ -494,6 +494,7 @@ public:
-     initDetector(detectorName);
-   }
- 
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   /*!
-     Template function to set to a \p parameterName a value for a specific detector named by his \p detectorName.
- 
-@@ -507,6 +508,7 @@ public:
-       m_detectors[detectorName]->set(parameterName, value);
-     }
-   }
-+#endif
- 
-   /*!
-      Set and initialize a list of detectors denominated by their names \p detectorNames.
-@@ -532,6 +534,7 @@ public:
-     initExtractor(extractorName);
-   }
- 
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   /*!
-     Template function to set to a \p parameterName a value for a specific extractor named by his \p extractorName.
- 
-@@ -545,6 +548,7 @@ public:
-       m_extractors[extractorName]->set(parameterName, value);
-     }
-   }
-+#endif
- 
-   /*!
-      Set and initialize a list of extractors denominated by their names \p extractorNames.
-@@ -700,7 +704,7 @@ public:
-     m_useAffineDetection = useAffine;
-   }
- 
--#if (VISP_HAVE_OPENCV_VERSION >= 0x020400)
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   /*!
-     Set if cross check method must be used to eliminate some false matches with a brute-force matching method.
- 
-Index: ViSP-2.10.0/src/key-point/vpKeyPoint.cpp
-===================================================================
---- ViSP-2.10.0.orig/src/key-point/vpKeyPoint.cpp
-+++ ViSP-2.10.0/src/key-point/vpKeyPoint.cpp
-@@ -868,7 +868,7 @@ void vpKeyPoint::detect(const vpImage<un
-                       (int) rectangle.getBottom());
-     cv::rectangle(mask, leftTop, rightBottom, cv::Scalar(255), CV_FILLED);
-   } else {
--    mask = cv::Mat::ones(matImg.rows, matImg.cols, CV_8U);
-+    mask = cv::Mat::ones(matImg.rows, matImg.cols, CV_8U) * 255;
-   }
- 
-   detect(matImg, keyPoints, elapsedTime, mask);
-@@ -1544,7 +1544,7 @@ void vpKeyPoint::initExtractors(const st
- void vpKeyPoint::initMatcher(const std::string &matcherName) {
-   m_matcher = cv::DescriptorMatcher::create(matcherName);
- 
--#if (VISP_HAVE_OPENCV_VERSION >= 0x020400)
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   if(m_matcher != NULL && !m_useKnn && matcherName == "BruteForce") {
-     m_matcher->set("crossCheck", m_useBruteForceCrossCheck);
-   }
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 00ace0279414..565d1854e294 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1 +1,2 @@
 DIST cfitsio-3.360.tar.gz 4104894 SHA256 b5fb209583c76a0bcc39808e55ebf2417b9c26114c59db1a3f49ea1ede5fa95d SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072 WHIRLPOOL 05589a27c6fa83a0240b26924954c1c6d25d985ad609dfbd37fccfe5758fd28efbd97a5ec289803053e2f53e053e51c017292845de1b4368bcd1725fa2eccdb7
+DIST cfitsio-3.38.tar.gz 4142236 SHA256 d4aef44401b1d2142a13ffc3a28cce7c77264ca0ddce164d87fdcb275503dd5d SHA512 7428c1c87736ca384153f7f810e0bdbccdcc2f41892b0b9ceda9e5efb20655585c2789b16510a5362f8b67ef53a0ac443094786966e5748cbe7ad828599723fc WHIRLPOOL 8a809e0cc89357a983e60c56e41ef5d758561751d49a2443c0c0b2640d0573f6f7313c99342458600aa28739e0ea55f85adc1e04505777c3339dc750aa829bcf
diff --git a/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild b/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
new file mode 100644
index 000000000000..1bc7e276b397
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit autotools-multilib fortran-2
+
+DESCRIPTION="C and Fortran library for manipulating FITS files"
+HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 doc examples fortran static-libs +tools threads"
+
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	fortran? ( dev-lang/cfortran )"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	# avoid internal cfortran
+	if use fortran; then
+		mv cfortran.h cfortran.h.disabled
+		ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
+	fi
+	autotools-multilib_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable fortran)
+		$(use_enable threads)
+		$(use_enable tools)
+		$(use_with bzip2)
+	)
+	autotools-multilib_src_configure
+}
+
+src_install () {
+	autotools-multilib_src_install
+	dodoc README README.md CHANGES.md docs/changes.txt docs/cfitsio.doc
+	use fortran && dodoc docs/fitsio.doc
+	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
+	use doc && use fortran && dodoc docs/fitsio.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins cookbook.c testprog.c speed.c smem.c
+		use fortran && doins cookbook.f testf77.f
+	fi
+}
diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index 11949d6f6198..ae6065bcbd93 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1,4 +1 @@
-DIST exodus-5.22b.tar.gz 4693236 SHA256 6781b96039af030a98ddb893c40db06959b4843b6e2961c770b5d64d90241265 SHA512 04364b473d074c8bff194c63ed5ef78cb163ccc72a8dd196803646e8a8fe0faf25f9fd9a68d6df0ee821b9a84341b6aeabcc816b476fb3f7befe1e482a9455b7 WHIRLPOOL a95c98db2c6d825602618acaeced503bc1b9e312b6a4968011bd663d4c036976b4f5bf3fd45ceec0f31d3bca8e9a8cb6d53fd2d1b33ab25ec9e0993436abc7c6
-DIST exodus-5.24.tar.bz2 4252980 SHA256 c16a70c0572341c7e680f8d6420c79e1fd744ba717dc4f7e023f7421c636515d SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e WHIRLPOOL 5a622fce123d55187c0895934db76c2cfb3ab2e83e13d6f5b6655c388e7cac1107acaa786b75be5275de7398035a5604d0be2975c78da05edbdaa4f8efbf9513
-DIST exodus-5.26-1.tar.gz 4673391 SHA256 9b681396b345d223bbd1b36b67173d1779afed5fabd0929b51e41ce1f830db2e SHA512 20e106cb0b733b7468002706ec6768502c8528cc8f4de7a5b957f324a76559404d97133bfc0e74e29a30b4dcc5aca9f605db55b45fdbbca6bb2099aad3c23273 WHIRLPOOL e2e4af23b0d521ec52e98636a2b0bc7095153683ff14b5e6d35d0e252c22a09772bcca9cb7029f9bf4f9456a76bd68c19d3ee63a425b09e9dd2496f9be97abcb
 DIST exodus-6.02.tar.gz 4735364 SHA256 a3d7ae6ad433bb9655748c0e3e7a95e66c46d9df1e4c3d8d7e125af3fec89193 SHA512 d086464f0af2edd06d6e6a49be28d3bdfe00c0e9a9a09abad7822a49c7a7fbb75b61324ea54d2163c73b45ee90222c22754c804ee6868cdb0f9e4b780d6d5ad0 WHIRLPOOL 53382f9ec4b11197c4b2424a222b4178de73ac233e2e23110070a7a72f150ec8ed2ad024b4ce1bdfed3ab6b3c9dfb040d243c394af2a60e7330a681f8dac58a2
diff --git a/sci-libs/exodusii/exodusii-5.22b.ebuild b/sci-libs/exodusii/exodusii-5.22b.ebuild
deleted file mode 100644
index 564d7abc24cf..000000000000
--- a/sci-libs/exodusii/exodusii-5.22b.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils multilib
-
-DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="http://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/${PN}/${P/ii/}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="sci-libs/netcdf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${P/ii/}/${PN/ii/}
-
-PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)"
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/forbind/test
-	csh testall
-	./f_test_nem || die
-}
diff --git a/sci-libs/exodusii/exodusii-5.24.ebuild b/sci-libs/exodusii/exodusii-5.24.ebuild
deleted file mode 100644
index de83032bcaaf..000000000000
--- a/sci-libs/exodusii/exodusii-5.24.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-MY_PN="${PN%ii}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="http://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="sci-libs/netcdf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}/${MY_PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.22b-multilib.patch )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)"
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/forbind/test
-	csh testall
-	./f_test_nem || die
-}
diff --git a/sci-libs/exodusii/exodusii-5.26.ebuild b/sci-libs/exodusii/exodusii-5.26.ebuild
deleted file mode 100644
index 6d3219805d47..000000000000
--- a/sci-libs/exodusii/exodusii-5.26.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 multilib
-
-MY_PN="${PN%ii}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="http://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}-1.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="sci-libs/netcdf[hdf5]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}/
-
-PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use_build !static-libs SHARED)
-		$(cmake-utils_use_build test TESTING)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/forbind/test || die
-	csh testall || die
-	./f_test_nem || die
-}
diff --git a/sci-libs/exodusii/exodusii-6.02.ebuild b/sci-libs/exodusii/exodusii-6.02.ebuild
index fd65fa986058..8b05c1c296bb 100644
--- a/sci-libs/exodusii/exodusii-6.02.ebuild
+++ b/sci-libs/exodusii/exodusii-6.02.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit cmake-utils multilib
+FORTRAN_NEEDED="test"
+
+inherit cmake-utils fortran-2 multilib
 
 MY_PN="${PN%ii}"
 MY_P="${MY_PN}-${PV}"
@@ -18,13 +20,23 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
-DEPEND="sci-libs/netcdf[hdf5]"
-RDEPEND="${DEPEND}"
+RDEPEND="sci-libs/netcdf[hdf5]"
+DEPEND="${RDEPEND}
+	test? ( app-shells/tcsh )
+"
 
 S="${WORKDIR}"/${MY_P}/${MY_PN}
 
 PATCHES=( "${FILESDIR}"/${PN}-5.26-multilib.patch )
 
+src_prepare() {
+	use test || \
+		sed \
+		-e 's:Fortran::g' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR=$(get_libdir)
diff --git a/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch b/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch
deleted file mode 100644
index 3cde66622c1d..000000000000
--- a/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch
+++ /dev/null
@@ -1,102 +0,0 @@
- exodus/CMakeLists.txt         |  6 +++---
- exodus/cbind/CMakeLists.txt   |  6 +++---
- exodus/forbind/CMakeLists.txt | 13 +++++++------
- 3 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/exodus/CMakeLists.txt b/exodus/CMakeLists.txt
-index 935da5a..33c68ca 100644
---- a/exodus/CMakeLists.txt
-+++ b/exodus/CMakeLists.txt
-@@ -21,7 +21,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY
-    NAMES netcdf
-    PATHS "$ENV{ACCESS}/lib"
--         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -35,14 +35,14 @@ find_program (NETCDF_NCDUMP ncdump
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-diff --git a/exodus/cbind/CMakeLists.txt b/exodus/cbind/CMakeLists.txt
-index 9aa54e9..a19a969 100644
---- a/exodus/cbind/CMakeLists.txt
-+++ b/exodus/cbind/CMakeLists.txt
-@@ -259,9 +259,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
- 
- IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
-   INSTALL(TARGETS exoIIv2c
--    RUNTIME DESTINATION lib COMPONENT Runtime
--    LIBRARY DESTINATION lib COMPONENT Runtime
--    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
-   INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 
-diff --git a/exodus/forbind/CMakeLists.txt b/exodus/forbind/CMakeLists.txt
-index 4a5e7c7..dad37ae 100644
---- a/exodus/forbind/CMakeLists.txt
-+++ b/exodus/forbind/CMakeLists.txt
-@@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY
-    NAMES netcdf
-    PATHS "$ENV{ACCESS}/lib"
--         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -28,20 +28,21 @@ find_program (NETCDF_NCDUMP ncdump
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
- 
- INCLUDE_DIRECTORIES(
-   "${CMAKE_CURRENT_SOURCE_DIR}/include"
-+  "${CMAKE_CURRENT_SOURCE_DIR}/../cbind/include"
-   "${CMAKE_CURRENT_BINARY_DIR}/include"
-   "${NETCDF_INCLUDE_DIR}"
- )
-@@ -60,9 +61,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
- 
- IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
-   INSTALL(TARGETS exoIIv2for
--    RUNTIME DESTINATION lib COMPONENT Runtime
--    LIBRARY DESTINATION lib COMPONENT Runtime
--    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
-   INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 
diff --git a/sci-libs/geos/geos-3.5.0.ebuild b/sci-libs/geos/geos-3.5.0.ebuild
index dfdd7bb03935..46343b1322cf 100644
--- a/sci-libs/geos/geos-3.5.0.ebuild
+++ b/sci-libs/geos/geos-3.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc php python ruby static-libs"
 
 RDEPEND="
diff --git a/sci-libs/libbufr/Manifest b/sci-libs/libbufr/Manifest
deleted file mode 100644
index e0171be94843..000000000000
--- a/sci-libs/libbufr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bufrdc_000405.tar.gz 11873311 SHA256 0c3ab33bdb3eea600c5af6f1e4064a000ec143f4c96a14b72ca09666ca3c3775 SHA512 3355d6bac54ef152f9feb13ae13f3c94f4e01a665a4b9bc7f85f0c98f9aa37411170668ba9adfb6b62c2fe906d0dff67b03a708cdf1acd21a0037e327c7c6169 WHIRLPOOL f97662c240e40086be2e2f7d33d446280576dd79ff119374d54d02af05bd51c9176a6592d965765baf549043ee80e8bb9e824e3149d4ce85599db1f5e3f42e10
diff --git a/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch b/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch
deleted file mode 100644
index 8b0ac1ce9a65..000000000000
--- a/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- examples/bufr_decode.c.orig	2008-09-17 03:02:39.000000000 -0700
-+++ examples/bufr_decode.c	2010-12-27 19:03:57.000000000 -0800
-@@ -7,9 +7,9 @@
- * See LICENSE and gpl-3.0.txt for details.
- */
- 
--#include "stdio.h"
--#include "stdlib.h"
--
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- 
- int main(int argc, char *argv[])
diff --git a/sci-libs/libbufr/files/libbufr-000405-makefile.patch b/sci-libs/libbufr/files/libbufr-000405-makefile.patch
deleted file mode 100644
index 08b30ded8d72..000000000000
--- a/sci-libs/libbufr/files/libbufr-000405-makefile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- Makefile.orig	2016-01-04 13:09:58.661150785 -0800
-+++ Makefile	2016-01-04 13:17:12.707621825 -0800
-@@ -1,7 +1,7 @@
- #                                Makefile for libbufrex
- #
- R64 = R64
--TARGETS = all clean
-+TARGETS = all clean test
- LIBRARY = libbufr$(R64).a
- SHELL=/bin/sh
- SUBDIRS = fortranC bufrdc pbio bufrtables examples
-@@ -11,12 +11,14 @@
- 	( echo "*************************"; \
- 	  echo "*** Make in $$name "; \
- 	  echo "*************************"; \
--	cd $$name ; make ; ) done
-+	$(MAKE) -C $$name LIB=bufr ; ) done
-+
-+test :
- 	./test.sh
- 	tables_tools/check_tables.sh bufrtables
- 
- clean   :
- 	@for name in $(SUBDIRS); do\
--	( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
-+	( echo "*** Clean in $$name ***" ;$(MAKE) -C $$name clean ); \
- 	done
- 	rm -f $(LIBRARY)
---- examples/Makefile.in.orig	2016-01-04 13:42:39.790648703 -0800
-+++ examples/Makefile.in	2016-01-04 13:45:02.384967830 -0800
-@@ -16,19 +16,19 @@
- #
- #
- TARGETS  = all clean
--EXECS    = decode_bufr decode_bufr_image bufr_decode_all tdexp tdexp create_bufr
-+EXECS    = decode_bufr decode_bufr_image bufr_decode_all bufr_compress tdexp create_bufr
- #
- #
- all :$(EXECS)
- 
--decode_bufr: decode_bufr.o 
-+decode_bufr: decode_bufr.o
- 	$(FC) $(FFLAGS) -o $@ decode_bufr.o -L$(PLACE) -l$(LIB)$(R64)
- 
--bufr_decode_all: bufr_decode_all.o 
--	$(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64) 
-+bufr_decode_all: bufr_decode_all.o
-+	$(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
- 
--bufr_compress: bufr_compress.o 
--	$(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64) 
-+bufr_compress: bufr_compress.o
-+	$(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
- 
- bufr2crex   : bufr2crex.o
- 	$(FC) $(FFLAGS) -o $@ bufr2crex.o -L$(PLACE) -l$(LIB)$(R64) -lcrex$(R64)
-@@ -48,4 +48,4 @@
- clean   :
- 	@for name in $(EXECS); do\
- 	(rm -f $$name *.o ); \
--	done 
-+	done
---- bufrtables/Makefile.orig	2016-01-04 14:03:47.292850644 -0800
-+++ bufrtables/Makefile	2016-01-04 14:05:22.242500485 -0800
-@@ -25,11 +25,14 @@
- OBJECTS      = $(OBJECTS.F) $(OBJECTS.c) 
- #
- #
--all:  links 
-+all:  pgms links
- 
- links: 
- 	./clean.sh
- 	./links.sh
-+
-+pgms: bufr2txt_tables bufr_split_tables txt2bufr_tables
-+
- bufr2txt_tables: bufr2txt_tables.f
- 	$(FC) $(FFLAGS) -o bufr2txt_tables bufr2txt_tables.f $(LIBRARY)
- bufr_split_tables: bufr_split_tables.f
diff --git a/sci-libs/libbufr/files/libbufr-makefile.patch b/sci-libs/libbufr/files/libbufr-makefile.patch
deleted file mode 100644
index bc6196245ee0..000000000000
--- a/sci-libs/libbufr/files/libbufr-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2011-03-16 22:05:18.000000000 -0700
-+++ Makefile	2011-03-16 22:05:40.000000000 -0700
-@@ -10,7 +10,7 @@
- 	( echo "*************************"; \
- 	  echo "*** Make in $$name "; \
- 	  echo "*************************"; \
--	cd $$name ; make LIB=bufr ; ) done
-+	$(MAKE) -C $$name LIB=bufr ; ) done
- 
- clean   :
- 	@for name in $(SUBDIRS); do\
diff --git a/sci-libs/libbufr/libbufr-000405.ebuild b/sci-libs/libbufr/libbufr-000405.ebuild
deleted file mode 100644
index 96df106f0f03..000000000000
--- a/sci-libs/libbufr/libbufr-000405.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fortran-2 toolchain-funcs
-
-MY_P="${PN/lib/}dc_${PV}"
-
-DESCRIPTION="ECMWF BUFR library - includes both C and Fortran example utilities"
-HOMEPAGE="https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home"
-SRC_URI="https://software.ecmwf.int/wiki/download/attachments/35752466/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# needs someone to test on these: ~alpha ~hppa ~ia64 ~sparc etc ...
-
-IUSE="debug doc examples lto"
-
-RDEPEND="
-	virtual/fortran
-	"
-
-DEPEND="sys-apps/findutils"
-
-S=${WORKDIR}/${MY_P}
-
-if use lto; then
-	RESTRICT="strip"
-fi
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	case "$(tc-getFC)" in
-		*gfortran)
-			export CNAME="_gfortran"
-			;;
-		*g77)
-			export CNAME="_gnu"
-			;;
-		*pgf90|*pgf77)
-			export CNAME=""
-			;;
-		ifc|ifort)
-			export CNAME="_intel"
-			;;
-	esac
-
-	elog "Note non-GNU compilers are not currently supported on non-x86"
-	elog "architectures.  If you need it, please submit a patch..."
-
-	export target="linux"
-	export A64=""
-	export R64=""
-	case "${ARCH}" in
-		amd64)
-			export R64="R64"
-			export A64="A64"
-			;;
-		ppc64)
-			export target="ppc_G5"
-			;;
-		ppc)
-			export target="ppc"
-			;;
-		*)
-			;;
-	esac
-}
-
-src_prepare() {
-	update_configs
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	local config="config/config.$target$CNAME$R64$A64"
-
-	if [[ "${ARCH}" == "ppc" ]] ; then
-		sed -i -e "s|= -mcpu=G4 -mtune=G4|= |" ${config}
-	elif [[ "${ARCH}" == "ppc64" ]] ; then
-		sed -i -e "s|= -mcpu=G5 -mtune=G5|= |" ${config}
-	else
-		cp ${config}.in ${config} || die "Error updating config!"
-	fi
-
-	sed -i -e "s:DEBUG = -O2:DEBUG = -g:g" ${config}
-	use debug || sed -i -e "s:DEBUG = -g:DEBUG =:g" ${config}
-
-	# add local CFLAGS to build flags
-	sed -i -e "s|\$(DEBUG)|${CFLAGS} \$(DEBUG) -fPIC|" \
-		-e 's|emos|/usr/share/bufrtables|g' ${config}
-
-	# add local LDFLAGS to bins
-	sed -i \
-		-e "s|-o|${LDFLAGS} -fPIC -o|" \
-		examples/Makefile \
-		bufrtables/Makefile
-}
-
-src_compile() {
-	export BUFR_TABLES="${S}"/bufrtables
-	EBUILD_ARCH="${ARCH}"
-	EBUILD_CFLAGS="${CFLAGS}"
-	unset ARCH CFLAGS
-
-	tc-export CC FC AR NM STRIP RANLIB
-	TC_FLAGS="CC=$CC FC=$FC AR=$AR RANLIB=$RANLIB"
-	ARFLAGS="rv"
-
-	if use lto; then
-		PLUGIN_PATH="--plugin=$(gcc -print-prog-name=liblto_plugin.so)"
-		tc-ld-is-gold && ARFLAGS="rv ${PLUGIN_PATH}"
-	fi
-
-	# emake won't work with this fossil...
-	BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
-	make $TC_FLAGS ARFLAGS="${ARFLAGS}" $BUFRFLAGS || die "make failed"
-
-	generate_files
-
-	ARCH="${EBUILD_ARCH}"
-	CFLAGS="${EBUILD_CFLAGS}"
-}
-
-src_test() {
-	unset ARCH CFLAGS
-	BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
-	make $BUFRFLAGS test || die "make test failed"
-
-	ARCH="${EBUILD_ARCH}"
-	CFLAGS="${EBUILD_CFLAGS}"
-}
-
-src_install() {
-	# install library
-	dolib.a libbufr$R64.a
-
-	dosbin bufrtables/{bufr2txt_tables,bufr_split_tables,txt2bufr_tables}
-	dobin examples/{bufr_decode_all,create_bufr,decode_bufr,decode_bufr_image,tdexp}
-
-	keepdir /usr/share/bufrtables
-	insinto /usr/share/bufrtables
-	doins -r bufrtables/{B,C,D}*.*
-
-	# files generated above
-	doenvd 20${PN}
-
-	dodoc README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf
-	fi
-
-	if use examples ; then
-		newdoc examples/README README.examples
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.F,*.c,Makefile}
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "This is the only GPL'd BUFR decoder library written in C/Fortran"
-	elog "but the build system is an old kluge that pre-dates the discovery"
-	elog "of fire.  File bugs as usual if you have build/runtime problems."
-	elog ""
-	elog "The default BUFR tables are stored in /usr/share/bufrtables, so"
-	elog "add your local tables there if needed.  Only a static lib is"
-	elog "installed currently, as shared lib support is incomplete (feel"
-	elog "free to submit a patch :)"
-	elog ""
-	elog "The installed user-land bufr utilities are just the examples;"
-	elog "the main library is really all there is (and there are no man"
-	elog "pages either).  Install the examples and use the source, Luke..."
-	elog
-}
-
-generate_files() {
-	## Do not remove blank lines from the response file
-	cat <<-EOF > 20${PN}
-	BUFR_TABLES="/usr/share/bufrtables"
-	EOF
-}
-
-update_configs() {
-	find . -type f -name \*.distinct -o -name \*.f -o -name \*.in \
-		 | xargs chmod -x
-	cp options/options_linux options/options_ppc
-	cp options/options_linux options/options_ppc_G5
-	cp pbio/sources.linux pbio/sources.ppc
-	cp pbio/sources.linux pbio/sources.ppc_G5
-	pushd config > /dev/null
-		cp config.ppc_gfortran.in config.ppc_gfortran
-		cp config.ppc_gfortranR64.in config.ppc_gfortranR64
-		cp config.ppc_gfortran_G5.in config.ppc_gfortran_G5
-		cp config.ppc_gfortranR64_G5.in config.ppc_gfortranR64_G5
-	popd > /dev/null
-}
diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
deleted file mode 100644
index d6a7bb3917c4..000000000000
--- a/sci-libs/libbufr/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nerdboy@gentoo.org</email>
-		<name>Steve Arnold</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-geosciences@gentoo.org</email>
-		<name>Gentoo Geosciences Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		This is mainly just an open source BUFR library from ECMWF that comes with a few example tools (some of which are built and installed).
-	</longdescription>
-	<use>
-		<flag name="lto">
-			Use gold linker and -flto (requires existing env setup)
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 429c5457bd6a..4b9f5dfa45f1 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,3 +1,2 @@
-DIST libint-1.1.4.tar.gz 350252 SHA256 f67b13bdf1135ecc93b4cff961c1ff33614d9f8409726ddc8451803776885cff SHA512 9a4011c227fbdee52f95a40659ebb131a2d2422784b35e5c8fc781da250f32bb53207c29e429785c1a59054391f44e1efad2c85b37c5d3a70f2e392a7857805d WHIRLPOOL ac84f3cbf8b21f02a2f3ae5b6b48e4e629c7c3c719fdd31fdaf308d42339250473c55620f1350687e0ff9f203ad835fdadba7ff3e7749f44d19462b5b2e96acc
 DIST libint-1.1.6.tar.gz 256404 SHA256 f201b0c621df678cfe8bdf3990796b8976ff194aba357ae398f2f29b0e2985a6 SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7 WHIRLPOOL ed6e0f850df067da115cdea4e9cff2545ea6ffe4e7b9dea28ef3232adec12d23c6b6709e8a058f78b9764890134440f4869a770b3b4e4934b4571562848fdb6a
 DIST libint-2.0.5.tar.gz 3209528 SHA256 f64298bc6513771ffea476a250110b3f488c01d669e05dd309fe4ba6114c5f95 SHA512 d7717a6337b73645dcb77d3c0731df17884b4c662b0d52061b7b80ac0ebd9de344e6c301294f714db09e7b6e3dff5b4b6958ef06122303df52d0ebb6a011cf24 WHIRLPOOL 896269589d6c95f83b5dc0517491d2b07bf60103fb0a11c131681acaa4a83f494ab436647ae7989a1a9e944b0fd59b03d530ab025efbba73efc75e9f1f720653
diff --git a/sci-libs/libint/files/1.1.4-as-needed.patch b/sci-libs/libint/files/1.1.4-as-needed.patch
deleted file mode 100644
index cc87d760b699..000000000000
--- a/sci-libs/libint/files/1.1.4-as-needed.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/lib/libderiv/Makefile.library b/src/lib/libderiv/Makefile.library
-index ee152ef..8debfe8 100644
---- a/src/lib/libderiv/Makefile.library
-+++ b/src/lib/libderiv/Makefile.library
-@@ -23,7 +23,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
- 
- # this is how shared library is made
- $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
--	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
-+	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
- 
- $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
- 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
-diff --git a/src/lib/libint/Makefile.library b/src/lib/libint/Makefile.library
-index 23e2918..01c4225 100644
---- a/src/lib/libint/Makefile.library
-+++ b/src/lib/libint/Makefile.library
-@@ -41,7 +41,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
- 
- # this is how shared library is made
- $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
--	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
-+	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
- 
- $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
- 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
-diff --git a/src/lib/libr12/Makefile.library b/src/lib/libr12/Makefile.library
-index 1510807..26d47a4 100644
---- a/src/lib/libr12/Makefile.library
-+++ b/src/lib/libr12/Makefile.library
-@@ -47,7 +47,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
- 
- # this is how shared library is made
- $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
--	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
-+	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
- 
- $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
- 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
diff --git a/sci-libs/libint/files/dont-append-mcpu.patch b/sci-libs/libint/files/dont-append-mcpu.patch
deleted file mode 100644
index 72b5e437051b..000000000000
--- a/sci-libs/libint/files/dont-append-mcpu.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN libint-1.1.2.orig/configure libint-1.1.2/configure
---- libint-1.1.2.orig/configure	2003-12-05 13:24:55.000000000 -0800
-+++ libint-1.1.2/configure	2005-12-06 03:27:37.000000000 -0800
-@@ -3554,10 +3554,10 @@
-       cpu_arch_option="-mcpu=$target_cpu"
-     fi
-     if test X$GCC = Xyes; then
--      COPTIONS_MISC="$COPTIONS_MISC $cpu_arch_option"
-+      COPTIONS_MISC="$COPTIONS_MISC"
-     fi
-     if test X$GXX = Xyes; then
--      CXXOPTIONS_MISC="$CXXOPTIONS_MISC $cpu_arch_option"
-+      CXXOPTIONS_MISC="$CXXOPTIONS_MISC"
-     fi
-     echo "$as_me:3562: result: IA-32: $cpu_arch_option" >&5
- echo "${ECHO_T}IA-32: $cpu_arch_option" >&6
diff --git a/sci-libs/libint/libint-1.1.4-r1.ebuild b/sci-libs/libint/libint-1.1.4-r1.ebuild
deleted file mode 100644
index 8c6bef0a605c..000000000000
--- a/sci-libs/libint/libint-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
-HOMEPAGE="http://www.chem.vt.edu/chem-dept/valeev/software/libint/libint.html"
-SRC_URI="http://www.chem.vt.edu/chem-dept/valeev/software/libint/src/${P}.tar.gz"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.1.4-as-needed.patch
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-deriv \
-		--enable-r12 \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-cc-optflags="${CFLAGS}" \
-		--with-cxx-optflags="${CXXFLAGS}" \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-}
diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild
index ed13b18c9a47..cede7af197b1 100644
--- a/sci-libs/libint/libint-1.1.6.ebuild
+++ b/sci-libs/libint/libint-1.1.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/release-${MY_PV}.tar.gz -> ${
 
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-release-${MY_PV}"
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 4cf23af44119..f865dc10c090 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -2,3 +2,4 @@ DIST STIX_font.tgz 2450541 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef9
 DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc WHIRLPOOL 3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
 DIST mathgl-2.1.3.tar.gz 5269347 SHA256 b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73 WHIRLPOOL 9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
 DIST mathgl-2.3.3.tar.gz 20888708 SHA256 324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512 8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2 WHIRLPOOL e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942
+DIST mathgl-2.3.4.tar.gz 21361705 SHA256 6e93cd9f640c5b6c9dac4ca56854612d4261b4eadd6c8aad6536965195f08c02 SHA512 2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d WHIRLPOOL cc7043ec2f6a84999de65ad3a5127564da3563644456d08c280d7f462dedf86e7cd5f28996f43e32300aa30adb730904c6cf6cb8f8e2c434402395af37f3ddc7
diff --git a/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch b/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch
new file mode 100644
index 000000000000..6254321c59a2
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch
@@ -0,0 +1,25 @@
+ src/fit.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/fit.cpp b/src/fit.cpp
+index 6a42a4b..d167022 100644
+--- a/src/fit.cpp
++++ b/src/fit.cpp
+@@ -179,6 +179,7 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitData &fd, mreal *ini)
+ 	const gsl_multifit_fdfsolver_type *T = gsl_multifit_fdfsolver_lmsder;

+ 	gsl_multifit_fdfsolver *s = gsl_multifit_fdfsolver_alloc(T, n, m);

+ 	gsl_multifit_function_fdf f;

++	gsl_matrix *J;

+ 	f.f = mgl_fit__f;		f.df = mgl_fit__df;

+ 	f.fdf = mgl_fit__fdf;	f.n = n;	f.p = m;

+ 	f.params = &fd;

+@@ -193,7 +194,8 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitData &fd, mreal *ini)
+ 	}

+ 	while ( status == GSL_CONTINUE && iter < 500 );

+ 	gsl_matrix *covar = gsl_matrix_alloc(m, m);

+-	gsl_multifit_covar (s->J, 0.0, covar );

++	gsl_multifit_fdfsolver_jac (s, J);

++	gsl_multifit_covar (J, 0.0, covar);

+ 	mglFitCovar.Set(covar);

+ 	mreal res = gsl_blas_dnrm2(s->f);

+ 	for(i=0;i<m;i++)	ini[i] = gsl_vector_get(s->x, i);

diff --git a/sci-libs/mathgl/mathgl-2.1.3.1.ebuild b/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
index 7f0ff4af3215..7b5085944d23 100644
--- a/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,7 +30,7 @@ RDEPEND="
 	fltk? ( x11-libs/fltk:1 )
 	gif? ( media-libs/giflib )
 	glut? ( media-libs/freeglut )
-	gsl? ( sci-libs/gsl )
+	gsl? ( <sci-libs/gsl-2 )
 	hdf? ( sci-libs/hdf )
 	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
diff --git a/sci-libs/mathgl/mathgl-2.1.3.ebuild b/sci-libs/mathgl/mathgl-2.1.3.ebuild
index 65ff4c8ec660..ce36b9d6961f 100644
--- a/sci-libs/mathgl/mathgl-2.1.3.ebuild
+++ b/sci-libs/mathgl/mathgl-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,7 +30,7 @@ RDEPEND="
 	fltk? ( x11-libs/fltk:1 )
 	gif? ( media-libs/giflib )
 	glut? ( media-libs/freeglut )
-	gsl? ( sci-libs/gsl )
+	gsl? ( <sci-libs/gsl-2 )
 	hdf? ( sci-libs/hdf )
 	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
diff --git a/sci-libs/mathgl/mathgl-2.3.3-r1.ebuild b/sci-libs/mathgl/mathgl-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..7b3109feef1b
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.3.3-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+	png python qt4 qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+	IUSE+=" linguas_${l}"
+done
+
+RDEPEND="
+	!sci-visualization/udav
+	virtual/opengl
+	fltk? ( x11-libs/fltk:1 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	gsl? ( >=sci-libs/gsl-2 )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
+	openmp? ( sys-cluster/openmpi )
+	pdf? ( media-libs/libharu )
+	png? ( media-libs/libpng:0 )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+	qt4? ( dev-qt/qtgui:4 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	openmp? ( !threads )
+	png? ( zlib )
+	pdf? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gsl-2.patch
+)
+
+pkg_setup() {
+	use mpi && export CC=mpicc CXX=mpicxx
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	if ! [[ -d "${S}"/fonts ]]; then
+		mkdir "${S}"/fonts || die
+	fi
+	cd "${S}"/fonts || die
+	unpack STIX_font.tgz
+}
+
+src_prepare() {
+	default
+	epatch "${PATCHES[@]}"
+	# fix for location of hdf headers
+	sed -i -e 's:hdf/::g' src/data_io.cpp || die
+	# bored of reporting bad libdir upstream
+	sed -i \
+		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+		{src,widgets}/CMakeLists.txt || die
+	echo "" > lang/install.m || die
+	# fix desktop file
+	sed -i -e 's/.png//' udav/udav.desktop || die
+	# prevent sandbox violation
+	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+	# fix missing include, bug 564204
+	sed \
+		-e '/#include <QStringList>/i #include <QObject>' \
+		-i json/Backend.hpp || die
+
+	use python && \
+		append-cppflags \
+		-I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
+	use wxwidgets && need-wxwidgets unicode
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# No clue about this option:
+		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
+		-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+		-DMGL_LIB_INSTALL_DIR="$(get_libdir)"
+		$(cmake-utils_use doc enable-all-docs)
+		$(cmake-utils_use fltk enable-fltk)
+		$(cmake-utils_use gif enable-gif)
+		$(cmake-utils_use glut enable-glut)
+		$(cmake-utils_use gsl enable-gsl)
+		$(cmake-utils_use hdf enable-hdf4)
+		$(cmake-utils_use hdf5 enable-hdf5_18)
+		$(cmake-utils_use jpeg enable-jpeg)
+		$(cmake-utils_use lua enable-lua)
+		$(cmake-utils_use mpi enable-mpi)
+		$(cmake-utils_use octave enable-octave)
+		$(cmake-utils_use opengl enable-opengl)
+		$(cmake-utils_use openmp enable-openmp)
+		$(cmake-utils_use pdf enable-pdf)
+		$(cmake-utils_use png enable-png)
+		$(cmake-utils_use qt4 enable-qt4)
+		$(cmake-utils_use qt5 enable-qt5)
+		$(cmake-utils_use threads enable-pthread)
+		$(cmake-utils_use python enable-python)
+		$(cmake-utils_use wxwidgets enable-wx)
+		$(cmake-utils_use zlib enable-zlib)
+	)
+	cmake-utils_src_configure
+	# to whoever cares: TODO: do for multiple python ABI
+	if use python; then
+		sed -i \
+			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
+			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README* *.txt AUTHORS
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+	if use qt4 ; then
+		local lang
+		insinto /usr/share/udav
+		for lang in ${LANGS} ; do
+			use linguas_${lang} && doins udav/udav_${lang}.qm
+		done
+	fi
+	if use octave ; then
+		insinto /usr/share/${PN}/octave
+		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
+	fi
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if use octave; then
+		octave <<-EOF
+		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
+		EOF
+	fi
+}
+
+pkg_prerm() {
+	if use octave; then
+		octave <<-EOF
+		pkg uninstall ${PN}
+		EOF
+	fi
+}
diff --git a/sci-libs/mathgl/mathgl-2.3.3.ebuild b/sci-libs/mathgl/mathgl-2.3.3.ebuild
index f75fe4b357a1..69f6c1f674c5 100644
--- a/sci-libs/mathgl/mathgl-2.3.3.ebuild
+++ b/sci-libs/mathgl/mathgl-2.3.3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	fltk? ( x11-libs/fltk:1 )
 	gif? ( media-libs/giflib )
 	glut? ( media-libs/freeglut )
-	gsl? ( sci-libs/gsl )
+	gsl? ( <sci-libs/gsl-2 )
 	hdf? ( sci-libs/hdf )
 	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
diff --git a/sci-libs/mathgl/mathgl-2.3.4.ebuild b/sci-libs/mathgl/mathgl-2.3.4.ebuild
new file mode 100644
index 000000000000..165c0d13e718
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.3.4.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.4.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+	png python qt4 qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+	IUSE+=" linguas_${l}"
+done
+unset l
+
+RDEPEND="
+	!sci-visualization/udav
+	virtual/opengl
+	fltk? ( x11-libs/fltk:1 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	gsl? ( >=sci-libs/gsl-2 )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
+	openmp? ( sys-cluster/openmpi )
+	pdf? ( media-libs/libharu )
+	png? ( media-libs/libpng:0 )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+	qt4? ( dev-qt/qtgui:4 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	openmp? ( !threads )
+	png? ( zlib )
+	pdf? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc CXX=mpicxx
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	if ! [[ -d "${S}"/fonts ]]; then
+		mkdir "${S}"/fonts || die
+	fi
+	cd "${S}"/fonts || die
+	unpack STIX_font.tgz
+}
+
+src_prepare() {
+	default
+
+	# fix for location of hdf headers
+	sed -i -e 's:hdf/::g' src/data_io.cpp || die
+	# bored of reporting bad libdir upstream
+	sed -i \
+		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+		{src,widgets}/CMakeLists.txt || die
+	echo "" > lang/install.m || die
+	# fix desktop file
+	sed -i -e 's/.png//' udav/udav.desktop || die
+	# prevent sandbox violation
+	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+	# fix missing include, bug 564204
+	sed \
+		-e '/#include <QStringList>/i #include <QObject>' \
+		-i json/Backend.hpp || die
+
+	use python && \
+		append-cppflags \
+		-I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
+	use wxwidgets && need-wxwidgets unicode
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# No clue about this option:
+		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
+		-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+		-DMGL_LIB_INSTALL_DIR="$(get_libdir)"
+		$(cmake-utils_use doc enable-all-docs)
+		$(cmake-utils_use fltk enable-fltk)
+		$(cmake-utils_use gif enable-gif)
+		$(cmake-utils_use glut enable-glut)
+		$(cmake-utils_use gsl enable-gsl)
+		$(cmake-utils_use hdf enable-hdf4)
+		$(cmake-utils_use hdf5 enable-hdf5_18)
+		$(cmake-utils_use jpeg enable-jpeg)
+		$(cmake-utils_use lua enable-lua)
+		$(cmake-utils_use mpi enable-mpi)
+		$(cmake-utils_use octave enable-octave)
+		$(cmake-utils_use opengl enable-opengl)
+		$(cmake-utils_use openmp enable-openmp)
+		$(cmake-utils_use pdf enable-pdf)
+		$(cmake-utils_use png enable-png)
+		$(cmake-utils_use qt4 enable-qt4)
+		$(cmake-utils_use qt5 enable-qt5)
+		$(cmake-utils_use threads enable-pthread)
+		$(cmake-utils_use threads enable-pthr-widget)
+		$(cmake-utils_use python enable-python)
+		$(cmake-utils_use wxwidgets enable-wx)
+		$(cmake-utils_use zlib enable-zlib)
+	)
+	cmake-utils_src_configure
+	# to whoever cares: TODO: do for multiple python ABI
+	if use python; then
+		sed -i \
+			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
+			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README* *.txt AUTHORS
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+	if use qt4 ; then
+		local lang
+		insinto /usr/share/udav
+		for lang in ${LANGS} ; do
+			use linguas_${lang} && doins udav/udav_${lang}.qm
+		done
+	fi
+	if use octave ; then
+		insinto /usr/share/${PN}/octave
+		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
+	fi
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if use octave; then
+		octave <<-EOF
+		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
+		EOF
+	fi
+}
+
+pkg_prerm() {
+	if use octave; then
+		octave <<-EOF
+		pkg uninstall ${PN}
+		EOF
+	fi
+}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
new file mode 100644
index 000000000000..2d3e4d75aa7f
--- /dev/null
+++ b/sci-libs/pastix/Manifest
@@ -0,0 +1 @@
+DIST pastix_5.2.2.22.tar.bz2 2664470 SHA256 30f771a666719e6b116f549a6e4da451beabab99c2ecabc0745247c3654acbed SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70 WHIRLPOOL 7031f822d3c2f89bd520175a124200303adc2dda56cbae4eb9e011b90d5119c5b96958d648c7e18d034e2845a32ad80385714bfb424260aa62c9f6484a18ce6b
diff --git a/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
new file mode 100644
index 000000000000..c01b02bb8f72
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
@@ -0,0 +1,15 @@
+--- ./sopalin/src/updo.c.orig	2016-02-23 01:42:00.000000000 +0000
++++ ./sopalin/src/updo.c	2016-02-23 01:42:10.000000000 +0000
+@@ -940,8 +940,10 @@
+     i = TASK_CBLKNUM(i);
+ #    define END_LOOP(a) } SMP_END_LOOP(a)
+ #  else /* SMP_SOPALIN */
+-#    define START_LOOP for (i=0;i<SYMB_CBLKNBR;i++)
+-#    define END_LOOP
++#    define START_LOOP \
++    int bubnum  = me;                             \
++    for (i=0;i<SYMB_CBLKNBR;i++)
++#    define END_LOOP(a) a
+ #  endif
+ 
+   /* Xi=(Dii)-1Xi; */
diff --git a/sci-libs/pastix/metadata.xml b/sci-libs/pastix/metadata.xml
new file mode 100644
index 000000000000..387eff2e8edd
--- /dev/null
+++ b/sci-libs/pastix/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  PaStiX (Parallel Sparse matriX package) is a scientific library that
+  provides a high performance parallel solver for very large sparse
+  linear systems based on direct methods.  Numerical algorithms are
+  implemented in single or double precision (real or complex) using
+  LLt, LDLt and LU with static pivoting (for non symmetric matrices
+  having a symmetric pattern).  This solver provides also an adaptive
+  blockwise iLU(k) factorization that can be used as a parallel
+  preconditioner using approximated supernodes to build a coarser
+  block structure of the incomplete factors.
+</longdescription>
+  <use>
+    <flag name="int64">Build the 64 bits integer library</flag>
+    <flag name="starpu">Build and link with <pkg>dev-libs/starpu</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
new file mode 100644
index 000000000000..de59c9a71479
--- /dev/null
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit fortran-2 toolchain-funcs
+
+# TODO:
+# testing: emake examples?
+# better doc instalation and building
+# pypastix (separate package?)
+# multilib with eselect?
+# static libs building without pic
+# metis?
+
+# package id: change every version, see the link on inriaforge
+PID=35070
+# commit id: change every version
+#CID=351ef60
+# leave empty if this is not a post release bug fix
+#PPV=bugfix9_
+#MYPN=pastix_release
+#SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${MYPN}_${PPV}${CID}.tar.bz2"
+
+DESCRIPTION="Parallel solver for very large sparse linear systems"
+HOMEPAGE="http://pastix.gforge.inria.fr"
+SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc int64 mpi +smp starpu static-libs"
+
+RDEPEND="
+	sci-libs/scotch:0=[int64?,mpi?]
+	sys-apps/hwloc:0=
+	virtual/blas
+	mpi? ( virtual/mpi )
+	starpu? ( dev-libs/starpu:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}_${PV}/src"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-nosmp-undefined-variable.patch
+	sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
+		-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
+		-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
+		-e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \
+		-e "s:^\(MPCCPROG\s*=\).*:\1 mpicc -cc=$(tc-getCC):" \
+		-e "s:^\(MPCXXPROG\s*=\).*:\1 mpic++ -cxx=$(tc-getCXX):" \
+		-e "s:^\(MCFPROG\s*=\).*:\1 mpif90 -f90=$(tc-getFC):" \
+		-e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \
+		-e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
+		-e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
+		-e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
+		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX%/}/usr:" \
+		-e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
+		-e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
+		-e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
+		-e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \
+		-e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \
+		-e '/fPIC/s/^#//g' \
+		-e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \
+		-e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
+		-e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
+		-e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \
+		-e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \
+		-e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
+		-e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
+		-e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
+		config/LINUX-GNU.in > config.in || die
+	sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
+}
+
+src_configure() {
+	if use amd64; then
+		sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
+			-i config.in || die
+	fi
+
+	if use int64; then
+		sed -e '/VERSIONINT.*_int64/s/#//' \
+			-e '/CCTYPES.*INTSSIZE64/s/#//' \
+			-i config.in || die
+	fi
+
+	if ! use mpi; then
+		sed -e '/VERSIONMPI.*_nompi/s/#//' \
+			-e '/CCTYPES.*NOMPI/s/#//' \
+			-e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
+			-e '/MCFPROG\s*= $(CFPROG)/s/#//' \
+			-e 's/-DDISTRIBUTED//' \
+			-e 's/-lptscotch/-lscotch/g' \
+			-i config.in || die
+	fi
+
+	if ! use smp; then
+		sed -e '/VERSIONSMP.*_nosmp/s/#//' \
+			-e '/CCTYPES.*NOSMP/s/#//' \
+			-i config.in || die
+	fi
+
+	if use starpu; then
+		sed -e '/libstarpu/s/#//g' -i config.in || die
+	fi
+}
+
+src_compile() {
+	emake all drivers
+}
+
+src_test() {
+	# both test and tests targets are defined and do not work
+	echo
+}
+
+src_install() {
+	default
+	sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die
+	# quick and dirty (static libs should really be built without pic)
+	cd .. || die
+	dodoc README.txt doc/refcard/refcard.pdf
+}
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index 51eed1c016ec..beaf1cafc211 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/12"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
 	ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test
 	threads tk truetype wxwidgets X"
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild
index ba2669243c9f..f61a0c1adf94 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]
diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest
index 478051082096..2cc158c61ed8 100644
--- a/sci-mathematics/dataplot/Manifest
+++ b/sci-mathematics/dataplot/Manifest
@@ -1,2 +1,3 @@
 DIST dplib.2009_07_15.tar.gz 7507367 SHA256 bb1dce97fbcec611cabe636bbdf20efa77c191b84e9c3db621554daea831f00d SHA512 5e4e6c866a5690c3f67b322d53b6bf1bec33c488a99c95f360ce74785a57286541945fdcab5cbbacb04039046f5ba94aeaf8112b80aa34ed2c2cf04abc6f7d40 WHIRLPOOL f531fe7fa4ef3f2ffb65777dd2e5d08f68fd32f5fcf7fbae19db2e5e015e9aba88577c71e9f4dac1f638d8fccf749b0a9c13fd30f7950a7f24669caed5e7e8b1
 DIST dpsrc_2009_08_21.tar.gz 6656048 SHA256 ee47746fb28b88a5a0affa6a51a0e10c9350b1dc28977ecbee19d64a1e204cd4 SHA512 1e655c6832b724b9f69692f28f5497fb4064d208cde5462c4bd73c8d255605ba62b9b703f5ea32bbe7506b18ccd0ad5c4c2556381fbebdb6e05ce51625a4a339 WHIRLPOOL 7ed6951206cd35e449123bd8863f7b3ae26fbcf947156fb6b018aa200768c72861feca65392740303da644c33738d442aa59cab7a09ddb2bcc6dd9dcff70d003
+DIST dpsrc_2013_12_20.tar.gz 6761551 SHA256 419f2a672e2fcc076d95bb67f5c2a9c05a66dc1f697c729b52cddb860e83ae12 SHA512 a62df14f3ec59ccae4ead52b34adfc6e881ade1397e5a31b8a73c9740e7a2245317fef4f9756224c8d2fb57799c2247b15f6c4d65777de6302553fd138bb4083 WHIRLPOOL d43e99f2cc59d483f4f7843b532d324b94ec6d75c5ddd42f737570e5b058da2d8f874bea387627f6a87949677607769bf1e6c32103ed706980617ca77483955e
diff --git a/sci-mathematics/dataplot/dataplot-20090821.ebuild b/sci-mathematics/dataplot/dataplot-20090821.ebuild
index c646b4be26e4..5b67730df62e 100644
--- a/sci-mathematics/dataplot/dataplot-20090821.ebuild
+++ b/sci-mathematics/dataplot/dataplot-20090821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,8 @@ LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples gd opengl X"
 
+REQUIRED_USE="opengl? ( X )"
+
 COMMON_DEPEND="
 	media-libs/plotutils
 	opengl? ( virtual/opengl )
diff --git a/sci-mathematics/dataplot/dataplot-20131220.ebuild b/sci-mathematics/dataplot/dataplot-20131220.ebuild
new file mode 100644
index 000000000000..c8b5dba315cd
--- /dev/null
+++ b/sci-mathematics/dataplot/dataplot-20131220.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils fortran-2 toolchain-funcs autotools
+
+#     YEAR         MONTH    DAY
+MY_PV=${PV:0:4}_${PV:4:2}_${PV:6:2}
+MY_P=dpsrc_${MY_PV}
+# MY_PV_AUX usually ${MY_PV}
+MY_PV_AUX=2009_07_15
+MY_P_AUX=dplib.${MY_PV_AUX}
+
+DESCRIPTION="Program for scientific visualization and statistical analyis"
+HOMEPAGE="http://www.itl.nist.gov/div898/software/dataplot/"
+SRC_URI="
+	ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P}.tar.gz
+	ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P_AUX}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples gd opengl X"
+
+REQUIRED_USE="opengl? ( X )"
+
+COMMON_DEPEND="
+	media-libs/plotutils
+	opengl? ( virtual/opengl )
+	gd? ( media-libs/gd[png,jpeg] )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	X? ( x11-misc/xdg-utils )"
+
+S="${WORKDIR}/${MY_P}"
+S_AUX="${WORKDIR}/${MY_P_AUX}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20090821-opengl.patch )
+
+src_unpack() {
+	# unpacking and renaming because
+	# upstream does not use directories
+	mkdir "${S_AUX}" || die
+	pushd "${S_AUX}" > /dev/null || die
+	unpack ${MY_P_AUX}.tar.gz
+	popd > /dev/null || die
+	mkdir ${MY_P} || die
+	cd "${S}" || die
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	default
+	cp "${FILESDIR}"/Makefile.am.${PV} Makefile.am || die
+	cp "${FILESDIR}"/configure.ac.${PV} configure.ac || die
+	sed -e "s:IHOST1='SUN':IHOST1='@HOST@:" \
+		-e "s:/usr/local/lib:@datadir@:g" \
+		dp1_linux.f > dp1_linux.f.in || die
+	sed -e "s/(MAXOBV=.*)/(MAXOBV=@MAXOBV@)/" \
+		-e "s:/usr/local/lib:@datadir@:g" \
+		DPCOPA.INC > DPCOPA.INC.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gd) \
+		$(use_enable opengl gl) \
+		$(use_enable X)
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S_AUX}"/data/*
+	fi
+	insinto /usr/share/dataplot
+	doins "${S_AUX}"/dp{mes,sys,log}f.tex
+	doenvd "${FILESDIR}"/90${PN}
+}
diff --git a/sci-mathematics/dataplot/files/Makefile.am.20131220 b/sci-mathematics/dataplot/files/Makefile.am.20131220
new file mode 100644
index 000000000000..85e8c493b80f
--- /dev/null
+++ b/sci-mathematics/dataplot/files/Makefile.am.20131220
@@ -0,0 +1,46 @@
+bin_PROGRAMS = dataplot
+dataplot_SOURCES = dp1_linux.f \
+	dp2.f dp3.f dp4.f dp5.f dp6.f dp7.f dp8.f dp9.f dp10.f dp11.f   \
+	dp12.f dp13.f dp14.f dp15.f dp16.f dp17.f dp18.f dp19.f dp20.f dp21.f \
+	dp22.f dp23.f dp24.f dp25.f dp26.f dp27.f dp28.f dp29.f dp30.f dp31.f \
+	dp32.f dp33.f dp34.f dp35.f dp36.f dp37.f dp38.f dp39.f dp40.f dp41.f \
+	dp42.f dp43.f dp44.f dp45.f dp46.f \
+	dpcalc.f dpdds2.f dpdds3.f dpdds.f edinit.f edmai2.f edsear.f edsub.f \
+	edwrst.f fit3b.f starpac.f tcdriv_nopc.f aqua_src.f cluster.f compgeom.f \
+	optimi.f libplot_src.c rldp.c main.f gks_src.f
+
+if ENABLE_GD
+dataplot_SOURCES += gd_src.c
+else
+dataplot_SOURCES += gd_src.f
+endif
+
+if ENABLE_GL
+dataplot_SOURCES += gl_src.c
+else
+dataplot_SOURCES += gl_src.f
+endif
+
+if ENABLE_X11
+dataplot_SOURCES += x11_src.c
+else
+dataplot_SOURCES += x11src.f
+endif
+
+dataplot_CFLAGS = @GL_CFLAGS@
+dataplot_LDADD = @GD_LIBS@ @GL_LIBS@ @X11_LIBS@ $(FLIBS) -lreadline
+
+# this is to remove ambiguity between the similar filenames
+# of the c and f77 version (shortcoming of automake)
+# the f77 versions are forced
+# the c versions objects are called dataplot-gd_src.o etc
+gd_src.o: gd_src.f
+	$(F77COMPILE) -c -o $@ $<
+gl_src.o: gl_src.f
+	$(F77COMPILE) -c -o $@ $<
+aqua_src.o: aqua_src.f
+	$(F77COMPILE) -c -o $@ $<
+libplot_src.o: libplot_src.f
+	$(F77COMPILE) -c -o $@ $<
+rldp.o: rldp.f
+	$(F77COMPILE) -c -o $@ $<
diff --git a/sci-mathematics/dataplot/files/configure.ac.20090821 b/sci-mathematics/dataplot/files/configure.ac.20090821
index 2343b23823dd..fa9a700aa060 100644
--- a/sci-mathematics/dataplot/files/configure.ac.20090821
+++ b/sci-mathematics/dataplot/files/configure.ac.20090821
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([dataplot], [20080225], [n.heckert@nist.gov])
+AC_INIT([dataplot], [20090821], [n.heckert@nist.gov])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(config)
 AM_MAINTAINER_MODE
diff --git a/sci-mathematics/dataplot/files/configure.ac.20131220 b/sci-mathematics/dataplot/files/configure.ac.20131220
new file mode 100644
index 000000000000..e2e1412fbfe8
--- /dev/null
+++ b/sci-mathematics/dataplot/files/configure.ac.20131220
@@ -0,0 +1,76 @@
+AC_PREREQ(2.59)
+AC_INIT([dataplot], [20131220], [n.heckert@nist.gov])
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(config)
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign])
+
+AC_PROG_CC
+AC_PROG_F77
+AC_F77_LIBRARY_LDFLAGS
+case $F77 in
+    *gfortran*) FFLAGS="${FFLAGS} -w -fno-range-check" ;;
+    *) ;;
+esac
+
+AC_CANONICAL_HOST
+case $host in
+     i?86*linux*) MAXOBV=100000 ;;
+     *64*linux*)  MAXOBV=1000000 ;;
+esac
+AC_SUBST(MAXOBV)
+
+AC_ARG_ENABLE(gd,
+  [AS_HELP_STRING([--enable-gd], [Enable the gd device driver])],
+  [enable_gd=$enableval],
+  [enable_gd=no])
+
+AC_CHECK_LIB(plot, pl_closepl_r, ,
+   	[AC_MSG_ERROR([plotutils libraries not found])])
+
+AC_ARG_ENABLE(gl,
+  [AS_HELP_STRING([--enable-gl], [Enable the OpenGL device driver])],
+  [enable_gl=$enableval],
+  [enable_gl=no])
+
+AC_ARG_ENABLE(X,
+  [AS_HELP_STRING([--enable-X], [Enable the X11 device driver])],
+  [enable_x11=$enableval],
+  [enable_x11=no])
+
+if test x"$enable_gd" = x"yes"; then
+   AC_CHECK_PROG(enable_gd, [gdlib-config],,
+   	[AC_MSG_ERROR([GD driver requested but gdlib-config not found])])
+   GD_LIBS="`gdlib-config --libs` -lgd"
+   GD_CFLAGS="`gdlib-config --cflags`"
+   AC_SUBST(GD_LIBS)
+   AC_SUBST(GD_CFLAGS)
+fi
+AM_CONDITIONAL(ENABLE_GD, [test x"$enable_gd" = x"yes"] )
+
+if test x"$enable_gl" = x"yes"; then
+dnl hardcoded opengl libs (should be host/implementation dependent)
+   AC_CHECK_HEADER(GL/gl.h,,
+   	[AC_MSG_ERROR([OpenGL driver requested but header gl.h not found])])
+   AC_CHECK_HEADER(GL/glu.h,,
+  	[AC_MSG_ERROR([OpenGL driver requested but header glu.h not found])])
+   GL_CFLAGS="-DUNIX_OS -DAPPEND_UNDERSCORE -DSUBROUTINE_CASE"
+   AC_SUBST(GL_CFLAGS)
+
+   AC_CHECK_LIB(GL, glXCreateContext, GL_LIBS="-lGL",
+   	[AC_MSG_ERROR([OpenGL driver requested but libraries not found])])
+   AC_CHECK_LIB(GLU, gluPerspective, GL_LIBS="-lGL -lGLU",
+   	[AC_MSG_ERROR([OpenGL driver requested but libraries not found])])
+   GL_LIBS="-lGL -lGLU"
+   AC_SUBST(GL_LIBS)
+fi
+AM_CONDITIONAL(ENABLE_GL, [ test x"$enable_gl" = x"yes" ])
+
+if test x"$enable_x11" = x"yes"; then
+   PKG_CHECK_MODULES(X11, x11,,
+     [AC_MSG_ERROR([X11 driver requested but pkgconfig module not found])])
+fi
+AM_CONDITIONAL(ENABLE_X11, [ test x"$enable_x11" = x"yes" ])
+
+AC_CONFIG_FILES([Makefile DPCOPA.INC dp1_linux.f])
+AC_OUTPUT
diff --git a/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch b/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch
index 5810b6029b87..c2640db69c85 100644
--- a/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch
+++ b/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch
@@ -1,5 +1,5 @@
---- gl_src.c.orig	2001-02-28 16:45:56.000000000 -0500
-+++ gl_src.c	2008-04-10 17:03:03.000000000 -0400
+--- dpsrc_2013_12_20/gl_src.c.orig	2001-02-28 16:45:56.000000000 -0500
++++ dpsrc_2013_12_20/gl_src.c	2008-04-10 17:03:03.000000000 -0400
 @@ -154,7 +154,7 @@
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/sci-mathematics/fricas/fricas-1.2.7-r1.ebuild b/sci-mathematics/fricas/fricas-1.2.7-r1.ebuild
deleted file mode 100644
index 3601edc82109..000000000000
--- a/sci-mathematics/fricas/fricas-1.2.7-r1.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 elisp-common
-
-DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://${PN}.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl     gcl ecls   clisp clozurecl )
-# Version restrictions, . means no restrictions
-REST=( "<=dev-lisp/sbcl-1.3.0" . . . . . )
-# command name: . means just ${LISP}
-COMS=(  .    lisp      .   ecl    .     ccl       )
-
-IUSE="${LISPS[*]} X emacs gmp"
-RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( virtual/emacs )
-	gmp? ( dev-libs/gmp )"
-
-# Generating lisp deps
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	LISP=${LISPS[$n]}
-	if [ "${REST[$n]}" = "." ]; then
-		DEP="dev-lisp/${LISP}"
-	else
-		DEP="${REST[$n]}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
-done
-if [ "${REST[0]}" = "." ]; then
-	DEP="dev-lisp/${LISPS[0]}"
-else
-	DEP="${REST[0]}"
-fi
-RDEPEND="${RDEPEND} ${DEP}:="
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-src_configure() {
-	local LISP n
-	LISP=sbcl
-	n=${#LISPS[*]}
-	for ((n--; n > 0; n--)); do
-		if use ${LISPS[$n]}; then
-			LISP=${COMS[$n]}
-			if [ "${LISP}" = "." ]; then
-				LISP=${LISPS[$n]}
-			fi
-		fi
-	done
-	einfo "Using lisp: ${LISP}"
-
-	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) $(use_with gmp)
-}
-
-src_compile() {
-	# bug #300132
-	emake -j1
-}
-
-src_test() {
-	emake -j1 all-input
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc README FAQ
-
-	if use emacs; then
-		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
-			-i "${D}"/usr/bin/efricas \
-			|| die "sed efricas failed"
-		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	else
-		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
-	fi
-	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/fricas/fricas-1.2.7-r2.ebuild b/sci-mathematics/fricas/fricas-1.2.7-r2.ebuild
new file mode 100644
index 000000000000..3e1eadb4a4a0
--- /dev/null
+++ b/sci-mathematics/fricas/fricas-1.2.7-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+inherit multilib elisp-common
+
+DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Supported lisps, number 0 is the default
+LISPS=( sbcl cmucl     gcl ecls   clisp clozurecl )
+# command name: . means just ${LISP}
+COMS=(  .    lisp      .   ecl    .     ccl       )
+
+IUSE="${LISPS[*]} X emacs gmp"
+RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
+	emacs? ( virtual/emacs )
+	gmp? ( dev-libs/gmp:= )"
+
+# Generating lisp deps
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+	LISP=${LISPS[$n]}
+	DEP="dev-lisp/${LISP}"
+	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
+done
+DEP="dev-lisp/${LISPS[0]}"
+RDEPEND="${RDEPEND} ${DEP}:="
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+	RDEPEND="${RDEPEND} )"
+done
+
+DEPEND="${RDEPEND}"
+
+# necessary for clisp and gcl
+RESTRICT="strip"
+
+src_configure() {
+	local LISP n
+	LISP=sbcl
+	n=${#LISPS[*]}
+	for ((n--; n > 0; n--)); do
+		if use ${LISPS[$n]}; then
+			LISP=${COMS[$n]}
+			if [ "${LISP}" = "." ]; then
+				LISP=${LISPS[$n]}
+			fi
+		fi
+	done
+	einfo "Using lisp: ${LISP}"
+
+	# aldor is not yet in portage
+	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) $(use_with gmp)
+}
+
+src_compile() {
+	# bug #300132
+	emake -j1
+}
+
+src_test() {
+	emake -j1 all-input
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	dodoc README FAQ
+
+	if use emacs; then
+		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
+			-i "${D}"/usr/bin/efricas \
+			|| die "sed efricas failed"
+		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	else
+		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
+	fi
+	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/isabelle/Manifest b/sci-mathematics/isabelle/Manifest
index f3bd2a8ec892..87a47c5dd225 100644
--- a/sci-mathematics/isabelle/Manifest
+++ b/sci-mathematics/isabelle/Manifest
@@ -3,9 +3,15 @@ DIST Isabelle2012-doc-src.tar.gz 2688496 SHA256 e18965fe0f7f89b286d4707e38201f1e
 DIST Isabelle2012.tar.gz 49529865 SHA256 b86f957dee221041f92c9d4ced4758d45b4950339743d0d58b1ea6061e2b53f0 SHA512 1346f563233eba10bc14f7d140706b8bfba8e832f7ee5887316c829926136af07d700914a925272d8adc1275b0bdd682540518957910c136a15bfc60d61285a0 WHIRLPOOL 23b764a1a0044a9525d058e95da318f4425fadf7660edc8ab8f35b248f98dcff0dba2e533ff18d8bf47ea164cec12a9648642749de2a49887bbe84ed4e71a68b
 DIST Isabelle2013-2.tar.gz 52603110 SHA256 602e91377b0999c25950ae2a34c0fcb23e3aff3a196bdbc5ce61634bd90d7f22 SHA512 464a2735b2f4e28dcf44e55cd4abb4d8766a6bb7eb86f989f3592e7819e33d97922bdfb6701da85aa9d7c4cc2aee3eadebde1c7e3fc74bb3f6108a5daf5fea45 WHIRLPOOL 0dc354d60e3440ea0909dc09f25b66cb301b82f88fbe21c0b7f4bfef40ecc3631014757abd8657f0464047f0ad32827ad308e3f998fcf2477e05907ff7b19a84
 DIST Isabelle2013.tar.gz 54638791 SHA256 2f2cda9939248bd4346ad7e074cb6b2cfad70708777491c6262a5ae670c8f83a SHA512 e03f9b747f678749a562c3de6100f4f4e010ace51b2eb13bcde0a63591eec0cb4e081f7fad9147d022fe787b56eac3f037ab3a296080fd70cc7d058ea961a789 WHIRLPOOL 5cbcbc93bd2ce4723034c3d95d4678b2de90c924601b795c5da378cb76f58275e5d5f47ce9120234a9ea36e43ab759ced843dca76942378abfa1fb7aff858a65
+DIST Isabelle2015.tar.gz 36529154 SHA256 08723d3be6f91c57a7a69a8624c54cc1e0cd31506988bf29ed365a5aa5a5156f SHA512 052bb80316a9345368a295a7c5f3869b58d71a6879548fc6240a04fd2cf8c11406274ead8a1ed098563ef9b7573a826656da543e745044fc1d275322af5cc212 WHIRLPOOL 0be4759a1064f4759c2f227b037c448093ff36b47e16002fbb7e99d2843583e01314c4ea5c7a8cbf4d1304f8f72a383052911e483d51e4af2e68c4c36dea5121
+DIST csdp-isabelle-component-6.x.tar.gz 493 SHA256 65dde42fa476095052ca3820df4c0e45089653d4467a53de711c8e13670a1b19 SHA512 9be28ecbf61d0f6ad23e28d44bd7ceb8f06ab22f3a05a7c823a9c5bf52ddcf5e5c300c41e14451d6b8e6a4c32b1bbd17769c731cd890fab335a866cd5e735290 WHIRLPOOL c930c531637172e4c75ec44d68f71e69e748a8b976fa3651ef4015fb6a90e30b568bd092632dc16c6389aac09bc13f3249af6c3ac261f09ad2dc5ad915282f99
+DIST exec_process-isabelle-component-1.0.3.tar.gz 814 SHA256 ee3b7b299852bcfd0bf7ffce6c8cd2279f2d71247c4a7b0042971b31c2b2a89d SHA512 7880b7f9843ff5806ab37d938a817a5b33e973772d9a6c6cf76bf04076fb532309bd22dfaa203be7c72c07f5a638f0f97e730c414ed164024fd31f1f09fc7c09 WHIRLPOOL 9d9beb7a41baac8b591ceee31bb7b69e1dd07fce66757511649977f6a85d85eef525ba0be13b0873c1aef47de0eace8bf88283b4a136397000e61cfc81da8d4d
 DIST jedit_build-20120414.tar.gz 7509120 SHA256 3c5840fd01b87013b05a92742d41f66f655df6fe9edef1525c6722f92d8f3e41 SHA512 2e2f0db4964a041ba54382a9c787246e1d433e43167019c6ea8d4cf6beb84ce438c0bc559d2588229b0166c91bac603bed39abc45d5d4267020f55eaba1aaa0c WHIRLPOOL 40b883943bde312b4c7adc43607ba4759e5ebe22cab3c922c81393375f917af21d4a8dc068e5692ffcf7bdfb1e7fe3081358dc8e346d1942582bf79e249b0cbb
 DIST jedit_build-isabelle-component-20130104.tar.gz 10734679 SHA256 22a4880deb1054a548476b22662b42bfaf5394ceb07b30eba69be433bcea1074 SHA512 bacdb3ca73d48fe9ba71dd32cd68e98333831f205dd3ced69bb9344c5b167ba084662f1108690f371b4b64f6b786955a332bcd51a2dc21c2179fb1b4727430dd WHIRLPOOL fc97923e08202e117ca3112b69f74a9f4663a70f55fa051ac55e02c85be57423f762263cac2ded33d9c2f412736e4fa0937aa07df3f36b915e806959055a796b
 DIST jedit_build-isabelle-component-20131106.tar.gz 8796625 SHA256 a13a896263804f5aee82db0e1fe6be7982abe3ca1266cd15f7fe9c8c2f6e2ba5 SHA512 7fc3313916cd408c906e453a4895f49223a8b9dc1e2c577c16468394b73a3724449b411521884d419683cd3d2eb3ef59929608483ff092b9b0e3663efd5e136e WHIRLPOOL 4e7c933df7eea5b9c312f8e0c2c46d44a442d0dd2bb76415bea1fcf307ff75d1f8fb592fe4cad647674dc387fe6fa017dbf4e0cf2ec64459bdafb093470e2abf
+DIST jedit_build-isabelle-component-20150228.tar.gz 10674317 SHA256 2bee3c5242a3ce4150656f106e658096e82b6bd966e04d590e20023a956be29b SHA512 ba2d0804f21cee596fc3528a592941efc393e98b890efe054aed18fc0d31edfe459047b58ed79b42892e219b4c35a4fb5c8cca0f402b96d641ff8ce62e321339 WHIRLPOOL b2971bdef70e32d858385cb58603d6a5a7e357dbbc9810569093a31332a7838387f43a76a65048a12f259f08de86f200e962ccf2deb2bd3cd4e83dc4c1e41d8b
 DIST jfreechart-isabelle-component-1.0.14-1.tar.gz 3444825 SHA256 b0eb7365c4c5877379889100f081a4afc4117afc0d332941c3dd01bef2c4aee9 SHA512 ee1d84a45e43029d5e3acee823176196da19789322e8d3c2c81d5504930ad81d50e16e5da87655e4151034901daefb4ce6b82334839e39134b3a7ce32203aa67 WHIRLPOOL e6f9caadb802ecb5b784e86e96c008e9271aa0b1c940152fb0b0358280d9c1e274bb0dee1507f8ff0fe7f43f863db538d631c76e146d1f66ab6e8a8fb27eb42d
 DIST jfreechart-isabelle-component-1.0.14.tar.gz 3443727 SHA256 c873ad6f07edbcceb5c76aac2e848c7d7f12c78c93c05f7e97c4b1fdba7c2df0 SHA512 c55ec01b215368f064de2f288f788960a256445adca5565c00aa9c0fab5732707a9e72bcdb3838676c80e735c520b9948855d7a32b9076bf35f1a279320ee72a WHIRLPOOL ba1a75e21525c302a3b755d814502dad60c540c2004dd894f60fdd6966766f85d71bbb45728ca220a4a7cff334de81db756fbb89e1059f32e248cabf0a7b97d6
 DIST polyml-isabelle-component-5.5.1-1.tar.gz 831 SHA256 f19a4dfc3117792423270cb98a5c406f7339f4bd7715c16976a281d964792844 SHA512 35ab69d0fd2737f3c6a13ca022103428bcb0e71032304d244614d271848b9ae8986da25bd4ef02668eef169f3a3a72576a619152ce3cbf036af7aa365e857c1a WHIRLPOOL 682e25b677e1b0401a43d4cff35c69658359b4c74f86d3459c050e7c7b0d17f1de1e7b792f2a51f97acf574ad56b3e89ade688bc24d090b3e89eaf0cb99a08d5
+DIST polyml-isabelle-component-5.5.2-3.tar.gz 691 SHA256 1ba253974193efc70711b7fe32cc831d8bcc13107b0b130ddf6087bb6ff6d3e7 SHA512 45d68fa7a07ae9fc39cb21fa4c4c43a34576377fb828c8652002c56cc9ec7b3c7b5fcefb7604fc4bc90ce4868dd2fca41ddf37ce285da4902664ab21e4657b3f WHIRLPOOL 3a85c59b1bb928c5ea91f8150c6ded5309fae96bd7558b56e6c3d8f04c418b03b57fb49565af5ed919179fd9e30c957575ca7b65d938ce69c5d3131d8c55ab1e
+DIST xz-java-isabelle-component-1.5.tar.gz 315 SHA256 e7fdd433608561c87558d4d0ee39166e8396ce11242e85391417ec7fd3ce7b8e SHA512 6dfec49e12c4cafbb6b6386dd54477e86b6bb419a77c52d9606a0305aeea9cd11f087ed6bba77352c7bf9ec656052ef617e845f472e57b5cdfbccf22b2eeb4fa WHIRLPOOL 9c1fc16db0adc88557b81608902d9d69007dc90d5849f4f7501101930842ce81ded76af0e76e38df8bd0b07d137e53bafaa338bf6c7ae338e97af2a1433d5c1d
diff --git a/sci-mathematics/isabelle/files/isabelle-2015-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2015-classpath.patch
new file mode 100644
index 000000000000..3783e46cb707
--- /dev/null
+++ b/sci-mathematics/isabelle/files/isabelle-2015-classpath.patch
@@ -0,0 +1,26 @@
+--- Isabelle2015-orig/lib/Tools/java	2015-05-25 20:06:24.000000000 +1000
++++ Isabelle2015/lib/Tools/java	2015-07-07 16:00:19.283326554 +1000
+@@ -10,5 +10,5 @@
+ unset CLASSPATH
+ 
+ isabelle_java java "${JAVA_ARGS[@]}" \
+-  -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
++  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11)")" "$@"
+ 
+--- Isabelle2015-orig/lib/Tools/scala	2015-05-25 20:06:24.000000000 +1000
++++ Isabelle2015/lib/Tools/scala	2015-07-07 16:00:45.926327297 +1000
+@@ -14,4 +14,4 @@
+ done
+ 
+ isabelle_scala scala "${SCALA_ARGS[@]}" \
+-  -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
++  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11)")" "$@"
+--- Isabelle2015-orig/lib/Tools/scalac	2015-05-25 20:06:24.000000000 +1000
++++ Isabelle2015/lib/Tools/scalac	2015-07-07 15:59:33.906325289 +1000
+@@ -7,5 +7,5 @@
+ isabelle_admin_build jars || exit $?
+ 
+ isabelle_scala scalac -Dfile.encoding=UTF-8 \
+-  -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
++  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11)")" "$@"
+ 
diff --git a/sci-mathematics/isabelle/files/isabelle-2015-jfreechart-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2015-jfreechart-classpath.patch
new file mode 100644
index 000000000000..9594d28c86a2
--- /dev/null
+++ b/sci-mathematics/isabelle/files/isabelle-2015-jfreechart-classpath.patch
@@ -0,0 +1,16 @@
+--- Isabelle2015-orig/contrib/jfreechart-1.0.14-1/etc/settings	2013-09-12 07:46:57.000000000 +1000
++++ Isabelle2015/contrib/jfreechart-1.0.14-1/etc/settings	2015-07-07 17:22:55.716464804 +1000
+@@ -1,9 +1,8 @@
+ # -*- shell-script -*- :mode=shellscript:
+ 
+ JFREECHART_HOME="$COMPONENT"
+-JFREECHART_JAR_NAMES="iText-2.1.5.jar jcommon-1.0.18.jar jfreechart-1.0.14.jar"
+-
+-classpath "$JFREECHART_HOME/lib/iText-2.1.5.jar"
+-classpath "$JFREECHART_HOME/lib/jcommon-1.0.18.jar"
+-classpath "$JFREECHART_HOME/lib/jfreechart-1.0.14.jar"
++JFREECHART_JAR_NAMES="$(java-config --classpath itext | sed -e 's@:@ @g' -e 's@/[^ ]*/@@g') $(java-config --classpath jcommon-1.0 | sed -e 's@:@ @g' -e 's@/[^ ]*/@@g') $(java-config --classpath jfreechart-1.0 | sed -e 's@:@ @g' -e 's@/[^ ]*/@@g')"
+ 
++classpath "$(java-config --classpath itext)"
++classpath "$(java-config --classpath jcommon-1.0)"
++classpath "$(java-config --classpath jfreechart-1.0)"
diff --git a/sci-mathematics/isabelle/isabelle-2015.ebuild b/sci-mathematics/isabelle/isabelle-2015.ebuild
new file mode 100644
index 000000000000..2d0f9d9b10a8
--- /dev/null
+++ b/sci-mathematics/isabelle/isabelle-2015.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils check-reqs java-pkg-2 multilib versionator
+
+MY_PN="Isabelle"
+MY_PV=$(replace_all_version_separators '-')
+MY_P="${MY_PN}${MY_PV}"
+
+# csdp is used in the compile of HOL_ex in
+# Library/Sum_of_Squares/sos_wrapper.ML where it execs $ISABELLE_CSDP
+CSDP_PV="6.x"
+CSDP_PN="csdp"
+CSDP_P="${CSDP_PN}-${CSDP_PV}"
+CSDP_IC_PN="${CSDP_PN}-isabelle-component"
+CSDP_IC_P="${CSDP_IC_PN}-${CSDP_PV}"
+
+# exec_process is used in the compile of HOL-Mirabelle-ex, Codegen, etc.
+EXEC_PROCESS_PV="1.0.3"
+EXEC_PROCESS_PN="exec_process"
+EXEC_PROCESS_P="${EXEC_PROCESS_PN}-${EXEC_PROCESS_PV}"
+EXEC_PROCESS_IC_PN="${EXEC_PROCESS_PN}-isabelle-component"
+EXEC_PROCESS_IC_P="${EXEC_PROCESS_IC_PN}-${EXEC_PROCESS_PV}"
+
+JEDIT_PV="20150228"
+JEDIT_PN="jedit_build"
+JEDIT_P="${JEDIT_PN}-${JEDIT_PV}"
+JEDIT_IC_PN="${JEDIT_PN}-isabelle-component"
+JEDIT_IC_P="${JEDIT_IC_PN}-${JEDIT_PV}"
+
+JFREECHART_PV="1.0.14-1"
+JFREECHART_PN="jfreechart"
+JFREECHART_P="${JFREECHART_PN}-${JFREECHART_PV}"
+JFREECHART_IC_PN="${JFREECHART_PN}-isabelle-component"
+JFREECHART_IC_P="${JFREECHART_IC_PN}-${JFREECHART_PV}"
+
+POLYML_PV="5.5.2-3"
+POLYML_PN="polyml"
+POLYML_P="${POLYML_PN}-${POLYML_PV}"
+POLYML_IC_PN="${POLYML_PN}-isabelle-component"
+POLYML_IC_P="${POLYML_IC_PN}-${POLYML_PV}"
+
+XZ_JAVA_PV="1.5"
+XZ_JAVA_PN="xz-java"
+XZ_JAVA_P="${XZ_JAVA_PN}-${XZ_JAVA_PV}"
+XZ_JAVA_IC_PN="${XZ_JAVA_PN}-isabelle-component"
+XZ_JAVA_IC_P="${XZ_JAVA_IC_PN}-${XZ_JAVA_PV}"
+
+SS="2.11"
+
+DESCRIPTION="Isabelle is a generic proof assistant"
+HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/Isabelle/index.html"
+SRC_URI="http://isabelle.in.tum.de/dist/${MY_P}.tar.gz
+		http://dev.gentoo.org/~gienah/snapshots/${CSDP_IC_P}.tar.gz
+		http://dev.gentoo.org/~gienah/snapshots/${EXEC_PROCESS_IC_P}.tar.gz
+		http://isabelle.in.tum.de/components/${JEDIT_P}.tar.gz -> ${JEDIT_IC_P}.tar.gz
+		http://isabelle.in.tum.de/dist/contrib/${JFREECHART_P}.tar.gz -> ${JFREECHART_IC_P}.tar.gz
+		http://dev.gentoo.org/~gienah/snapshots/${POLYML_IC_P}.tar.gz
+		http://dev.gentoo.org/~gienah/snapshots/${XZ_JAVA_IC_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc graphbrowsing ledit readline proofgeneral"
+
+#upstream says
+#bash 2.x/3.x, Poly/ML 5.x, Perl 5.x,
+#for document preparation: complete LaTeX
+DEPEND=">=app-shells/bash-3.0:*
+	>=dev-java/jcommon-1.0.18:1.0
+	>=dev-java/jfreechart-1.0.14:1.0
+	>=dev-java/itext-2.1.5:0
+	dev-java/xz-java:0
+	>=dev-lang/ghc-7.6.3
+	>=dev-lang/polyml-5.5.2:=[-portable]
+	>=dev-lang/perl-5.8.8-r2
+	dev-lang/swi-prolog
+	sci-libs/coinor-csdp
+	=virtual/jdk-1.7*
+	doc? (
+		virtual/latex-base
+		dev-tex/rail
+	)
+	>=dev-lang/scala-2.11.6:${SS}
+	ledit? (
+		app-misc/ledit
+	)
+	readline? (
+		app-misc/rlwrap
+	)"
+
+RDEPEND="dev-perl/libwww-perl
+	sci-mathematics/sha1-polyml
+	>=virtual/jre-1.7
+	proofgeneral? (
+		>=app-emacs/proofgeneral-4.1
+	)
+	${DEPEND}"
+
+S="${WORKDIR}"/Isabelle${MY_PV}
+CSDP_S="${WORKDIR}/${CSDP_P}"
+EXEC_PROCESS_S="${WORKDIR}/${EXEC_PROCESS_P}"
+JEDIT_S="${WORKDIR}/${JEDIT_P}"
+JFREECHART_S="${WORKDIR}/${JFREECHART_P}"
+XZ_JAVA_S="${WORKDIR}/${XZ_JAVA_P}"
+TARGETDIR="/usr/share/Isabelle"${MY_PV}
+LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
+
+# Notes on QA warnings: * Class files not found via DEPEND in package.env
+# Stuff with $ in the name appear to be spurious:
+# isabelle/Markup_Tree$$anonfun$results$1$1.class
+# scala/tools/nsc/backend/jvm/GenJVM$BytecodeGenerator$$anonfun$computeLocalVarsIndex$1.class
+# It wants javafx, I am unsure how to fix this. I test isabelle with the Sun JDK:
+# javafx/application/Platform.class               javafx
+# Presumably the user can provide the jEdit plugins if they are necessary:
+# marker/MarkerSetsPlugin.class                   http://plugins.jedit.org/plugins/?MarkerSets
+# projectviewer/gui/OptionPaneBase.class          http://plugins.jedit.org/plugins/?ProjectViewer
+
+LIBRARY_PKGS="itext,jcommon-1.0,jfreechart-1.0,scala-${SS},xz-java"
+
+CHECKREQS_MEMORY="8192M"
+CHECKREQS_DISK_BUILD="35G"
+CHECKREQS_DISK_USR="17G"
+
+src_unpack() {
+	unpack "${MY_P}.tar.gz"
+	cd "${S}/contrib" || die
+	unpack ${CSDP_IC_P}.tar.gz
+	unpack ${EXEC_PROCESS_IC_P}.tar.gz
+	unpack ${JEDIT_IC_P}.tar.gz
+	unpack ${JFREECHART_IC_P}.tar.gz
+	unpack ${POLYML_IC_P}.tar.gz
+	unpack ${XZ_JAVA_IC_P}.tar.gz
+}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_getjars ${LIBRARY_PKGS}
+	epatch "${FILESDIR}/${PN}-2013-gentoo-settings.patch"
+	epatch "${FILESDIR}/${PN}-2015-classpath.patch"
+	epatch "${FILESDIR}/${PN}-2015-jfreechart-classpath.patch"
+	polymlver=$(poly -v | cut -d' ' -f2)
+	polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1)
+	sed -e "s@5.5.0@${polymlver}@g" \
+		-i "${S}/etc/settings" \
+		|| die "Could not configure polyml version in etc/settings"
+	sed -e "s@ML_HOME=\"/@ML_HOME=\"${ROOT}@" \
+		-i "${S}/etc/settings" \
+		|| die "Could not configure polyml ML_HOME in etc/settings"
+	sed -e "s@x86_64@${polymlarch}@g" \
+		-i "${S}/etc/settings" \
+		|| die "Could not configure polyml arch in etc/settings"
+	sed -e "s@PROOFGENERAL_HOME=\"/@PROOFGENERAL_HOME=\"${ROOT}@" \
+		-i "${S}/etc/settings" \
+		|| die "Could not configure PROOFGENERAL_HOME in etc/settings"
+	sed -e "s@/usr/lib64/Isabelle${MY_PV}@${LIBDIR}@g" \
+		-i "${S}/etc/settings" \
+		|| die "Could not configure Isabelle lib directory in etc/settings"
+	epatch "${FILESDIR}/${PN}-2012-graphbrowser.patch"
+	epatch "${FILESDIR}/${PN}-2012-libsha1.patch"
+	# this example fails to compile with swi-prolog 6.5.2, so patch it so that
+	# Isabelle will build, then reverse the patch so that the user can see the
+	# original code.
+	epatch "${FILESDIR}/${PN}-2013.2-HOL-Predicate_Compile_Examples.patch"
+	cat <<- EOF >> "${S}/etc/settings"
+
+		ISABELLE_GHC="${ROOT}usr/bin/ghc"
+		ISABELLE_OCAML="${ROOT}usr/bin/ocaml"
+		ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
+		ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
+		SCALA_HOME="${ROOT}usr/share/scala-${SS}"
+		SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
+	EOF
+	cat <<- EOF >> "${S}/etc/components"
+		#bundled components
+		contrib/${CSDP_P}
+		contrib/${EXEC_PROCESS_P}
+		contrib/${JEDIT_P}
+		contrib/${JFREECHART_P}
+		contrib/${POLYML_P}
+		contrib/${XZ_JAVA_P}
+	EOF
+	if use ledit && ! use readline; then
+		epatch "${FILESDIR}/${PN}-2012-reverse-line-editor-order.patch"
+	fi
+	rm -f "${S}/contrib/jfreechart-1.0.14-1/lib/jcommon-1.0.18.jar" \
+		"${S}/contrib/jfreechart-1.0.14-1/lib/jfreechart-1.0.14.jar" \
+		"${S}/contrib/jfreechart-1.0.14-1/lib/iText-2.1.5.jar" \
+		|| die "Could not rm bundled jar files supplied by Gentoo"
+}
+
+src_compile() {
+	einfo "Building Isabelle. This may take some time."
+	pushd contrib/${EXEC_PROCESS_P} || die "Could not cd to contrib/${EXEC_PROCESS_P}"
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${EXEC_PROCESS_PN} ${EXEC_PROCESS_PN}.c \
+		|| die "Could not build ${EXEC_PROCESS_PN}"
+	popd
+	if use graphbrowsing
+	then
+		rm -f "${S}/lib/browser/GraphBrowser.jar" \
+			|| die "failed cleaning graph browser directory"
+		pushd "${S}/lib/browser" \
+			|| die "Could not change directory to lib/browser"
+		./build || die "failed building the graph browser"
+		popd
+	fi
+	./bin/isabelle jedit -b -f || die "pide build failed"
+	pushd "${S}"/src/Pure || die "Could not change directory to src/Pure"
+	../../bin/isabelle env ./build-jars -f || die "build-jars failed"
+	popd
+	./bin/isabelle build -a -b -s -v || die "isabelle build failed"
+	epatch --reverse "${FILESDIR}/${PN}-2013.2-HOL-Predicate_Compile_Examples.patch"
+}
+
+src_install() {
+	insinto ${TARGETDIR}
+	doins -r src
+	doins -r lib
+	doins -r contrib
+	doins ROOTS
+
+	docompress -x /usr/share/doc/${PF}
+	dodoc -r doc
+	if use doc; then
+		dosym /usr/share/doc/${PF}/doc "${TARGETDIR}/doc"
+		# The build of sci-mathematics/haskabelle with use doc requires
+		# sci-mathematics/isabelle[doc?]. The haskabelle doc build requires
+		# the src/Doc directory stuff in the isabelle package.
+		doins -r src/Doc
+		for i in $(find ./src/Doc -type f -executable -print)
+		do
+			exeinto $(dirname "${TARGETDIR}/${i}")
+			doexe ${i}
+		done
+	fi
+
+	for i in $(find ./{bin,lib,src/HOL,src/Pure,src/Tools} -type f -executable -print)
+	do
+		exeinto $(dirname "${TARGETDIR}/${i}")
+		doexe ${i}
+	done
+
+	insinto /etc/isabelle
+	doins -r etc/*
+	dosym /etc/isabelle "${TARGETDIR}/etc"
+
+	dosym "${LIBDIR}/heaps" "${TARGETDIR}/heaps"
+	insinto ${LIBDIR}
+	doins -r heaps
+
+	./bin/isabelle install -d ${TARGETDIR} "${ED}usr/bin" \
+		|| die "isabelle install failed"
+	newicon lib/icons/"${PN}.xpm" "${PN}.xpm"
+	newicon lib/icons/"${PN}-mini.xpm" "${PN}-mini.xpm"
+	dodoc ANNOUNCE CONTRIBUTORS COPYRIGHT NEWS README
+
+	java-pkg_regjar \
+		$(find . -type f -name \*.jar -print | sed -e "s@^\.@${ED}${TARGETDIR}@g")
+}
+
+pkg_postinst() {
+	# If any of the directories in /etc/isabelle/components do not exist, then
+	# even isabelle getenv ISABELLE_HOME fails.  Hence it is necessary to
+	# to delete any non-existing directories.  If an old Isabelle version was
+	# installed with component ebuilds like sci-mathematics/e, then the
+	# Isabelle version is upgraded, then the contrib directories will not
+	# exist initially, it is necessary to delete them from /etc/isabelle/components.
+	# Then these components are rebuilt (creating these directories) using the
+	# EAPI=5 subslot depends.
+	for i in $(egrep '^[^#].*$' "${ROOT}etc/isabelle/components")
+	do
+		if [ ! -d /usr/share/${MY_P}/${i} ]; then
+			sed -e "\@${i}@d" -i "${ROOT}etc/isabelle/components"
+		fi
+	done
+	if use ledit && use readline; then
+		elog "Both readline and ledit use flags specified.  The default setting"
+		elog "if both are installed is to use readline (rlwrap), this can be"
+		elog "modfied by editing the ISABELLE_LINE_EDITOR setting in"
+		elog "${ROOT}/etc/isabelle/settings"
+	fi
+	elog "Please ensure you have a pdf viewer installed, for example:"
+	elog "As root: emerge app-text/zathura-pdf-poppler"
+	elog "Please configure your preferred pdf viewer, something like:"
+	elog "As normal user: xdg-mime default zathura.desktop application/pdf"
+	elog "Or alternatively by editing the PDF_VIEWER variable in the system"
+	elog "settings file ${ROOT}etc/isabelle/settings and/or the user"
+	elog "settings file \$HOME/.isabelle/${MY_P}/etc/settings"
+	elog "To improve sledgehammer performance, consider installing:"
+	elog "USE=isabelle emerge sci-mathematics/e sci-mathematics/spass"
+	elog "For nitpick it is necessary to install:"
+	elog "emerge sci-mathematics/kodkodi"
+}
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index bf7a9f9e6713..441eacac7c96 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,2 +1,3 @@
 DIST Normaliz2.12.2.zip 6432949 SHA256 230772425b3c9964b9e144c0919c75fac0ec95260a1943c10a8a94eea9d7273e SHA512 fd42071cb87b8efbaf9af0885c173a0583e0b38dedb8821a83225eeebb44060a7b5748c44adfc4faeac20c3a1706071bcb9883cb4447e4a1ff3aeb770bd22038 WHIRLPOOL cb2974e02eac6e6d51c234214a719a24ad2e12d1400f0a6f8aee3e7a4ba3aa2ba053beec65c9032f42726e4dd4f1866820bb5b7b96f7c3d34cd132fcdbdb91af
 DIST Normaliz3.0.0.zip 8607387 SHA256 4dbc315de34a1f115a911194b22628948a32a993c486bda03623e6786172857b SHA512 b4ce7b5ab849982ee986e3b1cbef1ed620ddf57c8d89ef3d5973509ead52d49c2a59a2924357fb70838963ec1490f68cfe0c5c294b05c571402f8445234bdbf5 WHIRLPOOL f90b81eb7ea426a393cd515932765ad9e48b888e47c07a709ab085f15960c4cda4c70f90ba61bf590bbe9a2ee2ca125a46bd9a24bb0940c1e2b09203b0f16452
+DIST Normaliz3.1.0.zip 5734218 SHA256 dfb6b801c4a4bb9aeec6601c58eca2c92bfc420d126c5e0dce0e1f2cdb7d8200 SHA512 835f39cfcd7b6b39139a7c731320e297df2e7a41d0e68e0bfb4d72b9d6905a8b83b1ef61408458c071315933968290d5166470445cd19af4ef1b5ac6ba04496a WHIRLPOOL 25fedc897515fc4b8ce2ec82f70a2c2474b63d928c22126f140f69836af3f7af0cf9de9e1849ae6a886155e5ceabcedc8a42b234ad939648f5278302cb7a1950
diff --git a/sci-mathematics/normaliz/normaliz-3.1.0.ebuild b/sci-mathematics/normaliz/normaliz-3.1.0.ebuild
new file mode 100644
index 000000000000..161c8949a772
--- /dev/null
+++ b/sci-mathematics/normaliz/normaliz-3.1.0.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 toolchain-funcs versionator
+
+MYPV=$(get_version_component_range 1-2)
+MYP="Normaliz${MYPV}"
+
+DESCRIPTION="Tool for computations in affine monoids and more"
+HOMEPAGE="www.mathematik.uni-osnabrueck.de/normaliz/"
+SRC_URI="https://www.normaliz.uni-osnabrueck.de/wp-content/uploads/2016/02/Normaliz${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc extras openmp"
+
+RDEPEND="dev-libs/gmp[cxx]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-libs/boost"
+# Only a boost header is needed -> not RDEPEND
+
+S=${WORKDIR}/${MYP}
+
+src_prepare () {
+	epatch "${FILESDIR}/${PN}-3.0.0-respect-flags.patch"
+
+	# Respect users AR tool (Bug 474532)
+	sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die
+
+	if use openmp && tc-has-openmp; then
+		export OPENMP=yes
+	else
+		export OPENMP=no
+	fi
+}
+
+src_compile(){
+	emake CXX="$(tc-getCXX)" OPENMP="${OPENMP}" -C source
+}
+
+src_install() {
+	dobin source/normaliz
+	if use doc ; then
+		dodoc doc/"Normaliz.pdf"
+		dodoc doc/"NmzIntegrate.pdf"
+	fi
+	if use extras; then
+		elog "You have selected to install extras which consist of Macaulay2"
+		elog "and Singular packages. These have been installed into "
+		elog "/usr/share/${PN}, and cannot be used without additional setup. Please refer"
+		elog "to the homepages of the respective projects for additional information."
+		elog "Note however, Gentoo's versions of Singular and Macaulay2 bring their own"
+		elog "copies of these interface packages. Usually you don't need normaliz's versions."
+		insinto "/usr/share/${PN}"
+		doins Singular/normaliz.lib
+		doins Macaulay2/Normaliz.m2
+	fi
+}
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index cc582ca8f73a..d84f7215eb33 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -23,6 +23,7 @@ DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9
 DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0
 DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941
 DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee33c6840a060067b8019404ff44b03f SHA512 2658694d6154f4b91b2dc07a7ec653edb7f593c4d9829a06a5e600e4db465ca6059418be6812d5ba2529fd6202dd136f0f58d74576f856fdcf6f81032d74f3c2 WHIRLPOOL e71650a07cc010ab3c25955c7fa9e90eee68577c1ef78e02a5f81a0160c688908ec5ec4fd89c89e5a9bc49b926623cd5de976fb249aa2d472354d23f5fad76de
+DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c67cdcbcd2f291952fdef8e999a097 SHA512 c2bbe598a4a9c2abc69e39807af70be5729a06bbcb73bac5249f74f3c3daddb2909bf4a46d988f0d4bfeabe308f0c31d2a75aa28a52f11c1343dfcead07e2c45 WHIRLPOOL 5c9c75a7891ac53eb80a36eff518d77a0c281b16bff383526ac1ede07ee57486d7b00be4e400a0cad48dfea92729becf25c67f18782af7930f9b4218592afe5c
 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/files/rstudio-0.99.879-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch
new file mode 100644
index 000000000000..c3af2b7a6f56
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch
@@ -0,0 +1,77 @@
+--- rstudio-0.99.879-orig/src/cpp/session/CMakeLists.txt	2016-02-12 09:24:39.000000000 +1100
++++ rstudio-0.99.879/src/cpp/session/CMakeLists.txt	2016-02-19 23:04:57.266186448 +1100
+@@ -25,30 +25,11 @@
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23")
+   message(FATAL_ERROR "Mathjax 2.3 not found (re-run install-dependencies script to install)")
+ endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
+-  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+-endif()
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect")
+   message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)")
+ endif()
+ 
+ 
+-# verify libclang is installed
+-if(WIN32)
+-   set(LIBCLANG_VERSION "3.4")
+-else()
+-   set(LIBCLANG_VERSION "3.5")
+-endif()
+-set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
+-if(NOT EXISTS "${LIBCLANG_DIR}")
+-  message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
+-endif()
+-set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
+-if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
+-  message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
+-endif()
+-
+-
+ # include files
+ file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
+ 
+@@ -399,18 +380,6 @@
+    install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23"
+            DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
+ 
+-   # install pandoc
+-   if(RSTUDIO_PACKAGE_BUILD_SLES)
+-      # when producing a SUSE Linux Enterpise build, we want to install the 
+-      # static Pandoc binaries (see dependencies/common/install-pandoc)
+-      set(PANDOC_EXTENSION_DIR "/static")
+-   endif()
+-   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.15.2${PANDOC_EXTENSION_DIR}")
+-   file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
+-   install(FILES ${PANDOC_FILES}
+-           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+-           DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
+-
+    # install rsconnect package
+    file(GLOB RSCONNECT_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect*.tar.gz")
+    install(FILES ${RSCONNECT_PACKAGE}
+@@ -428,24 +397,6 @@
+    install(DIRECTORY "resources/help_resources"
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+ 
+-   # install libclang
+-   if(WIN32)
+-      file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_32_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86)
+-      file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_64_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
+-   else()
+-      file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang)
+-   endif()
+-
+-   # install libclang builtin-headers
+-   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
+-           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
+-
+    # install 64 bit binaries if we are on win64
+    if(WIN32)
+       if(NOT ("$ENV{PROGRAMW6432}" STREQUAL ""))
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch
new file mode 100644
index 000000000000..a8b48f24968c
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch
@@ -0,0 +1,130 @@
+--- rstudio-0.99.879-orig/CMakeGlobals.txt	2016-02-12 09:24:39.000000000 +1100
++++ rstudio-0.99.879/CMakeGlobals.txt	2016-02-19 22:58:41.396818474 +1100
+@@ -120,7 +120,7 @@
+    else()
+      set(RSTUDIO_INSTALL_BIN bin)
+    endif()
+-   set(RSTUDIO_INSTALL_SUPPORTING .)
++   set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
+ endif()
+ 
+ # if the install prefix is /usr/local then tweak as appropriate
+--- rstudio-0.99.879-orig/src/cpp/server/CMakeLists.txt	2016-02-12 09:24:39.000000000 +1100
++++ rstudio-0.99.879/src/cpp/server/CMakeLists.txt	2016-02-19 22:58:41.397818478 +1100
+@@ -155,7 +155,7 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
+ 
+    # install configured redhat init.d script
+    set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
+@@ -163,7 +163,7 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_REDHAT_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
+ 
+    # install configured suse init.d script
+    set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
+@@ -171,13 +171,13 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_SUSE_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
+ 
+    # install pam profile
+    set(RSERVER_PAM_DIR "extras/pam")
+    set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
+-           DESTINATION ${RSERVER_PAM_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
+ 
+    # install configured apparmor profile
+    set(RSERVER_APPARMOR_DIR "extras/apparmor")
+@@ -185,9 +185,9 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
+-           DESTINATION ${RSERVER_APPARMOR_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
+    install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
+-           DESTINATION ${RSERVER_APPARMOR_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
+ 
+    # install configured upstart profile
+    set(RSERVER_UPSTART_DIR "extras/upstart")
+@@ -195,12 +195,12 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
+-           DESTINATION ${RSERVER_UPSTART_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+    set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf")
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}
+-           DESTINATION ${RSERVER_UPSTART_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+            
+     # install configured systemd profile
+    set(RSERVER_SYSTEMD_DIR "extras/systemd")
+--- rstudio-0.99.879-orig/src/cpp/server/ServerOptions.cpp	2016-02-12 09:24:39.000000000 +1100
++++ rstudio-0.99.879/src/cpp/server/ServerOptions.cpp	2016-02-19 22:58:41.397818478 +1100
+@@ -382,8 +382,8 @@
+ 
+    // convert relative paths by completing from the system installation
+    // path (this allows us to be relocatable)
+-   resolvePath(resourcePath, &wwwLocalPath_);
+-   resolvePath(resourcePath, &wwwSymbolMapsPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
+    resolvePath(binaryPath, &authPamHelperPath_);
+    resolvePath(binaryPath, &rsessionPath_);
+    resolvePath(binaryPath, &rldpathPath_);
+--- rstudio-0.99.879-orig/src/cpp/session/SessionOptions.cpp	2016-02-12 09:24:39.000000000 +1100
++++ rstudio-0.99.879/src/cpp/session/SessionOptions.cpp	2016-02-20 18:13:34.807771539 +1100
+@@ -49,7 +49,7 @@
+ namespace session {  
+ 
+ namespace {
+-const char* const kDefaultPandocPath = "bin/pandoc";
++const char* const kDefaultPandocPath = "bin";
+ const char* const kDefaultPostbackPath = "bin/postback/rpostback";
+ const char* const kDefaultRsclangPath = "bin/rsclang";
+ } // anonymous namespace
+@@ -451,14 +451,14 @@
+    }
+    
+    // convert relative paths by completing from the app resource path
+-   resolvePath(resourcePath_, &rResourcesPath_);
+-   resolvePath(resourcePath_, &agreementFilePath_);
+-   resolvePath(resourcePath_, &wwwLocalPath_);
+-   resolvePath(resourcePath_, &wwwSymbolMapsPath_);
+-   resolvePath(resourcePath_, &coreRSourcePath_);
+-   resolvePath(resourcePath_, &modulesRSourcePath_);
+-   resolvePath(resourcePath_, &sessionLibraryPath_);
+-   resolvePath(resourcePath_, &sessionPackageArchivesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
+    resolvePostbackPath(resourcePath_, &rpostbackPath_);
+ #ifdef _WIN32
+    resolvePath(resourcePath_, &consoleIoPath_);
+@@ -467,7 +467,7 @@
+    resolvePath(resourcePath_, &msysSshPath_);
+    resolvePath(resourcePath_, &sumatraPath_);
+ #endif
+-   resolvePath(resourcePath_, &hunspellDictionariesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
+    resolvePath(resourcePath_, &mathjaxPath_);
+    resolvePath(resourcePath_, &libclangHeadersPath_);
+    resolvePandocPath(resourcePath_, &pandocPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch
new file mode 100644
index 000000000000..483613cc5c09
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch
@@ -0,0 +1,45 @@
+--- rstudio-0.99.879-orig/src/gwt/build.xml	2016-02-12 09:24:39.000000000 +1100
++++ rstudio-0.99.879/src/gwt/build.xml	2016-02-20 00:25:39.458756693 +1100
+@@ -25,6 +25,7 @@
+    <property name="gwt.extra.args" value=""/>
+    <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
+    <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
++   <property environment="env"/>
+ 
+    <path id="project.class.path">
+       <pathelement location="bin"/>
+@@ -101,8 +102,10 @@
+             <pathelement location="src"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
+          <jvmarg value="-Xmx1536M"/>
++         <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
+          <arg value="-war"/>
+          <arg value="www"/>
+          <arg value="-localWorkers"/>
+@@ -142,6 +145,7 @@
+             <pathelement location="src"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+          <arg value="-war"/>
+          <arg value="www"/>
+@@ -163,6 +167,7 @@
+             <pathelement location="src"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+       	<arg value="-src"/>
+       	<arg value = "src"/>
+@@ -194,6 +199,7 @@
+                   <pathelement location="src"/>
+                   <path refid="test.class.path"/>
+                </classpath>
++               <jvmarg value="-Duser.home=${env.T}"/>
+                <arg value="org.rstudio.studio.selenium.RStudioTestSuite"/>
+             </java>
+          </sequential>
diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
new file mode 100644
index 000000000000..35a886baa234
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2016 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 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-0.99.879-paths.patch"
+		"${FILESDIR}/${PN}-0.99.879-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"
+		"${FILESDIR}/${PN}-0.99.486-systemd.patch"
+)
+
+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
+
+	egit_clean
+
+	epatch "${PATCHES[@]}"
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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
+
+	# The git commit for tag v0.99.879
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 9ac918338d6f9d6dd25807d6d746b470f1cfcf6d@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| 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
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	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/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch b/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch
new file mode 100644
index 000000000000..4e94e5b84eb1
--- /dev/null
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch
@@ -0,0 +1,23 @@
+Fix errors caused by wrong parameter type:
+* File "mathexpr.ml", line 423, characters 55-56:
+* Error: This expression has type int but an expression was expected of type
+*          float
+
+--- flashdot-1.1.4/mathexpr/mathexpr.ml
++++ flashdot-1.1.4/mathexpr/mathexpr.ml
+@@ -419,7 +419,6 @@
+ 		| "NegativeBinomial" ->
+ 			let p = float'_of_string (aod cont_type "P" "1.0") in
+ 			let n = float'_of_string (aod cont_type "N" "1.0") in
+-			(*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*)
+ 			fun () -> foi  (Gsl_randist.negative_binomial rng p n)
+ 		| "Pascal" ->
+ 			let p = float'_of_string (aod cont_type "P" "1.0") in
+@@ -4094,7 +4093,6 @@
+ 				| "NegativeBinomialPDF" ->
+ 					let p = float'_of_string (aod cont_type "P" "1.0") in
+ 					let n = float'_of_string (aod cont_type "N" "1.0") in
+-					(*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*)
+ 					fun x -> Gsl_randist.negative_binomial_pdf (int_of_float x) p n
+ 				| "PascalPDF" ->
+ 					let p = float'_of_string (aod cont_type "P" "1.0") in
diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..66f46d4ef92c
--- /dev/null
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Generator for psychophysical experiments"
+HOMEPAGE="http://www.flashdot.info/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-3.10[ocamlopt?]
+	dev-ml/gsl-ocaml
+	dev-ml/lablgl[glut]
+	dev-ml/ocamlsdl
+	x11-apps/xdpyinfo"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}/${P}-gsl-ocaml.patch"
+)
+
+src_prepare() {
+	default
+	MAKEOPTS+=" -j1 VERSION=${PV}"
+	use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
+}
+
+src_install() {
+	emake DESTDIR="${D}" CALLMODE=script install
+}
diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild
index 9f43c742848b..0eb8bf75a175 100644
--- a/sci-physics/clhep/clhep-2.2.0.5.ebuild
+++ b/sci-physics/clhep/clhep-2.2.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.cern.ch/clhep"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="amd64 hppa ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc static-libs test"
 RDEPEND=""
diff --git a/sci-physics/lammps/lammps-20151207.ebuild b/sci-physics/lammps/lammps-20151207.ebuild
index 2158b5f7de0b..90353f9f1b15 100644
--- a/sci-physics/lammps/lammps-20151207.ebuild
+++ b/sci-physics/lammps/lammps-20151207.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples gzip lammps-memalign mpi python static-libs"
 
 DEPEND="
diff --git a/sci-visualization/extrema/Manifest b/sci-visualization/extrema/Manifest
deleted file mode 100644
index a934c66ea1ba..000000000000
--- a/sci-visualization/extrema/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST extrema-4.4.5.tar.gz 6536157 SHA256 ce648d6531c3d55501078073e08a18d70e880b6329b5b168a59db5213d048491 SHA512 933caac15b511fc599366d42472d38bfce5031dbfa7bb7139bcd222268307f0141b18eb885948b39e52a6f06980ad7575cb9b56a31ad81d4cd7b2af291402e87 WHIRLPOOL 870235201d564aefe0c8352fb71b02177072f2bf5ad228e0e64553c1a45c0e48284a5284d6fc7af1348f01b865c1550e507df894b884c4f4fb764e2b1923966d
diff --git a/sci-visualization/extrema/extrema-4.4.5.ebuild b/sci-visualization/extrema/extrema-4.4.5.ebuild
deleted file mode 100644
index 4f4c0b8997a2..000000000000
--- a/sci-visualization/extrema/extrema-4.4.5.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
-WX_GTK_VER="2.8"
-inherit eutils fdo-mime wxwidgets
-
-DESCRIPTION="Interactive data analysis and visualization tool"
-HOMEPAGE="http://exsitewebware.com/extrema/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-# File collision, see bug #249423
-RDEPEND="!sci-chemistry/psi
-	x11-libs/wxGTK:2.8[X]
-	dev-util/desktop-file-utils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's/$(pkgdatadir)/$(DESTDIR)$(pkgdatadir)/g' \
-		src/Makefile.in || die
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-}
-
-src_configure() {
-	# extrema cannot be compiled with versions of minuit
-	# available in portage
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	make_desktop_entry ${PN}
-	dodir /usr/share/icons/hicolor
-	tar xjf extrema_icons.tar.bz2 -C "${ED}usr/share/icons/hicolor"
-	dosym ../../icons/hicolor/48x48/apps/extrema.png /usr/share/pixmaps/extrema.png
-
-	use doc && dodoc doc/*.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins Scripts/*.pcm Scripts/*.dat || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/extrema/files/extrema-4.4.5-gcc46.patch b/sci-visualization/extrema/files/extrema-4.4.5-gcc46.patch
deleted file mode 100644
index 45a80429264b..000000000000
--- a/sci-visualization/extrema/files/extrema-4.4.5-gcc46.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix building with gcc-4.6
-
-https://bugs.gentoo.org/show_bug.cgi?id=363467
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/src/Graphics/GRA_thiessenTriangulation.h
-+++ b/src/Graphics/GRA_thiessenTriangulation.h
-@@ -19,6 +19,7 @@
- #define GRA_THIESSENTRIANGULATION
- 
- #include <vector>
-+#include <cstddef>
- 
- class GRA_thiessenTriangulation
- {
diff --git a/sci-visualization/extrema/metadata.xml b/sci-visualization/extrema/metadata.xml
deleted file mode 100644
index 2c0ea674f4e8..000000000000
--- a/sci-visualization/extrema/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-  Extrema is a powerful visualization and data analysis tool that
-  enables researchers to quickly distill their large, complex data sets
-  into meaningful information. Its flexibility, sophistication, and
-  power allow you to easily develop your own commands and create highly
-  customized graphs.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">extrema</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 1fd7b6f384e1..2271a07a47d0 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,2 +1,3 @@
 DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99 SHA512 62f5bb531c2fc7e061661ab5733a70acf9a61ff90a934af42b5741c63478caebabc8240f37d25660f623c5cbcd530e1303e967a095ca99b3452f29cfb5200b69 WHIRLPOOL 94b4b704737c2e6bb86caa00497164749df7eb01b13b49d06daa8f33b3e34d23782bde4fec617f35755c2e2f4286327bb39270bf48a9f020e94ef113f9d962bb
+DIST qtiplot-0.9.8.9-origin.patch.xz 89660 SHA256 8d1a9927fad711b7e357641926b884f68d28f8e2f648f6a7c071514d5d552c11 SHA512 adbd002975bb49997eb610b150c1bbfe9c9617b0b5bbb70f52df7475339b7d68cada175eb9f6048f6ece043ca3dcf5c62ef361d82bc670b1576ee8493d6b757c WHIRLPOOL 41fd5c1627737f060d7a0d99682e58417e050c7655798453a602c1cf9409d5bab319870b6054efe3542ac038c2bc32f804ae427646a3f56290a2c5b1905cbcd4
 DIST qtiplot-0.9.8.9.tar.bz2 16202943 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 SHA512 3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a WHIRLPOOL 3cf9d9ab7d58301364a61f6c5ad51858ffe1e6214c5971c1d042c7894fcb70fa4b28fe0e6631f142ab8fa9b2c2b979e4e178bc44b1961cde70b29d9aaa2c7d3f
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch
new file mode 100644
index 000000000000..9ad891938cd6
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch
@@ -0,0 +1,36 @@
+ * Info: Using [gentoo] (https://bugs.gentoo.org/xmlrpc.cgi)
+ * Info: Getting attachment 425760
+ * Info: Viewing attachment: "fix_fit_gsl_fdfsolver.patch"
+diff --git a/qtiplot/src/analysis/Fit.cpp b/qtiplot/src/analysis/Fit.cpp
+index 22cb5be..555f21d 100755
+--- a/qtiplot/src/analysis/Fit.cpp
++++ b/qtiplot/src/analysis/Fit.cpp
+@@ -106,6 +106,7 @@ void Fit::init()
+ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iterations, int &status)
+ {
+ 	const gsl_multifit_fdfsolver_type *T;
++	gsl_matrix *J;
+ 	if (d_solver)
+ 		T = gsl_multifit_fdfsolver_lmder;
+ 	else
+@@ -128,7 +129,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration
+ 	}
+ 
+ 	if (status){
+-	    gsl_multifit_covar (s->J, 0.0, covar);
++	    gsl_multifit_fdfsolver_jac (s, J);
++	    gsl_multifit_covar (J, 0.0, covar);
+ 	    iterations = 0;
+ 	    return s;
+ 	}
+@@ -155,7 +157,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration
+ 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
+ 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
+ 
+-	gsl_multifit_covar (s->J, 0.0, covar);
++	gsl_multifit_fdfsolver_jac (s, J);
++	gsl_multifit_covar (J, 0.0, covar);
+ 
+ 	iterations = iter;
+ 	return s;
+
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
index f93b9455b91f..e2db5e6eae43 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,7 +45,7 @@ CDEPEND="
 	dev-libs/quazip
 	media-libs/libpng:=
 	sci-libs/alglib:=
-	sci-libs/gsl
+	<sci-libs/gsl-2
 	sci-libs/tamu_anova
 	latex? ( dev-tex/qtexengine )
 	mono? ( dev-dotnet/libgdiplus )
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
index eec88b2a3604..060eeae33676 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,7 +45,7 @@ CDEPEND="
 	dev-libs/quazip
 	media-libs/libpng:=
 	sci-libs/alglib:=
-	sci-libs/gsl
+	<sci-libs/gsl-2
 	sci-libs/tamu_anova
 	latex? ( dev-tex/qtexengine )
 	mono? ( dev-dotnet/libgdiplus )
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
new file mode 100644
index 000000000000..5163a6a4dbb1
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils qmake-utils python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="
+	http://soft.proindependent.com/qtiplot.html
+	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
+	https://dev.gentoo.org/~jlec/distfiles/${P}-origin.patch.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bindist doc mono latex python"
+
+LANGS="cn cz de es fr ja ro ru sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+done
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# qwtplot3d much modified from original upstream
+# >=x11-libs/qwt-5.3 they are using trunk checkouts
+CDEPEND="
+	media-libs/libemf
+	dev-qt/qthelp:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qt3support:4
+	dev-qt/qthelp:4[compat]
+	dev-qt/qtsvg:4
+	>=x11-libs/gl2ps-1.3.5[png]
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0:=
+	dev-libs/quazip
+	media-libs/libpng:=
+	sci-libs/alglib:=
+	>=sci-libs/gsl-2
+	sci-libs/tamu_anova
+	latex? ( dev-tex/qtexengine )
+	mono? ( dev-dotnet/libgdiplus )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+		)"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] )
+	doc? (
+		>=app-text/docbook-sgml-utils-0.6.14-r1
+		>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-origin.patch
+	"${FILESDIR}"/${P}-origin-2.patch
+	"${FILESDIR}"/${P}-qt48.patch
+	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
+	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
+	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
+	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
+	"${FILESDIR}"/${P}-set_col_values.patch
+	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
+	"${FILESDIR}"/${P}-crasher_without_internet.patch
+	"${FILESDIR}"/${P}-private.patch
+	"${FILESDIR}"/${P}-sip-4.15.patch
+	"${FILESDIR}"/${P}-PyQt4-4.11.3.patch
+	"${FILESDIR}"/${P}-gsl-2.patch
+	)
+
+RESTRICT="!bindist? ( bindist )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local mylibs
+
+	xdg_src_prepare
+
+	rm -rf \
+		3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} \
+		|| die
+	sed \
+		-e "s:dll:static:g" \
+		-e "/INSTALLS/d" \
+		-i 3rdparty/qwtplot3d/*.pro || die
+
+	mylibs="${mylibs} -lquazip"
+	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
+
+	# Check build.conf for changes on bump.
+	cat > build.conf <<-EOF
+	# Automatically generated by Gentoo ebuild
+	isEmpty( QTI_ROOT ) {
+	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+	}
+
+	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
+	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	EMF_INCLUDEPATH = "${EPREFIX}"/usr/include/libEMF
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
+
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
+	TAMUANOVA_LIBS = -ltamuanova
+	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
+	ALGLIB_LIBS = -lalglib
+
+	EOF
+
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
+	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use python && echo "PYTHON = ${EPYTHON}" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+
+	sed \
+		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
+		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
+		-i qtiplot/qtiplot.pro || die
+
+	if use python; then
+		sed \
+			-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
+			-i qtiplot/qtiplot.pro || die
+	fi
+
+	sed \
+		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
+		-i fitPlugins/*/*.pro || die
+
+	sed -e '/manual/d' -i qtiplot.pro || die
+
+	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
+
+	# Drop langs only if LINGUAS is not empty
+	if [[ -n ${LINGUAS} ]]; then
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} || \
+				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
+						-i qtiplot/qtiplot.pro || die
+		done
+	fi
+
+	sed \
+		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
+		-i qtiplot/src/core/ApplicationWindow.cpp || die
+
+	chmod -x qtiplot/qti_wordlist.txt
+
+	# sed out debian paths
+	sed \
+		-e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+		-i manual/qtiplot.dsl || die
+	sed \
+		-e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+		-i manual/qtiplot_html.xsl || die
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i 3rdparty/zlib/minigzip.c || die
+}
+
+src_configure() {
+	use amd64 && export QMAKESPEC="linux-g++-64"
+	eqmake4
+}
+
+src_compile() {
+	default
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual || die
+		emake web
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	insinto /usr/share/qtiplot
+	doins qtiplot/qti_wordlist.txt
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
+
+	use doc && dodoc -r manual/html
+
+	use python && python_optimize
+
+	if [[ -n ${LINGUAS} ]]; then
+		insinto /usr/share/${PN}/translations
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} && \
+				doins qtiplot/translations/qtiplot_${l}.qm
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		optfeature "Enhanced python support" \
+			dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r1.ebuild
index 2529ca23575d..e98915fe9623 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r10.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r10.ebuild
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r2.ebuild
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r3.ebuild
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r4.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r4.ebuild
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r5.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r5.ebuild
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r6.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r6.ebuild
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r7.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r7.ebuild
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d870f9f85308..41c7f233f79a 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r1.ebuild
index 3469c39966d3..fe6dfb3cea76 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r2.ebuild
index f038d000007a..4fbeab715cd6 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild b/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
index 7a8e2e206aba..a6befe4d9219 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r1.ebuild
index e377451aa5da..60962e89fc4a 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r10.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r10.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r2.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r3.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r4.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r4.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r5.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r5.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r6.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r6.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r7.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r7.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r9.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r9.ebuild
index 425c5a48ad70..f8fbffd76c13 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r1.ebuild
index 8d7a05a77489..e47766a84309 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r2.ebuild
index 86fa6615e385..ca975f995502 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
index a23ce2fa2d67..87a6a4ca224d 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r1.ebuild
index ecf9e47c680b..c8cd66c1bd2c 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r10.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r10.ebuild
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r2.ebuild
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r3.ebuild
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r4.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r4.ebuild
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r5.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r5.ebuild
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r6.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r6.ebuild
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r7.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r7.ebuild
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 236e134bd523..1d0610c43577 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20151208-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20151208-r1.ebuild
index 0bf886c4d4b4..a1533f78e24a 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20151208-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20151208-r2.ebuild
index a1c1ac17eb5c..404399b0f640 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-9999.ebuild b/sec-policy/selinux-acct/selinux-acct-9999.ebuild
index a6af4bd679d3..c2d79057d3eb 100644
--- a/sec-policy/selinux-acct/selinux-acct-9999.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r1.ebuild
index cf8632843363..abb76b20d3fe 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r10.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r10.ebuild
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r2.ebuild
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r3.ebuild
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r4.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r4.ebuild
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r5.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r5.ebuild
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r6.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r6.ebuild
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r7.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r7.ebuild
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9727174906b9..f2fb47e80c4f 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20151208-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20151208-r1.ebuild
index 7e878e7246bd..aa44972bd67b 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20151208-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20151208-r2.ebuild
index 7fcc79df6384..8c026d95f569 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-9999.ebuild b/sec-policy/selinux-ada/selinux-ada-9999.ebuild
index 2fb9bc56bdc5..186b61486dfa 100644
--- a/sec-policy/selinux-ada/selinux-ada-9999.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r1.ebuild
index f1428e24b668..49b9c502d067 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r10.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r10.ebuild
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r2.ebuild
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r3.ebuild
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r4.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r4.ebuild
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r5.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r5.ebuild
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r6.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r6.ebuild
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r7.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r7.ebuild
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 90cb62870388..6f57cb8eb6ff 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20151208-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20151208-r1.ebuild
index cb69afbeeeba..34333663843e 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20151208-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20151208-r2.ebuild
index 3b9da07f0eeb..ceba0c5309e1 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-9999.ebuild b/sec-policy/selinux-afs/selinux-afs-9999.ebuild
index a85b1067ff39..21aa3b6ec23a 100644
--- a/sec-policy/selinux-afs/selinux-afs-9999.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r1.ebuild
index 4a5d67aaa192..aa585b4506e1 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r10.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r10.ebuild
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r2.ebuild
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r3.ebuild
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r4.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r4.ebuild
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r5.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r5.ebuild
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r6.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r6.ebuild
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r7.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r7.ebuild
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3d1f762da5eb..9ad4a766ae0b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20151208-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20151208-r1.ebuild
index 075bba7966ee..c4e863f440c7 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20151208-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20151208-r2.ebuild
index 91c207cb2a5e..d9ced1a2b43b 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-9999.ebuild b/sec-policy/selinux-aide/selinux-aide-9999.ebuild
index 577bf38526f8..f9129f7b9c30 100644
--- a/sec-policy/selinux-aide/selinux-aide-9999.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r1.ebuild
index aafa2c5ee216..de55d92f6873 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r10.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r10.ebuild
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r2.ebuild
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r3.ebuild
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r4.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r4.ebuild
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r5.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r5.ebuild
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r6.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r6.ebuild
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r7.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r7.ebuild
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 37a1b3796e5c..c669ec0f5c5d 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r1.ebuild
index 819b7f7267ee..878f3ceef1c0 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r2.ebuild
index 8f44acb73a46..38cb2bd26151 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild b/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
index c660049b5eb5..0207a727a423 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r1.ebuild
index 1f445a95e2c3..e9516c504d76 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r10.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r10.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r2.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r3.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r4.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r4.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r5.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r5.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r6.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r6.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r7.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r7.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r9.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r9.ebuild
index 84b1daef572a..23c3ee88ce1f 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r1.ebuild
index d7a040be958e..913b6b321f62 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r2.ebuild
index 13c20701f141..deabc72ad2ba 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
index 8a16d377d1ed..42fce40dfc35 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r1.ebuild
index da729869267e..0608fd625cde 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r10.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r10.ebuild
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r2.ebuild
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r3.ebuild
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r4.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r4.ebuild
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r5.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r5.ebuild
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r6.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r6.ebuild
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r7.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r7.ebuild
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 90a2274a0e7e..55f413348e68 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r1.ebuild
index 28cce2d7289b..7e734df5f7a6 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r2.ebuild
index adb555291856..2ba507f654b0 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild b/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
index 4dea763b6932..9f43c96552bd 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r1.ebuild
index 9fac9c1cd473..94e252071643 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r10.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r10.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r2.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r3.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r4.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r4.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r5.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r5.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r6.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r6.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r7.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r7.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r9.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r9.ebuild
index fa35be339094..76e849d60d5b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20151208-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20151208-r1.ebuild
index 00e991b262d8..86b78367ff3b 100644
--- a/sec-policy/selinux-android/selinux-android-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-2.20151208-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20151208-r2.ebuild
index 45e02206a06d..033d0e421143 100644
--- a/sec-policy/selinux-android/selinux-android-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-android/selinux-android-9999.ebuild b/sec-policy/selinux-android/selinux-android-9999.ebuild
index 23db988d0013..a3272405b9c7 100644
--- a/sec-policy/selinux-android/selinux-android-9999.ebuild
+++ b/sec-policy/selinux-android/selinux-android-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for android"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r1.ebuild
index 6926a8004beb..2805e8d41b28 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r10.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r10.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r2.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r3.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r4.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r4.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r5.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r5.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r6.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r6.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r7.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r7.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r9.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r9.ebuild
index fcf4600da640..bd546f247f5a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20151208-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20151208-r1.ebuild
index 80b7ff92aa3a..414828ff5755 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20151208-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20151208-r2.ebuild
index 939f1e20568a..6f1839a1e697 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-9999.ebuild b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
index b0bcf737220d..999c7dc036f3 100644
--- a/sec-policy/selinux-apache/selinux-apache-9999.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r1.ebuild
index 32d765eb42b9..7ee203679977 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r10.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r10.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r2.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r3.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r4.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r4.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r5.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r5.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r6.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r6.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r7.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r7.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r9.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r9.ebuild
index 1ec3970ce8c6..7927f7a483bb 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r1.ebuild
index 1d0ad73bb167..2403c005970e 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r2.ebuild
index 3ca49fcd2806..bbb3858b539c 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
index d463c48b4ea1..32f25d93f650 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r1.ebuild
index cbfdb9de6c0a..87b29dc778c1 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r10.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r10.ebuild
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r2.ebuild
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r3.ebuild
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r4.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r4.ebuild
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r5.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r5.ebuild
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r6.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r6.ebuild
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r7.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r7.ebuild
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 6d87a909e2bb..89e243e27eba 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20151208-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20151208-r1.ebuild
index 39d39db89f59..3a91a1d74e4b 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20151208-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20151208-r2.ebuild
index 4cf87ae6fd65..ca8f5cff3553 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-9999.ebuild b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
index 509bc2021aa7..a82f90dd235a 100644
--- a/sec-policy/selinux-apm/selinux-apm-9999.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r1.ebuild
index 66be889d235c..906ff7f36592 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r10.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r10.ebuild
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r2.ebuild
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r3.ebuild
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r4.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r4.ebuild
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r5.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r5.ebuild
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r6.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r6.ebuild
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r7.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r7.ebuild
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d4383285c03b..bfb1e0092bc2 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r1.ebuild
index 8bfb269bae9a..dcbd9d3db34c 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r2.ebuild
index 452ba9a1f9b5..6eff6a6a6b60 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
index b0fa448ee61c..b02c7155fb84 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r1.ebuild
index e9e722df0087..21018321fb86 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r10.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r10.ebuild
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r2.ebuild
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r3.ebuild
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r4.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r4.ebuild
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r5.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r5.ebuild
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r6.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r6.ebuild
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r7.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r7.ebuild
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 8936841ee645..af83f2d9a1ed 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r1.ebuild
index acaac4f0bad0..801330749eaf 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r2.ebuild
index 6712a9e60471..4f66327bcfcb 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
index a4fa7528a1d9..dbf8d00a6882 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r1.ebuild
index c1295b2592ce..2718bfaba8bb 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r10.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r10.ebuild
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r2.ebuild
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r3.ebuild
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r4.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r4.ebuild
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r5.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r5.ebuild
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r6.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r6.ebuild
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r7.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r7.ebuild
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 067814b627ab..dc8a8455e91d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20151208-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20151208-r1.ebuild
index 6bf63e74ad83..9dbda803dc54 100644
--- a/sec-policy/selinux-at/selinux-at-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20151208-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20151208-r2.ebuild
index e1daef915272..8de018a890a9 100644
--- a/sec-policy/selinux-at/selinux-at-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-9999.ebuild b/sec-policy/selinux-at/selinux-at-9999.ebuild
index 7c2c7802e001..d15178775d50 100644
--- a/sec-policy/selinux-at/selinux-at-9999.ebuild
+++ b/sec-policy/selinux-at/selinux-at-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r1.ebuild
index bfc9e5976f66..970aaca84e9d 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r10.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r10.ebuild
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r2.ebuild
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r3.ebuild
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r4.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r4.ebuild
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r5.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r5.ebuild
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r6.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r6.ebuild
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r7.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r7.ebuild
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 54d281a8003f..9e922342d00a 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20151208-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20151208-r1.ebuild
index 15629ba88ee5..e1de6c6dae60 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20151208-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20151208-r2.ebuild
index dbbf074d1c24..15cbac043496 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-9999.ebuild b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
index f10a3b2a0c2e..421f33d45b0c 100644
--- a/sec-policy/selinux-automount/selinux-automount-9999.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r1.ebuild
index 248e434e3c16..6c4c93a9715a 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r10.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r10.ebuild
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r2.ebuild
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r3.ebuild
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r4.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r4.ebuild
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r5.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r5.ebuild
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r6.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r6.ebuild
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r7.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r7.ebuild
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a573b0e9216e..ea58ebd5b526 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r1.ebuild
index ca834c9228f2..a32c5671c43a 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r2.ebuild
index 93952f5febb0..d473d8a647a3 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
index f5fe9ecab6ec..0bd120d7c0fb 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r1.ebuild
index f57957587f1b..1b5e5fab58b1 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r10.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r10.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r2.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r3.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r4.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r4.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r5.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r5.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r6.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r6.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r7.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r7.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r9.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r9.ebuild
index 9f8d76aa8f1a..5adca62a7da3 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r1.ebuild
index f661e63ad3da..74f96245040f 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r2.ebuild
index c7e191e5af3f..1b0de98e0c2d 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild b/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
index 41bd29179faa..80124503aa00 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r1.ebuild
index 36758d41c17f..b6f65defa021 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r10.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r10.ebuild
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r2.ebuild
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r3.ebuild
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r4.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r4.ebuild
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r5.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r5.ebuild
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r6.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r6.ebuild
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r7.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r7.ebuild
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 1a8ab1a76b7b..ca4572330285 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20151208-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20151208-r1.ebuild
index 01b7ceb59caa..dfb9ba7e52f6 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20151208-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20151208-r2.ebuild
index 2520280e4f94..2730fee9c332 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-9999.ebuild b/sec-policy/selinux-backup/selinux-backup-9999.ebuild
index fcb4ec0d6e75..765a55ec7323 100644
--- a/sec-policy/selinux-backup/selinux-backup-9999.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup apps"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r1.ebuild
index 0e093fa3ed51..b7cf3363dff8 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r10.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r10.ebuild
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r2.ebuild
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r3.ebuild
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r4.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r4.ebuild
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r5.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r5.ebuild
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r6.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r6.ebuild
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r7.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r7.ebuild
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c64e4a4b089a..5afc2e193818 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r1.ebuild
index d39403d6cf19..a5e0a34b8e1a 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r2.ebuild
index da88eadb1dc4..a9578b77017d 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild b/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
index b2e99e5e2f83..13e788801841 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r1.ebuild
index 211996b882f3..24cb30da9465 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r1.ebuild
@@ -11,12 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 x86"
-fi
 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"
@@ -31,11 +25,6 @@ IUSE="+unconfined"
 RDEPEND="=sec-policy/selinux-base-${PVR}"
 PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
 DEPEND=""
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 x86"
-fi
 
 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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r10.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r10.ebuild
index 170cd876629e..ebfa18f8dfab 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r10.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r2.ebuild
index 6bef07d8617e..24cb30da9465 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r2.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r3.ebuild
index 6bef07d8617e..24cb30da9465 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r3.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r4.ebuild
index 6bef07d8617e..24cb30da9465 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r4.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r5.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r5.ebuild
index 6bef07d8617e..24cb30da9465 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r5.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r6.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r6.ebuild
index 170cd876629e..ebfa18f8dfab 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r6.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r7.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r7.ebuild
index 170cd876629e..ebfa18f8dfab 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r7.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
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 170cd876629e..ebfa18f8dfab 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
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
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
index 170cd876629e..ebfa18f8dfab 100644
--- 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
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r1.ebuild
index 6902b8196b2d..1283a435190a 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r1.ebuild
@@ -11,12 +11,10 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild
index 55b9d0f964f9..452dec5784c2 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild
@@ -11,12 +11,10 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index a23b7c25de15..21b98bd9ba70 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -11,12 +11,10 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r1.ebuild
index 59def65cc864..2c9dd4fe27ae 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r1.ebuild
@@ -11,12 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 x86"
-fi
 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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r10.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r10.ebuild
index c042baf4316d..5ce1035e9abc 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r10.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r2.ebuild
index 6c0b4555e4cf..2c9dd4fe27ae 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r2.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r3.ebuild
index 6c0b4555e4cf..2c9dd4fe27ae 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r3.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r4.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r4.ebuild
index 6c0b4555e4cf..2c9dd4fe27ae 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r4.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild
index 6c0b4555e4cf..2c9dd4fe27ae 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
 
 	inherit git-2
-
-	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r6.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r6.ebuild
index 035bf3d05f45..328dc7c65f92 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r6.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r7.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r7.ebuild
index 035bf3d05f45..328dc7c65f92 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r7.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
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 035bf3d05f45..328dc7c65f92 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r8.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r9.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r9.ebuild
index 035bf3d05f45..328dc7c65f92 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r9.ebuild
@@ -11,8 +11,6 @@ if [[ ${PV} == 9999* ]]; then
 	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"
diff --git a/sec-policy/selinux-base/selinux-base-2.20151208-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20151208-r1.ebuild
index 842d92552b68..050025762aff 100644
--- a/sec-policy/selinux-base/selinux-base-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20151208-r1.ebuild
@@ -11,13 +11,11 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-base/selinux-base-2.20151208-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20151208-r2.ebuild
index ad5271f587d8..78c628e5e862 100644
--- a/sec-policy/selinux-base/selinux-base-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20151208-r2.ebuild
@@ -11,13 +11,11 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index d86db33d977a..51af052d67ec 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -11,13 +11,11 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r1.ebuild
index ffcdc39503ea..69fd14bea25c 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r10.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r10.ebuild
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r2.ebuild
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r3.ebuild
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r4.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r4.ebuild
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r5.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r5.ebuild
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r6.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r6.ebuild
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r7.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r7.ebuild
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d5347a4aa1bd..e8efa6f7a440 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20151208-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20151208-r1.ebuild
index 479cd24a80b5..f4c85da09c1b 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20151208-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20151208-r2.ebuild
index 039bdf513d46..8adb16ce614a 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-9999.ebuild b/sec-policy/selinux-bind/selinux-bind-9999.ebuild
index ad8292844d2b..135adbceca8f 100644
--- a/sec-policy/selinux-bind/selinux-bind-9999.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r10.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r10.ebuild
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r2.ebuild
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r3.ebuild
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r4.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r4.ebuild
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r5.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r5.ebuild
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r6.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r6.ebuild
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r7.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r7.ebuild
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index fc6fc780d39f..bc7e9beed6cb 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r1.ebuild
index 209db2122014..03361e1a369e 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r2.ebuild
index 4ad7c4a3d0de..a444e02f8054 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
index 730b6a9688a1..bd6d5ed614fc 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitcoin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r1.ebuild
index fcac6d24b8ef..2e91a2a20247 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r10.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r10.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r2.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r3.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r4.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r4.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r5.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r5.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r6.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r6.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r7.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r7.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r9.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r9.ebuild
index 5cf2619873fd..c8779a5ec658 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r1.ebuild
index a4e28f6bffe1..e4dcd6568b04 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r2.ebuild
index 6c80c6c76bb2..77b0afb02ff7 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
index 079ec07d6e9e..5959cb1bae9a 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r1.ebuild
index a81177dd8f9f..269372db7193 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r10.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r10.ebuild
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r2.ebuild
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r3.ebuild
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r4.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r4.ebuild
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r5.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r5.ebuild
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r6.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r6.ebuild
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r7.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r7.ebuild
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index e408a3271662..8e8b30afa327 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r1.ebuild
index 0a9a3feef68d..4e14253a30db 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r2.ebuild
index f82ba6035ade..75334ea9e38c 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
index d654599a76fe..b3f68e4a4d2a 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r1.ebuild
index 2e59b5b64487..7ae746952795 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r10.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r10.ebuild
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r2.ebuild
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r3.ebuild
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r4.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r4.ebuild
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r5.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r5.ebuild
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r6.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r6.ebuild
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r7.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r7.ebuild
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 086befe83548..e94c1b2a7607 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r1.ebuild
index b69f1d518497..0f0d005be258 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r2.ebuild
index 448eb9739dcd..ef93a888aa34 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
index 2a2da441a874..4131118e90b7 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r1.ebuild
index 718466c74f50..044f9657983b 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r10.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r10.ebuild
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r2.ebuild
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r3.ebuild
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r4.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r4.ebuild
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r5.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r5.ebuild
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r6.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r6.ebuild
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r7.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r7.ebuild
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 29ec40fa3bab..d20caa8d0609 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r1.ebuild
index 7542cb0193f6..3e44b52db158 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r2.ebuild
index 020022cb8a69..08396e63193f 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
index 42da13b7eb79..987d808ff206 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r1.ebuild
index 86988751c1bd..bae8f0c3ae83 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r10.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r10.ebuild
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r2.ebuild
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r3.ebuild
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r4.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r4.ebuild
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r5.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r5.ebuild
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r6.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r6.ebuild
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r7.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r7.ebuild
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b065dfc25cde..b4dc35ee5795 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r1.ebuild
index b995251e4468..1a478e00756c 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r2.ebuild
index 972d3fe6fce7..0ed9339d01c2 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
index b29b07e69586..a6fcaa681248 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r1.ebuild
index 50e00dbfb2b1..1a092315f775 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r10.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r10.ebuild
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r2.ebuild
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r3.ebuild
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r4.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r4.ebuild
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r5.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r5.ebuild
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r6.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r6.ebuild
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r7.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r7.ebuild
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 888a0e8d15c8..e24d778ab581 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20151208-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20151208-r1.ebuild
index 1f560c3e3fe1..ee418e7f4d6d 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20151208-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20151208-r2.ebuild
index 2ca1edbc7cc0..999144e54e17 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-9999.ebuild b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
index b9f3d2a8bfeb..b3e32bdd2220 100644
--- a/sec-policy/selinux-canna/selinux-canna-9999.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r1.ebuild
index 6f6dd64d15b2..f7422cca4de6 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r10.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r10.ebuild
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r2.ebuild
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r3.ebuild
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r4.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r4.ebuild
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r5.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r5.ebuild
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r6.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r6.ebuild
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r7.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r7.ebuild
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b90f3c734804..9b3c64294b58 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r1.ebuild
index 853cd1f327f3..bfdd95c1c299 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r2.ebuild
index 0bff17007ad1..125636b8a8bb 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild b/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
index 640f3334d71e..d3e4e68b3adb 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r1.ebuild
index 824bdf11bc5c..15a9ebe586e2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r10.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r10.ebuild
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r2.ebuild
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r3.ebuild
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r4.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r4.ebuild
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r5.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r5.ebuild
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r6.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r6.ebuild
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r7.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r7.ebuild
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 34446ca6449c..65848bb9cfc2 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r1.ebuild
index 53befc632a1b..c7a869f701d8 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r2.ebuild
index 5d067810af70..6a46e189807a 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
index 95dc675b2111..601ef94314e7 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r10.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r10.ebuild
index 8b3b213a4195..f4160aee9ee4 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ceph"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 8b3b213a4195..f4160aee9ee4 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ceph"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 8b3b213a4195..f4160aee9ee4 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ceph"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r1.ebuild
index 3d365ac08710..3d1c563b7324 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ceph"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r2.ebuild
index a9f9e5ef92dd..809172d62461 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ceph"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild b/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
index 1968c0bc474a..914f5b4d6fad 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ceph"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild
index 0c88f0ef001c..9fda81203227 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild
index 0c88f0ef001c..9fda81203227 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild
index 0c88f0ef001c..9fda81203227 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r2.ebuild
index 79c0d1894568..05f2bc7a1b72 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
index 79c0d1894568..05f2bc7a1b72 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r1.ebuild
index 73690159830d..79fadc167682 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r10.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r10.ebuild
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r2.ebuild
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r3.ebuild
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r4.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r4.ebuild
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r5.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r5.ebuild
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r6.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r6.ebuild
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r7.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r7.ebuild
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9c1f240d11d5..9387f071352a 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r1.ebuild
index fbf302c585a6..c68570652569 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r2.ebuild
index f741483ed750..6e6b8289d57d 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
index e549cbd6566d..b5e4f6a80209 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r1.ebuild
index f1a1816366f3..b9fd74108de9 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r10.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r10.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r2.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r3.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r4.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r4.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r5.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r5.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r6.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r6.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r7.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r7.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r9.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r9.ebuild
index fecdba3811d7..dd6d642c197c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r1.ebuild
index 4c63fc245628..4186eae4154e 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r2.ebuild
index 3bf8bd839f4e..b541fa2fe30a 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild b/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
index ceacf4543a43..168ddbb2b7b3 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r1.ebuild
index 93bac4bb0fb1..f642c87180cb 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r10.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r10.ebuild
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r2.ebuild
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r3.ebuild
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r4.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r4.ebuild
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r5.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r5.ebuild
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r6.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r6.ebuild
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r7.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r7.ebuild
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 1f0eff9e0f4a..313b45c5ce97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r1.ebuild
index 6867d33083bf..b8ebe919349b 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r2.ebuild
index 9c669937df61..00487b173179 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
index 3aca05f2c924..2a756569ef7f 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r1.ebuild
index 9f0db41c4ccf..562acfcd9d6e 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r10.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r10.ebuild
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r2.ebuild
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r3.ebuild
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r4.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r4.ebuild
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r5.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r5.ebuild
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r6.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r6.ebuild
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r7.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r7.ebuild
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 24a38288ebf0..529b667ab596 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r1.ebuild
index 14f03b1a0bca..3d11eb65cf97 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r2.ebuild
index 836c5ff95210..fc4ec72b5bd3 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild b/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
index 4c5b12496f52..186750453dc3 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r1.ebuild
index baddd090770b..059715b20a9d 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r10.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r10.ebuild
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r2.ebuild
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r3.ebuild
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r4.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r4.ebuild
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r5.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r5.ebuild
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r6.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r6.ebuild
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r7.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r7.ebuild
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a5f8904cb5aa..e22844465a6a 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r1.ebuild
index c6df659a275a..1cfe920e7d50 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r2.ebuild
index 38e143ef59a7..afa2e0980058 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
index bb13958a0fa6..13793d639615 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r1.ebuild
index 6a513334ca41..37d12b5302b1 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r10.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r10.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r2.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r3.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r4.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r4.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r5.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r5.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r6.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r6.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r7.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r7.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r9.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r9.ebuild
index bcc5e0d50a93..0889fb6677fd 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r1.ebuild
index 020d90732b6e..e219bb1c6f86 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r2.ebuild
index 7f65a4cad0b3..1bd3f1a4c100 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild b/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
index e627daefc922..553602148143 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r1.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r1.ebuild
index a9011786e7be..cf4a15e9387a 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r10.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r10.ebuild
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r2.ebuild
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r3.ebuild
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r4.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r4.ebuild
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r5.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r5.ebuild
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r6.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r6.ebuild
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r7.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r7.ebuild
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index df1c21df7cb2..313e9f744626 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r1.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r1.ebuild
index 13acb533583d..c18a2d846d61 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r2.ebuild
index ee09e4826aee..591814ce66ca 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
index a3954b73492a..f1efd9fa36da 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r1.ebuild
index 35f088153498..5d294ac88ade 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r10.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r10.ebuild
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r2.ebuild
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r3.ebuild
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r4.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r4.ebuild
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r5.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r5.ebuild
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r6.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r6.ebuild
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r7.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r7.ebuild
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0986796b417d..ec5324328a0b 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r1.ebuild
index b188814f75f0..83fc844265b6 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r2.ebuild
index a6c6870d9740..8a46267847a7 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild b/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
index 15fa0c50a8a1..f6fc37b14179 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r1.ebuild
index 112f9f00611d..adb6e454b9f6 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r10.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r10.ebuild
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r2.ebuild
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r3.ebuild
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r4.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r4.ebuild
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r5.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r5.ebuild
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r6.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r6.ebuild
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r7.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r7.ebuild
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index ad84d595056b..1e2753558fb3 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r1.ebuild
index 4175f42d2277..8c4a232713df 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r2.ebuild
index d6a07823bdb2..f80229a52b74 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
index 202e6febb4a7..12dbdaecd75b 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r1.ebuild
index 31253ea006df..424aa0e5409f 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r10.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r10.ebuild
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r2.ebuild
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r3.ebuild
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r4.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r4.ebuild
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r5.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r5.ebuild
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r6.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r6.ebuild
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r7.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r7.ebuild
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9acc6c4c9898..ee3894460dd5 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20151208-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20151208-r1.ebuild
index f87b07bac8a9..3daa4af38fdf 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20151208-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20151208-r2.ebuild
index 1590dc84fbf4..bcca76efdaef 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-9999.ebuild b/sec-policy/selinux-courier/selinux-courier-9999.ebuild
index c147576391a0..4e3e216a13a6 100644
--- a/sec-policy/selinux-courier/selinux-courier-9999.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r1.ebuild
index 459908a36046..97404955a5f9 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r10.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r10.ebuild
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r2.ebuild
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r3.ebuild
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r4.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r4.ebuild
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r5.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r5.ebuild
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r6.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r6.ebuild
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r7.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r7.ebuild
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index be127e1b5e60..45733efe7fa5 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r1.ebuild
index c6c67a0f0b8b..007834b1b2e9 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r2.ebuild
index a3f85552c23f..bc167fb35642 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
index f4f506fa0d5e..4c79368d1f90 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r1.ebuild
index 8829cf6427d7..6bea00e6c2c2 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r10.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r10.ebuild
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r2.ebuild
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r3.ebuild
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r4.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r4.ebuild
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r5.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r5.ebuild
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r6.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r6.ebuild
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r7.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r7.ebuild
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index f0fccaf1d342..031840db2c37 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r1.ebuild
index eabda84eacf7..abad0710b3d5 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r2.ebuild
index 8119402e7d78..b86286829868 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
index a20d621edfa1..99e7b6263fad 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r1.ebuild
index 7e4428ace351..9fe16534a5b2 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r10.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r10.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r2.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r3.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r4.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r4.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r5.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r5.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r6.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r6.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r7.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r7.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r9.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r9.ebuild
index 04e7c606274c..1508262f7183 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20151208-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20151208-r1.ebuild
index 646e9e5d7737..975341af8ec9 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20151208-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20151208-r2.ebuild
index f709781096a4..2cc0dd9c0f0f 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-9999.ebuild b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
index 790f440b5665..7ac16a51fbef 100644
--- a/sec-policy/selinux-cups/selinux-cups-9999.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r1.ebuild
index 2cbd97c09ace..16ebc9b4c193 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r10.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r10.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r2.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r3.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r4.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r4.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r5.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r5.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r6.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r6.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r7.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r7.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r9.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r9.ebuild
index 3042d4ad1823..de965550311a 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r1.ebuild
index 22cfc59c9f4b..a864fd177b41 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r2.ebuild
index f20c9471ae06..5bdbb01dd5b1 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
index b6bc80760d38..adc4b0dc38d0 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r1.ebuild
index 4ffeb613fde0..129393008d7e 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r10.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r10.ebuild
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r2.ebuild
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r3.ebuild
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r4.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r4.ebuild
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r5.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r5.ebuild
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r6.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r6.ebuild
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r7.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r7.ebuild
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 96db5dce05ec..2fe3fbe99faf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r1.ebuild
index f27aa047f33a..d91661da854a 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r2.ebuild
index ce532ed12c46..69ab29d98147 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
index 165510ae05a1..97692d4cc236 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r1.ebuild
index e21797f959bd..569d6c92c293 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r10.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r10.ebuild
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r2.ebuild
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r3.ebuild
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r4.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r4.ebuild
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r5.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r5.ebuild
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r6.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r6.ebuild
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r7.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r7.ebuild
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9c9eaca8a425..1284b1793d3b 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r1.ebuild
index 3db1012104cd..5f25616d77e1 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r2.ebuild
index 1c1ccdf845aa..e5333a80e285 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
index 1d09ffa66917..fe8e337e0413 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r1.ebuild
index 198ec227bc3e..ad3b998bbff9 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r10.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r10.ebuild
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r2.ebuild
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r3.ebuild
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r4.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r4.ebuild
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r5.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r5.ebuild
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r6.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r6.ebuild
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r7.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r7.ebuild
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b49548110451..0e767bb4446f 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20151208-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20151208-r1.ebuild
index c3c0731f540c..19f188132eaa 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20151208-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20151208-r2.ebuild
index 638555b8e34a..917ffbda302a 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-9999.ebuild b/sec-policy/selinux-dante/selinux-dante-9999.ebuild
index 488c20466024..5afe49485360 100644
--- a/sec-policy/selinux-dante/selinux-dante-9999.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r1.ebuild
index cb209ca9676c..d51a2fa862e9 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r10.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r10.ebuild
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r2.ebuild
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r3.ebuild
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r4.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r4.ebuild
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r5.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r5.ebuild
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r6.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r6.ebuild
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r7.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r7.ebuild
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a2ad8f80e734..705bd4dcf845 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r1.ebuild
index 5388aafdaad5..d16c594745dc 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r2.ebuild
index 5e68773b69fa..0d044783aa57 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
index 57969a45189e..943b3725bdea 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r1.ebuild
index f2804c9fa6f5..dbe69ed630a9 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r10.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r10.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r2.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r3.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r4.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r4.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r5.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r5.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r6.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r6.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r7.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r7.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r9.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r9.ebuild
index 3169bc921ff6..c701c29c602d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r1.ebuild
index d649e486d657..0578a467a3c2 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r2.ebuild
index ef1b556d972a..4bffad65cb0d 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
index 77987f1a1517..54bee6856eb0 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r1.ebuild
index fc71d746fa11..079eea01768b 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r10.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r10.ebuild
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r2.ebuild
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r3.ebuild
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r4.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r4.ebuild
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r5.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r5.ebuild
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r6.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r6.ebuild
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r7.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r7.ebuild
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index ea08574b0027..bf92218ec1a0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r1.ebuild
index 16a78322efdd..637fe1621953 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r2.ebuild
index 8d433f3faa88..cba6560640ea 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild b/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
index 2039d8f93327..e8ffc45a0113 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r1.ebuild
index 0069fb1d4a09..d7408782c116 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r10.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r10.ebuild
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r2.ebuild
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r3.ebuild
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r4.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r4.ebuild
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r5.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r5.ebuild
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r6.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r6.ebuild
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r7.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r7.ebuild
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b354b1a46ce5..81b17a9446b9 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r1.ebuild
index a23657aa19d6..22835e7f0880 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r2.ebuild
index 6fbdfe6f7f08..7294438d0871 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild b/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
index 97dcc2a50608..74d82ec62d8c 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r1.ebuild
index 8d174415c0e9..2fd6dea0395c 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r10.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r10.ebuild
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r2.ebuild
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r3.ebuild
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r4.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r4.ebuild
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r5.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r5.ebuild
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r6.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r6.ebuild
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r7.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r7.ebuild
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d6f67fb89973..0600f661cf06 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r1.ebuild
index 5cdbee5ae479..984746c5d6a4 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r2.ebuild
index 323e83f9cff4..2e8602975826 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
index 1a6aec0329c6..46d0bedb1d9c 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r1.ebuild
index 5406647d3b6d..e9149f750a1c 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r10.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r10.ebuild
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r2.ebuild
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r3.ebuild
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r4.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r4.ebuild
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r5.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r5.ebuild
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r6.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r6.ebuild
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r7.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r7.ebuild
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index cc013c89345f..2c8031fe8175 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r1.ebuild
index f82677303f90..014ff3a411c9 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r2.ebuild
index 9bcc2a8da29f..9c51891c75a1 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
index adf31d4c0d9e..705544ee2316 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r1.ebuild
index 5da7d842c4e5..848df30a09b4 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r10.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r10.ebuild
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r2.ebuild
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r3.ebuild
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r4.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r4.ebuild
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r5.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r5.ebuild
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r6.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r6.ebuild
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r7.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r7.ebuild
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c051a0431d0a..cdc6f0bda538 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r1.ebuild
index afae8632c643..c964a7e54368 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r2.ebuild
index 2773e98b12d8..dd6df916b922 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
index 5615093335ca..8c2aebdcf86b 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r1.ebuild
index 7a7f882109e2..bc933644123c 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r10.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r10.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r2.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r3.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r4.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r4.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r5.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r5.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r6.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r6.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r7.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r7.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r9.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r9.ebuild
index 13b385c4446d..ab0c48297331 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r1.ebuild
index 838a3a004c8d..c0593abece22 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r2.ebuild
index 75682236e6c9..0c6003ed5ba0 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
index 9e1647b89961..ee325ef1ac80 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r1.ebuild
index 3fbadff79e17..e14007ae26ab 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r10.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r10.ebuild
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r2.ebuild
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r3.ebuild
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r4.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r4.ebuild
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r5.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r5.ebuild
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r6.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r6.ebuild
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r7.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r7.ebuild
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index fb37426bb5f1..a5a7a3eba784 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r1.ebuild
index 88526ab4fb61..8d5ebd175ef1 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r2.ebuild
index 5ea4fe124acf..659d081c7de4 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
index 6db4a25b25ae..2160c8ec1f96 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r1.ebuild
index fc6ae7c32488..140d06de79f8 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r10.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r10.ebuild
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r2.ebuild
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r3.ebuild
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r4.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r4.ebuild
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r5.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r5.ebuild
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r6.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r6.ebuild
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r7.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r7.ebuild
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0c824a17e78b..43c3f9776ecb 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r1.ebuild
index 165a10b9739d..7df786821c22 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r2.ebuild
index 7a2f391d6a20..cfa3d47aebed 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild b/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
index 362cb532cc95..8ccfbf872d3f 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r1.ebuild
index 737212180b32..718a37ab91cb 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r10.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r10.ebuild
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r2.ebuild
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r3.ebuild
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r4.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r4.ebuild
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r5.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r5.ebuild
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r6.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r6.ebuild
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r7.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r7.ebuild
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9144b3aab17d..533f58591c9e 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r1.ebuild
index a54bcf5dc3b7..881a40d291cf 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r2.ebuild
index 516549d5c415..ac8248f09f1c 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
index 680addf16668..7a88f2679990 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r1.ebuild
index ddb7c74c8c80..8e672dc36508 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r10.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r10.ebuild
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r2.ebuild
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r3.ebuild
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r4.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r4.ebuild
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r5.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r5.ebuild
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r6.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r6.ebuild
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r7.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r7.ebuild
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 20ed50cb4074..024c50a0a1a5 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r1.ebuild
index 697a767d7ebd..adf597105902 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r2.ebuild
index d864d746e4a5..488df9ee88a0 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild b/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
index bb427c7a1900..b62fa7bd0c8b 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r1.ebuild
index 69a9a072a88d..f7d9bcc525df 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r10.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r10.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r2.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r3.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r4.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r4.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r5.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r5.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r6.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r6.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r7.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r7.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r9.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r9.ebuild
index 419dcfd2ff2a..b3f4a64713b9 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r1.ebuild
index 126beac59449..165f1ff9172a 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r2.ebuild
index ad29e5e0aacc..fd41e2aedbde 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
index 5b70fa29059c..bafff26d43b3 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r1.ebuild
index 0e932205bbf9..7aa39c4bdf05 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r10.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r10.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r2.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r3.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r4.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r4.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r5.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r5.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r6.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r6.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r7.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r7.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r9.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r9.ebuild
index 27b839b52b57..b7b6ffd36599 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r1.ebuild
index f2a803f040a4..04f045fea69b 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r2.ebuild
index ef0b508338cd..01d4a9cf3402 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild b/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
index 7d6a35c36c26..98f6606e6de1 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r1.ebuild
index 64da18310fcc..265607652784 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r10.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r10.ebuild
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r2.ebuild
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r3.ebuild
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r4.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r4.ebuild
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r5.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r5.ebuild
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r6.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r6.ebuild
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r7.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r7.ebuild
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 6750201e9200..e5b7fca7fda5 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r1.ebuild
index 76315649cefd..a68f21b365c3 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r2.ebuild
index b61baa88538b..e02fec27812a 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
index 0b73c518fbde..7dc1f26ded88 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r1.ebuild
index 05fb0846dd06..23e237065ce2 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r10.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r10.ebuild
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r2.ebuild
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r3.ebuild
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r4.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r4.ebuild
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r5.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r5.ebuild
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r6.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r6.ebuild
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r7.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r7.ebuild
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index df33341961e2..084012b15b86 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r1.ebuild
index 53bcce9950da..bfe666fd300d 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r2.ebuild
index 68757eb445c1..d0422e0f530b 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
index 30a9424f9f2f..98c7df925391 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r1.ebuild
index 104b9d3391b7..95a536d66d9a 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r10.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r10.ebuild
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r2.ebuild
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r3.ebuild
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r4.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r4.ebuild
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r5.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r5.ebuild
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r6.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r6.ebuild
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r7.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r7.ebuild
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d75a271b0562..25de784c2026 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r1.ebuild
index b260697cdddf..d4463e668824 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r2.ebuild
index 4e5748f423d5..c85e2aebfd4d 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
index eb2e8313aa7d..db2ec0973a16 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r1.ebuild
index 753c5c4ee84d..ccb1f53e4f91 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r10.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r10.ebuild
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r2.ebuild
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r3.ebuild
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r4.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r4.ebuild
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r5.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r5.ebuild
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r6.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r6.ebuild
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r7.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r7.ebuild
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 6fa16c49af3c..da95adf19120 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r1.ebuild
index 60ab429454da..72b9205f415a 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r2.ebuild
index dfc5bd7a285e..903ea5210fd4 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
index fc62269b995b..c1306113604a 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r1.ebuild
index afb843e60ba5..ddc855add5d6 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r10.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r10.ebuild
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r2.ebuild
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r3.ebuild
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r4.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r4.ebuild
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r5.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r5.ebuild
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r6.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r6.ebuild
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r7.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r7.ebuild
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 68772bfcf576..c0c8e387d944 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r1.ebuild
index 09293b31b7f4..0af8c4b4acbf 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r2.ebuild
index bcd320c54845..885c262e3399 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild b/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
index 09d582f28fca..f3290259219e 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r1.ebuild
index 2cabd47a4568..418dcf9a2194 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r10.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r10.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r2.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r3.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r4.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r4.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r5.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r5.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r6.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r6.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r7.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r7.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r9.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r9.ebuild
index 785045937fc1..405a531f0fe4 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r1.ebuild
index 6012b307d2f3..7b9e3b525c66 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r2.ebuild
index fd9aed26bc18..af5d00cd6fca 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
index 863b5feb3e2d..128c60547c1c 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dropbox"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r1.ebuild
index 33fcef2de59f..ede9ba985907 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r10.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r10.ebuild
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r2.ebuild
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r3.ebuild
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r4.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r4.ebuild
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r5.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r5.ebuild
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r6.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r6.ebuild
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r7.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r7.ebuild
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 07aa4712f1ad..93a928bdde82 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r1.ebuild
index 13b03507e83f..f8031327a03a 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r2.ebuild
index a78049864748..449abb108599 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
index 61202f068b0e..91727191c8e0 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r1.ebuild
index a79b05e73a9e..7570cf386cc2 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r10.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r10.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r2.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r3.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r4.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r4.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r5.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r5.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r6.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r6.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r7.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r7.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r9.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r9.ebuild
index aebb5cd0af44..498c6e9ed70f 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r1.ebuild
index 6694698aa666..b45b69b4f773 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r2.ebuild
index 1ecefa83b074..5f7a39d19d79 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild b/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
index 4e1f8f6e8882..87d18cebaf67 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r1.ebuild
index d8b3b6f86a67..28d283fc4334 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r10.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r10.ebuild
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r2.ebuild
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r3.ebuild
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r4.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r4.ebuild
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r5.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r5.ebuild
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r6.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r6.ebuild
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r7.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r7.ebuild
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 237a9f436365..032ae6387310 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20151208-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20151208-r1.ebuild
index c758611c42e8..732b28b402ec 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20151208-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20151208-r2.ebuild
index 2362f21ac009..6b7d3a8bd900 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-9999.ebuild b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
index 08e981929d23..f84d4349a9cb 100644
--- a/sec-policy/selinux-exim/selinux-exim-9999.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r1.ebuild
index 757c8cfd5f7d..7b8045f03ac3 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r10.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r10.ebuild
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r2.ebuild
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r3.ebuild
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r4.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r4.ebuild
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r5.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r5.ebuild
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r6.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r6.ebuild
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r7.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r7.ebuild
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 2dd3dfc05ec7..5662b065d8a0 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r1.ebuild
index 5e2f58ad006a..071775d8315a 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r2.ebuild
index 10c3daa19dbe..cf03929fe711 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
index 9d2f3caf7169..6ae46c4e8086 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r1.ebuild
index a7b5889db567..b24ba4872d0a 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r10.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r10.ebuild
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r2.ebuild
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r3.ebuild
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r4.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r4.ebuild
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r5.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r5.ebuild
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r6.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r6.ebuild
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r7.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r7.ebuild
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index fc6502f4cb35..f69866c9a376 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r1.ebuild
index 367954c1a2b3..be1b50449bd0 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r2.ebuild
index 6739b9b38e3a..383646585513 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
index a0251ddcdd5c..fcf8fd7b73ec 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r1.ebuild
index 4e66917c28e6..477666337581 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r10.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r10.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r2.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r3.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r4.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r4.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r5.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r5.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r6.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r6.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r7.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r7.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r9.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r9.ebuild
index 422910c68496..6dec2336e2ad 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20151208-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20151208-r1.ebuild
index e3b5e5b5f952..a9625baf9c06 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20151208-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20151208-r2.ebuild
index cbd554166d03..513071b61a41 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-finger/selinux-finger-9999.ebuild b/sec-policy/selinux-finger/selinux-finger-9999.ebuild
index b3d6ec848229..adc1fa3c301a 100644
--- a/sec-policy/selinux-finger/selinux-finger-9999.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r1.ebuild
index 80faf8207d5e..5baa61b566d6 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r10.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r10.ebuild
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r2.ebuild
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r3.ebuild
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r4.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r4.ebuild
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r5.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r5.ebuild
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r6.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r6.ebuild
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r7.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r7.ebuild
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d4cc2a7a0ae3..2e301c8e4bc1 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20151208-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20151208-r1.ebuild
index 02fba2cab190..2c4a32ab93c6 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20151208-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20151208-r2.ebuild
index 4a24cd12fad3..fe8f13144ddc 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-9999.ebuild b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
index 61748b82b0e3..2e5cd4f13ccb 100644
--- a/sec-policy/selinux-flash/selinux-flash-9999.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r1.ebuild
index dcb41088afe7..55bf5d0417e0 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r10.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r10.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r2.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r3.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r4.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r4.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r5.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r5.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r6.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r6.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r7.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r7.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r9.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r9.ebuild
index 8fb9bf1e9cce..74b08e60f6f4 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r1.ebuild
index 951fdaba953d..ebc95f0b492f 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r2.ebuild
index 7c299a6aeb58..924cbb2a2d51 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
index 441050ccd677..667a22fff445 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r1.ebuild
index 6f14bed22e44..5902700238c6 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r10.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r10.ebuild
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r2.ebuild
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r3.ebuild
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r4.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r4.ebuild
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r5.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r5.ebuild
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r6.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r6.ebuild
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r7.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r7.ebuild
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 412aac4125b6..98d155b90dde 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r1.ebuild
index 33a0e6953905..02a7e772e827 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r2.ebuild
index 3a835849f86a..9f59d3800a8c 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild b/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
index 00c6b4c5a3b1..a6fc0ea48b00 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r1.ebuild
index b90d84bf3156..b351caa85e2f 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r10.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r10.ebuild
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r2.ebuild
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r3.ebuild
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r4.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r4.ebuild
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r5.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r5.ebuild
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r6.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r6.ebuild
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r7.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r7.ebuild
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 947966dbd17d..7395a288b70a 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20151208-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20151208-r1.ebuild
index b34e4082a28e..c8304f8f4126 100644
--- a/sec-policy/selinux-games/selinux-games-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20151208-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20151208-r2.ebuild
index 5174442389e1..92b46a728046 100644
--- a/sec-policy/selinux-games/selinux-games-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-9999.ebuild b/sec-policy/selinux-games/selinux-games-9999.ebuild
index bbabfa8db513..404eaa46def4 100644
--- a/sec-policy/selinux-games/selinux-games-9999.ebuild
+++ b/sec-policy/selinux-games/selinux-games-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r1.ebuild
index b15a0cbc2c1b..4e78a87949cb 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r10.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r10.ebuild
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r2.ebuild
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r3.ebuild
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r4.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r4.ebuild
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r5.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r5.ebuild
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r6.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r6.ebuild
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r7.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r7.ebuild
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 82a90a5bfa62..dcce32e56059 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r1.ebuild
index 02f670f5dc5e..a2d749359216 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r2.ebuild
index a16544347765..162b221dd838 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
index 187d08a9ab1e..ec4ce777001b 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r1.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r1.ebuild
index c6f4e19fd2ae..d4af0f21a56b 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r10.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r10.ebuild
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r2.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r2.ebuild
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r3.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r3.ebuild
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r4.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r4.ebuild
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r5.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r5.ebuild
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r6.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r6.ebuild
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r7.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r7.ebuild
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 848e5a59bd74..06152c1a3ffb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20151208-r1.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20151208-r1.ebuild
index 14c9da004833..8a3352c52dcb 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20151208-r2.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20151208-r2.ebuild
index bd456c9b0bd1..b4a54ae6e9d9 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-9999.ebuild b/sec-policy/selinux-gift/selinux-gift-9999.ebuild
index 4596b3953650..8e1ad64ea3a9 100644
--- a/sec-policy/selinux-gift/selinux-gift-9999.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-git/selinux-git-2.20141203-r10.ebuild b/sec-policy/selinux-git/selinux-git-2.20141203-r10.ebuild
index 77c072e5eb2b..45fdbac1ab5f 100644
--- a/sec-policy/selinux-git/selinux-git-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-git/selinux-git-2.20141203-r5.ebuild b/sec-policy/selinux-git/selinux-git-2.20141203-r5.ebuild
index 77c072e5eb2b..45fdbac1ab5f 100644
--- a/sec-policy/selinux-git/selinux-git-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-git/selinux-git-2.20141203-r6.ebuild b/sec-policy/selinux-git/selinux-git-2.20141203-r6.ebuild
index 77c072e5eb2b..45fdbac1ab5f 100644
--- a/sec-policy/selinux-git/selinux-git-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-git/selinux-git-2.20141203-r7.ebuild b/sec-policy/selinux-git/selinux-git-2.20141203-r7.ebuild
index 77c072e5eb2b..45fdbac1ab5f 100644
--- a/sec-policy/selinux-git/selinux-git-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 77c072e5eb2b..45fdbac1ab5f 100644
--- a/sec-policy/selinux-git/selinux-git-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-git/selinux-git-2.20141203-r9.ebuild b/sec-policy/selinux-git/selinux-git-2.20141203-r9.ebuild
index 77c072e5eb2b..45fdbac1ab5f 100644
--- a/sec-policy/selinux-git/selinux-git-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-git/selinux-git-2.20151208-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20151208-r1.ebuild
index b5c6ca7be2d1..a10390703834 100644
--- a/sec-policy/selinux-git/selinux-git-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-git/selinux-git-2.20151208-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20151208-r2.ebuild
index 0aa29fcee084..52a9dbcbaf0e 100644
--- a/sec-policy/selinux-git/selinux-git-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-git/selinux-git-9999.ebuild b/sec-policy/selinux-git/selinux-git-9999.ebuild
index 5cb6287cc5c1..a271df6a6a85 100644
--- a/sec-policy/selinux-git/selinux-git-9999.ebuild
+++ b/sec-policy/selinux-git/selinux-git-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for git"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r1.ebuild
index aee591bb7bc1..114e3df150fd 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r10.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r10.ebuild
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r2.ebuild
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r3.ebuild
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r4.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r4.ebuild
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r5.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r5.ebuild
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r6.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r6.ebuild
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r7.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r7.ebuild
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index e09c983a70c4..47356c9daf88 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r1.ebuild
index d23d28b3299a..88d8a25db523 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r2.ebuild
index ba47438e2680..655231e410f4 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
index 10cdcb488876..71ee6b5f8a44 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r1.ebuild
index 4db9009d16ba..8157fb614592 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r10.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r10.ebuild
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r2.ebuild
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r3.ebuild
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r4.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r4.ebuild
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r5.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r5.ebuild
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r6.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r6.ebuild
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r7.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r7.ebuild
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a24013604051..717c1c278c85 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r1.ebuild
index b9c944d76758..dc86d4193daf 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r2.ebuild
index 49a735753050..5ddf059838f7 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild b/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
index 91c714285d56..8f5dd3599083 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r1.ebuild
index a0c73744f680..d79d06acfcc7 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r10.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r10.ebuild
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r2.ebuild
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r3.ebuild
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r4.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r4.ebuild
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r5.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r5.ebuild
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r6.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r6.ebuild
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r7.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r7.ebuild
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 63d0847c5346..5b6ca57e5e31 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r1.ebuild
index 34a10f288e95..cabd4c1c065b 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r2.ebuild
index 1530f5f88662..4ba048a4ffcf 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
index 4d474a034e0f..bac6eb10f54e 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r1.ebuild
index 092c924108cf..87e4e1bf37aa 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r10.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r10.ebuild
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r2.ebuild
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r3.ebuild
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r4.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r4.ebuild
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r5.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r5.ebuild
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r6.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r6.ebuild
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r7.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r7.ebuild
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 76775db8aeee..c5bfe4d9b574 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r1.ebuild
index 531f9036d622..9cbe4929df57 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r2.ebuild
index c382da4b036b..b6cb0c45cbc2 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild b/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
index e44cf2ab691b..816af37bbed6 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r1.ebuild
index d8e7baafff0e..e5351388779a 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r10.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r10.ebuild
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r2.ebuild
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r3.ebuild
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r4.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r4.ebuild
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r5.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r5.ebuild
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r6.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r6.ebuild
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r7.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r7.ebuild
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b9054776423d..8eb12bcb4696 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r1.ebuild
index fe8e7a9c4c96..4470c2effa42 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r2.ebuild
index f6a949c32e6e..686a856cb028 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
index 65b9d0682526..b5e997710915 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r1.ebuild
index 4bd79c77b36b..32a01d7e2612 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r10.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r10.ebuild
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r2.ebuild
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r3.ebuild
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r4.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r4.ebuild
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r5.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r5.ebuild
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r6.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r6.ebuild
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r7.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r7.ebuild
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 2d018374a774..791a6fa3adaf 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r1.ebuild
index 512b2ede6054..b5a08be398e8 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r2.ebuild
index 13f2f52747af..79d1041db5bd 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild b/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
index 64a436022c04..09077b02920d 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r1.ebuild
index a4c513f20490..e3913d89b5d7 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r10.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r10.ebuild
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r2.ebuild
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r3.ebuild
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r4.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r4.ebuild
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r5.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r5.ebuild
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r6.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r6.ebuild
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r7.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r7.ebuild
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 039ca4aba333..f2b6935626d8 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r1.ebuild
index 6ba56f2e8037..e41950912789 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r2.ebuild
index 303e0709f46f..b4703009ee74 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
index 125d41aeb1cd..fac054bb2d2a 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r1.ebuild
index a0262b6225a1..bb8dcac93a2f 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r10.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r10.ebuild
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r2.ebuild
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r3.ebuild
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r4.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r4.ebuild
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r5.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r5.ebuild
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r6.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r6.ebuild
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r7.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r7.ebuild
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 2fe2b65fc58d..96e177e18b59 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r1.ebuild
index a0e4165b83a9..ade57d55e863 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r2.ebuild
index 0fa9c35740b6..eeb2edde13bc 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
index 381eb31ba939..83957987bf83 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r1.ebuild
index 98045ef5f24f..d01828fffe2e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r10.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r10.ebuild
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r2.ebuild
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r3.ebuild
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r4.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r4.ebuild
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r5.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r5.ebuild
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r6.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r6.ebuild
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r7.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r7.ebuild
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 726c90dea450..6e1f8a3b021e 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20151208-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20151208-r1.ebuild
index d4290bba9657..3582b9f33ed1 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20151208-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20151208-r2.ebuild
index 58e2468354d4..a3c8a9036d68 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-9999.ebuild b/sec-policy/selinux-howl/selinux-howl-9999.ebuild
index 8d5663c1e248..461f1cabf34d 100644
--- a/sec-policy/selinux-howl/selinux-howl-9999.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r1.ebuild
index 86741c0989b1..e6df06637682 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r10.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r10.ebuild
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r2.ebuild
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r3.ebuild
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r4.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r4.ebuild
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r5.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r5.ebuild
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r6.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r6.ebuild
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r7.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r7.ebuild
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d70c8a2d445b..3979c2b69e9a 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r1.ebuild
index 770ce3ca3647..6e2e7c5b7c64 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r2.ebuild
index 9418d6ba5e99..c17c7d4e8b09 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild b/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
index f94810ac5f62..fec469d0760c 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r1.ebuild
index 165068d7986c..bc9105afb9ad 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r10.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r10.ebuild
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r2.ebuild
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r3.ebuild
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r4.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r4.ebuild
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r5.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r5.ebuild
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r6.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r6.ebuild
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r7.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r7.ebuild
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 5286ebc1ff46..05089c2e659e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r1.ebuild
index dded64973b78..a36355992515 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r2.ebuild
index 40269bca72e0..4f2683f0a143 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
index 797c3da33ce7..ca4e97562719 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r1.ebuild
index a055797114cb..5e71b77d0010 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r10.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r10.ebuild
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r2.ebuild
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r3.ebuild
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r4.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r4.ebuild
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r5.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r5.ebuild
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r6.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r6.ebuild
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r7.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r7.ebuild
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index e151fa3e5152..12847a47391a 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r1.ebuild
index 2d0001c8b005..a9607a1af6cf 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r2.ebuild
index b7b5add272d9..fb774e52f934 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild b/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
index b85d5178a407..375f4a9bd37b 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r1.ebuild
index b1c04d676d54..fe92bfd8fd36 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r10.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r10.ebuild
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r2.ebuild
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r3.ebuild
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r4.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r4.ebuild
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r5.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r5.ebuild
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r6.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r6.ebuild
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r7.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r7.ebuild
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 58c6d660bb3a..b28fe181a84a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r1.ebuild
index 9e85b0161266..a30a9df843ab 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r2.ebuild
index c0a1f2feae1c..300d006b4670 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
index 91fc6b78f843..77db161f1b9d 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r1.ebuild
index dbd13e074a55..6d14880d2e84 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r10.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r10.ebuild
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r2.ebuild
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r3.ebuild
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r4.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r4.ebuild
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r5.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r5.ebuild
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r6.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r6.ebuild
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r7.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r7.ebuild
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 38d590c02e78..e7e773fd8bc2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20151208-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20151208-r1.ebuild
index 67ecbd7fd0db..eff1c656b6b9 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20151208-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20151208-r2.ebuild
index 610dd6dba671..b2dc3009822c 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-9999.ebuild b/sec-policy/selinux-inn/selinux-inn-9999.ebuild
index b1e999e41131..f4ecd1fad024 100644
--- a/sec-policy/selinux-inn/selinux-inn-9999.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r1.ebuild
index 2f05e56a7693..18a12fb0a566 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r10.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r10.ebuild
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r2.ebuild
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r3.ebuild
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r4.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r4.ebuild
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r5.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r5.ebuild
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r6.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r6.ebuild
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r7.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r7.ebuild
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 897ddc00c1a8..c0688531fa74 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r1.ebuild
index 50c477a33ce1..b47738b8b6a6 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r2.ebuild
index 6b20ba45eda2..752d6b919691 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
index ffe16812d3fa..e5695b6e5a55 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r1.ebuild
index aa6f1577c6cd..24600ff39960 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r10.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r10.ebuild
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r2.ebuild
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r3.ebuild
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r4.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r4.ebuild
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r5.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r5.ebuild
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r6.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r6.ebuild
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r7.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r7.ebuild
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index e2bff602696e..e79cbf281cc1 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20151208-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20151208-r1.ebuild
index b8b98911721f..127853fe889f 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20151208-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20151208-r2.ebuild
index 334d928fbf2d..b38ad8932a7d 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-9999.ebuild b/sec-policy/selinux-irc/selinux-irc-9999.ebuild
index 1f2bd3fd2065..1a35a4c10c5d 100644
--- a/sec-policy/selinux-irc/selinux-irc-9999.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r1.ebuild
index ba01779f8df4..68fc494b5178 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r10.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r10.ebuild
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r2.ebuild
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r3.ebuild
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r4.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r4.ebuild
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r5.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r5.ebuild
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r6.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r6.ebuild
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r7.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r7.ebuild
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index fa28d74be7ce..d147a8d99baa 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r1.ebuild
index 6734c1cca91d..2db3d6ac7a80 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r2.ebuild
index 482010b32aec..4259eb1a25a3 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
index 18697ac3008a..5a3a2c6f85d4 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r1.ebuild
index 76da754ee60e..8f0ba0cfb6f3 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r10.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r10.ebuild
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r2.ebuild
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r3.ebuild
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r4.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r4.ebuild
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r5.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r5.ebuild
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r6.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r6.ebuild
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r7.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r7.ebuild
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 62388821f780..a547e8a87bb7 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r1.ebuild
index 945cf54d19c1..78d65d79ee01 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r2.ebuild
index ef8c22468da1..2491846edced 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
index c36d63518297..52b3212bdb0c 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r1.ebuild
index 06b5dfba406a..f9695c3d2c3e 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r10.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r10.ebuild
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r2.ebuild
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r3.ebuild
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r4.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r4.ebuild
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r5.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r5.ebuild
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r6.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r6.ebuild
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r7.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r7.ebuild
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 36daacb9b606..cb1d79dea3c1 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r1.ebuild
index eba2767b3706..528bfdca5eec 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r2.ebuild
index 3ffed4f7c42b..f6478588a4b0 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild b/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
index 387f01edb278..088420f540b8 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r1.ebuild
index e6d76e4fcafc..a7d3a34afcfd 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r10.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r10.ebuild
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r2.ebuild
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r3.ebuild
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r4.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r4.ebuild
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r5.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r5.ebuild
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r6.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r6.ebuild
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r7.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r7.ebuild
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 585ca5fc5535..2c10671c84d0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20151208-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20151208-r1.ebuild
index 4b068e58bf7d..71f31fbacbc0 100644
--- a/sec-policy/selinux-java/selinux-java-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20151208-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20151208-r2.ebuild
index 24b1da1d46d2..0cecb0f9de33 100644
--- a/sec-policy/selinux-java/selinux-java-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-9999.ebuild b/sec-policy/selinux-java/selinux-java-9999.ebuild
index 5cec61a4035a..75a0e0888dce 100644
--- a/sec-policy/selinux-java/selinux-java-9999.ebuild
+++ b/sec-policy/selinux-java/selinux-java-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r10.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r10.ebuild
index d07d881b8c51..8436c2ed0496 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r6.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r6.ebuild
index d07d881b8c51..8436c2ed0496 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r7.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r7.ebuild
index d07d881b8c51..8436c2ed0496 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d07d881b8c51..8436c2ed0496 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d07d881b8c51..8436c2ed0496 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r1.ebuild
index 5eb0481d541a..632ffc5d4e75 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r2.ebuild
index f8bfe73190ae..c85a0a2f23e4 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
index b6df8dd32f85..7015461a3442 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdeconnect"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r1.ebuild
index 537781ccb335..3366c457d154 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r10.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r10.ebuild
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r2.ebuild
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r3.ebuild
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r4.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r4.ebuild
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r5.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r5.ebuild
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r6.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r6.ebuild
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r7.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r7.ebuild
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 958d59fc4104..db1051c5dd29 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r1.ebuild
index 07a30176184d..48c52849ce26 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r2.ebuild
index 5d3d37dc7354..4ce96e414ba1 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild b/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
index 76bbb44c6558..0d98721c7494 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r1.ebuild
index b64e341ff8be..643b127d62b6 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r10.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r10.ebuild
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r2.ebuild
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r3.ebuild
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r4.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r4.ebuild
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r5.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r5.ebuild
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r6.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r6.ebuild
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r7.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r7.ebuild
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 5c72b58f7148..14ba8de668ce 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r1.ebuild
index e121272c2ee3..f178d3bf12c6 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r2.ebuild
index 919f163677c9..a013a5427405 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
index 20f27715e007..0eda2f7b5db3 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r1.ebuild
index fdeffd4392c2..5e73e16e4ec3 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r10.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r10.ebuild
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r2.ebuild
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r3.ebuild
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r4.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r4.ebuild
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r5.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r5.ebuild
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r6.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r6.ebuild
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r7.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r7.ebuild
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 7199c740ebfc..9f7ff69a138b 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r1.ebuild
index a8742766ce24..8c19f335db0f 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r2.ebuild
index 8fec2c4d44cf..b6589fa4b576 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
index a7bc4954eaf8..9c7cb25e5a1f 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r1.ebuild
index d0c26b9f148e..3c43ee1ad07c 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r10.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r10.ebuild
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r2.ebuild
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r3.ebuild
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r4.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r4.ebuild
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r5.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r5.ebuild
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r6.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r6.ebuild
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r7.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r7.ebuild
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 8c8ad7bf7e43..da45f9127b44 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r1.ebuild
index 309f8f102a8f..066f66541cc6 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r2.ebuild
index cf3edd7a5d21..0a0821ff5c1b 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild b/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
index 61454fa1b3c5..a35bec09f4aa 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r1.ebuild
index 872ad096c980..ec788d9506b8 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r10.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r10.ebuild
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r2.ebuild
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r3.ebuild
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r4.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r4.ebuild
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r5.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r5.ebuild
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r6.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r6.ebuild
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r7.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r7.ebuild
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d30162d68b12..cead59fd38a4 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r1.ebuild
index c04fdf8af732..0cece90806e7 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r2.ebuild
index 94cfc602f586..53529398c1c3 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
index f611fc0a6674..9a116bb5f8e6 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r1.ebuild
index 21c3094a1019..3a4fb7797c58 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r10.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r10.ebuild
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r2.ebuild
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r3.ebuild
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r4.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r4.ebuild
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r5.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r5.ebuild
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r6.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r6.ebuild
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r7.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r7.ebuild
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a8e8ee0cc749..791e95433a6b 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r1.ebuild
index acefbebe3e47..ad09ca9d8d98 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r2.ebuild
index 40dbcb5cc527..f36daca74fc1 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
index c34980720d41..85280f4e319d 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r1.ebuild
index 6741961b0745..5bcbcdcb7425 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r10.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r10.ebuild
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r2.ebuild
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r3.ebuild
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r4.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r4.ebuild
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r5.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r5.ebuild
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r6.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r6.ebuild
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r7.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r7.ebuild
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3cba896fd284..e23b8a4572fb 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r1.ebuild
index 8718ff8d5697..fcc388e9540b 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r2.ebuild
index 960d65a743b7..c6b4a2d67899 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild b/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
index 19a97012f9fa..c4a75d142987 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r1.ebuild
index 4a6bb57a7c39..2fed16eb0369 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r10.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r10.ebuild
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r2.ebuild
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r3.ebuild
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r4.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r4.ebuild
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r5.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r5.ebuild
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r6.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r6.ebuild
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r7.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r7.ebuild
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index cdd7caedd91e..38681068c329 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20151208-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20151208-r1.ebuild
index de9eb2521faa..0e0a7e252388 100644
--- a/sec-policy/selinux-links/selinux-links-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20151208-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20151208-r2.ebuild
index f2810cfc7555..98106953f5af 100644
--- a/sec-policy/selinux-links/selinux-links-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-9999.ebuild b/sec-policy/selinux-links/selinux-links-9999.ebuild
index 2310d60365fb..a6c59e6c6577 100644
--- a/sec-policy/selinux-links/selinux-links-9999.ebuild
+++ b/sec-policy/selinux-links/selinux-links-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r1.ebuild
index 0866f9d4306a..8672a70f71b7 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r10.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r10.ebuild
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r2.ebuild
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r3.ebuild
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r4.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r4.ebuild
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r5.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r5.ebuild
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r6.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r6.ebuild
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r7.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r7.ebuild
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 8c07f12c9f1d..5213621b4cac 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r1.ebuild
index 3d2230ae069a..6e8fb1deeb7d 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r2.ebuild
index b6151e2bdefc..a36692458fcb 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
index c8181f304e35..432600550d2c 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r1.ebuild
index 993c14377d0f..1675b0731f9a 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r10.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r10.ebuild
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r2.ebuild
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r3.ebuild
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r4.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r4.ebuild
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r5.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r5.ebuild
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r6.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r6.ebuild
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r7.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r7.ebuild
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9522baa4ed41..9911ffbe2fea 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r1.ebuild
index 6a7b2a164629..68d145347d17 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r2.ebuild
index dfad2f9ed129..8905e6849d6e 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
index 72a0ed226476..595133665022 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r1.ebuild
index cff3e0260c44..325bbb12d5e3 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r10.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r10.ebuild
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r2.ebuild
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r3.ebuild
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r4.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r4.ebuild
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r5.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r5.ebuild
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r6.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r6.ebuild
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r7.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r7.ebuild
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c4f3817a5c73..1e4bd5a2d304 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r1.ebuild
index 380411b2ed11..c3a6174ca0d7 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r2.ebuild
index 93622860f196..291bed4c34c6 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
index 848eed568c1d..409b235ca83a 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r1.ebuild
index 04315d169ab3..fa9ebbefea79 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r10.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r10.ebuild
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r2.ebuild
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r3.ebuild
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r4.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r4.ebuild
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r5.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r5.ebuild
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r6.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r6.ebuild
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r7.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r7.ebuild
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b2a27c05b820..152e19d6f727 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r1.ebuild
index 99685a269bec..657673e0ce12 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r2.ebuild
index a4318ef626c5..00a47fa3bb87 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
index 997eef18fb06..939a8a96ed5d 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r1.ebuild
index 5ed849007960..d55aafbefdbf 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r10.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r10.ebuild
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r2.ebuild
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r3.ebuild
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r4.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r4.ebuild
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r5.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r5.ebuild
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r6.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r6.ebuild
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r7.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r7.ebuild
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index acd11a57988f..64ea7dd9c905 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r1.ebuild
index 948ad82ad50c..48bb8d023f59 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r2.ebuild
index 1942f2da06e6..7bd25c77b605 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
index 795437ddb489..dcf420e77aaf 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r1.ebuild
index 13ab2d46d6d9..780d023cc2f4 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r10.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r10.ebuild
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r2.ebuild
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r3.ebuild
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r4.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r4.ebuild
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r5.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r5.ebuild
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r6.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r6.ebuild
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r7.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r7.ebuild
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 6abd986d8eaf..a54eab935df2 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r1.ebuild
index 6afe401b69f5..195f07d71926 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r2.ebuild
index 27b13192b112..d6edce9e5c3f 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
index 88898934d4ea..974d0ce35152 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r1.ebuild
index 21b4f08e9be8..465327ef570b 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r10.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r10.ebuild
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r2.ebuild
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r3.ebuild
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r4.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r4.ebuild
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r5.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r5.ebuild
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r6.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r6.ebuild
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r7.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r7.ebuild
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 5b5bf2d593c8..95e36bb063cc 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r1.ebuild
index 43ab4ce63288..c6f984743f8d 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r2.ebuild
index 679aa57a7592..f40ad6994bc0 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild b/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
index 34e1915ec9dc..6036e1c59903 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r1.ebuild
index e6250f54d7c7..fb02ad188340 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r10.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r10.ebuild
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r2.ebuild
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r3.ebuild
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r4.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r4.ebuild
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r5.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r5.ebuild
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r6.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r6.ebuild
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r7.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r7.ebuild
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a9a919748e5c..c15b70b0526a 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r1.ebuild
index 00b52c5e9c3b..6de962f6d3f1 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r2.ebuild
index 2395e6fe8bea..30e38d675f52 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild b/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
index a20284d40646..055b1ebfb6c7 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r1.ebuild
index 176efef8301b..d1511595328f 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r10.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r10.ebuild
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r2.ebuild
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r3.ebuild
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r4.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r4.ebuild
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r5.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r5.ebuild
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r6.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r6.ebuild
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r7.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r7.ebuild
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 1bfc1ea19b54..c8eab5e9200c 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r1.ebuild
index 86e1d77d4f2c..9bfa23543486 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r2.ebuild
index ee302cdd72d7..c6bfe339b038 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
index 11c520732f3c..50c0cc95749b 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r1.ebuild
index 680fdbe3276d..5b9a45ddf54d 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r10.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r10.ebuild
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r2.ebuild
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r3.ebuild
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r4.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r4.ebuild
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r5.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r5.ebuild
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r6.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r6.ebuild
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r7.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r7.ebuild
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 785c609bdb79..51da70018075 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r1.ebuild
index d932eddee706..5be31507fa00 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r2.ebuild
index 9b01f6841a68..724d46c62c7f 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild b/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
index afae66e25ccd..7f850154c3b0 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r1.ebuild
index e487b68175be..2ad28648444e 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r10.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r10.ebuild
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r2.ebuild
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r3.ebuild
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r4.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r4.ebuild
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r5.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r5.ebuild
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r6.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r6.ebuild
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r7.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r7.ebuild
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 44f545f05c55..3391f9f84cb0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r1.ebuild
index df31592d95b7..26b401aff051 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r2.ebuild
index 8477afff77b3..7c36e7a4f359 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
index a58d9010f928..e59aaf82273f 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r1.ebuild
index 807ee8a8a9d1..ab67815ff09e 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r10.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r10.ebuild
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r2.ebuild
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r3.ebuild
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r4.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r4.ebuild
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r5.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r5.ebuild
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r6.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r6.ebuild
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r7.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r7.ebuild
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 887fa3305f43..0988228ea29d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r1.ebuild
index 8fdbf1d5dc96..3bf5d39ca104 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r2.ebuild
index 8e3c9b8e7813..7e45ff322dd0 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
index e0c0c914e9c7..93df5a399ded 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r1.ebuild
index ddddcf656c28..c88bc5f5e216 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r10.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r10.ebuild
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r2.ebuild
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r3.ebuild
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r4.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r4.ebuild
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r5.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r5.ebuild
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r6.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r6.ebuild
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r7.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r7.ebuild
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 988641e335f5..8b4dcebeaae0 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20151208-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20151208-r1.ebuild
index 389b48fe9790..42b6c2bee699 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20151208-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20151208-r2.ebuild
index 00ca0b4968bc..07178e860dbe 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-9999.ebuild b/sec-policy/selinux-milter/selinux-milter-9999.ebuild
index 5447646722dc..2917ced27927 100644
--- a/sec-policy/selinux-milter/selinux-milter-9999.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r1.ebuild
index b180e0e27017..ed077d57314f 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r10.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r10.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r2.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r3.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r4.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r4.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r5.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r5.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r6.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r6.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r7.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r7.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r9.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r9.ebuild
index 557eb2bae899..0b7aa2530658 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r1.ebuild
index 1f25e8dbe4be..047efab65ad3 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r2.ebuild
index 0c1af3b866bf..f51ab4d0d221 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
index 44540375af01..532481c0ec85 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r1.ebuild
index 5a029b4bd48a..b86a98c5f5cb 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r10.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r10.ebuild
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r2.ebuild
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r3.ebuild
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r4.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r4.ebuild
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r5.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r5.ebuild
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r6.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r6.ebuild
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r7.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r7.ebuild
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c55daf7a59c7..1e5843d83948 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20151208-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20151208-r1.ebuild
index 65eb7d7df915..e223409c9c2e 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20151208-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20151208-r2.ebuild
index 1c82f4d8cffe..6be66cfca129 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-9999.ebuild b/sec-policy/selinux-mono/selinux-mono-9999.ebuild
index 4ff3a61d8a5d..4eab3051a69c 100644
--- a/sec-policy/selinux-mono/selinux-mono-9999.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r1.ebuild
index e376fc2a71be..bfd02dc8df50 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r10.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r10.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r2.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r3.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r4.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r4.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r5.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r5.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r6.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r6.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r7.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r7.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r9.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r9.ebuild
index 4861d2c421f8..f2bed24403bd 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r1.ebuild
index b3005b32ca8b..c8f432e4eba7 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r2.ebuild
index 182a65ed78c3..cd2b9a273ae6 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
index 63a803efdce7..05d8c593ec1c 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r1.ebuild
index 8cef3c9e2083..b92e82b98639 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r10.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r10.ebuild
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r2.ebuild
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r3.ebuild
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r4.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r4.ebuild
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r5.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r5.ebuild
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r6.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r6.ebuild
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r7.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r7.ebuild
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index ac82a3a57d1b..e8b5c88dd7bb 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r1.ebuild
index 1376ef489189..182dc603e144 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r2.ebuild
index bff61c922ab7..4be96e44bf49 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild b/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
index 4a3544b3e0cc..f24969250fda 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r1.ebuild
index 9993659414d0..adb71886ef68 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r10.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r10.ebuild
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r2.ebuild
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r3.ebuild
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r4.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r4.ebuild
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r5.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r5.ebuild
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r6.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r6.ebuild
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r7.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r7.ebuild
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 8ebb73782a44..718fd6f07882 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r1.ebuild
index 435757df2d15..1262343d39cf 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r2.ebuild
index 35e8f1208d2c..fa4470f6fd16 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
index 7886d175026f..69dc98647f49 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r1.ebuild
index 307431da5967..c11a92279c79 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r10.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r10.ebuild
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r2.ebuild
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r3.ebuild
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r4.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r4.ebuild
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r5.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r5.ebuild
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r6.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r6.ebuild
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r7.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r7.ebuild
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index dbd15a5fd784..c06769b0ece9 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r1.ebuild
index a543a31d585e..ff45a86201e2 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r2.ebuild
index 3504880b14f2..bc1faa2e97ab 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
index a517dc75f989..8645864a8daf 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r1.ebuild
index cfbd464ff131..398d9b5d0534 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r10.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r10.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r2.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r3.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r4.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r4.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r5.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r5.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r6.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r6.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r7.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r7.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r9.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r9.ebuild
index 398878e73c89..c626246cda86 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20151208-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20151208-r1.ebuild
index 0ae1872a495d..212cbf75cbda 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20151208-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20151208-r2.ebuild
index de7a2ceb2553..6bc2e1c46322 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-munin/selinux-munin-9999.ebuild b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
index fd4175500220..575c61b33704 100644
--- a/sec-policy/selinux-munin/selinux-munin-9999.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r1.ebuild
index cd72d6ab1b08..c9b64bcd3593 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r10.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r10.ebuild
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r2.ebuild
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r3.ebuild
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r4.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r4.ebuild
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r5.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r5.ebuild
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r6.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r6.ebuild
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r7.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r7.ebuild
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 04f6819f4f4e..bb1dc217fcd1 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r1.ebuild
index ed3b840ffa74..8624b5f75fbc 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r2.ebuild
index 49d0ec006e76..5c3d72e2e9aa 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
index 469432b8942b..58ced8bbdb08 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r1.ebuild
index 9b80f23282eb..93471dc86888 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r10.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r10.ebuild
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r2.ebuild
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r3.ebuild
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r4.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r4.ebuild
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r5.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r5.ebuild
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r6.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r6.ebuild
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r7.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r7.ebuild
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 7b58f7831df3..55327b52435f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r1.ebuild
index 397d44b3b1ac..50d4b7b1e8c8 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r2.ebuild
index 47be9a9d2b68..45addc0ae361 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild b/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
index bad2376a0365..39cdd9ab12a2 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r1.ebuild
index 7fb15a2fad69..308d48b0f43a 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r10.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r10.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r2.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r3.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r4.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r4.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r5.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r5.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r6.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r6.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r7.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r7.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r9.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r9.ebuild
index 56cfef545a9a..6c6afc292f5d 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r1.ebuild
index b340e4a0e21e..a9a0eafd41ed 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r2.ebuild
index 9304f3f134ab..dbf53ecd83ad 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
index 224ada901964..3e11a9ec004e 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r1.ebuild
index ca02d10219d6..9d42ab8ac0d9 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r10.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r10.ebuild
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r2.ebuild
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r3.ebuild
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r4.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r4.ebuild
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r5.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r5.ebuild
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r6.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r6.ebuild
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r7.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r7.ebuild
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d8f466fe2d34..a9f6abcf7a6c 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r1.ebuild
index 32bfde1b06e8..7a8e6829dbc3 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r2.ebuild
index 4d8dd2d5d9f3..d6f73fc00d5d 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
index 0626c6f6c274..7215c8852e33 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r1.ebuild
index 583380236817..f02e43d341b8 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r10.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r10.ebuild
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r2.ebuild
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r3.ebuild
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r4.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r4.ebuild
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r5.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r5.ebuild
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r6.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r6.ebuild
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r7.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r7.ebuild
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index fa4ab315fc61..f206dce93d77 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r1.ebuild
index cc28f31b6161..ca90ea2979e7 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r2.ebuild
index ba0790c8698e..3102e2008d61 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild b/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
index 03f1f028f04c..ad6f1287774a 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r1.ebuild
index fd41f425d4b4..32c2160eb36a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r10.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r10.ebuild
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r2.ebuild
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r3.ebuild
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r4.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r4.ebuild
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r5.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r5.ebuild
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r6.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r6.ebuild
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r7.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r7.ebuild
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 6bb1d2db3647..ce94ca1b938a 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r1.ebuild
index 0ec23604cbb6..8db34d4f8bd9 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r2.ebuild
index eb9ca7c40729..8231add3b993 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
index 208521b01727..3b882c500063 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r1.ebuild
index a8792c0c2ed3..7e6d4ad7e986 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r10.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r10.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r2.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r3.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r4.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r4.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r5.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r5.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r6.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r6.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r7.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r7.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r9.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r9.ebuild
index 21d945a7425f..f7a372c07c02 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r1.ebuild
index 6956901efed3..1e631ec154c8 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r2.ebuild
index 1a599b44487b..062e5fa10748 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild b/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
index cf66f2d58f52..698ca89816b0 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r1.ebuild
index 2cee218f7a89..854d46bfdea5 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r10.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r10.ebuild
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r2.ebuild
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r3.ebuild
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r4.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r4.ebuild
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r5.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r5.ebuild
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r6.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r6.ebuild
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r7.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r7.ebuild
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 4dab8df1b170..d8a16ed8f8fc 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r1.ebuild
index f3cc60f60c87..a220ae391a73 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r2.ebuild
index 7bdda9dc9045..bf6d2a759ead 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
index 237b8c92e649..53afa5460605 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r1.ebuild
index ffd88d2abfd9..50dd9735d37b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r10.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r10.ebuild
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r2.ebuild
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r3.ebuild
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r4.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r4.ebuild
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r5.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r5.ebuild
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r6.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r6.ebuild
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r7.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r7.ebuild
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 5652fa2e1f6c..2260f3f7e27b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r1.ebuild
index 299a6c8d3971..1ebe135e73d7 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r2.ebuild
index e1c99e986514..65ac30b2cd51 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild b/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
index 47d2d0030507..51489849754b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r1.ebuild
index 6a36f823622c..cbb199a9713b 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r10.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r10.ebuild
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r2.ebuild
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r3.ebuild
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r4.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r4.ebuild
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r5.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r5.ebuild
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r6.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r6.ebuild
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r7.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r7.ebuild
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index f6fb8c1db85d..a3d91ee94dbc 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r1.ebuild
index 2b0a8639a8f2..700d615f07ce 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r2.ebuild
index 5224d8b7fb61..7f3a77ce3153 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild b/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
index d9aa753e05e2..9b71f63ff0af 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r1.ebuild
index 92cd4c9159a8..c6d542914749 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r10.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r10.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r2.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r3.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r4.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r4.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r5.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r5.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r6.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r6.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r7.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r7.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r9.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r9.ebuild
index 15a47507c0f4..6d7def56853c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20151208-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20151208-r1.ebuild
index e99165a0d94b..315979ca98e2 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20151208-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20151208-r2.ebuild
index 4d9bacae44aa..75b768323523 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nut/selinux-nut-9999.ebuild b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
index c5a5fc04fd3a..780f23ce9841 100644
--- a/sec-policy/selinux-nut/selinux-nut-9999.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r1.ebuild
index 6b6b15bef14c..7a9a4b438191 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r10.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r10.ebuild
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r2.ebuild
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r3.ebuild
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r4.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r4.ebuild
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r5.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r5.ebuild
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r6.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r6.ebuild
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r7.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r7.ebuild
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index ed7ccad1f872..68bcf34ac5fe 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20151208-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20151208-r1.ebuild
index eea51e96a2ec..56e4294530cd 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20151208-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20151208-r2.ebuild
index 15a482961c72..a7f57be522f8 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-9999.ebuild b/sec-policy/selinux-nx/selinux-nx-9999.ebuild
index c6e57d5ebf09..e3afc9347304 100644
--- a/sec-policy/selinux-nx/selinux-nx-9999.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r1.ebuild
index acbd8451fc7f..d5e5a63a7efb 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r10.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r10.ebuild
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r2.ebuild
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r3.ebuild
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r4.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r4.ebuild
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r5.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r5.ebuild
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r6.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r6.ebuild
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r7.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r7.ebuild
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 20e7796355ee..fea6d62fd267 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r1.ebuild
index b3cb4f3a8637..db08f136a3ec 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r2.ebuild
index 48bdc98d253d..5f1edcf81cb3 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
index 543de6d401e4..aef2f044c2d7 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r1.ebuild
index d43f7a46b21f..79bfe42942f7 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r10.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r10.ebuild
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r2.ebuild
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r3.ebuild
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r4.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r4.ebuild
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r5.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r5.ebuild
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r6.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r6.ebuild
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r7.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r7.ebuild
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a6665c0a4356..2039666e21a5 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20151208-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20151208-r1.ebuild
index 105563b18cc2..008062b14165 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20151208-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20151208-r2.ebuild
index b004220a7b6f..fd1a68628ac2 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-9999.ebuild b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
index f9a8bfd2b0e4..a1a74c5580a8 100644
--- a/sec-policy/selinux-oident/selinux-oident-9999.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r1.ebuild
index 20272388eff9..c63e772b7976 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r10.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r10.ebuild
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r2.ebuild
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r3.ebuild
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r4.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r4.ebuild
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r5.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r5.ebuild
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r6.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r6.ebuild
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r7.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r7.ebuild
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 7c04e793e8ee..852d9d7cbd17 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20151208-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20151208-r1.ebuild
index da7b63ae5190..59a3eb36258f 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20151208-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20151208-r2.ebuild
index c88765ef8762..69c12ed1d75d 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-9999.ebuild b/sec-policy/selinux-openct/selinux-openct-9999.ebuild
index 6f265c53a93e..a5313bef133e 100644
--- a/sec-policy/selinux-openct/selinux-openct-9999.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r1.ebuild
index a5bff4b200c6..e869d18f928f 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r10.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r10.ebuild
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r2.ebuild
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r3.ebuild
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r4.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r4.ebuild
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r5.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r5.ebuild
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r6.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r6.ebuild
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r7.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r7.ebuild
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b6cefe7f4702..730d2a3bf877 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r1.ebuild
index c3a5159aeb56..3829ce22a3a0 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r2.ebuild
index ad83ef2aac62..4b8a62e0ae21 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild b/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
index fb6f2173c397..2ed662fdd460 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r1.ebuild
index f3ae9888c197..668536beded4 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r10.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r10.ebuild
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r2.ebuild
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r3.ebuild
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r4.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r4.ebuild
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r5.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r5.ebuild
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r6.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r6.ebuild
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r7.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r7.ebuild
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index e5c43eac9aac..2e263cf0e694 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r1.ebuild
index 547aae5e5150..64a4a0b2ccf8 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r2.ebuild
index 9d5d757af721..d9d44c6768ee 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
index 5ab117a61776..0dcfa25923c4 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r1.ebuild
index 28967f7e3072..943e51689a5d 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r10.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r10.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r2.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r3.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r4.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r4.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r5.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r5.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r6.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r6.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r7.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r7.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r9.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r9.ebuild
index 9605471c4084..2c4faf4fdc45 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20151208-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20151208-r1.ebuild
index 09f4822a9fba..c4dcea3a9420 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20151208-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20151208-r2.ebuild
index 57b3329a94ed..6594b1587050 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pan/selinux-pan-9999.ebuild b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
index ef31138c54f7..f2faff42a789 100644
--- a/sec-policy/selinux-pan/selinux-pan-9999.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r1.ebuild
index 5f7547370bab..3172e1c6154e 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r10.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r10.ebuild
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r2.ebuild
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r3.ebuild
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r4.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r4.ebuild
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r5.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r5.ebuild
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r6.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r6.ebuild
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r7.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r7.ebuild
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d9d0b33143ed..21436a86628f 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r1.ebuild
index f64d6d2b0795..cf7aa798fab0 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r2.ebuild
index 527e5c503d21..ef8977281578 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
index 29d461e5a9eb..e3564b8fb01e 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r1.ebuild
index 436d2b7602de..f0532c476da3 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r10.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r10.ebuild
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r2.ebuild
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r3.ebuild
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r4.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r4.ebuild
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r5.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r5.ebuild
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r6.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r6.ebuild
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r7.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r7.ebuild
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 2f8f11b3f55c..80eb5e782e30 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r1.ebuild
index 5388353c6586..4675227ed52f 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r2.ebuild
index 50dd3f9faaad..500051227514 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
index d6131d8d8f20..2fc19f69e10a 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r1.ebuild
index cf62b7e7859f..ed36cd029a13 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r10.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r10.ebuild
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r2.ebuild
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r3.ebuild
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r4.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r4.ebuild
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r5.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r5.ebuild
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r6.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r6.ebuild
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r7.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r7.ebuild
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9ab69431148e..375502172854 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r1.ebuild
index 710a28f91ea6..da51260d9684 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r2.ebuild
index d723245fc339..5e9494fc6e22 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild b/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
index 6de146b97965..6bd251cb9a0d 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r1.ebuild
index b5c4fe1e46a2..10486c37b1eb 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r10.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r10.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r2.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r3.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r4.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r4.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r5.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r5.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r6.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r6.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r7.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r7.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r9.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r9.ebuild
index 83bfc5f3a5c5..990f47e1211f 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r1.ebuild
index f6f5adf76b75..23428603b612 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r2.ebuild
index 31f517d0c42c..c6abb17d9da9 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
index 916da00cb6ac..12e6974f6152 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r1.ebuild
index 18861b6e4fc4..1dfaf9fd2ce7 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r10.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r10.ebuild
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r2.ebuild
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r3.ebuild
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r4.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r4.ebuild
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r5.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r5.ebuild
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r6.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r6.ebuild
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r7.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r7.ebuild
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 02b531f793ab..27f8c9a62690 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r1.ebuild
index 5b18279e9967..09634a0e9231 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r2.ebuild
index 160d54014a37..6ac42b18b04b 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
index 7f7ea4ac7f0c..78cd54d5e595 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r1.ebuild
index 9f1de74e3be2..0d2f323e64e6 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r10.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r10.ebuild
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r2.ebuild
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r3.ebuild
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r4.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r4.ebuild
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r5.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r5.ebuild
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r6.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r6.ebuild
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r7.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r7.ebuild
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 649a30fc26e6..a2fa9f325b89 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r1.ebuild
index abf72975129f..75100cc9cfc6 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r2.ebuild
index 931b7f392b15..b821a04e4175 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
index 5edd2b88854a..edac20dc9c38 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r1.ebuild
index c4485d969d47..3c169c74d0a4 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r10.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r10.ebuild
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r2.ebuild
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r3.ebuild
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r4.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r4.ebuild
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r5.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r5.ebuild
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r6.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r6.ebuild
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r7.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r7.ebuild
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index f50ad7dad9ad..97f75c8218e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r1.ebuild
index 636522d1c587..1ad551ac3de8 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r2.ebuild
index 10b8c72550dd..6009be32bd9c 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild b/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
index 95883f6ff894..341c5253b18d 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r1.ebuild
index 2ba2a9428d04..c9d086fee617 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r10.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r10.ebuild
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r2.ebuild
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r3.ebuild
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r4.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r4.ebuild
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r5.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r5.ebuild
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r6.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r6.ebuild
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r7.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r7.ebuild
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d19358bd54ec..136587661e7a 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r1.ebuild
index ab40ebe82cf2..00061c2a0215 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r2.ebuild
index 4a346bb4a270..2dfb573f450d 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild b/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
index 8995d67b5428..0b61d32dad50 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r1.ebuild
index b560e9c14583..37c2556d8b8c 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r10.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r10.ebuild
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r2.ebuild
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r3.ebuild
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r4.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r4.ebuild
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r5.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r5.ebuild
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r6.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r6.ebuild
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r7.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r7.ebuild
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b87f33dbddfd..3cb66e662fdc 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r1.ebuild
index 9e98f0415c29..0b581878226e 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r2.ebuild
index 49a08956794f..a630fbd8c2df 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
index 8eedcffa4283..419b715906e3 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r1.ebuild
index d816ff7a7919..1c662b4defee 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r10.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r10.ebuild
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r2.ebuild
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r3.ebuild
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r4.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r4.ebuild
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r5.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r5.ebuild
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r6.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r6.ebuild
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r7.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r7.ebuild
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index d17f4609561b..2c89dd90b5d6 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r1.ebuild
index c12fe7fc49dc..a1c0ab365b19 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r2.ebuild
index 6d543e30ecf6..7c33a674f80a 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
index d216e6d4636d..a4ebd75180e9 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r1.ebuild
index f9fcd3e88a83..4235e276dfc0 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r10.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r10.ebuild
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r2.ebuild
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r3.ebuild
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r4.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r4.ebuild
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r5.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r5.ebuild
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r6.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r6.ebuild
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r7.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r7.ebuild
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b002f12bd749..e0b5d461af3b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r1.ebuild
index 42ba737ec400..e2b28fee4ecf 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r2.ebuild
index 65f50f201841..2dad81c16d7f 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
index 58b38a0b5055..c6703a759f84 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r1.ebuild
index 06e1da74c7e5..5ee81f4a6e5f 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r10.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r10.ebuild
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r2.ebuild
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r3.ebuild
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r4.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r4.ebuild
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r5.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r5.ebuild
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r6.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r6.ebuild
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r7.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r7.ebuild
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 70614b2c6e04..274c23471a40 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r1.ebuild
index 20edb867947d..1d259269c92b 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r2.ebuild
index ff1bb70cff8d..fb02cf91588a 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild b/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
index 6129bb5266ab..9d27218e5bac 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r1.ebuild
index 8d20d3b2b00a..1805cdb819b9 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r10.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r10.ebuild
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r2.ebuild
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r3.ebuild
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r4.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r4.ebuild
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r5.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r5.ebuild
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r6.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r6.ebuild
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r7.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r7.ebuild
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index f9a110013c3d..26c7d0afee25 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r1.ebuild
index 4bcf0469dced..7d070b7c1f02 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r2.ebuild
index 0fdbb5d4a3ee..ceba02007c83 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild b/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
index 810014c8ed0c..97f3bdeaaa6e 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r1.ebuild
index 971784f4bee8..675a5a40e963 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r10.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r10.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r2.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r3.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r4.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r4.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r5.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r5.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r6.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r6.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r7.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r7.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r9.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r9.ebuild
index b08b1c81bada..8233c0437ce2 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r1.ebuild
index d9d0bb8b0cd4..e8d1a7eb3b13 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r2.ebuild
index d05490cc13c7..23bd60efbedd 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild b/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
index af325acad96d..fbafbd04a1ac 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r1.ebuild
index 65d25fccb874..018a6dce2d15 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r10.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r10.ebuild
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r2.ebuild
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r3.ebuild
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r4.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r4.ebuild
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r5.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r5.ebuild
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r6.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r6.ebuild
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r7.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r7.ebuild
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 685e03b7d28f..2468a5912b7c 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r1.ebuild
index 2a8e1c982bc0..155b795f0f2b 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r2.ebuild
index b8e4667d1aa1..452e4e24fabc 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
index 1560ea2cd6be..b6ec9161d1ab 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r1.ebuild
index 2732860eb97f..f75377c7a8a5 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r10.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r10.ebuild
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r2.ebuild
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r3.ebuild
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r4.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r4.ebuild
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r5.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r5.ebuild
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r6.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r6.ebuild
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r7.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r7.ebuild
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c269a5cda2ff..d0eb4fe862b6 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r1.ebuild
index c0216eb49e82..d59e638bd562 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r2.ebuild
index c6bd01a30116..7b4597ec591c 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
index e12dca38246e..945b7ad13e09 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r1.ebuild
index 7c5aa67c2cba..069af5962465 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r10.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r10.ebuild
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r2.ebuild
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r3.ebuild
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r4.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r4.ebuild
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r5.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r5.ebuild
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r6.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r6.ebuild
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r7.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r7.ebuild
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index dec8eb033334..7a47a885ceba 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20151208-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20151208-r1.ebuild
index f68fee0e05d7..ccbb1c1e9d3a 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20151208-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20151208-r2.ebuild
index 48488de2e9bf..937bd876710c 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-9999.ebuild b/sec-policy/selinux-psad/selinux-psad-9999.ebuild
index f776c6464a48..9b34f6751c63 100644
--- a/sec-policy/selinux-psad/selinux-psad-9999.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r1.ebuild
index 562d8fca0379..c414a577b4f2 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r10.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r10.ebuild
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r2.ebuild
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r3.ebuild
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r4.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r4.ebuild
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r5.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r5.ebuild
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r6.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r6.ebuild
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r7.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r7.ebuild
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a4b7c86f3eb6..fe3870052b38 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r1.ebuild
index 1fdf102f8c83..88a07112c46c 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r2.ebuild
index 7c276479c359..9a496d0ec01d 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
index b1cfae569c11..9717373af96a 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r1.ebuild
index a12c5910679a..491ad4e3494f 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r10.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r10.ebuild
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r2.ebuild
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r3.ebuild
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r4.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r4.ebuild
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r5.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r5.ebuild
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r6.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r6.ebuild
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r7.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r7.ebuild
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c7b3afaa63b8..0c0b29ec8fbc 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r1.ebuild
index 5a11a2359b62..a7677598e9f0 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r2.ebuild
index 63e040858c1b..9a268fd346a9 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
index 2502bae21e9a..fc37e63ba575 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r1.ebuild
index 679c71343c00..498296bf6e0a 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r10.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r10.ebuild
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r2.ebuild
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r3.ebuild
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r4.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r4.ebuild
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r5.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r5.ebuild
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r6.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r6.ebuild
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r7.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r7.ebuild
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0cfbeeb8d747..a96ff4221289 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r1.ebuild
index 0cd56a6058b1..274463661708 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r2.ebuild
index 78d258c8de1c..9f25f62a81fb 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild b/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
index f77d3abb227a..42736978a091 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r1.ebuild
index 72ab02633a99..5d528f881672 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r10.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r10.ebuild
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r2.ebuild
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r3.ebuild
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r4.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r4.ebuild
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r5.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r5.ebuild
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r6.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r6.ebuild
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r7.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r7.ebuild
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 907eea382c9b..75f51bf58b42 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r1.ebuild
index b1387e968e69..d8cff214b9f2 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r2.ebuild
index d8beefe79b8a..d60baab53e26 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
index 492b76ad105d..bd86ead3fb5b 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r1.ebuild
index 7a76cca5ccec..498a151ef732 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r10.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r10.ebuild
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r2.ebuild
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r3.ebuild
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r4.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r4.ebuild
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r5.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r5.ebuild
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r6.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r6.ebuild
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r7.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r7.ebuild
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0351cf81145b..a3ed834b48f1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r1.ebuild
index 0f3cb08dd71c..55fcd52c18db 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r2.ebuild
index 50ea093a724b..2738208e89c5 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
index fd5160fc17de..7c1117b6911f 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r1.ebuild
index fb200f4acbfb..0ce9c76ed8c6 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r10.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r10.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r2.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r3.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r4.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r4.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r5.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r5.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r6.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r6.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r7.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r7.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r9.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r9.ebuild
index 551a30c4cfeb..212aa15c997f 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r1.ebuild
index a66bcc029620..c90ecf3ec3b2 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r2.ebuild
index b87091fbe37f..fd6676fad692 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild b/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
index 9ecab5c45338..892c8f6b12b6 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r1.ebuild
index 2c8a1941bb5b..dddeabde60ae 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r10.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r10.ebuild
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r2.ebuild
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r3.ebuild
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r4.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r4.ebuild
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r5.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r5.ebuild
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r6.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r6.ebuild
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r7.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r7.ebuild
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index f156ae0762c4..4c3a090dacd6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r1.ebuild
index 00fe45932645..802e923c1919 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r2.ebuild
index ff2f541f2af6..e53e78ce0cc8 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
index aa9eb61767cd..ed8f79efeae7 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r1.ebuild
index 9853d35dac39..9005c94b7b72 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r10.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r10.ebuild
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r2.ebuild
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r3.ebuild
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r4.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r4.ebuild
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r5.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r5.ebuild
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r6.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r6.ebuild
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r7.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r7.ebuild
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a5e9beb0865c..780278f10882 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20151208-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20151208-r1.ebuild
index 2c1a8f63035c..c35d2cfc52b0 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20151208-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20151208-r2.ebuild
index dd0440dcf10e..c38534d78a29 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-9999.ebuild b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
index e241cb401157..13f9f5a181ac 100644
--- a/sec-policy/selinux-quota/selinux-quota-9999.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r1.ebuild
index dce4b4f2190e..1b551facbe5f 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r10.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r10.ebuild
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r2.ebuild
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r3.ebuild
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r4.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r4.ebuild
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r5.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r5.ebuild
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r6.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r6.ebuild
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r7.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r7.ebuild
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c1ddfbd9d715..6269d0e1b491 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20151208-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20151208-r1.ebuild
index a2859a8603d8..127496dd5435 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20151208-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20151208-r2.ebuild
index 46c02378d03e..076694b0ce8e 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-9999.ebuild b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
index 63f282e43c12..cb10a70ba6b3 100644
--- a/sec-policy/selinux-radius/selinux-radius-9999.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r1.ebuild
index 5d0cac64d982..8cc1f172d45e 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r10.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r10.ebuild
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r2.ebuild
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r3.ebuild
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r4.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r4.ebuild
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r5.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r5.ebuild
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r6.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r6.ebuild
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r7.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r7.ebuild
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index ba16a5735c40..15ea31eefb3f 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r1.ebuild
index b710b54cb2c9..8a3240923126 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r2.ebuild
index bad6c4429651..95d951df6a1c 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild b/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
index 222adf8eb341..8ae04a6d4138 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r1.ebuild
index 5b5fe5700749..1b0b3f01c344 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r10.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r10.ebuild
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r2.ebuild
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r3.ebuild
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r4.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r4.ebuild
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r5.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r5.ebuild
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r6.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r6.ebuild
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r7.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r7.ebuild
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 745a0c92ca4e..5a31953106b9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20151208-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20151208-r1.ebuild
index 24375a681a5b..6ca00384ea80 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20151208-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20151208-r2.ebuild
index ffc33040ef4e..7dcf7e367467 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-9999.ebuild b/sec-policy/selinux-razor/selinux-razor-9999.ebuild
index 00e51aa1c7f8..f0e5e857d73f 100644
--- a/sec-policy/selinux-razor/selinux-razor-9999.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r1.ebuild
index 6fa4fc038c8c..718f76fde648 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r10.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r10.ebuild
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r2.ebuild
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r3.ebuild
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r4.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r4.ebuild
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r5.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r5.ebuild
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r6.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r6.ebuild
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r7.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r7.ebuild
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 980574699d5f..a275d71d6d41 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r1.ebuild
index 6fa51c200efa..cb23be27657d 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r2.ebuild
index 3fa4116a4342..90f9e6bf20fd 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
index b2931aff42fd..11db3f80f756 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r1.ebuild
index bbfde858aa0e..942a9befbb65 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r10.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r10.ebuild
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r2.ebuild
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r3.ebuild
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r4.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r4.ebuild
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r5.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r5.ebuild
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r6.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r6.ebuild
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r7.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r7.ebuild
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 6536fb880be1..a49a3e2f4cd7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r1.ebuild
index d0ed76a7e8c5..9e3fbc7be8b6 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r2.ebuild
index f286acb0267a..07e8ca39c420 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
index f3b91810c856..e42d2a0286f7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for resolvconf"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r1.ebuild
index 0715cfac6f58..d5cda7028378 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r10.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r10.ebuild
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r2.ebuild
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r3.ebuild
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r4.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r4.ebuild
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r5.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r5.ebuild
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r6.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r6.ebuild
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r7.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r7.ebuild
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 078f9c508af9..b718bb076956 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r1.ebuild
index 8f8e00b6979d..9792d21e3857 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r2.ebuild
index 4f2157adb51d..4aab8982a41b 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
index 9ccc7601f22a..387c04a05f65 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r1.ebuild
index 17c346a25be3..d9efb24f7697 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r10.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r10.ebuild
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r2.ebuild
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r3.ebuild
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r4.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r4.ebuild
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r5.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r5.ebuild
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r6.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r6.ebuild
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r7.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r7.ebuild
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index fd1382a719d5..64334ec269de 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r1.ebuild
index b2e3ea2c18b3..b3304a12ccb4 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r2.ebuild
index f831bed17208..3a69a3a9874f 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild b/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
index f89d2f1d3619..c17b72899a6b 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r1.ebuild
index c1da65376a31..596c7395faf2 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r10.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r10.ebuild
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r2.ebuild
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r3.ebuild
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r4.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r4.ebuild
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r5.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r5.ebuild
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r6.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r6.ebuild
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r7.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r7.ebuild
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index abe29d5f268c..fddba62e93eb 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r1.ebuild
index 5c418cd73156..6715e64f49c9 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r2.ebuild
index 6553b66dd7e5..dd78f3d4e8d4 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild b/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
index 443c41890a4d..b7f940517ea6 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r1.ebuild
index ebac7614749e..b621ca7a566c 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r10.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r10.ebuild
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r2.ebuild
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r3.ebuild
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r4.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r4.ebuild
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r5.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r5.ebuild
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r6.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r6.ebuild
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r7.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r7.ebuild
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 85413fa66c5e..2cccb75af3e6 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r1.ebuild
index bda95c6857c6..ac22dc04861f 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r2.ebuild
index a2eec324ecef..367ac2ad1862 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
index 56cfe9d9a8e0..10441aeb8716 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r1.ebuild
index 0488ce68a214..f8ffad2d745d 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r10.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r10.ebuild
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r2.ebuild
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r3.ebuild
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r4.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r4.ebuild
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r5.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r5.ebuild
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r6.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r6.ebuild
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r7.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r7.ebuild
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 511605a4be1e..589a42f8ae48 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r1.ebuild
index b13d857e188c..2e7409ef07c7 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r2.ebuild
index 74a9049afd21..75f78b9776e2 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
index 3762021f16a1..638addf9149f 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r1.ebuild
index d468d8d52c45..d7583f337d4e 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r10.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r10.ebuild
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r2.ebuild
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r3.ebuild
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r4.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r4.ebuild
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r5.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r5.ebuild
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r6.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r6.ebuild
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r7.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r7.ebuild
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 647be8aad17e..99c393f00d08 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r1.ebuild
index 81fa4c72a872..ef4e509db291 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r2.ebuild
index 97c4154b7b53..b4fcf312439f 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild b/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
index 805f0aa45502..84d79f356254 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r1.ebuild
index cf4af5c9b8d7..b72094ff8f72 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r10.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r10.ebuild
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r2.ebuild
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r3.ebuild
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r4.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r4.ebuild
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r5.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r5.ebuild
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r6.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r6.ebuild
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r7.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r7.ebuild
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9ce67ca96922..cc4a093435bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r1.ebuild
index b6cdbffbe4c9..0a3b5bde66a7 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r2.ebuild
index e8fca5e83317..390c018053bb 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild b/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
index 22b5a6d213d0..26df650b0aba 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r1.ebuild
index 355ba65d8440..854705532365 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r10.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r10.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r2.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r3.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r4.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r4.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r5.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r5.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r6.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r6.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r7.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r7.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r9.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r9.ebuild
index 8b517a064ba1..421e39b5aec6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r1.ebuild
index b3ed2fc155c7..4f9ea7866733 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r2.ebuild
index 06f0d908b97c..49da761b57ed 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
index c7fee66cef1a..6487ce4e63be 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r1.ebuild
index 14963a1766c2..4abe7bb94bc7 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r10.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r10.ebuild
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r2.ebuild
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r3.ebuild
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r4.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r4.ebuild
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r5.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r5.ebuild
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r6.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r6.ebuild
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r7.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r7.ebuild
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index ac8c6ec770bf..5ccb83bef654 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r1.ebuild
index 557de6481848..a8f171d0ebe6 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r2.ebuild
index 6a288df1dc1e..4bf060efabba 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
index df447b49cae6..efb4761441f3 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r1.ebuild
index 86504310f681..73546d6c664e 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r10.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r10.ebuild
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r2.ebuild
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r3.ebuild
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r4.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r4.ebuild
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r5.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r5.ebuild
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r6.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r6.ebuild
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r7.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r7.ebuild
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index e40e22ba8046..c293dd4a91c4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20151208-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20151208-r1.ebuild
index 1dbbbaeeb1bc..af4a02a3772f 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20151208-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20151208-r2.ebuild
index bdeef5f86403..62e1a881fa72 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-9999.ebuild b/sec-policy/selinux-salt/selinux-salt-9999.ebuild
index c6e888b43fb3..18b9a57b7ab6 100644
--- a/sec-policy/selinux-salt/selinux-salt-9999.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for salt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r1.ebuild
index 153e2d2136d4..4eebb6f68fc9 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r10.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r10.ebuild
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r2.ebuild
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r3.ebuild
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r4.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r4.ebuild
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r5.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r5.ebuild
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r6.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r6.ebuild
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r7.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r7.ebuild
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3949bf2e47db..6b88236695db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20151208-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20151208-r1.ebuild
index dc5c682aafb7..5e077ea0dee8 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20151208-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20151208-r2.ebuild
index eab94d7dfc68..2ff02fc16aef 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-9999.ebuild b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
index b8518f63983b..f9c7998c89ce 100644
--- a/sec-policy/selinux-samba/selinux-samba-9999.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r1.ebuild
index 606a69d6d32d..3092f0ccd646 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r10.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r10.ebuild
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r2.ebuild
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r3.ebuild
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r4.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r4.ebuild
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r5.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r5.ebuild
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r6.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r6.ebuild
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r7.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r7.ebuild
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index f68978fdce4a..365262946fbc 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r1.ebuild
index f8c66863bf15..3abdb52f820f 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r2.ebuild
index cde8aa898e86..b0e636cd0538 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
index 29d1f07fc134..4b40b6ef0dad 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r1.ebuild
index e9e63ea3ba7f..ad477053ab0e 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r10.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r10.ebuild
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r2.ebuild
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r3.ebuild
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r4.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r4.ebuild
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r5.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r5.ebuild
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r6.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r6.ebuild
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r7.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r7.ebuild
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3615f7e164a9..e4bcb85d24bf 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20151208-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20151208-r1.ebuild
index 22957aa0ff8d..9ba7acaf61ee 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20151208-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20151208-r2.ebuild
index 0909695b2edc..6dee290fde8e 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-9999.ebuild b/sec-policy/selinux-screen/selinux-screen-9999.ebuild
index bdc3f652e0cb..b04e8dc3b889 100644
--- a/sec-policy/selinux-screen/selinux-screen-9999.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r1.ebuild
index 8a91d4983bf7..28b127e192b6 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r10.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r10.ebuild
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r2.ebuild
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r3.ebuild
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r4.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r4.ebuild
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r5.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r5.ebuild
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r6.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r6.ebuild
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r7.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r7.ebuild
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index fa147acd0efe..366e15904e67 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r1.ebuild
index e70b8e74465c..28f2bce7cece 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r2.ebuild
index 4bb8586fe5fe..245b442fef4d 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
index ca085016864f..eaf1dc7de6ef 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r1.ebuild
index 78600919522b..6f9cef9dc9ea 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r10.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r10.ebuild
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r2.ebuild
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r3.ebuild
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r4.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r4.ebuild
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r5.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r5.ebuild
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r6.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r6.ebuild
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r7.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r7.ebuild
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 01a687ba0150..4924799712a6 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r1.ebuild
index 7bdbbc78ba3c..f217f3fe4833 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r2.ebuild
index e1850032ee08..b3e2425a1baa 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild b/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
index e617f7cfa7b5..cc763cb03037 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r1.ebuild
index 5fab7258c499..3396a28fb96c 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r10.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r10.ebuild
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r2.ebuild
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r3.ebuild
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r4.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r4.ebuild
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r5.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r5.ebuild
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r6.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r6.ebuild
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r7.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r7.ebuild
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b661903c1df8..d800cdb568f2 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r1.ebuild
index d879bc351b7c..a24fd0384174 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r2.ebuild
index 5ca15fc95af6..ffb60e85d30b 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
index b2fd0ac065a9..1d9a0f813ebb 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r1.ebuild
index 9a14e680dd72..d58007e449f1 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r10.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r10.ebuild
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r2.ebuild
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r3.ebuild
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r4.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r4.ebuild
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r5.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r5.ebuild
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r6.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r6.ebuild
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r7.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r7.ebuild
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 102644128891..f3449621e5fa 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r1.ebuild
index e3f4c68f939f..6a10201a7696 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r2.ebuild
index 0545e306b110..24c3de84677a 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
index 531cc9b85198..e65054e78589 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r1.ebuild
index 9fe56d177bab..6301288b979e 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r10.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r10.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r2.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r3.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r4.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r4.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r5.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r5.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r6.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r6.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r7.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r7.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r9.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r9.ebuild
index 9d082b5a9b9b..b5ec77d6154c 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20151208-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20151208-r1.ebuild
index e9cf814ce451..bb4827492d4d 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20151208-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20151208-r2.ebuild
index 5a153ff31ca3..8f74e29102a3 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-skype/selinux-skype-9999.ebuild b/sec-policy/selinux-skype/selinux-skype-9999.ebuild
index 8fa579cc06cc..189bd518481e 100644
--- a/sec-policy/selinux-skype/selinux-skype-9999.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r1.ebuild
index 2aea54d98b09..fd425495a4cf 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r10.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r10.ebuild
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r2.ebuild
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r3.ebuild
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r4.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r4.ebuild
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r5.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r5.ebuild
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r6.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r6.ebuild
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r7.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r7.ebuild
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index dc34013f981b..68e0d756a7c5 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r1.ebuild
index bbf0e0607888..2fa79b7afea7 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r2.ebuild
index f265f3cd9216..197ea53593de 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild b/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
index 03bb3f3ca731..0476975a4242 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r1.ebuild
index 17a5f8cea808..af436e7b78de 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r10.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r10.ebuild
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r2.ebuild
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r3.ebuild
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r4.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r4.ebuild
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r5.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r5.ebuild
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r6.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r6.ebuild
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r7.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r7.ebuild
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index db7888715db2..2ac26c9ed3cd 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r1.ebuild
index 25f7628f1411..f9c4fe27fbb1 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r2.ebuild
index eaa44712995a..ed7747b3dd2b 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
index 98bf7e5544b6..700305b4cd9b 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r1.ebuild
index dc163997abbd..a87da9568d15 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r10.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r10.ebuild
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r2.ebuild
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r3.ebuild
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r4.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r4.ebuild
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r5.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r5.ebuild
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r6.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r6.ebuild
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r7.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r7.ebuild
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b164fd1d6fc0..7a13356cb707 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r1.ebuild
index 3570cda388ac..ffd6349220af 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r2.ebuild
index c9306acc16f4..8b82df574c92 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
index 535869b6fbad..9c2f627188d1 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r1.ebuild
index 4a2ade03e4e3..c617679cf223 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r10.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r10.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r2.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r3.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r4.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r4.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r5.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r5.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r6.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r6.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r7.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r7.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r9.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r9.ebuild
index 548546f7fbc9..9f394303bd3b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r1.ebuild
index 0e16e0c46046..6114eb8c050b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r2.ebuild
index 519208ef97c1..9ddfe8213ce6 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
index 65ee403460e7..980d2d463908 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r1.ebuild
index f0ef341f743d..ee07cfab48bd 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r10.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r10.ebuild
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r2.ebuild
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r3.ebuild
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r4.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r4.ebuild
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r5.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r5.ebuild
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r6.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r6.ebuild
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r7.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r7.ebuild
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 2c0589edbecf..5ba517877d05 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r1.ebuild
index 448f29e132a7..12118bfdb5e5 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r2.ebuild
index 35984883f0df..bc8470a4e39a 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild b/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
index a20532c9f7fa..fed2cbed32c5 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r1.ebuild
index b608880b3c4a..fbb8bd74dc43 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r10.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r10.ebuild
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r2.ebuild
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r3.ebuild
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r4.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r4.ebuild
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r5.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r5.ebuild
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r6.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r6.ebuild
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r7.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r7.ebuild
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 051ad60f57d6..31afb471b97f 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20151208-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20151208-r1.ebuild
index 6f78ec5aafff..893febf98b32 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20151208-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20151208-r2.ebuild
index 178157d07c19..e82b474fb23c 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-9999.ebuild b/sec-policy/selinux-snort/selinux-snort-9999.ebuild
index 70cbb7918673..8d352031c55f 100644
--- a/sec-policy/selinux-snort/selinux-snort-9999.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r1.ebuild
index dc19013bca88..1fbdcf4b233d 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r10.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r10.ebuild
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r2.ebuild
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r3.ebuild
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r4.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r4.ebuild
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r5.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r5.ebuild
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r6.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r6.ebuild
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r7.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r7.ebuild
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index e62fecc52753..3af87fe2d613 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r1.ebuild
index b2c95e4da88a..c5417119749a 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r2.ebuild
index cbfeefe133fc..1baac1a31fdf 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
index ce324c846a0a..4fbd2ce91e18 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r1.ebuild
index eb751f9c2248..2517d281438d 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r10.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r10.ebuild
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r2.ebuild
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r3.ebuild
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r4.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r4.ebuild
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r5.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r5.ebuild
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r6.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r6.ebuild
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r7.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r7.ebuild
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 7c6d2c8f7f83..0941e021775b 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r1.ebuild
index 3390ad3ae4fa..dc72e8a89055 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r2.ebuild
index 0c604907e4db..27899265e406 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
index dc343200d04e..e2977e362a88 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r1.ebuild
index 0b6f82a08019..74d643c9936a 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r10.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r10.ebuild
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r2.ebuild
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r3.ebuild
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r4.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r4.ebuild
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r5.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r5.ebuild
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r6.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r6.ebuild
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r7.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r7.ebuild
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 548b5d92afb1..c5a3e22e0fb2 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r1.ebuild
index 0d4526a53239..d3938daa7517 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r2.ebuild
index 649c37718d3b..9e551a6d405d 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
index 3eaa6f4bf99c..a4869cee8bce 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r1.ebuild
index e2bf2d180003..54a09d77fb07 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r10.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r10.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r2.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r3.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r4.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r4.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r5.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r5.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r6.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r6.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r7.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r7.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r9.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r9.ebuild
index f3b8426a31fd..3d6d20ab8630 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20151208-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20151208-r1.ebuild
index 995865b6216a..aa18e38f409f 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20151208-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20151208-r2.ebuild
index f72b5a6a2865..bd58c4e7b240 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-squid/selinux-squid-9999.ebuild b/sec-policy/selinux-squid/selinux-squid-9999.ebuild
index c4b2a600027b..8417b30b2820 100644
--- a/sec-policy/selinux-squid/selinux-squid-9999.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r1.ebuild
index c8934db0c1e9..d572a0762a75 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r10.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r10.ebuild
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r2.ebuild
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r3.ebuild
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r4.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r4.ebuild
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r5.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r5.ebuild
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r6.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r6.ebuild
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r7.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r7.ebuild
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 6708c97321db..790c17c4c317 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r1.ebuild
index b603357be121..c9f848bbeb19 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r2.ebuild
index 85f05408fc41..0749b320f3ac 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild b/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
index 3b510059b671..72000a5d54d0 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r1.ebuild
index 85d079d69375..553781673517 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r10.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r10.ebuild
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r2.ebuild
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r3.ebuild
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r4.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r4.ebuild
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r5.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r5.ebuild
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r6.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r6.ebuild
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r7.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r7.ebuild
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a260ae363578..3cef777e1db2 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r1.ebuild
index 9ee5d4f89c5f..ee298d309116 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r2.ebuild
index bd77a7baa18e..2f6a78686891 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
index 0b804bf71053..e2aeb550a027 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r10.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r10.ebuild
index 0ef6b968e5dc..387d5447daa8 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for subsonic"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0ef6b968e5dc..387d5447daa8 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for subsonic"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0ef6b968e5dc..387d5447daa8 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for subsonic"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r1.ebuild
index 35064ed5e227..a772188acadc 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for subsonic"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r2.ebuild
index f5daac56f706..ade8328c8a7e 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for subsonic"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
index 48141a7964b1..ff05b48fa92b 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for subsonic"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r1.ebuild
index ad5baf5bb9f8..23b49e12aefe 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r10.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r10.ebuild
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r2.ebuild
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r3.ebuild
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r4.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r4.ebuild
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r5.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r5.ebuild
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r6.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r6.ebuild
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r7.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r7.ebuild
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 29d1d8e53e7c..fc3d4527843d 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r1.ebuild
index 756cc1af2be5..2b049318b2a4 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r2.ebuild
index 2e7f08f5027a..dc9243f0cd68 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild b/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
index 021969afe9ea..45854e73e094 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r1.ebuild
index 763d7609d989..49e49832d4aa 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r10.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r10.ebuild
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r2.ebuild
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r3.ebuild
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r4.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r4.ebuild
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r5.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r5.ebuild
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r6.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r6.ebuild
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r7.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r7.ebuild
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a609d52d25fe..63e675893790 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r1.ebuild
index f64a32407549..5b15f5a8cf8a 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r2.ebuild
index 55cf594575b8..4b289e9cf411 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
index c5d7b5cedf5a..29576784650b 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r1.ebuild
index 2a44bd4ae846..bc4884fa4caf 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r10.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r10.ebuild
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r2.ebuild
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r3.ebuild
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r4.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r4.ebuild
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r5.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r5.ebuild
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r6.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r6.ebuild
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r7.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r7.ebuild
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c0c1d963342e..77dad84ffffa 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r1.ebuild
index 2dba8d448852..79adf5cb5cd8 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r2.ebuild
index a8b378cdff42..f5743e27202e 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
index ea3bff72efda..73fdcba0c060 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r1.ebuild
index 26d6c3fa12f1..bdbb91abb0f9 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r10.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r10.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r2.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r3.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r4.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r4.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r5.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r5.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r6.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r6.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r7.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r7.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r9.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r9.ebuild
index 55667d582022..a41dfa3d997c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r1.ebuild
index 8dce96f15f94..8f31d7d8581b 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r2.ebuild
index c2b89e0bbee1..1bdf0dde3d8a 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
index bbd9221a5af7..561ae89c473d 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r1.ebuild
index 590c27ae85ee..a97ecfcf1940 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r10.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r10.ebuild
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r2.ebuild
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r3.ebuild
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r4.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r4.ebuild
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r5.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r5.ebuild
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r6.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r6.ebuild
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r7.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r7.ebuild
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index ccabdb886964..1fe039d167e5 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r1.ebuild
index 5f57a6309811..010c9f23d370 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r2.ebuild
index c6c53e1a7552..b68b2faa9c19 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
index ba6ee03492f6..a244e61afe68 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r1.ebuild
index 4dc2550980d8..ebc133e706f6 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r10.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r10.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r2.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r3.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r4.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r4.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r5.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r5.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r6.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r6.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r7.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r7.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r9.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r9.ebuild
index 25ebc0513c4d..192ccfd8d816 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r1.ebuild
index 696fb11d10c8..fe44f8740634 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r2.ebuild
index 820e0a898eac..9ac4a2bb7382 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild b/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
index f2ea1a6896ad..637db6ae4dbc 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r1.ebuild
index 8c23ceac6256..347a2a7a1ecc 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r10.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r10.ebuild
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r2.ebuild
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r3.ebuild
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r4.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r4.ebuild
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r5.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r5.ebuild
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r6.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r6.ebuild
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r7.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r7.ebuild
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 70c59c60075c..c299fd1a1381 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r1.ebuild
index 732e0c91fbe3..38823ebcf1bd 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r2.ebuild
index 356a1e22729c..ac9cf29526f9 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild b/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
index ea0936c1579d..76e3058b5067 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r1.ebuild
index 63b3b7d6e61f..f0187d868a7b 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r10.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r10.ebuild
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r2.ebuild
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r3.ebuild
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r4.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r4.ebuild
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r5.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r5.ebuild
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r6.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r6.ebuild
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r7.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r7.ebuild
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b1d8d5cfc5b0..3c91e750b04d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r1.ebuild
index 79476de1bfe9..4c93c2425508 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r2.ebuild
index 4769627426d2..93cff662c454 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
index ab8e13fb99a0..a56d8963cf47 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r1.ebuild
index 8a85f4846846..b6d12e80ab5a 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r10.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r10.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r2.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r3.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r4.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r4.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r5.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r5.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r6.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r6.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r7.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r7.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r9.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r9.ebuild
index 54bc17a54163..9ca4ad84c612 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r1.ebuild
index b28f3fd728ca..55f1ba515703 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r2.ebuild
index 498b860e46bc..b541ff5402bb 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
index c699c974439a..5280efc37f67 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r1.ebuild
index 9a9854839962..d73b87e6111e 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r10.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r10.ebuild
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r2.ebuild
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r3.ebuild
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r4.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r4.ebuild
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r5.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r5.ebuild
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r6.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r6.ebuild
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r7.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r7.ebuild
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 39a3a2165f15..f86c782f26ec 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r1.ebuild
index 3fab5ae95e29..bc26f639e7f7 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r2.ebuild
index aad772a795e8..e208b8b86d22 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
index 00d62cb3890a..0ab68ebefbfc 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r1.ebuild
index 1c6ea5b30c63..80387d8455a8 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r10.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r10.ebuild
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r2.ebuild
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r3.ebuild
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r4.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r4.ebuild
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r5.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r5.ebuild
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r6.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r6.ebuild
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r7.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r7.ebuild
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index bb00b5556fac..18c6dce2ebf0 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r1.ebuild
index c6eda5d39757..9b2306fdc3ed 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r2.ebuild
index 221734764a3b..6b14ba128189 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
index 71b5ea0570a0..d5356a0663b7 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r1.ebuild
index 3c7f0fc056df..19b4cd458236 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r10.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r10.ebuild
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r2.ebuild
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r3.ebuild
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r4.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r4.ebuild
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r5.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r5.ebuild
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r6.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r6.ebuild
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r7.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r7.ebuild
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3fb3b32da6dc..1da2ff22aaef 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20151208-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20151208-r1.ebuild
index d08c2f709c4b..35ed37d152a9 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20151208-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20151208-r2.ebuild
index 779ce662d031..b114b39b947f 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-9999.ebuild b/sec-policy/selinux-tor/selinux-tor-9999.ebuild
index d91e0f1c0085..71d7e97f0f16 100644
--- a/sec-policy/selinux-tor/selinux-tor-9999.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r1.ebuild
index 9464efcf21c3..66618cfaea90 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r10.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r10.ebuild
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r2.ebuild
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r3.ebuild
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r4.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r4.ebuild
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r5.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r5.ebuild
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r6.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r6.ebuild
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r7.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r7.ebuild
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 9acc80062b18..5769670c54d6 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r1.ebuild
index 5dcfc2df6597..366970b83d7d 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r2.ebuild
index 65709a721473..f2082be2d32b 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
index 0597d25be1d5..93c76e334e1a 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r1.ebuild
index 148c4367ddb7..b53455297c15 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r10.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r10.ebuild
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r2.ebuild
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r3.ebuild
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r4.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r4.ebuild
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r5.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r5.ebuild
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r6.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r6.ebuild
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r7.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r7.ebuild
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3129727034c8..9c1f883b9d37 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r1.ebuild
index 9cbfd4caa034..b05fcc7b9e14 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r2.ebuild
index 0f80015196e9..d7afa6bce652 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
index b20f624079fc..9db5777c3bf5 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r1.ebuild
index 293660bc9cd2..582e6fcfca48 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r10.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r10.ebuild
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r2.ebuild
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r3.ebuild
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r4.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r4.ebuild
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r5.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r5.ebuild
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r6.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r6.ebuild
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r7.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r7.ebuild
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3405d967dcec..bcbe2aa7ddb1 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r1.ebuild
index 4cb42d7227d3..95fd02956bcb 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r2.ebuild
index 01c4560ab92d..a8bf2db2b2b2 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
index 722c93a0be55..fb25634a3195 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r1.ebuild
index 41b2b1146fbe..7c5d42a813b3 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r10.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r10.ebuild
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r2.ebuild
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r3.ebuild
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r4.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r4.ebuild
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r5.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r5.ebuild
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r6.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r6.ebuild
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r7.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r7.ebuild
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0120af3ba5b0..af2a9730eb86 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20151208-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20151208-r1.ebuild
index f76da974335d..9ecb9766eadb 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20151208-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20151208-r2.ebuild
index 7d130679e1ca..dab4a9b87bc0 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-9999.ebuild b/sec-policy/selinux-uml/selinux-uml-9999.ebuild
index ac16c2fcd830..900769180513 100644
--- a/sec-policy/selinux-uml/selinux-uml-9999.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r1.ebuild
index 15fce34bfeec..9a42584bc1e2 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r10.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r10.ebuild
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r2.ebuild
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r3.ebuild
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r4.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r4.ebuild
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r5.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r5.ebuild
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r6.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r6.ebuild
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r7.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r7.ebuild
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 141e496b772d..b826187b2af9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r1.ebuild
index 775b6999ae65..111c7f53485d 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 x86"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r2.ebuild
index 7094fb042175..0c6e265a92f5 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
index c8667a824184..a8a44a674b57 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r1.ebuild
index 7dd1ccb7b60f..2fa2524e5d25 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r10.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r10.ebuild
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r2.ebuild
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r3.ebuild
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r4.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r4.ebuild
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r5.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r5.ebuild
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r6.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r6.ebuild
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r7.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r7.ebuild
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 72317e5a6931..c69aa62b7ae2 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r1.ebuild
index 57bc05596a35..51be4ea658b5 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r2.ebuild
index ccdd02530d29..4fc344c74b43 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild b/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
index 0b2bcd1d54d9..5cfe1dbd76f0 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r1.ebuild
index 43847a442551..29412c36d530 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r10.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r10.ebuild
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r2.ebuild
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r3.ebuild
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r4.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r4.ebuild
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r5.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r5.ebuild
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r6.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r6.ebuild
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r7.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r7.ebuild
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index c69788dcda8e..4031646b6d80 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r1.ebuild
index a5373ec4a9ba..75673ae703cd 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r2.ebuild
index 5028a28f2b7d..305f9d56237d 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
index fc36f0c2855f..f1009ccadd7c 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r1.ebuild
index 0f152ebbb56a..87853921b2e7 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r10.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r10.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r2.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r3.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r4.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r4.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r5.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r5.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r6.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r6.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r7.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r7.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r9.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r9.ebuild
index e092a9f70045..c5cc4d9f55a6 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r1.ebuild
index 4d2999fa107e..b3d9843df4ba 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r2.ebuild
index 34aa7394b0b8..b542a170e98a 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild b/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
index 9806412866d9..2dbb27d5ddfd 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r1.ebuild
index 6824ed05ad85..d7318b247c5b 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r10.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r10.ebuild
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r2.ebuild
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r3.ebuild
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r4.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r4.ebuild
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r5.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r5.ebuild
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r6.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r6.ebuild
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r7.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r7.ebuild
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 2f79184024f0..9154d27a7510 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r1.ebuild
index 7abd9acfa749..037baa532a72 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r2.ebuild
index df335097a112..b8bfb7a4d133 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
index d6c25f9dd08a..eeb0b8f27058 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r10.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r10.ebuild
index 0bd8ac373a5c..782d910628b3 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r5.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r5.ebuild
index 0bd8ac373a5c..782d910628b3 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r6.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r6.ebuild
index 0bd8ac373a5c..782d910628b3 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r7.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r7.ebuild
index 0bd8ac373a5c..782d910628b3 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0bd8ac373a5c..782d910628b3 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0bd8ac373a5c..782d910628b3 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r1.ebuild
index 2966574d1630..096066a197b3 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r2.ebuild
index f5c3d7cb2547..1b9206607f2b 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
index 20ab2229a22b..fe250ad74232 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uWSGI"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r1.ebuild
index 8cb2271aba4a..9ad40725722c 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r10.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r10.ebuild
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r2.ebuild
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r3.ebuild
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r4.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r4.ebuild
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r5.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r5.ebuild
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r6.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r6.ebuild
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r7.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r7.ebuild
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 5a2f55aa6df5..b2e2f0b42928 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r1.ebuild
index 98f87be41058..a573e2249a83 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r2.ebuild
index b741c488a2e1..f663d75a67bc 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
index 18713071f12c..8bf7a17ee038 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r1.ebuild
index f793efd8df2c..0f935df9ee26 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r10.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r10.ebuild
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r2.ebuild
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r3.ebuild
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r4.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r4.ebuild
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r5.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r5.ebuild
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r6.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r6.ebuild
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r7.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r7.ebuild
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 65e6bcc7cb00..b0b374713bbe 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r1.ebuild
index cbb2290e681e..431c1b455435 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r2.ebuild
index cf5d9ec722c1..40931dc62a3f 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
index bafe50dd7ef4..4a5a4f6dbbd3 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r1.ebuild
index 3558833e9e28..b370d77699b6 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r10.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r10.ebuild
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r2.ebuild
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r3.ebuild
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r4.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r4.ebuild
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r5.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r5.ebuild
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r6.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r6.ebuild
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r7.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r7.ebuild
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index dd00a67e066c..13658ce5e49f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r1.ebuild
index d962cdcd7e25..9a450cbf6fd4 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r2.ebuild
index d800a0881c8a..768d8eae778b 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
index db51541e64f8..bf7649d80185 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r1.ebuild
index e641c86540a1..4219390e4d35 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r10.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r10.ebuild
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r2.ebuild
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r3.ebuild
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r4.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r4.ebuild
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r5.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r5.ebuild
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r6.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r6.ebuild
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r7.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r7.ebuild
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 19e7ecb5b18a..bf65154761f0 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20151208-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20151208-r1.ebuild
index f0c0ce8dae0a..46692cfe2b9f 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20151208-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20151208-r2.ebuild
index f8d6db920603..61ca784757cd 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-9999.ebuild b/sec-policy/selinux-vde/selinux-vde-9999.ebuild
index ed0d3c74b5b0..6123dcfc7acc 100644
--- a/sec-policy/selinux-vde/selinux-vde-9999.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r1.ebuild
index 52bdae90c01b..9d2c24f83bc4 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r10.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r10.ebuild
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r2.ebuild
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r3.ebuild
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r4.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r4.ebuild
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r5.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r5.ebuild
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r6.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r6.ebuild
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r7.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r7.ebuild
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index bcc4f670fd9f..1b7bba7f3444 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20151208-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20151208-r1.ebuild
index d098db5128bd..6939e3f71942 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20151208-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20151208-r2.ebuild
index 0ec88a321b9e..ea1ae25df647 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-9999.ebuild b/sec-policy/selinux-virt/selinux-virt-9999.ebuild
index 490dfd3f951d..99f7d282a8cc 100644
--- a/sec-policy/selinux-virt/selinux-virt-9999.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r1.ebuild
index 1701f36feab9..24f1b7764cfe 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r10.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r10.ebuild
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r2.ebuild
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r3.ebuild
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r4.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r4.ebuild
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r5.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r5.ebuild
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r6.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r6.ebuild
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r7.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r7.ebuild
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 856e814c340f..e1212dca6bbd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r1.ebuild
index c2d6c654f479..af420eb9e032 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r2.ebuild
index 76547be30250..9d67927e1289 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild b/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
index e436c9d70bde..e1d40aa914bb 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r1.ebuild
index 5a7f4431569d..ccd65da24332 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r10.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r10.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r2.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r3.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r4.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r4.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r5.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r5.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r6.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r6.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r7.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r7.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r9.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r9.ebuild
index aa3d3b370f9b..5c08df9379b4 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r1.ebuild
index d3bf1ff33243..103103b6e0fc 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r2.ebuild
index 1dd03d7a98e8..355dd975fb0c 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild b/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
index 3e34b3dcaef9..d7f404dd1eb7 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r1.ebuild
index 8764fd1abb59..e19d2b7fb6bc 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r10.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r10.ebuild
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r2.ebuild
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r3.ebuild
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r4.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r4.ebuild
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r5.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r5.ebuild
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r6.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r6.ebuild
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r7.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r7.ebuild
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 7cd6ce79f04f..d4e8cf1e850a 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r1.ebuild
index a7d688f019c6..162e037c18fb 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r2.ebuild
index c49dc3872979..b7b6d5e12ff2 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
index c2d612b6cbce..7b78f8a3d802 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r1.ebuild
index 3fa7587f6941..26e2b4bf5b58 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r10.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r10.ebuild
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r2.ebuild
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r3.ebuild
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r4.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r4.ebuild
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r5.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r5.ebuild
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r6.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r6.ebuild
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r7.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r7.ebuild
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 0e2587864189..01d6f30a66b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r1.ebuild
index 748fec914b4a..8fb15389365c 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r2.ebuild
index 0456e03b6bdf..efa3c1872bec 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild b/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
index aa9684fba99d..c01239b65776 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r1.ebuild
index c081d62348bc..bc0b937a5c7b 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r10.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r10.ebuild
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r2.ebuild
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r3.ebuild
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r4.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r4.ebuild
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r5.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r5.ebuild
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r6.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r6.ebuild
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r7.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r7.ebuild
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 3c6304bd095b..9761766ce770 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r1.ebuild
index 767fa6989b85..5ea723d5a87b 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r2.ebuild
index 1801e623227d..5b665bbe2bac 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
index 2b7ece3f211b..bd4b1e5ed01e 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r1.ebuild
index 1fd4ed0b23d4..05b8d055dc15 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r10.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r10.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r2.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r3.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r4.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r4.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r5.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r5.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r6.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r6.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r7.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r7.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
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 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r9.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r9.ebuild
index 24f84c29380e..899cc32c294e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r1.ebuild
index 1e2b76c8268f..72be1ef2406d 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r2.ebuild
index a4ff5a146ad3..4cd1e6ff72ad 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
index 87cec7784765..b1f7285771b1 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for webalizer"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r1.ebuild
index 52404d5ac8f2..71bf2c894fcb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r10.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r10.ebuild
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r2.ebuild
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r3.ebuild
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r4.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r4.ebuild
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r5.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r5.ebuild
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r6.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r6.ebuild
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r7.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r7.ebuild
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 4a8ced659344..886ce8551bfb 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20151208-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20151208-r1.ebuild
index cd6727d3737f..b8442d9ec426 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20151208-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20151208-r2.ebuild
index 4294a079fef6..8a54a0136fcf 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-9999.ebuild b/sec-policy/selinux-wine/selinux-wine-9999.ebuild
index a1122bed8733..e4469e6fa644 100644
--- a/sec-policy/selinux-wine/selinux-wine-9999.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r1.ebuild
index 20c06eb6d90d..19337325c5d7 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r10.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r10.ebuild
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r2.ebuild
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r3.ebuild
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r4.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r4.ebuild
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r5.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r5.ebuild
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r6.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r6.ebuild
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r7.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r7.ebuild
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 64e561bbc93d..9831bf776240 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r1.ebuild
index efb86484a876..ae47713edd15 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r2.ebuild
index 46f9a07eefa8..460635f672ed 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
index 13da42f12f82..94f10419e548 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r1.ebuild
index c991c70cd627..dc3dc4742f22 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r10.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r10.ebuild
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r2.ebuild
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r3.ebuild
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r4.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r4.ebuild
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r5.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r5.ebuild
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r6.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r6.ebuild
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r7.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r7.ebuild
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index a17df9dc59a0..4dbde171e630 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20151208-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20151208-r1.ebuild
index a44984206344..1b2fae162cde 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20151208-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20151208-r2.ebuild
index 401256e4374e..e51085b85149 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-9999.ebuild b/sec-policy/selinux-wm/selinux-wm-9999.ebuild
index d81997c97903..896df936695c 100644
--- a/sec-policy/selinux-wm/selinux-wm-9999.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r1.ebuild
index b24dada16871..1d1bb7f262c7 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r10.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r10.ebuild
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r2.ebuild
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r3.ebuild
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r4.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r4.ebuild
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r5.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r5.ebuild
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r6.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r6.ebuild
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r7.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r7.ebuild
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index b3c68b76deeb..a984d32eb3c1 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20151208-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20151208-r1.ebuild
index 277e86c39636..94c141bc7482 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20151208-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20151208-r2.ebuild
index 519d286ed52f..f6d0cef566e0 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-9999.ebuild b/sec-policy/selinux-xen/selinux-xen-9999.ebuild
index ad746060667f..70f16f694fb3 100644
--- a/sec-policy/selinux-xen/selinux-xen-9999.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r1.ebuild
index 4a61964505df..f78fffbac4c1 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r10.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r10.ebuild
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r2.ebuild
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r3.ebuild
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r4.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r4.ebuild
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r5.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r5.ebuild
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r6.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r6.ebuild
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r7.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r7.ebuild
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 230aa0bdfffe..3e0cd30beb25 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r1.ebuild
index a66190d58af6..7d42c99e44ac 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r2.ebuild
index 1876e7ed84ff..5e2044e3f5d8 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
index 42bed3449033..18184c342bfa 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r1.ebuild
index 2805085bde6d..d2253148c200 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r10.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r10.ebuild
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r2.ebuild
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r3.ebuild
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r4.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r4.ebuild
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r5.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r5.ebuild
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r6.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r6.ebuild
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r7.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r7.ebuild
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 13f6c5832676..145d563a3059 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r1.ebuild
index 74ccf109d401..de0dd156c00f 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r2.ebuild
index f32868308bdf..f0b88394b031 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild b/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
index 8e3cc26bd8ef..27c0039c461e 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r1.ebuild
index 41b89e8ca054..be43c3cae79b 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r10.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r10.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r10.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r2.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r3.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r3.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r4.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r4.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r4.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r5.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r5.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r5.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r6.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r6.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r6.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r7.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r7.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r7.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
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 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r8.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r9.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r9.ebuild
index 39d41b6a82d8..a8824f64c1e7 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r9.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r1.ebuild
index abe9817d132b..bc97ccec4e3a 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r1.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r2.ebuild
index 3e710ddc29bf..3ead38c0dd97 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20151208-r2.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
index f66e640cedc9..515ee5cafc74 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
@@ -10,9 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r1.ebuild
index c9b5d326e0aa..a8d2fe398500 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r10.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r10.ebuild
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r2.ebuild
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r3.ebuild
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r4.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r4.ebuild
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r5.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r5.ebuild
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r6.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r6.ebuild
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r7.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r7.ebuild
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index cd88f06624e8..6a6ca8d47e21 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r1.ebuild
index 8cff75e526b0..c8e14ef02a9b 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r2.ebuild
index 3fc8c4650466..408c7633e51e 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
index 0a9ea124113d..8f9b1032b963 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r1.ebuild
index ec7b1ea64be7..31c8aa38df50 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r10.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r10.ebuild
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r10.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r2.ebuild
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r2.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r3.ebuild
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r3.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r3.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r4.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r4.ebuild
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r4.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r4.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r5.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r5.ebuild
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r5.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r5.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r6.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r6.ebuild
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r6.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r6.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r7.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r7.ebuild
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r7.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r7.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
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 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r8.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	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
index 377fa85b69b3..b89d57b7b8e7 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r9.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r1.ebuild
index 046bfc724801..7fb1380745cb 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r1.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r2.ebuild
index 28f057c4e769..2654e1903125 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20151208-r2.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
index fa0e3ec11417..73c2d5e2f56f 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
@@ -10,8 +10,6 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-if [[ $PV == 9999* ]] ; then
-	KEYWORDS=""
-else
+if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/sys-apps/baobab/baobab-3.18.1.ebuild b/sys-apps/baobab/baobab-3.18.1.ebuild
index b94ae698f3a9..783447c6da49 100644
--- a/sys-apps/baobab/baobab-3.18.1.ebuild
+++ b/sys-apps/baobab/baobab-3.18.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[dbus]
diff --git a/sys-apps/checkpolicy/checkpolicy-2.4.ebuild b/sys-apps/checkpolicy/checkpolicy-2.4.ebuild
index 6c71b0dc1216..e58f5dcb8bc4 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.4.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE="debug"
 
 DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 0d877e0cc8fb..a2ed44bafeef 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index ab6ad43aeb2a..2480bef7dc4c 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,3 +1,3 @@
 DIST etckeeper-1.11.tar.gz 48100 SHA256 a58b84af8307623f8c59acd6b161bf781909a1dac4b82853baa3098d47decabc SHA512 f9ae79dfee4d97195b0a40ef319d75242662b9717d0293ac9722a7728e22374b6425391e91076ab5e0e4524a16c211511a2857b867d3610ff5c6b2bc561c96a7 WHIRLPOOL 174b857dce5d4ecdb26a01e030c312f57aeb9d1db3eaede5ead4c7e3a08ce05695ca528d226ce1847d28eb14a7360990bb21bb777a710f3b56ab5594ffd01301
 DIST etckeeper-1.18.1.tar.gz 56366 SHA256 80adee6e17bfc41359ffb85a401d9a510ae25956950adbfdd07a0bda36d99e9b SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 WHIRLPOOL 890b38f761f49a5a4713fa850bc18e09688ed8fb04d9b41f3727f868448fb1ba1ecf92750df777fc6011a3f88abeb8756105fbdc60ebf6fd3e693360764fb27c
-DIST etckeeper-1.18.tar.gz 56203 SHA256 f9d9eedb2b66c4c40e16824e0899755226543b7c124756f5e0168353fc194d36 SHA512 439a3316b938fe78ab8f0032964ea62392098ca37043960995713f5ca698efb1df4e2c57177ebf3036ec1a8652157ecf990316fd68fd6376bb090b3f0bc42131 WHIRLPOOL 27998338d8bdd9cf32ba443b1cffd45e83b9ca77eb84fead4dfff9c1413425435b15b9be7f18360488ce149f2aba208041cd89f1d2d4b6f5bf8fc5e01130641a
+DIST etckeeper-1.18.3.tar.gz 64982 SHA256 736302ee00c5a007901c60baab2dd67d419033ed1c62df3e98416e4ded8d4486 SHA512 c60ba647f15fa41e38ffb8492ce98820a53a0ce20eec9590b3098fa042b43f6f2d1c21d6143342150208e0eae48fca60efdfe9f779c973397e4035031813618c WHIRLPOOL 96181f1b5445b8f4bede9df180daafe97f40a3b8219ebd9b9fbab2cc643874d65c30c9e3b3899e3994130dc29004074de91b66de82114b7cd42bcdd1e99d068d
diff --git a/sys-apps/etckeeper/etckeeper-1.18.3.ebuild b/sys-apps/etckeeper/etckeeper-1.18.3.ebuild
new file mode 100644
index 000000000000..4e64cf6a36a7
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils prefix python-r1
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="bazaar cron"
+REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
+
+VCS_DEPEND="dev-vcs/git
+	dev-vcs/mercurial
+	dev-vcs/darcs"
+DEPEND="bazaar? ( dev-vcs/bzr )"
+RDEPEND="${DEPEND}
+	app-portage/portage-utils
+	cron? ( virtual/cron )
+	bazaar? ( ${PYTHON_DEPS} )
+	!bazaar? ( || ( ${VCS_DEPEND} ) )"
+
+src_prepare(){
+	epatch "${FILESDIR}"/${PN}-1.18.3-gentoo.patch
+}
+
+src_compile() {
+	:
+}
+
+src_install(){
+	emake DESTDIR="${ED}" install
+
+	bzr_install() {
+		${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
+			die "bzr support installation failed!"
+	}
+	use bazaar && python_foreach_impl bzr_install
+
+	if use prefix; then
+		doenvd "${FILESDIR}"/99${PN}
+		eprefixify "${ED%/}"/etc/env.d/99${PN}
+	fi
+
+	dodoc doc/README.mdwn
+	docinto examples
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily etckeeper
+	fi
+}
+
+pkg_postinst(){
+	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+	elog "	dev-vcs/bzr"
+	elog "This ebuild just ensures at least one is installed!"
+	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}/examples"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.ebuild b/sys-apps/etckeeper/etckeeper-1.18.ebuild
deleted file mode 100644
index 7b310675edd7..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils bash-completion-r1 prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install(){
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	docinto examples
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst(){
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch
new file mode 100644
index 000000000000..8661d391f9c6
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch
@@ -0,0 +1,78 @@
+From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Tue, 16 Feb 2016 00:19:07 +0100
+Subject: [PATCH] Support Gentoo's package managers
+
+
+diff --git a/Makefile b/Makefile
+index 70bddfa..6090a4e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
+ 	$(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
+ endif
+-	-$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
+ 	echo "** installation successful"
+ 
+ clean: etckeeper.spec etckeeper.version
+diff --git a/etckeeper.conf b/etckeeper.conf
+index 0d268bd..81214c7 100644
+--- a/etckeeper.conf
++++ b/etckeeper.conf
+@@ -31,11 +31,21 @@ DARCS_COMMIT_OPTIONS="-a"
+ 
+ # The high-level package manager that's being used.
+ # (apt, pacman, pacman-g2, yum, dnf, zypper etc)
+-HIGHLEVEL_PACKAGE_MANAGER=apt
++#HIGHLEVEL_PACKAGE_MANAGER=apt
++
++# Gentoo specific:                                                                                                                                                                                                                                
++# For portage this is emerge
++# For paludis this is cave
++HIGHLEVEL_PACKAGE_MANAGER=emerge
+ 
+ # The low-level package manager that's being used.
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, etc)
+-LOWLEVEL_PACKAGE_MANAGER=dpkg
++#LOWLEVEL_PACKAGE_MANAGER=dpkg
++
++# Gentoo specific:
++# For portage this is qlist
++# For paludis this is cave
++LOWLEVEL_PACKAGE_MANAGER=qlist
+ 
+ # To push each commit to a remote, put the name of the remote here.
+ # (eg, "origin" for git). Space-separated lists of multiple remotes
+diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed
+index 129447f..79d67f2 100755
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -21,5 +21,9 @@ else
+ 		pacmatic -Q
+ 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then
+ 		pkg info -E "*"
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
++		qlist -ICv
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
++		cave print-packages -r installed
+ 	fi
+ fi
+diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
+index 7347287..5dbb398 100755
+--- a/update-ignore.d/01update-ignore
++++ b/update-ignore.d/01update-ignore
+@@ -99,6 +99,10 @@ writefile () {
+ 		ignore "*.pacorig"
+ 		ignore "*.pacsave"
+ 		nl
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
++		comment "new and old versions of conffiles, stored by emerge"
++		ignore "._cfg*"
++		nl
+ 	fi
+ 	
+ 	comment "old versions of files"
+-- 
+2.7.1
+
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index a4244f2bde06..2f74e5e82190 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 
 DEPEND="sys-devel/bison
diff --git a/sys-apps/gcp/Manifest b/sys-apps/gcp/Manifest
new file mode 100644
index 000000000000..be52f620078a
--- /dev/null
+++ b/sys-apps/gcp/Manifest
@@ -0,0 +1 @@
+DIST gcp-0.1.3.tar.bz2 30946 SHA256 e53c6dd6146cb81421f10fe31c1a7175c24c4aabbc235e4e908b6dbab4e0c8bd SHA512 856561d7d1514b7e90ed4e976b4572b6a82113edb9c3127168053d8993f67ea4efa1d3d5543c318dd961ee9d42679232444e1f397b1c7ba22bfba6b5d7acfc76 WHIRLPOOL 3d1349eef678a614c4b37624829c1063e0c650ad05845d26222f731b5c8fdca6415a86e73bc7e346383b32b7395961115e20ec38f845ce12ed3ce835bcd18c0e
diff --git a/sys-apps/gcp/gcp-0.1.3.ebuild b/sys-apps/gcp/gcp-0.1.3.ebuild
new file mode 100644
index 000000000000..43cd8d3b228b
--- /dev/null
+++ b/sys-apps/gcp/gcp-0.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="File copying utility with progress and I/O indicator"
+HOMEPAGE="http://wiki.goffi.org/wiki/Gcp/en"
+SRC_URI="ftp://ftp.goffi.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/progressbar[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+	sed -e '/use_setuptools/d' \
+	    -e 's#.\+share/doc.\+#],#' -i setup.py || die
+}
diff --git a/sys-apps/gcp/metadata.xml b/sys-apps/gcp/metadata.xml
new file mode 100644
index 000000000000..e25cd064c44a
--- /dev/null
+++ b/sys-apps/gcp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>soap@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
index 606a2f1f4211..f09f650cda90 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.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[dbus]
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index a8d4c309c8e2..d623ffab030f 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,5 +1,6 @@
 DIST hwloc-1.10.0.tar.bz2 3765051 SHA256 b765f72507cf1cc98b398e0ec85b8f30e640bf1cd0a886c286d0b70d648d7be3 SHA512 0f1c011dbafbd4a78566b2ebc26b1c91a0e091e041f6e7996cea6812aeefd7fe4e8e7cb688634157c721dd9deea48ca32de823f8a9e0a1c341853b925a9c89c0 WHIRLPOOL a3eb47450f9e3fc97cb484ad4cab93f4eab10c5039da113029a0e918f654a878f44a9460b4606616d43580ea56ba21fc54ab4fc671b290f480e2e19514e524d7
 DIST hwloc-1.10.1.tar.bz2 3771665 SHA256 35ce13a9a0737d2de1c6facb5c3c0438f7c83b45d6ce652e05ba000f6f2e514a SHA512 47cc1f084730021996ae0c18996e13dde5b991004fe9160bc1e118b6cb0288fe5d65d149450f05bd7b9e13bd6f16dfe82181d1e731dd1b0e46a43fd4435850cc WHIRLPOOL b7e089c1de3f967295768dc2dbc6acec80fa99f66d9340cedf3b02c1d2e869a339fa9fdd71a5f8ef77554ec8622a246abae6ca5f41354790bf09bf2d0d8236d7
+DIST hwloc-1.11.2.tar.bz2 4019136 SHA256 8c029b6b1638245837707bfa6c865f448af4e49e7d352335e019d818b51fecf8 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68 WHIRLPOOL 783752a449f907bca5dd0b42445f8291d8cdc3a09f4e1bdb677cf34c3bc56ef739def0c1684455979d36570a51bdc99cefccbd5052e0996226dfc832ade9664a
 DIST hwloc-1.6.1.tar.bz2 3075453 SHA256 8bb0a13d70852442cfce8883a99113e9238e187a91b3160279e260a10048057b SHA512 9bf613c35e27d7e0e7e4aee39602e949dd035c84ceab37a716c48d9be25f319cd7888448c9771e8a8408dcf958370e9b54f7e1f764349fa5d39c2bd4358032ff WHIRLPOOL a319c94d306e18bd0f9a721eb637df667fc0831e2c84770255736205ba30abb9cc18e4b401cbbd3c419369b1c3aae638253bb826e973ff6c763a233c9c986742
 DIST hwloc-1.6.2.tar.bz2 3066020 SHA256 fd4d47738afc9c5f60d2c35f0963f82feb78bb57f2bc239e84e93ad376169df1 SHA512 3e1a0b28f6f867c82c8d61110afc07cb0019fb8d4284a171cef36346ea9746acab11250f7f382260f8f40d3c28c2517b24f2a222427cb2951149a58a30cb0990 WHIRLPOOL 7f2a9a58f4f7b1aae18f6d50338553eaa8c26e0cd54add29395e8366cfb076ec4e790b3411978c581da1b67342ad14443040e08a766e727a7cf9b27530e356f1
 DIST hwloc-1.7.2.tar.bz2 3165052 SHA256 a0b40c01eead1d4c254ab87c2ec75b8eeb9877331763fbd1e1b81990ad566848 SHA512 e6472fb0639a178683ea7bbef666255a73c1962c360d22490e4aee6642da1d30648d2f057e11b529d91bf76da05d47632331d84dd0a7771c5732cc7cc90e7d7c WHIRLPOOL 6f39a871777e28cfb1f87f6a5c9c7ef02a31bf4a8178f7eeb43ec9eeef42132c8d432d803e66198129017f68228e3aa738a774665d0e8400f5617af81cc61f7c
diff --git a/sys-apps/hwloc/hwloc-1.11.2.ebuild b/sys-apps/hwloc/hwloc-1.11.2.ebuild
new file mode 100644
index 000000000000..cf5e10e5acf6
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.11.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic cuda autotools-multilib multilib versionator
+
+MY_PV=v$(get_version_component_range 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
+
+# TODO opencl only works with AMD so no virtual
+# dev-util/nvidia-cuda-toolkit is always multilib
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
+	gl? ( media-video/nvidia-settings )
+	opencl? ( x11-drivers/ati-drivers:* )
+	pci? (
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+	)
+	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.1-gl.patch"
+)
+AUTOTOOLS_AUTORECONF=1
+
+src_prepare() {
+	if use cuda ; then
+		append-cflags -I/opt/cuda/include
+		append-cppflags -I/opt/cuda/include
+	fi
+	autotools-utils_src_prepare
+}
+
+multilib_src_configure() {
+	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+	use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)"
+	local myeconfargs=(
+		--disable-silent-rules
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cairo)
+		$(use_enable cuda)
+		$(use_enable debug)
+		$(multilib_native_use_enable gl)
+		$(multilib_native_use_enable opencl)
+		$(use_enable pci)
+		$(use_enable plugins)
+		$(use_enable numa libnuma)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild
index 59b1bbede18e..9deb8f278024 100644
--- a/sys-apps/iproute2/iproute2-4.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.3.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/magneto-core/Manifest b/sys-apps/magneto-core/Manifest
deleted file mode 100644
index 520d012e476c..000000000000
--- a/sys-apps/magneto-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/sys-apps/magneto-core/magneto-core-254.ebuild b/sys-apps/magneto-core/magneto-core-254.ebuild
deleted file mode 100644
index d15490f0d8c7..000000000000
--- a/sys-apps/magneto-core/magneto-core-254.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib
-
-DESCRIPTION="Entropy Package Manager notification applet library"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/magneto"
-
-DEPEND="~sys-apps/rigo-daemon-${PV}[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-core-install || die "make install failed"
-	python_optimize "${D}/usr/$(get_libdir)/entropy/magneto"
-}
diff --git a/sys-apps/magneto-core/metadata.xml b/sys-apps/magneto-core/metadata.xml
deleted file mode 100644
index ba0420baf285..000000000000
--- a/sys-apps/magneto-core/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/man-db/man-db-2.7.5.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild
index 73499719d0cb..9bfd9c5439c1 100644
--- a/sys-apps/man-db/man-db-2.7.5.ebuild
+++ b/sys-apps/man-db/man-db-2.7.5.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 +manpager nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 3d12c4ab90c6..c0cf0cbb99c8 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,6 +1,4 @@
-DIST net-tools-1.60_p20130513023548-patches-1.tar.xz 3352 SHA256 926240c304e20a0ab966c3d278703a6ef8e7833a54aaf636598854450bd01f4e SHA512 6dd3eef6469a18581a98fc91f424b418f3875cd0eff86724d6bdbacca1b83d1229a567a184b82e0187d01a428ea6be933d53090796b5c7d301009b2e211c4531 WHIRLPOOL fb638e122f85e95fda35b77336fbb5d4f6e89c5f5a5b76d759bd08f53eb0741feb9c7221940b836e0e7f5c60bd312d99d823c3af89340d6e254f1be96e34d2ce
-DIST net-tools-1.60_p20130513023548-patches-2.tar.xz 14780 SHA256 4eba8545c64db6d2b0eedca45ff7346e4c0b6f1b526ca31b2db6462a0ec0be1b SHA512 6cb4ce7324bae696997839492edd3578e8c9971395de5d499a735ef6421aacc37d24311ada4b94e596c61b55660e2a4babb58f2403ef83da7ac32d2ccbf23201 WHIRLPOOL 200f0a5a88c1e637d183dd098ec1077ee565f0cac1b021b9500a803e2717143184d2c6c597158d73867331b1dc5e474e4858654b6927c314522cd228f660c00a
-DIST net-tools-1.60_p20130513023548.tar.xz 196684 SHA256 e4f47c0736c5d73853f3bbfd30bec1922465f7a2b5bce25e5067774bac1d716d SHA512 d01404ac461f93fbd304f6c67a8dcc642b833f3653b97a5c2ecf3774bfef8489d6aa5631dbefe432a6675e2ce20e88ce1b9888a9ec055198076970505afd1f1b WHIRLPOOL 24e5917bb790d683507d9406213e0ee0ca94c36fcca469ff0ab7fa4c30517cb29a4cfafb98fdedf3a4ba94baa3f66da48ae3a2f359e522b9d42e6e1c599772fa
 DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256 12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512 139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9 WHIRLPOOL 3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190
 DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256 22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512 5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e WHIRLPOOL c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec
 DIST net-tools-1.60_p20151124144947.tar.xz 227044 SHA256 fd771419c735ac43b27584594595e9bf8ee708aaf9948a44696ce9aa955e887d SHA512 0118af976ebc45edfd301c666fbf934c1fca1fd09396b6e3d09a8f9810809f7b765d6b3329044da5fccf96574b15b04fdedbaeac8e76e9811c0e87f53eff6530 WHIRLPOOL 33e1de04bc53ba16edc964b4f4b9393fbc2f474c423d73b565eb5449dfdb866edd275a16c08c25bd7eacbf8dff761e20f5eb13abd15c6af0062b6439fe439c5f
+DIST net-tools-1.60_p20160215155418.tar.xz 227284 SHA256 9c9aee20e3b09213ab0b27c62329fafcb25e156143fc3999c16e8dcee72304b2 SHA512 3fac6e00f061daf5c9ed1c8038d14635333a6149b09ad1493db35e4f931095915ad47468c42cc10299a4df1b5c946d6609a92a00c326a50a4da166670f6608e4 WHIRLPOOL b04de5acd5cb17177d105168d8dd5d4e1cbb108d946bd656b162b11081098b9254993883088df851c3f2fc4eab2dbc18892cff96f20f1e2748663ab6f17ffac0
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r1.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548-r1.ebuild
deleted file mode 100644
index f6b10ea23a03..000000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
-	inherit git-2
-else
-	PATCH_VER="2"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls old-output selinux static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	local patches="${p}-patches-${PATCH_VER:-1}"
-	local d="${T}/${patches}"
-	mkdir "${d}"
-	git format-patch -o "${d}" master..gentoo > /dev/null
-	echo "From https://cgit.gentoo.org/proj/net-tools.git" > "${d}"/README
-	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
-	rm -rf "${d}"
-
-	du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
-	local opt=$1 ans
-	shift
-	ans=$("$@" && echo y || echo n)
-	einfo "Setting option ${opt} to ${ans}"
-	sed -i \
-		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
-		config.in || die
-}
-
-src_prepare() {
-	if [[ -n ${PATCH_VER} ]] ; then
-		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
-		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
-	fi
-}
-
-src_configure() {
-	set_opt I18N use nls
-	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
-	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
-	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
-	set_opt SELINUX use selinux
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-	tc-export AR CC
-	yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
-	einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r2.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548-r2.ebuild
deleted file mode 100644
index aa56a5182d99..000000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
-	inherit git-2
-else
-	PATCH_VER="2"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls old-output selinux static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	local patches="${p}-patches-${PATCH_VER:-1}"
-	local d="${T}/${patches}"
-	mkdir "${d}"
-	git format-patch -o "${d}" master..gentoo > /dev/null
-	echo "From https://cgit.gentoo.org/proj/net-tools.git" > "${d}"/README
-	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
-	rm -rf "${d}"
-
-	du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
-	local opt=$1 ans
-	shift
-	ans=$("$@" && echo y || echo n)
-	einfo "Setting option ${opt} to ${ans}"
-	sed -i \
-		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
-		config.in || die
-}
-
-src_prepare() {
-	if [[ -n ${PATCH_VER} ]] ; then
-		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
-		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
-	fi
-}
-
-src_configure() {
-	set_opt I18N use nls
-	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
-	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
-	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
-	set_opt HAVE_SELINUX use selinux
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-	tc-export AR CC
-	yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
-	einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
deleted file mode 100644
index 7923b9b15b17..000000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
-	inherit git-2
-else
-	PATCH_VER="1"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls old-output selinux static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	local patches="${p}-patches-${PATCH_VER:-1}"
-	local d="${T}/${patches}"
-	mkdir "${d}"
-	git format-patch -o "${d}" master..gentoo > /dev/null
-	echo "From https://cgit.gentoo.org/proj/net-tools.git" > "${d}"/README
-	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
-	rm -rf "${d}"
-
-	du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
-	local opt=$1 ans
-	shift
-	ans=$("$@" && echo y || echo n)
-	einfo "Setting option ${opt} to ${ans}"
-	sed -i \
-		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
-		config.in || die
-}
-
-src_prepare() {
-	if [[ -n ${PATCH_VER} ]] ; then
-		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
-		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
-	fi
-}
-
-src_configure() {
-	set_opt I18N use nls
-	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
-	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
-	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
-	set_opt SELINUX use selinux
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-	tc-export AR CC
-	yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
-	einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild
deleted file mode 100644
index ea7727040dd9..000000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
-	inherit git-2
-else
-	PATCH_VER="1"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls old-output selinux static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	local patches="${p}-patches-${PATCH_VER:-1}"
-	local d="${T}/${patches}"
-	mkdir "${d}"
-	git format-patch -o "${d}" master..gentoo > /dev/null
-	echo "From https://cgit.gentoo.org/proj/net-tools.git" > "${d}"/README
-	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
-	rm -rf "${d}"
-
-	du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
-	local opt=$1 ans
-	shift
-	ans=$("$@" && echo y || echo n)
-	einfo "Setting option ${opt} to ${ans}"
-	sed -i \
-		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
-		config.in || die
-}
-
-src_prepare() {
-	if [[ -n ${PATCH_VER} ]] ; then
-		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
-		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
-	fi
-}
-
-src_configure() {
-	set_opt I18N use nls
-	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
-	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
-	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
-	set_opt SELINUX use selinux
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-	tc-export AR CC
-	yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
-	einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild b/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild
index 059a1aaef1ad..5db331c78dcb 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -76,7 +76,9 @@ src_configure() {
 }
 
 src_install() {
-	default
+	# We need to use emake by hand to pass ED. #567300
+	emake DESTDIR="${ED}" install
+	dodoc README THANKS TODO
 
 	# TODO: Make these into config knobs upstream.
 	if ! use arp ; then
diff --git a/sys-apps/net-tools/net-tools-1.60_p20160215155418.ebuild b/sys-apps/net-tools/net-tools-1.60_p20160215155418.ebuild
new file mode 100644
index 000000000000..31bb147c12ef
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20160215155418.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code"
+	inherit git-2
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
+REQUIRED_USE="nis? ( hostname )"
+
+RDEPEND="selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	selinux? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" nls? ( sys-devel/gettext )"
+fi
+RDEPEND+="
+	hostname? ( !sys-apps/coreutils[hostname] )
+	!<sys-apps/openrc-0.9.9.3"
+
+maint_pkg_create() {
+	cd /usr/local/src/net-tools
+	#git-update
+	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
+	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
+	local p="${PN}-${pv}"
+	git archive --prefix="${p}/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	emake -C "${p}/po" dist
+	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
+	tar cf - ${p}/ | xz > ${p}.tar.xz
+	popd >/dev/null
+
+	du -b "${T}"/*.tar.xz
+}
+
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
+
+set_opt() {
+	local opt=$1 ans
+	shift
+	ans=$("$@" && echo y || echo n)
+	einfo "Setting option ${opt} to ${ans}"
+	sed -i \
+		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
+		config.in || die
+}
+
+src_configure() {
+	set_opt I18N use nls
+	set_opt HAVE_AFINET6 use ipv6
+	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
+	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
+	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
+	set_opt HAVE_SELINUX use selinux
+	set_opt HAVE_ARP_TOOLS use arp
+	set_opt HAVE_HOSTNAME_TOOLS use hostname
+	set_opt HAVE_HOSTNAME_SYMLINKS use nis
+	set_opt HAVE_PLIP_TOOLS use plipconfig
+	set_opt HAVE_SERIAL_TOOLS use slattach
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+	tc-export AR CC
+	yes "" | ./configure.sh config.in || die
+}
+
+src_install() {
+	# We need to use emake by hand to pass ED. #567300
+	emake DESTDIR="${ED}" install
+	dodoc README THANKS TODO
+}
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index 059a1aaef1ad..31bb147c12ef 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,6 +20,7 @@ HOMEPAGE="http://net-tools.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
+REQUIRED_USE="nis? ( hostname )"
 
 RDEPEND="selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
@@ -67,6 +68,11 @@ src_configure() {
 	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
 	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
 	set_opt HAVE_SELINUX use selinux
+	set_opt HAVE_ARP_TOOLS use arp
+	set_opt HAVE_HOSTNAME_TOOLS use hostname
+	set_opt HAVE_HOSTNAME_SYMLINKS use nis
+	set_opt HAVE_PLIP_TOOLS use plipconfig
+	set_opt HAVE_SERIAL_TOOLS use slattach
 	if use static ; then
 		append-flags -static
 		append-ldflags -static
@@ -76,29 +82,7 @@ src_configure() {
 }
 
 src_install() {
-	default
-
-	# TODO: Make these into config knobs upstream.
-	if ! use arp ; then
-		rm "${ED}"/sbin/{,r}arp "${ED}"/usr/share/man/man8/{,r}arp.8* || die
-	fi
-	if ! use hostname ; then
-		if use nis ; then
-			# Since all the tools are symlinks, repoint them.
-			rm "${ED}"/bin/domainname || die
-			cp -p "${ED}"/bin/{host,domain}name || die
-			dosym domainname /bin/nisdomainname
-			dosym domainname /bin/ypdomainname
-		fi
-		rm "${ED}"/bin/{host,dnsdomain}name "${ED}"/usr/share/man/man1/{host,dnsdomain}name.1* || die
-	fi
-	if ! use nis ; then
-		rm "${ED}"/bin/{,nis,yp}domainname "${ED}"/usr/share/man/man1/{,nis,yp}domainname.1* || die
-	fi
-	if ! use plipconfig ; then
-		rm "${ED}"/sbin/plipconfig "${ED}"/usr/share/man/man8/plipconfig.8* || die
-	fi
-	if ! use slattach ; then
-		rm "${ED}"/sbin/slattach "${ED}"/usr/share/man/man8/slattach.8* || die
-	fi
+	# We need to use emake by hand to pass ED. #567300
+	emake DESTDIR="${ED}" install
+	dodoc README THANKS TODO
 }
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 3ca1b5026a58..fd9e45d8cc17 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -12,3 +12,4 @@ DIST openrc-0.18.3.tar.bz2 159104 SHA256 891478b28b3d2b964276b35a3cdf538a7f3d9cf
 DIST openrc-0.18.4.tar.bz2 157237 SHA256 2c8bf1c6f52fcf4c1f6945a2836ba2551a7d93015aa63ba5a2e1d2851c2942e4 SHA512 13f5dbc1292ce94c2e42a35e582bbba12e4bba943640952ea4cecc7ff5c60175d362055a4f5e213f218236ab4a040a5dff01a47c8bc007237554744d8a89a48a WHIRLPOOL f1f44effad80863276339af5bce1b3a9068d9c5ae7f7c3b571fb883b376c9083c207980c6d05170b0a18c0902ad1e2d76a1bafb0f11721b0522308e2cb7c67b4
 DIST openrc-0.19.1.tar.bz2 159598 SHA256 5628c04b12e2f51f25e59c303bdccbf545ba0db25484adcca48e70d0712ce0e6 SHA512 303db4475fd02aa3aa161dbd8794a45c2633b9fe96aaab67b81014fa3915bed1aa51cff57128f4413cf9f2329ce1f2012e460e089c39f01ac6eb061a95844329 WHIRLPOOL a4e8720579b8983cb3c2c9b4dd983c1b7bf45e053aa0c9545f31e36c22e44d06e55198d4143dc0a6bca3b7d00b151b43d1da439b2479044344ca12f3151711f1
 DIST openrc-0.20.4.tar.bz2 163060 SHA256 0474a08e9e280a3c2450bed014b1f6b485e1a583391575f0d35c3551709e3784 SHA512 6d4ccee5f3c3e64eeeaa05b591d7420e3cdaa82eb42606a8a721030b9323e1e56928da78d302e5cbd20c652f6ecf5db23a695de436216f2c55c0be4cfc98387a WHIRLPOOL b2bf5c1b66595a4b2b3a66a39f15896d6ab0aa4b0c42518146238016ba01adb12b3aaf6ce21570756693e283fe14a979f305afd253db68ba47246135529b1ab9
+DIST openrc-0.20.5.tar.bz2 163033 SHA256 2af530aff271ffb8ef9428ca5847cde952ab985e2542b57f8d059373f8a77c4b SHA512 0784ac741aee96d0a4eeddc028b92dd5c79dd7fb66c8102e660fd059789559babd52a0618b7ea9216ea0a113708b356b0e1f9cdd32246cc744b2c7d6004f5a81 WHIRLPOOL 9798675508060d07804eee04a2e10d0ce5a84340aff842e4bbb88a530e41385785100e2a6e107e5e6767471e85438a504f8531032807cd733232a40266425360
diff --git a/sys-apps/openrc/openrc-0.19.1.ebuild b/sys-apps/openrc/openrc-0.19.1.ebuild
index c960395418e3..5fdd41b018b8 100644
--- a/sys-apps/openrc/openrc-0.19.1.ebuild
+++ b/sys-apps/openrc/openrc-0.19.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.20.5.ebuild b/sys-apps/openrc/openrc-0.20.5.ebuild
new file mode 100644
index 000000000000..41ac4e9ff0ef
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.20.5.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	tools unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	tools? ( dev-lang/perl )
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		sys-libs/libselinux
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		sec-policy/selinux-base-policy
+		sec-policy/selinux-openrc
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKTOOLS=$(usex tools)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install the gentoo pam.d file
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+
+	ewarn "In this version of OpenRC, the loopback interface no longer"
+	ewarn "satisfies the net virtual."
+	ewarn "If you have services now which do not start because of this,"
+	ewarn "They can be fixed by adding rc_need=\"!net\""
+	ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
+	ewarn "You should also file a bug against the service asking that"
+	ewarn "need net be dropped from the dependencies."
+	ewarn "The bug you file should block the following tracker:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
+	ewarn
+
+	# Updated for 0.13.2.
+	ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not"
+	ewarn "fixed correctly in earlier versions of OpenRC."
+	ewarn "The correct fix is implemented in this version, but that"
+	ewarn "means netmount needs to be added to the default runlevel if"
+	ewarn "you are using nfs file systems."
+	ewarn
+
+	elog "You should now update all files in /etc, using etc-update"
+	elog "or equivalent before restarting any services or this host."
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
index 047d51130b3f..810202566186 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 48e996f02f98..73b096ae7432 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/progress/Manifest b/sys-apps/progress/Manifest
index 9573a57082e0..55e2e525afc5 100644
--- a/sys-apps/progress/Manifest
+++ b/sys-apps/progress/Manifest
@@ -1 +1 @@
-DIST progress-0.9.tar.gz 56297 SHA256 63e1834ec114ccc1de3d11722131b5975e475bfd72711d457e21ddd7fd16b6bd SHA512 f2928b2bf2a50edd0b85c5c1452d6c8451ad271527cf7963dce3498ded85804a9ecae7c8483b654f8f4751e7697796a8d5bb8cd310d9f6dc4b9db7769ef11e92 WHIRLPOOL b890e9dc049a20f3da1caaab6fcefd7be53710f58f0f84b464cf7ac5bdeb7102324b38b1bbe51994f7c5917d18aeae633133a965e1cb0d038e8e6b7de100f2d8
+DIST progress-0.13.tar.gz 57959 SHA256 160cb6156a0b8df32a3944f3dcecba956ae3e5579e91d53c9d7417bc4956718c SHA512 789e188e60137412f3ab0f47c82a969066eb1c312711982a4a77a28b1b334055a233b12d4840653a80ac6339e66f8c120e0312889369bbdc71fa10661e7c407e WHIRLPOOL 3cb04ba5f7be18d0ab2302863c9419c5852dd67f954a385a94134c599fda590d9ed1c1bcf7190be28bdcd8edfd9c3a49c59aac56f6f3a2f393b33ebebc67fe0b
diff --git a/sys-apps/progress/progress-0.13.ebuild b/sys-apps/progress/progress-0.13.ebuild
new file mode 100644
index 000000000000..eaab9caea03b
--- /dev/null
+++ b/sys-apps/progress/progress-0.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
+HOMEPAGE="https://github.com/Xfennec/progress"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i \
+		-e '/CFLAGS/s:-g ::' \
+		Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	emake PREFIX="${D}/${EPREFIX}/usr" install
+	dodoc README.md
+}
diff --git a/sys-apps/progress/progress-0.9.ebuild b/sys-apps/progress/progress-0.9.ebuild
deleted file mode 100644
index 2ad11d24e21a..000000000000
--- a/sys-apps/progress/progress-0.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
-HOMEPAGE="https://github.com/Xfennec/progress"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i \
-		-e '/LDFLAGS/s:-lncurses:$(shell $(PKG_CONFIG) --libs ncurses):' \
-		-e 's:CFLAGS=-g:CFLAGS+=:' \
-		-e 's:gcc:$(CC):g' \
-		Makefile || die
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	emake PREFIX="${D}/${EPREFIX}/usr" install
-	dodoc README.md
-}
diff --git a/sys-apps/rigo-daemon/Manifest b/sys-apps/rigo-daemon/Manifest
deleted file mode 100644
index 520d012e476c..000000000000
--- a/sys-apps/rigo-daemon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/sys-apps/rigo-daemon/metadata.xml b/sys-apps/rigo-daemon/metadata.xml
deleted file mode 100644
index 15f07e411445..000000000000
--- a/sys-apps/rigo-daemon/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
-	<use>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/rigo-daemon/rigo-daemon-254.ebuild b/sys-apps/rigo-daemon/rigo-daemon-254.ebuild
deleted file mode 100644
index aeb9388cf8f0..000000000000
--- a/sys-apps/rigo-daemon/rigo-daemon-254.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MY_PN="RigoDaemon"
-DESCRIPTION="Entropy Client DBus Services, aka RigoDaemon"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-
-S="${WORKDIR}/entropy-${PV}/rigo/${MY_PN}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
-	sys-auth/polkit[introspection]
-	sys-devel/gettext"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	python_optimize "${D}/usr/lib/rigo/${MY_PN}"
-}
-
-pkg_preinst() {
-	# ask RigoDaemon to shutdown, if running
-	# TODO: this will be removed in future
-	local shutdown_exec=${EROOT}/usr/lib/rigo/${MY_PN}/shutdown.py
-	[[ -x "${shutdown_exec}" ]] && "${shutdown_exec}"
-}
diff --git a/sys-apps/sandbox/sandbox-2.10-r1.ebuild b/sys-apps/sandbox/sandbox-2.10-r1.ebuild
index 76397192ff2b..e22cefc52e6e 100644
--- a/sys-apps/sandbox/sandbox-2.10-r1.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${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"
+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
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index 999538ea43d3..6c8f7db5cba0 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,3 +1,3 @@
 DIST sdparm-1.07.tgz 309317 SHA256 c1d257ba97f37f99a602e889a73e4c62f9b374c5b979e33fc06963462f0c0e41 SHA512 2ae898e8088e1a65c11987ec813128a0f6d74345b5e460ac6cb375844483e2991647671f2d3fadcc7d7b85256c64128db05e5a169b7dad8fb83cddc06fb0ee6c WHIRLPOOL 21e5b8c9c08c2ae864c4f7d89a271cf5a9b13faf9e16a7739ef8d6165664ce682b74e521a306b07afd8e3ca356fd372a78619db72d6196dbc2e10abe4c2ff66b
-DIST sdparm-1.08.tgz 325255 SHA256 376b78a414b1a9c47f3f13dbeb963e7a3ec7be126f83927d6856b5f7ac425e57 SHA512 ae3ed5f0286447affe60a4e73887d5d3ffdae3afff0e5d2a7f34a89f3686272dde818b2a7ba4b930082744e8fcf75b1793c5bd9ee83a3bef2c4ae239aaf2eb4a WHIRLPOOL 939f27d343407b20dd33f7e37c15983dcf5f2fd6db953a5603a93561b3ed5ce3f5339aa69e6550ba4f7421067e0531ca6d5760518f120dc20398417721bbdb96
 DIST sdparm-1.09.tgz 348129 SHA256 7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3 SHA512 c26caedd1e8906cc47468279d5924315cbf42b929d1e348d6054971693475fc9c47becdcc5fbdf583efd6b46298671358237eb4049cac4cae8a43278eb30dae2 WHIRLPOOL 0c7e15e9e1ec1909020a3c6bfc4c3f676acbb1cd98aad9ccde1d43d2702573a963d78610e1ae6da215a48d1c8dcb36cd564909483ceab3712e06c1b6b3139e9b
+DIST sdparm-1.10.tgz 361464 SHA256 1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3 SHA512 1cfa95ced443d190ee9e4a899c9cfc6b98367ba39a9cc201c0db2f8c92dd4e74368182be3b8bfe28e51761b1ededf914ee669ef8ff6023d1ec1f05d69889a35f WHIRLPOOL 34b606c440ea0375927efa6136ff53554df9af282060ca58cf8edebe6c9aebce68c53e7498eec81a1422c1c4224b1746a55999250c0b2774b66f39a26148b0c7
diff --git a/sys-apps/sdparm/sdparm-1.08-r1.ebuild b/sys-apps/sdparm/sdparm-1.08-r1.ebuild
deleted file mode 100644
index 2ea280aabc96..000000000000
--- a/sys-apps/sdparm/sdparm-1.08-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"
-
-DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
-HOMEPAGE="http://sg.danny.cz/sg/sdparm.html"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-# Older releases contain a conflicting sas_disk_blink
-RDEPEND=">=sys-apps/sg3_utils-1.28"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog CREDITS README notes.txt )
-
-src_configure() {
-	# sdparm ships with a local copy of this lib, but will use the system copy if it
-	# detects it (see the README file).  Force the use of the system lib.  #479578
-	export ac_cv_lib_sgutils2_sg_ll_inquiry=yes
-	default
-}
-
-src_install() {
-	default
-
-	# These don't exist yet. Someone wanna copy hdparm's and make them work? :)
-	#newinitd ${FILESDIR}/sdparm-init-7 sdparm
-	#newconfd ${FILESDIR}/sdparm-conf.d.3 sdparm
-}
diff --git a/sys-apps/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.10.ebuild
new file mode 100644
index 000000000000..057cd7472f0f
--- /dev/null
+++ b/sys-apps/sdparm/sdparm-1.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
+HOMEPAGE="http://sg.danny.cz/sg/sdparm.html"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+# Older releases contain a conflicting sas_disk_blink
+RDEPEND=">=sys-apps/sg3_utils-1.39"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog CREDITS README notes.txt )
+
+src_configure() {
+	# sdparm ships with a local copy of this lib, but will use the system copy if it
+	# detects it (see the README file).  Force the use of the system lib.  #479578
+	export ac_cv_lib_sgutils2_sg_ll_inquiry=yes
+	default
+}
+
+src_install() {
+	default
+
+	# These don't exist yet. Someone wanna copy hdparm's and make them work? :)
+	#newinitd ${FILESDIR}/sdparm-init-1 sdparm
+	#newconfd ${FILESDIR}/sdparm-conf.d-1 sdparm
+}
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 73bfecd91d58..1528a69475a0 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,2 +1,3 @@
 DIST sg3_utils-1.40.tgz 1179730 SHA256 44a9ecfd3af018fa9f3586067a8fa5f4874451c3d773d74436d262a7e530ee83 SHA512 cf4909c46d509ea7c1c8930d81df2b20ce56c56092830f017e69fa4ce7eddb395ae1d17f51657d8dfb539fdd78229223e54e0db2d61d2612d23313cd6846043a WHIRLPOOL d092fdd6ab46da73cda9bf2b0a85dc468bb222a443ca20e8d2f55ad91ed83b8a523fbd4946cd2e40874a56673085629227996f1f5e686273c8d2d44093797687
 DIST sg3_utils-1.41.tgz 1194212 SHA256 c4e2893c36df1ee5b07840ab7c22129544f5dc8a55f7cc8815c9cd8e44ec31c0 SHA512 ceca778a2f4d16dd341dd47cc1d92df5bc85d7f75d75e6b7c1a99c31e03e98103a18abf624880172e162bd0b751f760f0e919cbbb989303a9e1fbe9ff3eb1f46 WHIRLPOOL 9476f0f180879f1386b824b367314648d616b6925ff7b735760f25de6e086e38efa0eb12dd8fb9f9305eb367f7d8c2053ceabc83fc6270492357abce25de9784
+DIST sg3_utils-1.42.tgz 1219231 SHA256 1dcb7a0309bd0ba3d4a83acb526973b80106ee26cd9f7398186cd3f0633c9ef3 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad WHIRLPOOL 7cf34461312c55031b317b18defb69b57190ca22e83a162e957e213c658f6cb990675ec60b78849da40f54679027fa27f0c809be568fb1bdd31a8498c8b8665f
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
new file mode 100644
index 000000000000..081198b4cf1b
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc COVERAGE doc/README examples/*.txt
+	newdoc scripts/README README.scripts
+
+	# Better fix for bug 231089; some packages look for sgutils2
+	local path lib
+	path="/usr/$(get_libdir)"
+	for lib in "${ED}"${path}/libsgutils2.*; do
+		lib=${lib##*/}
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+	done
+
+	prune_libtool_files
+}
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index 57cee363f869..7a4a395f2556 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the BSD License
 # $Id$
 
 extra_started_commands="reload dump check"
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild
deleted file mode 100644
index 39c51be6fdef..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15-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 eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="http://www.xinetd.org/"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="perl rpc tcpd"
-
-DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-	rpc? ( net-libs/libtirpc:= )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-config.patch
-	find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
-}
-
-src_configure() {
-	if ! use rpc ; then
-		append-cppflags -DNO_RPC
-		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
-	fi
-	tc-export AR PKG_CONFIG
-	LIBS=$(${PKG_CONFIG} --libs libtirpc) \
-	econf \
-		$(use_with tcpd libwrap) \
-		--with-loadavg
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install-contrib
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc AUDIT INSTALL README TODO CHANGELOG
-}
diff --git a/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch b/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
new file mode 100644
index 000000000000..128ac8ce311b
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
@@ -0,0 +1,23 @@
+Remove spurious \n to fix udev rule generation
+
+Steven Newbury <steve@snewbury.org.uk>:
+libfprint generates 60-fprint-autosuspend.rules for all supported devices, 
+however there's a spurious \n before the ', MODE="0666"' which results in it 
+appearing on a new line after the match criteria.  At least on current 
+systemd/udev this results in MODE="0666" being applied unconditionally to all 
+device nodes.  This is an extremely serious security problem and effectively 
+gives root access to all users simply by having the ebuild emerged.
+
+https://bugs.gentoo.org/562218
+
+--- a/libfprint/fprint-list-udev-rules.c
++++ b/libfprint/fprint-list-udev-rules.c
+@@ -74,7 +74,7 @@
+ 	if (num_printed == 0)
+ 	    printf ("# %s\n", driver->full_name);
+ 
+-	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\"\n, MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
++	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\", MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
+ 	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{LIBFPRINT_DRIVER}=\"%s\"\n", driver->id_table[i].vendor, driver->id_table[i].product, driver->full_name);
+ 	num_printed++;
+     }
diff --git a/sys-auth/libfprint/libfprint-0.6.0-r1.ebuild b/sys-auth/libfprint/libfprint-0.6.0-r1.ebuild
deleted file mode 100644
index 3da16ada856d..000000000000
--- a/sys-auth/libfprint/libfprint-0.6.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 autotools eutils udev vcs-snapshot
-
-MY_PV="V_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="http://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="http://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://dev.gentoo.org/~xmw/${P}_vfs0050.patch.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug static-libs vanilla"
-
-RDEPEND="virtual/libusb:1
-	dev-libs/glib:2
-	dev-libs/nss
-	x11-libs/pixman"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if ! use vanilla ; then
-		epatch "${WORKDIR}"/${P}_vfs0050.patch
-	fi
-
-	# upeke2 and fdu2000 were missing from all_drivers.
-	sed -e '/^all_drivers=/s:"$: upeke2 fdu2000":' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers=all \
-		$(use_enable debug debug-log) \
-		$(use_enable static-libs static) \
-		-enable-udev-rules \
-		--with-udev-rules-dir=$(get_udevdir)/rules.d
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..4597a21ead14
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils udev vcs-snapshot
+
+MY_PV="V_${PV//./_}"
+DESCRIPTION="library to add support for consumer fingerprint readers"
+HOMEPAGE="http://cgit.freedesktop.org/libfprint/libfprint/"
+SRC_URI="http://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	https://dev.gentoo.org/~xmw/${P}_vfs0050.patch.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug static-libs vanilla"
+
+RDEPEND="virtual/libusb:1
+	dev-libs/glib:2
+	dev-libs/nss
+	x11-libs/pixman"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-udev-rules.patch"
+)
+
+src_prepare() {
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/${P}_vfs0050.patch
+	fi
+
+	default
+
+	# upeke2 and fdu2000 were missing from all_drivers.
+	sed -e '/^all_drivers=/s:"$: upeke2 fdu2000":' \
+		-i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-drivers=all \
+		$(use_enable debug debug-log) \
+		$(use_enable static-libs static) \
+		-enable-udev-rules \
+		--with-udev-rules-dir=$(get_udevdir)/rules.d
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	dodoc AUTHORS HACKING NEWS README THANKS TODO
+}
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
index 189d108814a6..9ada93d2b8fb 100644
--- a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
+++ b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
@@ -1,10 +1,14 @@
---- src/Makefile.am	2006-12-30 01:00:22.000000000 -0600
-+++ src/Makefile.am	2006-12-30 01:01:11.000000000 -0600
+https://bugs.gentoo.org/159341
+
+fix the full path to the socket run dir
+
+--- src/Makefile.am
++++ src/Makefile.am
 @@ -20,7 +20,7 @@
  AM_CFLAGS = \
  	-DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
  	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
 -	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
-+	-DAVAHI_SOCKET=\"$(ROOT)var/run/avahi-daemon/socket\"
++	-DAVAHI_SOCKET=\"/var/run/avahi-daemon/socket\"
  
  #AM_CFLAGS += -DNDEBUG=1 -Os
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 4190f4031118..8f64d7f345de 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,4 +1,3 @@
 DIST di-4.35.tar.gz 212325 SHA256 2cdfface7a85e3a359cb228277b090a0648cabe18520e43b09919bdaf67b71d2 SHA512 5b7e7bd347b1ea285c4410e864f29cf475015a560baf450e558d3f8e1994b10822d6c3e18c04447c6a229d6d5e991194a4a3b155f3b36a8acfee866c8d048cec WHIRLPOOL 2891f70976f5818aa73ec3a07dc4afda678ae02c63b5a018cfb538a78d25f0432d70a7104ef1fe5f6e23e8e5f301430f4cc39b1538a83ea35d1a4748d4e55929
-DIST di-4.38.tar.gz 213584 SHA256 a8e721239ef16cd3645532be5788b47bd552c23491a688e06e633de10408d7f5 SHA512 a95ee5e7286ed755a4ef2e857831519f543c1432eb608fbb9dcf9cf3a979aa03e67cb765df19600149a59077c5db6c437fff61ac66e60a7b3c6160a2f59bf04f WHIRLPOOL 269e624696d7b82ade509f453fe1d26de70caa0a65095b62c7fbe4ccc13bde164dfb83076384b68ad86dcfc003b422b59032bd779e9a561ad73fb5cfb3e52177
-DIST di-4.40.tar.gz 219245 SHA256 cfff021f33cadcd8536967164ddbe2947c67b690b086b27e478540eedb002af1 SHA512 1f7aeed4f68b91dd6d2e0cfbafaa86d9b93d37c741b1087e3d9e788c34356878995485102f4018e48681925542a4814fa6245ccfa976c1c2ff406530715cde67 WHIRLPOOL fc2a6306a0c65dc16d1d3eee74630c272e4635df479b052376ea0030697dbe663c58c54cdffadf5930b8c69c7cd09430dcc90112ca19224de9048c422ef4ba3b
 DIST di-4.41.tar.gz 219347 SHA256 3ae850b160b42c3b77e42b79a4374a480eca671a83a35357078308f52f431c8b SHA512 a64eb086379d2917ec898f17ea32579f071923a2e7a729934ed649f00028c8804696f3d5ad0d10a127f8d9a669a211ec9bee0d3ba585b07996a986e9a6abe3b7 WHIRLPOOL 7c97565b75cc0af9c39bf2512da0eea2e3a43a2176e9abd73edfc744da30bf9770e88140b57100403659a0f1d3627984674d405590254f28b7af10dd55afc157
+DIST di-4.42.tar.gz 267259 SHA256 f61865a0f18de49caaa2bf40fe2ed1677a755173e9d3809111c8b668db4fd5c4 SHA512 87ac16f6a410ab7da4a68c28d9fddf4755c17233e35660d3a19bc6eb34e5e721365e5f7e8678103b9a12d85f13751d09b8854770eaedb740b4680de2e5500be4 WHIRLPOOL 4554726cd257a229d41c2969321ba12b7a516b12d3a33c3296bcc21d53e7c880fd46d801446ad9eee386f7d5cb6e12305abcda0f0b1e2f2b541c3e1925178fff
diff --git a/sys-block/di/di-4.40.ebuild b/sys-block/di/di-4.40.ebuild
deleted file mode 100644
index 42ea3cc89ab1..000000000000
--- a/sys-block/di/di-4.40.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="http://www.gentoo.com/di/"
-SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test" #405205, #405471
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.33-build.patch
-}
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README
-}
diff --git a/sys-block/di/di-4.38.ebuild b/sys-block/di/di-4.42.ebuild
index 42ea3cc89ab1..42ea3cc89ab1 100644
--- a/sys-block/di/di-4.38.ebuild
+++ b/sys-block/di/di-4.42.ebuild
diff --git a/sys-block/gparted/gparted-0.25.0.ebuild b/sys-block/gparted/gparted-0.25.0.ebuild
index e1e86eea5d63..c610c5beff7d 100644
--- a/sys-block/gparted/gparted-0.25.0.ebuild
+++ b/sys-block/gparted/gparted-0.25.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
 
 # FIXME: add gpart support
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 58da7eb0b064..d3def750ccd5 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,4 +1,2 @@
-DIST tgt-1.0.19.tar.gz 241676 SHA256 69fd9e9528a70c272bcc3cd00ad6754edd819a0a1ce0fad21587d33c457c6f68 SHA512 613b9fe18da5013e6e3db92ac8595c21a8f78768679750c6f920bf678c9edeb4e499ed33685019e6f7249f72bd017ed13f2c175f9b5fce7d5b5013b0c0c1a61f WHIRLPOOL c35cab8b5874e7385a51eed272d315db0a76e1c2d2f8f4068d2c3ff7ac0eea7d1c22dac82dded044a7dd11e7926973f01ba5a6fba292247a429aba1144ab3155
-DIST tgt-1.0.22.tar.gz 227522 SHA256 a23e97d9e1bd2b5f0be06c7f441f70b8fcc98ebf1ce61b57d0e81f60c1cbcc06 SHA512 bc1def6c1b95a13351f2e2351d795d5338f3fe68b921574619547399598ff5b0b958b71749ec94ebb6efe2bcd0f941db1641334fabb4ba49aeda9a126385fdfe WHIRLPOOL 5a1da8431575cecb034d83db2e23fbea68cf5f3d3e7fbe67bbc3f77525f91b1e9d4cf5832d84dc433eb41546bac421b97739f79144184b685375e0239534168e
-DIST tgt-1.0.24.tar.gz 231583 SHA256 43758d81345c176774c9ec3b823295c6b090ab60406cd47c7a636d77af4362bc SHA512 9afc1ee0d56df0ae7a8a12c33522aefd0bde2f2874fcd9f7fcbe33bcdb2852ae72e9a161dbcc6cac4f7d88b496476693701d11f1a42057e9cbb93e28af0113ae WHIRLPOOL 94711df40bbf7bea32f073c6a9e284203785217ae9811b8c072fc4487c88a6973ac2ffd62b44ce19ee894fa0ee94ed6efd4b1c1d7f706e782425d1a3bf08a3d3
 DIST tgt-1.0.60.tar.gz 295304 SHA256 619b5250e4bc63971a26c05a3eea353beb4009ed0ffa06aab5f8ee25346cfb0a SHA512 4abca297e89dd92d1d1480f26af39a80f1cb7cd67e54911f4bdf29db8531b1df51fe214af05e685270e439bf702d4805542773c29baecc7a94ef271b2a0b97fb WHIRLPOOL 26119b14f741f6094fc816f48a58f1694b47505e7a0963e10e2efdffd49782886735c9b2463850d7ad03c149293f4b31512ee1b994607a5bbd30f0cee56f68fd
+DIST tgt-1.0.63.tar.gz 295305 SHA256 18aa8ad63edae7f3705577580cdbd35e312371155a2cf2059bbe96ed46efef21 SHA512 d68509c2384f969794c3d26d8cdf2994f33cf70f20e207eea25031ad310ecdeea6883d74c4589d85bd168e4abfa293bdefaa35ae603732f187e127f8d0c7b037 WHIRLPOOL 440d2f7adac630f1f1a6a7262269835d47c1f1f2346703f84a813dc03a12dc57d6458e506c513d3a8cf3594b924246868b2772b11f0ab5eb109dbd4b3f15fdee
diff --git a/sys-block/tgt/tgt-1.0.19.ebuild b/sys-block/tgt/tgt-1.0.19.ebuild
deleted file mode 100644
index d7c0173183df..000000000000
--- a/sys-block/tgt/tgt-1.0.19.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=4
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="http://stgt.sourceforge.net/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ibmvio infiniband fcp fcoe"
-
-DEPEND="dev-perl/Config-General
-	infiniband? (
-		sys-infiniband/libibverbs
-		sys-infiniband/librdmacm
-	)"
-RDEPEND="${DEPEND}
-	sys-apps/sg3_utils"
-
-pkg_setup() {
-	CONFIG_CHECK="~SCSI_TGT"
-	WARNING_SCSI_TGT="Your kernel needs CONFIG_SCSI_TGT"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-
-	sed -e 's:\($(CC)\):\1 $(LDFLAGS):' -i usr/Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}
-	doinitd "${FILESDIR}/tgtd"
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.22.ebuild b/sys-block/tgt/tgt-1.0.22.ebuild
deleted file mode 100644
index b7517dac4834..000000000000
--- a/sys-block/tgt/tgt-1.0.22.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=4
-
-inherit flag-o-matic linux-info
-
-MY_TREE="3e216c9"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ibmvio infiniband fcp fcoe"
-
-DEPEND="dev-perl/Config-General
-	dev-libs/libxslt
-	infiniband? (
-		sys-infiniband/libibverbs
-		sys-infiniband/librdmacm
-	)"
-RDEPEND="${DEPEND}
-	sys-apps/sg3_utils"
-
-S="${WORKDIR}"/fujita-tgt-"${MY_TREE}"
-
-pkg_setup() {
-	CONFIG_CHECK="~SCSI_TGT"
-	WARNING_SCSI_TGT="Your kernel needs CONFIG_SCSI_TGT"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:\($(CC)\):\1 $(LDFLAGS):' usr/Makefile || die "sed failed"
-
-	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @install: all @g" doc/Makefile || die
-}
-
-src_compile() {
-	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}
-	doinitd "${FILESDIR}/tgtd"
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.24-r1.ebuild b/sys-block/tgt/tgt-1.0.24-r1.ebuild
deleted file mode 100644
index cccaeb8cad23..000000000000
--- a/sys-block/tgt/tgt-1.0.24-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit flag-o-matic linux-info toolchain-funcs
-
-MY_TREE="e039354"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ibmvio infiniband fcp fcoe"
-
-CDEPEND="dev-perl/Config-General
-	dev-libs/libxslt
-	infiniband? (
-		sys-infiniband/libibverbs
-		sys-infiniband/librdmacm
-	)"
-DEPEND="${CDEPEND}
-	app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
-	sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
-	CONFIG_CHECK="~SCSI_TGT"
-	WARNING_SCSI_TGT="Your kernel needs CONFIG_SCSI_TGT"
-	linux-info_pkg_setup
-	tc-export CC
-}
-
-src_prepare() {
-	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-
-	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @& all @g" doc/Makefile || die
-}
-
-src_compile() {
-	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-	emake -C doc
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}
-	newinitd "${FILESDIR}"/tgtd-${PV}.initd tgtd
-	newconfd "${FILESDIR}"/tgtd-${PV}.confd tgtd
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.63.ebuild b/sys-block/tgt/tgt-1.0.63.ebuild
new file mode 100644
index 000000000000..2fb5edb1350b
--- /dev/null
+++ b/sys-block/tgt/tgt-1.0.63.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+MY_TREE="eca74a7"
+
+DESCRIPTION="Linux SCSI target framework (tgt)"
+HOMEPAGE="http://stgt.sourceforge.net"
+SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fcoe fcp ibmvio infiniband rbd"
+
+CDEPEND="dev-perl/Config-General
+	dev-libs/libxslt
+	rbd? ( sys-cluster/ceph )
+	infiniband? (
+		sys-infiniband/libibverbs:=
+		sys-infiniband/librdmacm:=
+	)"
+DEPEND="${CDEPEND}
+	app-text/docbook-xsl-stylesheets"
+RDEPEND="${DEPEND}
+	dev-libs/libaio
+	sys-apps/sg3_utils"
+
+S=${WORKDIR}/fujita-tgt-${MY_TREE}
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
+
+	# make sure xml docs are generated before trying to install them
+	sed -i -e "s@install: @& all @g" doc/Makefile || die
+}
+
+src_compile() {
+	local myconf
+	use ibmvio && myconf="${myconf} IBMVIO=1"
+	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
+	use fcp && myconf="${myconf} FCP=1"
+	use fcoe && myconf="${myconf} FCOE=1"
+	use rbd && myconf="${myconf} CEPH_RBD=1"
+
+	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
+	emake -C doc
+}
+
+src_install() {
+	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
+	newinitd "${FILESDIR}"/tgtd.initd tgtd
+	newconfd "${FILESDIR}"/tgtd.confd tgtd
+	dodir /etc/tgt
+	keepdir /etc/tgt
+}
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 5bf58c4f92a4..f5238792cecb 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,17 +1,4 @@
-DIST raspberrypi-firmware-128fa52bbc-bootcode.bin 17816 SHA256 f89d19c5287e566320ecd7e1d70d649f308a1b9d05a29d88a0768c3ba7a2bd14 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 WHIRLPOOL 24e179152e392fc303e92cdfb8b4ef64e323736854bc826ddd0132a5652c9aa441027791781ff7f16fa7fb761485629977bd0882561b008fb66d4503be171e05
-DIST raspberrypi-firmware-128fa52bbc-fixup.dat 5890 SHA256 f49cf9395c034f9e53049dc47fb109dc8e4bba2ec70d754335fc12cd31618a93 SHA512 9037ac2a5becf1d51ee6e35899c0a3687cf0cd0e29818a129cf38d0ef4d488405dab6f99e0929fe2c1a6949aad7d42531df0dff7e2ce3a175ea241b74b9454b7 WHIRLPOOL be3eb0291644dabdc35393e4b5b5977eae8eb94caae966d0c345e663468872bf865fde5c25e4a88a9ce0e91c3b226c50e461ee20eecde61996029065719cc69f
-DIST raspberrypi-firmware-128fa52bbc-fixup_cd.dat 2032 SHA256 dfc0a24dcf746b8b328184245fc50fc819d2933694a10723597881c6dc29e239 SHA512 dfb9d77ac7bdc1868cfc2dbabdf138c6f24ee671d7d147a66b1f2192fac7abd7c5589a7b051c92c47513ee01f6452eee0c862336cfbaf6c441801fc223d233ca WHIRLPOOL 327561b3b852afbc956e5a963773951b23b5dce147cd775b5662f68a358a869b23e1c0edeafe5c5dfb912144625885d774fc8953adc71350aa909acb86327c5d
-DIST raspberrypi-firmware-128fa52bbc-fixup_x.dat 8840 SHA256 6d6bd941afbbe749868ee20eb6603289d7636dd7425a267a075ec053582e5c5b SHA512 5e1d983a90a31c93c7e6ebda733ac18ebf0a6368599f510b71025e7de0bb88aa1b1b90c4ab989011abfccaaad433ab9c032bd1126c7ee1c4b8c8644c3a69014c WHIRLPOOL bf200500f8eba4ae0ad990c8b624e46b19f7dc2f0e93045e2cf463d8cfd8c3ffbc7735f152f5e17186c5be6f508efc9bc4e7ee74f5a21a06eab88ddf2bae7d35
-DIST raspberrypi-firmware-128fa52bbc-start.elf 2690772 SHA256 baa329d7bf465050c3ba59a69b854954e673fb644508870343183a9a22460a13 SHA512 e19ccc57481653a54481b0064bc7a9e52e85ccbedd55e3a5249210af9b9bcd418fe5143c1a95c5431a1c443794a92ae22c7e5d4de68e13578528e94bfb6e8f09 WHIRLPOOL fdce4af4af8f1312cf298d62181a2b0cd2ee4ffe86f0f5c12eb5e1c207e8018ccb60c7a1be2a196fe26c9a358cc46186fbfb631984a52b9c950963b80e83fa41
-DIST raspberrypi-firmware-128fa52bbc-start_cd.elf 469240 SHA256 fcb6783d4b3b39f5ffd1b103e5273db43d86d09220d2c266476db62bf8283824 SHA512 f5222c8fa05fd7e72cb751f45170b1a92297180f3239c0d3ef20b1d5d1688152dbd80ade6e410a3234d8c680cb822eb439f78bc52066bbaf03e1dba4c8fbf0cd WHIRLPOOL bcb0a76d880ca46059658d3d1313a1bd5c86a80f7c4d613f6d376efbde0f1260c880a5c13786a13565a320a8275cf3414df7e7260b69fa091568f9e40c98b9ce
-DIST raspberrypi-firmware-128fa52bbc-start_x.elf 3658180 SHA256 0b07a170ff2b7618c1bb1e7edcc2b5ecd160d8a41dcbb43e052148fbea5cff1c SHA512 a82ac10583fcdf6f43a300ee5f05b6b614f96493949820b8b89c428cb02ed91bd35ae3fd5e6e360ef97b5dd6d248dd3c76de433c746ef3dd378d84eb725cfa0e WHIRLPOOL 1d84c05cbbb3306b2f32b0c67235b2a91038139f81c22238d6eea4b40ae89acaa3c41ef3001d54a673406a4568a6455f68d44982d8e903d17132a2b75d6ec135
-DIST raspberrypi-firmware-89ac8f4661-bootcode.bin 17816 SHA256 f89d19c5287e566320ecd7e1d70d649f308a1b9d05a29d88a0768c3ba7a2bd14 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 WHIRLPOOL 24e179152e392fc303e92cdfb8b4ef64e323736854bc826ddd0132a5652c9aa441027791781ff7f16fa7fb761485629977bd0882561b008fb66d4503be171e05
-DIST raspberrypi-firmware-89ac8f4661-fixup.dat 5886 SHA256 fbdfaa3ecd4c40ea2fe7b5d2c615bcd877bfbec44348231546c819c3c812382d SHA512 530581b4408897bb8766ea1dbd6b9dd84449b65c59eca1e3335b820a0ecc2e0fa483f0c8c005bdf07da23f593ec9e54c879747ad46159abd73f0a5dc3ba2fee3 WHIRLPOOL 2963854b08b745102e89bee86a1ddd6f8323f4c09945d8124751b740f4ec7db57bbdfae492b5eaf2f161b8794a2448d27a97a6d83eb7e493d58ffe7ce9bde157
-DIST raspberrypi-firmware-89ac8f4661-fixup_cd.dat 2032 SHA256 dfc0a24dcf746b8b328184245fc50fc819d2933694a10723597881c6dc29e239 SHA512 dfb9d77ac7bdc1868cfc2dbabdf138c6f24ee671d7d147a66b1f2192fac7abd7c5589a7b051c92c47513ee01f6452eee0c862336cfbaf6c441801fc223d233ca WHIRLPOOL 327561b3b852afbc956e5a963773951b23b5dce147cd775b5662f68a358a869b23e1c0edeafe5c5dfb912144625885d774fc8953adc71350aa909acb86327c5d
-DIST raspberrypi-firmware-89ac8f4661-fixup_x.dat 8840 SHA256 08b925a7736b078e0c85601a0dbba7519de8f1b158c8c35383048bcbb97be233 SHA512 9056da89cdb9c1ebe1a4ad075345a336353eb0de12c93f21b141888332cbaa2e3ee17bf0ada7d0d83fa5152391f39c422704a347edc48635260ce7de4933ad71 WHIRLPOOL e50a1a2015e7bc34cbf4400dea8cf2ec0869b874857d07e5d24396f800b76b02146f6cac62d6a0ada4fe8c726e9f2f08c9964aa460570d0e7ae38773f31ea532
-DIST raspberrypi-firmware-89ac8f4661-start.elf 2690740 SHA256 c7720243212c2ac3196c3ab3b3e93de85c5e18fcafd486b08cf88d96e100e2a7 SHA512 49f6753cc4f5fa7817698e22a2074424a762cd1b5660490547e80269f700fdf8c27dc5e05dab4975c5af7d683ccebaf531443303666384903c73c7bbe2f27672 WHIRLPOOL fe2640000a2f013d9b54d3e95e03bb534f40c546207dbd3b712e07d4988998d253a8262ccaccceaf3de4f425a31759c811f71f06e2a8ae02b164d05ca534bf63
-DIST raspberrypi-firmware-89ac8f4661-start_cd.elf 469240 SHA256 0f39571eb6b8b3062c50b26b03a040a0bd712421cfd2ed099cf979c2bb5dd749 SHA512 39957c205ed1f59a806f32888baf9e17d3db4d7b55fd0cae88280df111a4aee39e2d8688e689942d5cc273f25973e4109ef7314832abfd030b5d67481f0492e6 WHIRLPOOL b2ceb05277a23a6931ebf66d5787b717c2ab8be6bfa7cd1d6ba96008b4ca59a7481f13bbc6db39c2e0f6b141ade27ba71a11d9c6589445f391b8c9555c933220
-DIST raspberrypi-firmware-89ac8f4661-start_x.elf 3658180 SHA256 450ff0b13a8c232a8ddfccccfef9ddbf0093dbea0c0248a21d807e6640b88c47 SHA512 2499fa76249b2c7ffc8746479563be460d5f6dc3d484e3de8c7c4c7eeee5cd6aef1ab06d3eb726b1121ae39ca2e4ef0a99777064d5e9b9c4d10a914c41cfedc6 WHIRLPOOL 3f7e9c1c056440172092cb83d95e6ada19a39b4dcbf37dbe3fd2caade758f080411da559bba8412ce74547b787b936a28aea21a782f49eeebdb489e25bc67bdd
+DIST raspberrypi-firmware-1.20160209.tar.gz 114792438 SHA256 ca6a88db72e90ef821b8ca7755bbee9c1d5bdb9a621a45eb029af195d2d29751 SHA512 281092c11d422d821e5e2b0479c3b8f891f8df66cfbf931992902d759c99ed40cbb2d9fada1f944372e5bcd8af69784739e79e9912db3482892b10bf668611f2 WHIRLPOOL 81974a53562ee91544d7a01dc9f4f4173a6e882891f8cf744b700162ddd8f8607b1cfcbbde04cafe2bcea47489f9ea4fd8840adf776e806bef0dba574448e76e
 DIST raspberrypi-firmware-b2dbc04508-bootcode.bin 17816 SHA256 f89d19c5287e566320ecd7e1d70d649f308a1b9d05a29d88a0768c3ba7a2bd14 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 WHIRLPOOL 24e179152e392fc303e92cdfb8b4ef64e323736854bc826ddd0132a5652c9aa441027791781ff7f16fa7fb761485629977bd0882561b008fb66d4503be171e05
 DIST raspberrypi-firmware-b2dbc04508-fixup.dat 5742 SHA256 98b57d8c03426e31d60a3cfb2e2f7c3388978ab1d5591e97f9b8c05c42d44634 SHA512 f701fce3db35bfcd204ca7130aa0db1a77a5c83815409ac0b85f1a57e495aea6cbdf81db985436b33b8862545a271743ea2edefd3b7c9ac0a5e5e30bafd206f3 WHIRLPOOL 7ec85f32fa966ba70fc4c2973588b94c4b48baf9bf0916f71b71171445c2defeebd19cd79f35369fc87c69c58e10fd927de553dc02c8fcf0baf8cc0a2fd9125c
 DIST raspberrypi-firmware-b2dbc04508-fixup_cd.dat 2032 SHA256 98af02d14bc617af5d44be8c3e4d059e150b6de968dbff86a79cfa25eeaa2b57 SHA512 c6b8b6fb7bc99f77c3aee5d51e1e07a5f9c4119d2ec64ade335315c0c28a2f6d310463a48b0becb424198d3771dc079fda1c15bb03b18c125bfb1b32f5c9867f WHIRLPOOL 11b35f02cf50bc33b3a7d77066c7194ca0fa51b4d912e489ecc3097f300ab2604f404e7e18f29045236cb5df8d0e81fe466f991116c6df5bd58a77610a964cf5
@@ -19,10 +6,3 @@ DIST raspberrypi-firmware-b2dbc04508-fixup_x.dat 8693 SHA256 ace173aa32d389e49ff
 DIST raspberrypi-firmware-b2dbc04508-start.elf 2494932 SHA256 a83ac7c267fa9dc057bed1c04f7da973ee37c1471b669fd37e5a2edc4bafa9a3 SHA512 bc1f5590de691b10bd375bc20acfe18a8658e4109736af4280ef7a3331024b61162330d8d687aca7da78bdb160beefd8bc38c90791e3e320282b8e98e091f670 WHIRLPOOL 0e825e21491cfdb2099c2c9ba6e4858083a9d749a49b3a91fe0a31cf6ec9877958899f8c41f74f2d745b7264ffd2506f13ea894d45515d968b6bc0f3e118a339
 DIST raspberrypi-firmware-b2dbc04508-start_cd.elf 469560 SHA256 1f05ae4ab2446cee6aae264b55a37e9e9ca0ed116fbb88214680397d1d50885e SHA512 bbd4b519ef6f830db7efdbb62f7f308a6092b9e99279fea96307771da08bf12898c664165d6dbd556799162728a479c1d0e1f8fd67ef2c2a7c731354dbea9d99 WHIRLPOOL 9bf67424f34db9bf35c08a7a550ce0a554180210cdfdda53d30260a27b342f828a1e67a00b501af8a86cfedf5533b263122fbe0277d0bcbab22f9ce7389038e0
 DIST raspberrypi-firmware-b2dbc04508-start_x.elf 3462244 SHA256 f4d1636e6ccd4274256b496ad30e95681e0ad7ee790cd83fd90ac3dcfb569b23 SHA512 4efb07958838d339b5635465e890cc433d734a47a5ec2d3e8b512755decc4fbffdd6b68f14c09b63284215f6b9d7716c222d77f18de0c783daa895e208796d2d WHIRLPOOL 5e4db8cdd288ed56a0d9eb4afc1c311f745f1db9d9b71cbd3b85da803953f5847d041e6287a9c2c34cfd45efc7a765182beb1234040132b1add29037355a8bde
-DIST raspberrypi-firmware-e0590d6dda-bootcode.bin 17816 SHA256 f89d19c5287e566320ecd7e1d70d649f308a1b9d05a29d88a0768c3ba7a2bd14 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 WHIRLPOOL 24e179152e392fc303e92cdfb8b4ef64e323736854bc826ddd0132a5652c9aa441027791781ff7f16fa7fb761485629977bd0882561b008fb66d4503be171e05
-DIST raspberrypi-firmware-e0590d6dda-fixup.dat 5742 SHA256 98b57d8c03426e31d60a3cfb2e2f7c3388978ab1d5591e97f9b8c05c42d44634 SHA512 f701fce3db35bfcd204ca7130aa0db1a77a5c83815409ac0b85f1a57e495aea6cbdf81db985436b33b8862545a271743ea2edefd3b7c9ac0a5e5e30bafd206f3 WHIRLPOOL 7ec85f32fa966ba70fc4c2973588b94c4b48baf9bf0916f71b71171445c2defeebd19cd79f35369fc87c69c58e10fd927de553dc02c8fcf0baf8cc0a2fd9125c
-DIST raspberrypi-firmware-e0590d6dda-fixup_cd.dat 2032 SHA256 98af02d14bc617af5d44be8c3e4d059e150b6de968dbff86a79cfa25eeaa2b57 SHA512 c6b8b6fb7bc99f77c3aee5d51e1e07a5f9c4119d2ec64ade335315c0c28a2f6d310463a48b0becb424198d3771dc079fda1c15bb03b18c125bfb1b32f5c9867f WHIRLPOOL 11b35f02cf50bc33b3a7d77066c7194ca0fa51b4d912e489ecc3097f300ab2604f404e7e18f29045236cb5df8d0e81fe466f991116c6df5bd58a77610a964cf5
-DIST raspberrypi-firmware-e0590d6dda-fixup_x.dat 8693 SHA256 ace173aa32d389e49ff3f7b8bb94712ed175b390b6bc2b083adff2fabc119457 SHA512 ea407fd4b6422a7c932e118260cebd4c578a15bbbbea07e76bf1175b9bf9776e006172997d085e50a2a2a28965afd036a66450b1f0b17fcda741f9f02673c20f WHIRLPOOL 6fc13c0b98455d3601463dcfd8635ce63b5845e86847d8c42d19a9453ff34fcae1e0b5a1144d6152687b01910989c7f1528099924eceef6cfa2a55e48e7a2b34
-DIST raspberrypi-firmware-e0590d6dda-start.elf 2494932 SHA256 775e71dc2cbaeda0ec4c2808aa067a8a9399d981c402658626a9652035c12907 SHA512 94770089103cf19f20633e1a6fe821c416ade90f7522731855506f64e70ecf65b94a1a4c6777bdbe0ec78825ecb5163c54bc170b6b5ffd8aa89add43eef67929 WHIRLPOOL d18d5fa00a1a7c69245a11e5232c9e4d9bb058055f9b3098b1e0dc72046a26509c6870b5bf78447f506e7e305480fa89d5cccedb9c3f655fe3ffca34cc6ee938
-DIST raspberrypi-firmware-e0590d6dda-start_cd.elf 469560 SHA256 8cde5095b5ecfb0d9c82841dfc86fa07721ac3d0942f6fc6a3fe76273ea5b035 SHA512 d273c281415910cb279bebdbaeb88ecfb48d5601fa397a9dbe52176a0693cb264f48e4a17407f92c39bfedace184db11f6cdacf98f615aeec90373b2a39e53b1 WHIRLPOOL 96238b527d32d838e362ab6c6e6926bbaa3c263089d6e2e87be1958c2df441bb7001e77567c4d5517d2b7730b5ca960bab0bac9652f5da60db99c3b3a9745306
-DIST raspberrypi-firmware-e0590d6dda-start_x.elf 3462244 SHA256 280a9a87a674ec689585decc7ae73166cd798cdf85bf95d0c06f42b8616d5452 SHA512 4c24b7dcc7b7c6d7a17d00c4b56676493c6cf8d814b8ef716a91c8e73c69f0132f927771e8e17ef259b99b2f32a33e0387a6fd26e2e6f20bfaa699d167c8961b WHIRLPOOL f26bb41d888e3aa20a557a4e8612a0375ae4b8d683fa9280e3ff02b94ed6a76ca4acd0956c6ee89352cb54e997158335b32738f9e30925343677b127fb02bb64
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130722.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130722.ebuild
deleted file mode 100644
index 3ae177742881..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130722.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="Raspberry PI boot loader and firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-MY_COMMIT="89ac8f4661"
-SRC_URI=""
-for my_src_uri in bootcode.bin fixup{,_cd,_x}.dat start{,_cd,_x}.elf ; do
-	SRC_URI="${SRC_URI} https://github.com/raspberrypi/firmware/raw/${MY_COMMIT}/boot/${my_src_uri} -> ${PN}-${MY_COMMIT}-${my_src_uri}"
-done
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks strip"
-
-src_unpack() { :; }
-
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies durning install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-src_install() {
-	insinto /boot
-	local a
-	for a in ${A} ; do
-		newins "${DISTDIR}"/${a} ${a#${PN}-${MY_COMMIT}-}
-	done
-	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130815.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130815.ebuild
deleted file mode 100644
index cbd74834c127..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130815.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="Raspberry PI boot loader and firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-MY_COMMIT="e0590d6dda"
-SRC_URI=""
-for my_src_uri in bootcode.bin fixup{,_cd,_x}.dat start{,_cd,_x}.elf ; do
-	SRC_URI="${SRC_URI} https://github.com/raspberrypi/firmware/raw/${MY_COMMIT}/boot/${my_src_uri} -> ${PN}-${MY_COMMIT}-${my_src_uri}"
-done
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks strip"
-
-src_unpack() { :; }
-
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies durning install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-src_install() {
-	insinto /boot
-	local a
-	for a in ${A} ; do
-		newins "${DISTDIR}"/${a} ${a#${PN}-${MY_COMMIT}-}
-	done
-	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild
new file mode 100644
index 000000000000..4982885a739a
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20160209.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130807.ebuild,v 1.1 2013/08/15 18:21:47 xmw Exp $
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="Raspberry PI boot loader and firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+SRC_URI="https://github.com/raspberrypi/firmware/archive/1.20160209.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+KEYWORDS="~arm -*"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/${P/raspberrypi-}
+
+RESTRICT="binchecks strip"
+
+pkg_preinst() {
+	if ! grep "${ROOT}boot" /proc/mounts >/dev/null 2>&1; then
+		ewarn "${ROOT}boot is not mounted, the files might not be installed at the right place"
+	fi
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	rm boot/{kernel{,7}.img,COPYING.linux,LICENCE.broadcom} || die
+	insinto /boot
+	doins -r boot/*
+
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+DOC_CONTENTS=" config.txt and cmdline.txt need to be generated by you
+More information here:
+https://www.raspberrypi.org/documentation/configuration/config-txt.md
+Another good source http://elinux.org/RPi_config.txt
+http://elinux.org/RPi_cmdline.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130801.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130801.ebuild
deleted file mode 100644
index 89c4f48183b8..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130801.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="Raspberry PI boot loader and firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-MY_COMMIT="128fa52bbc"
-SRC_URI=""
-for my_src_uri in bootcode.bin fixup{,_cd,_x}.dat start{,_cd,_x}.elf ; do
-	SRC_URI="${SRC_URI} https://github.com/raspberrypi/firmware/raw/${MY_COMMIT}/boot/${my_src_uri} -> ${PN}-${MY_COMMIT}-${my_src_uri}"
-done
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-KEYWORDS="~arm -*"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!sys-boot/raspberrypi-loader"
-
-S=${WORKDIR}
-
-RESTRICT="binchecks strip"
-
-src_unpack() { :; }
-
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies durning install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-src_install() {
-	insinto /boot
-	local a
-	for a in ${A} ; do
-		newins "${DISTDIR}"/${a} ${a#${PN}-${MY_COMMIT}-}
-	done
-	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-cluster/ceph/ceph-10.0.0.ebuild b/sys-cluster/ceph/ceph-10.0.0.ebuild
index acb485b4278a..ad1f5a7d225f 100644
--- a/sys-cluster/ceph/ceph-10.0.0.ebuild
+++ b/sys-cluster/ceph/ceph-10.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ else
 fi
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd ${scm_eclass}
+inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd versionator ${scm_eclass}
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
@@ -90,6 +90,8 @@ check-reqs_export_vars() {
 		export CHECKREQS_DISK_BUILD="1400M"
 		export CHECKREQS_DISK_USR="450M"
 	fi
+
+	export CHECKREQS_MEMORY="7G"
 }
 
 user_setup() {
@@ -184,3 +186,11 @@ src_install() {
 
 	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 9.0 ${REPLACING_VERSIONS}; then
+		ewarn "You've upgraded ceph from old version, please fix the permission issue"
+		ewarn "Please refer section 4) in README.gentoo doc for detail info"
+		ewarn "  bzless /usr/share/doc/${P}/README.gentoo.bz2"
+	fi
+}
diff --git a/sys-cluster/ceph/ceph-9.2.0.ebuild b/sys-cluster/ceph/ceph-9.2.0.ebuild
index 434fd90e1a2e..a3999e0accac 100644
--- a/sys-cluster/ceph/ceph-9.2.0.ebuild
+++ b/sys-cluster/ceph/ceph-9.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ else
 fi
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd ${scm_eclass}
+inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd versionator ${scm_eclass}
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
@@ -90,6 +90,8 @@ check-reqs_export_vars() {
 		export CHECKREQS_DISK_BUILD="9G"
 		export CHECKREQS_DISK_USR="450M"
 	fi
+
+	export CHECKREQS_MEMORY="7G"
 }
 
 user_setup() {
@@ -184,3 +186,11 @@ src_install() {
 
 	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 9.0 ${REPLACING_VERSIONS}; then
+		ewarn "You've upgraded ceph from old version, please fix the permission issue"
+		ewarn "Please refer section 4) in README.gentoo doc for detail info"
+		ewarn "  bzless /usr/share/doc/${P}/README.gentoo.bz2"
+	fi
+}
diff --git a/sys-cluster/ceph/files/README.gentoo b/sys-cluster/ceph/files/README.gentoo
index c59612081366..6e5f8366136c 100644
--- a/sys-cluster/ceph/files/README.gentoo
+++ b/sys-cluster/ceph/files/README.gentoo
@@ -17,9 +17,14 @@
    net-misc/openntpd
    net-misc/chrony
 
-4) Starting from version 9.0.x, Ceph daemons run as ‘ceph’ user instead root.
-   In order to fix this, we suggest to stop ceph daemons, and fix ownership
+4) Starting from version 9.0.x, Ceph daemons run as user 'ceph' instead of 'root'.
+   In order to solve this, we recommand to stop ceph daemons, and fix the ownership
 
-    chown -R ceph:ceph /var/lib/ceph
+    # chown -R ceph:ceph /var/lib/ceph
+
+    or
+
+    Add the following line to ceph.conf on all hosts:
+    " setuser match path = /var/lib/ceph/$type/$cluster-$id "
 
     https://ceph.com/releases/v9-2-0-infernalis-released/
diff --git a/sys-cluster/gfs-kernel/Manifest b/sys-cluster/gfs-kernel/Manifest
deleted file mode 100644
index 149dc40c95f1..000000000000
--- a/sys-cluster/gfs-kernel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cluster-2.03.09.tar.gz 1784357 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28 WHIRLPOOL 30158d495677d9cd0d8a8915dd062f75b60ca99a5d937fa10862d746608bab0e500565e94d14f6b2a4f6e8dc13674d342347aecd24546df6d3f578c0cf87113d
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-2.03.09.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-2.03.09.ebuild
deleted file mode 100644
index 4d471f62831a..000000000000
--- a/sys-cluster/gfs-kernel/gfs-kernel-2.03.09.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils linux-mod versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="GFS kernel module"
-HOMEPAGE="https://sources.redhat.com/cluster/wiki/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	case ${KV_FULL} in
-		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--kernel_src="${KERNEL_DIR}" \
-			--disable_kernel_check \
-	) || die "configure problem"
-
-	(cd "${S}"/src/gfs;
-		emake clean all \
-	) || die "compile problem"
-}
-
-src_install() {
-	(cd "${S}"/src/gfs;
-		emake DESTDIR="${D}" module_dir="${D}"/lib/modules/${KV_FULL} install \
-	) || die "install problem"
-
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/gfs-kernel/metadata.xml b/sys-cluster/gfs-kernel/metadata.xml
deleted file mode 100644
index 4a09d7ba8d61..000000000000
--- a/sys-cluster/gfs-kernel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/pacemaker-gui/Manifest b/sys-cluster/pacemaker-gui/Manifest
deleted file mode 100644
index 2d2463f06810..000000000000
--- a/sys-cluster/pacemaker-gui/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pacemaker-gui-2.1.2.tar.gz 398311 SHA256 9c431916a186c027fe714b46acf84f017440ed120cdca174cf244cd946fbfac3 SHA512 7d1bffbe6478a250452ce692371f2e47d6cba11eaa2a7684e99cf2befdb32662c092d0e6b59973fe076ed9ce640082fd4ebb3e7b7cd8730cfa697af82dfdf06f WHIRLPOOL 3f2913a283d9a2ef18153d10f477348e15c292a19070173dec761e0f5aee2999c7395476e237e6d5690efdc29d9157de4a0d6ef2280b46f7c8895057b3850428
diff --git a/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.1.1-doc.patch b/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.1.1-doc.patch
deleted file mode 100644
index 8e89cc177516..000000000000
--- a/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.1.1-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am	2010-03-26 12:05:47.000000000 +0100
-+++ Makefile.am.doc	2010-07-02 14:53:52.429888536 +0200
-@@ -41,7 +41,7 @@
- SNMP_SUBAGENT_DIR = snmp_subagent
- endif
- 
--SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR) doc
-+SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR)
- 
- tgz:
- 	rm -f $(TARFILE)
diff --git a/sys-cluster/pacemaker-gui/files/pacemaker-mgmt-query-node-uuid.patch b/sys-cluster/pacemaker-gui/files/pacemaker-mgmt-query-node-uuid.patch
deleted file mode 100644
index 72d1ff5d183d..000000000000
--- a/sys-cluster/pacemaker-gui/files/pacemaker-mgmt-query-node-uuid.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mgmt/daemon/mgmt_crm.c b/mgmt/daemon/mgmt_crm.c
-index 9e5140c..3b5ff36 100644
---- a/mgmt/daemon/mgmt_crm.c
-+++ b/mgmt/daemon/mgmt_crm.c
-@@ -1602,7 +1602,7 @@ on_cleanup_rsc(char* argv[], int argc)
- 	delete_lrm_rsc(crmd_channel, argv[1], argv[2]);
- 	refresh_lrm(crmd_channel, NULL); 
- 	
--	rc = query_node_uuid(cib_conn, argv[1], &dest_node);
-+	rc = query_node_uuid(cib_conn, argv[1], &dest_node, NULL);
- 	if (rc != 0) {
- 		mgmt_log(LOG_WARNING, "Could not map uname=%s to a UUID: %s\n",
- 				argv[1], pcmk_strerror(rc));
diff --git a/sys-cluster/pacemaker-gui/metadata.xml b/sys-cluster/pacemaker-gui/metadata.xml
deleted file mode 100644
index 9c0b44cceb3e..000000000000
--- a/sys-cluster/pacemaker-gui/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Pacemaker python GUI and management daemon</longdescription>
-	<use>
-		<flag name="heartbeat">Enable support for heartbeat based <pkg>sys-cluster/pacemaker</pkg>.</flag>
-		<flag name="gtk">Enable the GTK+ based GUI client.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">gao-yan/pacemaker-mgmt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.2.ebuild b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.2.ebuild
deleted file mode 100644
index 2e373c5bf841..000000000000
--- a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="2"
-MY_P="pacemaker-mgmt-${PV}"
-MY_TREE="3c95739"
-
-inherit python base autotools
-
-DESCRIPTION="Pacemaker python GUI and management daemon"
-HOMEPAGE="http://hg.clusterlabs.org/pacemaker/pygui/"
-SRC_URI="https://github.com/gao-yan/pacemaker-mgmt/tarball/${MY_P} -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="-gtk heartbeat nls snmp static-libs"
-
-CDEPEND="
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libxslt
-	dev-libs/openssl
-	net-libs/gnutls
-	sys-apps/util-linux
-	sys-cluster/cluster-glue
-	>=sys-cluster/pacemaker-1.1
-	heartbeat? ( sys-cluster/pacemaker[heartbeat] )
-	gtk? (
-		dev-python/pygtk
-		)
-	sys-libs/ncurses
-	sys-libs/pam
-	sys-libs/zlib"
-RDEPEND="${CDEPEND}
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	gtk? ( dev-lang/swig )
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)"
-
-S="${WORKDIR}/gao-yan-pacemaker-mgmt-${MY_TREE}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.1-doc.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	base_src_prepare
-	# FIXME upstream said they will find a way to avoid this patch
-	if has_version ">sys-cluster/pacemaker-1.1.8"; then
-		epatch "${FILESDIR}"/pacemaker-mgmt-query-node-uuid.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-	use heartbeat || myopts="--with-ais-support"
-	econf $(use_with heartbeat heartbeat-support) \
-		$(use_enable snmp) \
-		$(use_enable nls) \
-		$(use_enable gtk mgmt-client) \
-		$(use_enable static-libs static) \
-		${myopts} \
-		--disable-fatal-warnings
-}
-
-src_install() {
-	base_src_install
-	use static-libs || find "${D}"/usr/$(get_libdir)/ -name "*.la" -delete
-	dodoc README doc/AUTHORS || die
-}
-
-pkg_postinst() {
-	elog "IMPORTANT: To have the mgmtd daemon started with your cluster,"
-	elog "you must add this directive in /etc/corosync/service.d/pacemaker :"
-	elog ""
-	elog "use_mgmtd: 1"
-	elog ""
-	elog "NB: To access the GUI, your user must be part of the 'haclient' group"
-}
diff --git a/sys-cluster/xgridagent/Manifest b/sys-cluster/xgridagent/Manifest
deleted file mode 100644
index ad274abc14ff..000000000000
--- a/sys-cluster/xgridagent/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xgridagent-1.0.tar.gz 105965 SHA256 fa8bb477eb0682ffd98efe9e4caa107aacc94b44acac41857a4d0b2d96ab3ea0 SHA512 c2adfe434f4811b855c81cf2d61559ccad5577fd97da3ecf78a7d82129510f750bf97ec3a2daef0b14d3f3e50a2aaeea98e23bc3f939b52df2194b06e11eb13c WHIRLPOOL 8a0711c7c5deadece987dc49314eee8d819dc0f4893c952279d8bacc2a396fe4893c08c364948980526b5c01f1cbc344c5591cfbff21009f999a77ea8f5d8731
diff --git a/sys-cluster/xgridagent/metadata.xml b/sys-cluster/xgridagent/metadata.xml
deleted file mode 100644
index 4a09d7ba8d61..000000000000
--- a/sys-cluster/xgridagent/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/xgridagent/xgridagent-1.0.ebuild b/sys-cluster/xgridagent/xgridagent-1.0.ebuild
deleted file mode 100644
index 6aa4db82c76d..000000000000
--- a/sys-cluster/xgridagent/xgridagent-1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="A simple system for setting up and using a cluster of OS X machines"
-HOMEPAGE="http://www.novajo.ca/xgridagent/"
-SRC_URI="http://www.novajo.ca/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-DEPEND=">=net-libs/roadrunner-0.9.1"
-
-src_compile() {
-	econf \
-		--with-roadrunner-includedir=/usr/include/roadrunner-1.0 \
-		--with-roadrunner-libdir=/usr/lib || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin xgridagent
-	dodoc README
-	insinto /usr/share/${PN}
-	doins xgrid.config.xml
-}
diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild b/sys-devel/autogen/autogen-5.18.4.ebuild
index a3969ab0b246..8fa001bcea3f 100644
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-1.8
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index d3c9b9cb2d22..64f982b35279 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
@@ -29,8 +29,8 @@ src_prepare() {
 	# The makefiles make the man page depend on the configure script
 	# which we patched above.  Touch it to prevent regeneration.
 	touch doc/bison.1 #548778 #538300#9
-	# Avoid regenerating the info page when the timezone is diff.
-	touch doc/bison.info #574492
+	# Avoid regenerating the info page when the timezone is diff. #574492
+	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
 }
 
 src_configure() {
diff --git a/sys-devel/clang/clang-3.8.0_rc1-r100.ebuild b/sys-devel/clang/clang-3.8.0_rc2-r100.ebuild
index 1ba7a7085955..1ba7a7085955 100644
--- a/sys-devel/clang/clang-3.8.0_rc1-r100.ebuild
+++ b/sys-devel/clang/clang-3.8.0_rc2-r100.ebuild
diff --git a/sys-devel/crossdev/crossdev-20151026-r1.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
new file mode 100644
index 000000000000..d9e38620c110
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_prepare() {
+	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+}
+
+src_install() {
+	default
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 3b816c239cff..d9e38620c110 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
+inherit eutils
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
@@ -25,9 +26,14 @@ IUSE=""
 RDEPEND=">=sys-apps/portage-2.1
 	>=app-portage/portage-utils-0.55
 	app-shells/bash
+	sys-apps/gentoo-functions
 	!sys-devel/crossdev-wrappers"
 DEPEND="app-arch/xz-utils"
 
+src_prepare() {
+	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+}
+
 src_install() {
 	default
 	if [[ "${PV}" == "99999999" ]] ; then
diff --git a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
new file mode 100644
index 000000000000..8607fc134836
--- /dev/null
+++ b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
@@ -0,0 +1,11 @@
+--- crossdev.orig	2016-02-18 12:28:49.926442767 -0200
++++ crossdev	2016-02-18 12:32:25.962433210 -0200
+@@ -15,7 +15,7 @@
+ 
+ CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage"
+ 
+-source /etc/init.d/functions.sh || exit 1
++source /lib/gentoo/functions.sh || exit 1
+ esyslog() { :; }
+ die_logs() {
+ 	echo
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index a56f53553249..2cabbb18fdb1 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,4 +1,3 @@
 DIST gdb-7.10.1.tar.xz 18531436 SHA256 25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 WHIRLPOOL 02936f59d3f3f8a57966c72402f1da128dd8e10e686097ffdb3a2741cc0c1831ef27f97daa047fa006ff2ae9f79ae0480f6f0dc2d3f5904190a1dade0590c837
-DIST gdb-7.10.tar.xz 18540820 SHA256 7ebdaa44f9786ce0c142da4e36797d2020c55fa091905ac5af1846b5756208a8 SHA512 4d9d7b536ad46f881689fca9f3f0b60268ff413c7900115fed5030d81d1d794793cc51d51510584ea1a63fe5891d006a9867ba36981b86b50806d469b717457d WHIRLPOOL b245ab66171c5bc04fc828a94a7c532ab18c358ee865993cd6e934aba22a45a254ed4b5942a1c5ddb60b5a5fcf81cb493fc275d8a5782d3b32b15b23339b4e43
-DIST gdb-7.8.2.tar.xz 17678568 SHA256 605954d5747d5f08ea4b7f48e958d1ebbf39265e18f7f36738deeabb83744485 SHA512 face5bf1b4ce144fc8604fc84620beed956177a11fd632b4e41906fc7f632910b2b43a50e6cfdfd6cbd876ee527c813bddab8df29dc560a6c36694cdb8edc4e4 WHIRLPOOL b0e5adc8e98c8363c25b86a8f47d07863a97f215c74b4fe2fcce4e72ce82867bafea60cb51d26f3814e895a93e047ca962b19fb2557e9c74a0ab3d88b1e6ee1d
+DIST gdb-7.11.tar.xz 18934392 SHA256 7a434116cb630d77bb40776e8f5d3937bed11dea56bafebb4d2bc5dd389fe5c1 SHA512 eadd2a59a1e48b1484eb2bea85256d6b1912926bc8b690793d02babf2639608bd22a0f2de77d4f60092da3b1dafeaa6d75a7cff3e84bd4e22fc46364b68e5e9f WHIRLPOOL 9ae283b05b278ec2844aa3cf54193d9fd5735508e2eb60c0d741f719f1598b4e374dab6d4ee48d78323b0b8038715969d20435f1b8ce20775f2b3f072759c994
 DIST gdb-7.9.1.tar.xz 17867692 SHA256 cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 WHIRLPOOL fe7afb392f453fa5aab290da3b74118c4e3bbae6f4e276f2efd7f978e3987e031d92ecd90d35e0531901f1cf68b04a313df050b25bb3b632d1b6e62360acd591
diff --git a/sys-devel/gdb/gdb-7.10-r1.ebuild b/sys-devel/gdb/gdb-7.10-r1.ebuild
deleted file mode 100644
index 8d9e6c989a8c..000000000000
--- a/sys-devel/gdb/gdb-7.10-r1.ebuild
+++ /dev/null
@@ -1,234 +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 flag-o-matic eutils python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-9999*)
-	# live git tree
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
-	SRC_URI=""
-	;;
-*.*.50.2???????)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-	;;
-*.*.*.*.*.*)
-	# fedora versions; note we swap the rpm & fedora core versions.
-	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
-	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
-	inherit versionator rpm
-	gvcr() { get_version_component_range "$@"; }
-	parse_fedora_ver() {
-		set -- $(get_version_components)
-		MY_PV=$(gvcr 1-$(( $# - 2 )))
-		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
-	}
-	parse_fedora_ver
-	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
-esac
-
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-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"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( client server )
-"
-
-RDEPEND="server? ( !dev-util/gdbserver )
-	client? (
-		>=sys-libs/ncurses-5.2-r2:0=
-		sys-libs/readline:0=
-		expat? ( dev-libs/expat )
-		lzma? ( app-arch/xz-utils )
-		python? ( ${PYTHON_DEPS} )
-		sys-libs/zlib
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	client? (
-		virtual/yacc
-		test? ( dev-util/dejagnu )
-		nls? ( sys-devel/gettext )
-	)"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
-	! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	epatch_user
-	strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	local myconf=(
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-	)
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	if use server && ! use client ; then
-		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
-		myconf+=( --program-transform-name='' )
-	else
-		# gdbserver only works for native targets (CHOST==CTARGET).
-		# it also doesn't support all targets, so rather than duplicate
-		# the target list (which changes between versions), use the
-		# "auto" value when things are turned on.
-		is_cross \
-			&& myconf+=( --disable-gdbserver ) \
-			|| myconf+=( $(use_enable server gdbserver auto) )
-	fi
-
-	if ! ( use server && ! use client ) ; then
-		# if we are configuring in the top level, then use all
-		# the additional global options
-		myconf+=(
-			--enable-64-bit-bfd
-			--disable-install-libbfd
-			--disable-install-libiberty
-			# Disable guile for now as it requires guile-2.x #562902
-			--without-guile
-			# This only disables building in the readline subdir.
-			# For gdb itself, it'll use the system version.
-			--disable-readline
-			--with-system-readline
-			# This only disables building in the zlib subdir.
-			# For gdb itself, it'll use the system version.
-			--without-zlib
-			--with-system-zlib
-			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-			$(use_with expat)
-			$(use_with lzma)
-			$(use_enable nls)
-			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPYTHON}")
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	nonfatal emake check || ewarn "tests failed"
-}
-
-src_install() {
-	use server && ! use client && cd gdb/gdbserver
-	default
-	use client && find "${ED}"/usr -name libiberty.a -delete
-	cd "${S}"
-
-	# Delete translations that conflict with binutils-libs. #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -r "${ED}"/usr/share/{doc,info,locale}
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-	# Install it by hand for now:
-	# http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
-	if use client ; then
-		docinto gdb
-		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
-	fi
-	docinto sim
-	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
-	if use server ; then
-		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild
index e83f85ceba95..068546b3713b 100644
--- a/sys-devel/gdb/gdb-7.10.1.ebuild
+++ b/sys-devel/gdb/gdb-7.10.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit flag-o-matic eutils python-single-r1
 
@@ -57,7 +57,8 @@ 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"
+	# alpha #562128
+	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"
 REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-7.11.ebuild b/sys-devel/gdb/gdb-7.11.ebuild
new file mode 100644
index 000000000000..0b17d455d19c
--- /dev/null
+++ b/sys-devel/gdb/gdb-7.11.ebuild
@@ -0,0 +1,235 @@
+# 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,3_5} )
+
+inherit flag-o-matic eutils python-single-r1
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+9999*)
+	# live git tree
+	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+	inherit git-2
+	SRC_URI=""
+	;;
+*.*.50.2???????)
+	# weekly snapshots
+	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+	;;
+*.*.*.*.*.*)
+	# fedora versions; note we swap the rpm & fedora core versions.
+	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
+	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
+	inherit versionator rpm
+	gvcr() { get_version_component_range "$@"; }
+	parse_fedora_ver() {
+		set -- $(get_version_components)
+		MY_PV=$(gvcr 1-$(( $# - 2 )))
+		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
+	}
+	parse_fedora_ver
+	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+	;;
+esac
+
+PATCH_VER=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="http://sourceware.org/gdb/"
+SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	# alpha #562128
+	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"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	|| ( client server )
+"
+
+RDEPEND="server? ( !dev-util/gdbserver )
+	client? (
+		>=sys-libs/ncurses-5.2-r2:0=
+		sys-libs/readline:0=
+		expat? ( dev-libs/expat )
+		lzma? ( app-arch/xz-utils )
+		python? ( ${PYTHON_DEPS} )
+		sys-libs/zlib
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	client? (
+		virtual/yacc
+		test? ( dev-util/dejagnu )
+		nls? ( sys-devel/gettext )
+	)"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
+	! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	epatch_user
+	strip-linguas -u bfd/po opcodes/po
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	if use server && ! use client ; then
+		# just configure+build in the gdbserver subdir to speed things up
+		cd gdb/gdbserver
+		myconf+=( --program-transform-name='' )
+	else
+		# gdbserver only works for native targets (CHOST==CTARGET).
+		# it also doesn't support all targets, so rather than duplicate
+		# the target list (which changes between versions), use the
+		# "auto" value when things are turned on.
+		is_cross \
+			&& myconf+=( --disable-gdbserver ) \
+			|| myconf+=( $(use_enable server gdbserver auto) )
+	fi
+
+	if ! ( use server && ! use client ) ; then
+		# if we are configuring in the top level, then use all
+		# the additional global options
+		myconf+=(
+			--enable-64-bit-bfd
+			--disable-install-libbfd
+			--disable-install-libiberty
+			# Disable guile for now as it requires guile-2.x #562902
+			--without-guile
+			# This only disables building in the readline subdir.
+			# For gdb itself, it'll use the system version.
+			--disable-readline
+			--with-system-readline
+			# This only disables building in the zlib subdir.
+			# For gdb itself, it'll use the system version.
+			--without-zlib
+			--with-system-zlib
+			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+			$(use_with expat)
+			$(use_with lzma)
+			$(use_enable nls)
+			$(use multitarget && echo --enable-targets=all)
+			$(use_with python python "${EPYTHON}")
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	nonfatal emake check || ewarn "tests failed"
+}
+
+src_install() {
+	use server && ! use client && cd gdb/gdbserver
+	default
+	use client && find "${ED}"/usr -name libiberty.a -delete
+	cd "${S}"
+
+	# Delete translations that conflict with binutils-libs. #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -r "${ED}"/usr/share/{doc,info,locale}
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+	# Install it by hand for now:
+	# http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
+
+	if use client ; then
+		docinto gdb
+		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	fi
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdb/gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-7.8.2.ebuild b/sys-devel/gdb/gdb-7.8.2.ebuild
deleted file mode 100644
index 8fe989bf270d..000000000000
--- a/sys-devel/gdb/gdb-7.8.2.ebuild
+++ /dev/null
@@ -1,208 +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 flag-o-matic eutils python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
-	;;
-9999*)
-	# live git tree
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
-	SRC_URI=""
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
-esac
-
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-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"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( client server )
-"
-
-RDEPEND="server? ( !dev-util/gdbserver )
-	client? (
-		>=sys-libs/ncurses-5.2-r2:0=
-		sys-libs/readline:0=
-		expat? ( dev-libs/expat )
-		lzma? ( app-arch/xz-utils )
-		python? ( ${PYTHON_DEPS} )
-		zlib? ( sys-libs/zlib )
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	client? (
-		virtual/yacc
-		test? ( dev-util/dejagnu )
-		nls? ( sys-devel/gettext )
-	)"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
-	! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	epatch_user
-	strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	local myconf=(
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-	)
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	if use server && ! use client ; then
-		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
-		myconf+=( --program-transform-name='' )
-	else
-		# gdbserver only works for native targets (CHOST==CTARGET).
-		# it also doesn't support all targets, so rather than duplicate
-		# the target list (which changes between versions), use the
-		# "auto" value when things are turned on.
-		is_cross \
-			&& myconf+=( --disable-gdbserver ) \
-			|| myconf+=( $(use_enable server gdbserver auto) )
-	fi
-
-	if ! ( use server && ! use client ) ; then
-		# if we are configuring in the top level, then use all
-		# the additional global options
-		myconf+=(
-			--enable-64-bit-bfd
-			--disable-install-libbfd
-			--disable-install-libiberty
-			# Disable guile for now as it requires guile-2.x #562902
-			--without-guile
-			# This only disables building in the readline subdir.
-			# For gdb itself, it'll use the system version.
-			--disable-readline
-			--with-system-readline
-			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-			$(use_with expat)
-			$(use_with lzma)
-			$(use_enable nls)
-			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPYTHON}")
-			$(use_with zlib)
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	nonfatal emake check || ewarn "tests failed"
-}
-
-src_install() {
-	use server && ! use client && cd gdb/gdbserver
-	default
-	use client && find "${ED}"/usr -name libiberty.a -delete
-	cd "${S}"
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -r "${ED}"/usr/share/{doc,info,locale}
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-	# Install it by hand for now:
-	# http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
-	if use client ; then
-		docinto gdb
-		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
-	fi
-	docinto sim
-	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
-	if use server ; then
-		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 8d9e6c989a8c..50b169954b79 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit flag-o-matic eutils python-single-r1
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 28dd9b2a8572..57e3b37d79fd 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -5,14 +5,14 @@ DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 4feb575f74fb3a74b6245400460230141bf610f
 DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512 ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03 WHIRLPOOL a17419cea329999c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8
 DIST cfe-3.7.0.src.tar.xz 9147204 SHA256 4ed740c5a91df1c90a4118c5154851d6a475f39a91346bdf268c1c29c13aa1cc SHA512 099d34cb019ea548c6ee85efd22b150beba0aa92061394fa3e423b1ebfe4a5c98c0586e5d56fc5c39e2b1606d36db59f442c056cc59473e32df76c8790c9d0ae WHIRLPOOL 1078d962edfb1b90044f19921f64a28c32259e34d983ddf9f9c198d13c8cd0679778a640d7a06c0bf1224d982602294c79a510034276216e3a6de21c739e6c39
 DIST cfe-3.7.1.src.tar.xz 9110616 SHA256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5 WHIRLPOOL ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b
-DIST cfe-3.8.0rc1.src.tar.xz 9621648 SHA256 11cd5e001fe83a55040a976c8e7d7b2c808534980df16b97b200b3b897df89c3 SHA512 c22ca7630b3433fd5b3e4f81380efd1156111acaf29c94b6010fdf4295e4e08afe8e1d1719e05a6fe524adc6bea087b3a84c54f2052f920719529796c766a63f WHIRLPOOL a08e671cc2ac621199e3763585cf0a84ba5f85b7916043242033d654574f2ead217825974b3d235c66cad55f4617b322e16ca5dfe4fa9efb2ee7b55a94b2025b
+DIST cfe-3.8.0rc2.src.tar.xz 9623976 SHA256 94b0e158a31573c4bb47b872fea08c49f4e6754a4de2bacdc20db231c9ace9b6 SHA512 4132397f9025c8d908a75b88530bcdeff04673ff7a9cd07a34d395437a457b616f07af44f51bcccbfc2143b5c7df50b8cac9359380ae81359302d4a5730c99f1 WHIRLPOOL 8fd945a5de5153e1a60b1e42eb20f60b7355dc118a256e33b3cff66bfdf77623d564d2df0eb725e2d074e527ae51b9078dec59a37444bcfaf203fca8e55347a5
 DIST clang-tools-extra-3.4.src.tar.gz 230729 SHA256 ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 SHA512 9656678acea490fd5674b2d47ad30ec69e5aedb450924e566a90418c94ce6483faa254e7dde0d5163cb0643153113d27b6b000fea7bba08f0ba55741b35873b1 WHIRLPOOL c41ec11d0b88678c56d77d285c4383a39cabab16aae8a4457666014e0927aa4b04cf77e73af0275e6bfc603a9531598eca98ab61d5d81288e2920682088d9eaf
 DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256 2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512 5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee WHIRLPOOL 10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11
 DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004 SHA512 6a8e662d2704147296c13626fbc5885911c646c67404f12eacc67ee2995221445bf4f6122b271b9cb3a56b716f550a651024822f72358d400b9052bf50423669 WHIRLPOOL 088d2725a88a439a1a2c4048e0eaf540587078078bd1c9823a4804200265cab4d32606abf5e72be76da45ea4aa6e7a7201a2bdbddc78d5f9e0024b0d7b59e222
 DIST clang-tools-extra-3.6.2.src.tar.xz 248624 SHA256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb SHA512 1b7710a7deee30cefb6a3b4edb026a96d8935a0c6f3056ccdb7a45564d10baf01a4f6722ae853ad9a3bad17e8de32a3c0ec99c5cf6144647a5e182809d403f7a WHIRLPOOL 3dc8888c302bac84f53b673784dec092a2c59ea2985d9983e87f057b9aa7b5d3e34cf13d2b0f1f60ea44f342b8167377204a510036872a087037cf02335c19cd
 DIST clang-tools-extra-3.7.0.src.tar.xz 276628 SHA256 8ae8a0a3a96b7a700412d67df0af172cb2fc1326beec575fcc0f71d2e72709cd SHA512 c266eb327e2f50767b7d37c9d5713d6c70f590b59e4fe09d997f2eba0d54c9229ef6c8a2a903196380f67dffa7e35ebb47a9e5f2f097fd2a3c363481b72202eb WHIRLPOOL 681a5c14301990bb945e26375d0d31fa22b795101f342bcaaeb9d3e015c0f0f6b260b913388d086cb3054fc357845b34a6813e34614cdfa0de2c58fc6db7c64c
 DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7 WHIRLPOOL 2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb
-DIST clang-tools-extra-3.8.0rc1.src.tar.xz 323524 SHA256 7c2331c03af4013bd2a0ce5033044c1577f2f7bdd138638ebe7c2310ea14df02 SHA512 da94b3841b173068a7a0d345a7731cff714c0d316c86323327bc4481d087c363f634e0dbfbf90bbfdadcb1ff3fb75bcffb2d0669f20bbebfaa8e6195826c88d9 WHIRLPOOL 654be27b51979f872630a30dd5c92e5e543125d997fc9db567ad2ba98a5c781d1314b97db17a97c2afc1c06d2717ee694463e1623b16201419bcfc6a979ebb83
+DIST clang-tools-extra-3.8.0rc2.src.tar.xz 334256 SHA256 86cc4fdeb64c7d95dd6bb354edff5d3b590366d560dc23d48e7986c3c45a5465 SHA512 5f3094abc892251fc33506464f566b7e9fde6b0111def6c188b1dbee4ee7c996c32c57610c47f951a8a4cb94f26d421b413b483dc895853292e14b1747d8f11e WHIRLPOOL 1eb4aeb410fe97714fb6f366d7d49e780a9f96b045991899f7893870751e3a2a3f0bb7711de7f61c37e013da0bf26545c7c91f4e7b0802a65070a354590571a0
 DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512 3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929 WHIRLPOOL fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1
 DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc
 DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512 862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48 WHIRLPOOL 248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2
@@ -20,10 +20,10 @@ DIST compiler-rt-3.5.2.src.tar.xz 1093000 SHA256 542d7aadd21e7fe35bea0a7912bc965
 DIST compiler-rt-3.6.2.src.tar.xz 1128080 SHA256 0f2ff37d80a64575fecd8cf0d5c50f7ac1f837ddf700d1855412bb7547431d87 SHA512 7dafcc5bd4822475de649d8a84ae51af3c4ed4d0958f76b1b55ba79219638f3e78eb94a1986c6e9ba0e7f1ccf3ec834d546b5ca60e8b08083fea5880ecdf17a3 WHIRLPOOL dd77e7df43c9028a6873ed903da67560fdb04968013016a7f0ad2d2e9a81b3a3d890b95e4f49a6bdef349806d6507defcd80a0a9fb50c1c9f778e7eff42dbc5d
 DIST compiler-rt-3.7.0.src.tar.xz 1192832 SHA256 227fa998520bc94974a428dc8e7654d9bdf277e5bc70d4064ebc05691bd62b0b SHA512 2ba6abb3d6ec7f1469cfe1d48fde2069e9a767d19144f80f05516ac63f353ace90a9df3e9d1c1f708f3c397aba0ec61b12e4f105b25a2e1cd26b25b0dd252bc9 WHIRLPOOL 8bb535b667a7fdc1710d32e0912daee3798049f78cf70a03abc409157f02602b77f290b66185a35c464e512e55d57aab0125be6ae4843f6233f4017228afb579
 DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256 9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325 WHIRLPOOL 0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223
-DIST compiler-rt-3.8.0rc1.src.tar.xz 1266132 SHA256 770925debdb35985423835fcb6ac7b572ee273ff8a175f580d37e3ee930c2f9b SHA512 fcf77e1b9130b4b43894340f7bae10ebe465a036115bee8fedc672035437d54e1b3f768e471778c76f0e0e78dd5928e4de76b04074529b1528ef2b22845acc01 WHIRLPOOL ff92947a6ba1039c5b7b81d8404a08c90a107ec498182ac2b72f493a8a67dea7aa120fb0da8f7f8a3bc9347cf5c132c026202df666c59be764b0c2213ad98f5f
+DIST compiler-rt-3.8.0rc2.src.tar.xz 1267120 SHA256 2bdda9d47e59b075eba87fa712625f1cb7013a3c529223442247288d92ca56ff SHA512 16c13b82bd7dc4da08d5eed1883f1c644218efa0ec90b4ff61265fa632a463c77612442fe0c18e923ca3e40bca9f4253716a233346c62caabab8591648d5b086 WHIRLPOOL dcb37f7ae01e72dac466f4250987ca3669e85cab695ccda68c977bbd1c3565212fc4b9e09f94745208c2265eb1240c4092c50c8b3c7ace81115ff78892343559
 DIST lldb-3.7.0.src.tar.xz 10649660 SHA256 f4d7505bc111044eaa4033af012221e492938405b62522b8e3e354c20c4b71e9 SHA512 52157782ef13e2c8b7b35ff3ccc05887195fe46ddb6bafcf0707a3c46c1e034734b55342b8dbfc46cae7a8c3cb1012345284e4bedb2344c5016b8d19a12e90df WHIRLPOOL 8c0803a51820ec67944e27061c858e95a92aefa38a1540241fead2b63c5b065c1268cf958b14d8841f62fc8aea5da1e20204704426598bfc2c4e61bcda135c43
 DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1 WHIRLPOOL bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a
-DIST lldb-3.8.0rc1.src.tar.xz 10928688 SHA256 12a6bf9362a6a8a2affe18420543605f8128de3cd0ebd4cd65a075d2c6995ddd SHA512 acb7755308dfb4bbd78732b1e7e0ac12b61f5c72bdb30be737549c14abd0ed8b31fc80d3f592890b47312b670cfe3f8f9d493531ad19e1bd4fdcd15406241362 WHIRLPOOL d3e31bf763b95b4066f6b9c08c159b021f11dc2cebe8a4c4c763f24db4ae72c25587af46d3c45b6002b6d607a09f1b91053e3a7ed647a273fdb62927955d3b9a
+DIST lldb-3.8.0rc2.src.tar.xz 10931040 SHA256 a89128fb15b4e445cbb6ed23189acd4c7ad18be0bc9cb92234d977e927dadf71 SHA512 7a78974fcf31717318adeeb8d86920b86ac2c1eac748f903128bc5da2f2d89bc2f61556d4e32ed55cfcab5828fa89aeafb00034b8333bbb30a7cfa410eaedf00 WHIRLPOOL 4f113b6998ad1c3475648796518c9e57e7ac1512545c37a60855f476929432d416865e45cbbfe9ef168fbac0b5f0d0674e77bcc49eb536bff4b8e32a96fbf207
 DIST llvm-3.3-manpages.tar.bz2 27098 SHA256 46bb22d63d5fe7dd04e1a7bb7e16c03d93f2ed51d31540cfb9d97ed70059aa77 SHA512 6f24b66b13025d0606908f91ad9b4fc6de1b4aac2d97d261f6b989065476cf153d2f84792f8dd4972b95fb1a45a3931c328df3bcf8ce5ab21170a7a912a39783 WHIRLPOOL 31b9c3635b698f404b75b87c7891b4b6be9cbeb6062bcb6fba5476b0b3069a486ba60c27ab2b12b8a2da9404f666617162041860f023951050a9fc4c7d27748a
 DIST llvm-3.3.src.tar.gz 13602421 SHA256 68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578 SHA512 1b7f7c5e907a68f642dcbe48fdff9585cb1504022bc9d386f310ebe5d25103d0d5f7cf0abf19e0e3fd666970160a98c90033754e2b79b2fac0cf866c984f8038 WHIRLPOOL a89c0b470fde562a3402e7878b91bc0573d433ca0a60e62c9c46946d7948a4fb657b116b6bac032555e29c70d82c751876adb398fe240f5c8d0a9a2378ce1866
 DIST llvm-3.4-manpages.tar.bz2 33753 SHA256 dc2616104cf333dd9ef56b2d31f9a36e81303e2c5756ff8bc221e05b46f7e1cb SHA512 8e438a9392c9b896ccb2b1460a8f57ffa01633e3a6bba61e2bf2f718d970ff96c17d63b0bc0d4da1162e1d1dc4cb9b2a9e9a14a722e8a5b5d2f205f037ae665d WHIRLPOOL 1c037a9972442937f84bc3147d77d4bbc6d6c0812c3025f3107c2ee5f6259afab990f6e1bca564237fdca8089e2372df4b7ca45cbdea686fbf891f92d1bfbbe6
@@ -37,4 +37,4 @@ DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256 8597fa532464c6336aefbbef0b1ce452aa
 DIST llvm-3.7.0.src.tar.xz 14636252 SHA256 ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153 SHA512 fe3bfefd3d49423831ad12b89f944ac9f469aaaaafdea1dd94fc7fb6d5cc9fbe66b6463796aeaabfc145ae474ec3ad68da41c4a011e8aa4bc650f1835af75388 WHIRLPOOL 4787fc417042cbb4470887358225c367c6617ccd6cb90f1e4f226ec1565b302e4d70458fc13ceedca5b3ac270523637398bb7503c8c423c81fd9682a41c0289f
 DIST llvm-3.7.1.src.tar.xz 14592544 SHA256 be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5 SHA512 ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90 WHIRLPOOL 788ce0907b906ebee595c766713bec5067563c8aba7460211f5830e116df7c830de84704834c0df2f2f2c90354d75521e4a4aff57e769a2d8ab590778c1e4a70
 DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 4dda7f69f9412e0fb50d32631df34d6ea7f93c945c9a59cb050a99f1d2d0508b SHA512 a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f WHIRLPOOL 9790a576fd4db798c2339bb4ea1dc973f1057177364770a104be7916998a1ad824e6b4eee296066ddd32eb5e6c57ffd5716457cecbd8ca9fe1b317d0d5ed2676
-DIST llvm-3.8.0rc1.src.tar.xz 16559376 SHA256 41809e45cb3a97908c5741b4c15c90d801793e09d75858a6cfaa9582f233249b SHA512 0fbb2a5c16aad989a00b0068ab094882eb6f945237f1b82e102835321dc74cdbdaaa2d16dbc73df93ad466b3221ad440c18bd79e70e1f3de92e0a11de717d20e WHIRLPOOL ae25d7b12c359aaab53dafeb0dd737b564d6fceac95443049118ec8cb7a308836572243c77cfb0a6018fa2600b2844f252d95870fed79e11e3cc5ae5b5dbfe0d
+DIST llvm-3.8.0rc2.src.tar.xz 16567192 SHA256 8141ba68fde29e213fb82886b58b722d9c2aa2179116d1e7f8a7d6de23508047 SHA512 b64ec968693758ed5fc17a1c85a093e6a4313472210bb708cd8ea66ceac7bb11125202ef641d257ba1947d719405b533e2ec5ec3459c3279b8f8da30e5819f43 WHIRLPOOL 8ec6633d2872503d418be41d92864b06d6541e24d63849b4448c564f719b8e113edb7915aaf8fad777de4d59d339c7c14f46a5fe049473a9e0c0869bc5a33d96
diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch
index 90984e627c51..dc63b702b8c5 100644
--- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch
+++ b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch
@@ -52,24 +52,3 @@ diff -Naur llvm-9999.orig/tools/llvm-config/llvm-config.cpp llvm-9999/tools/llvm
        } else if (Arg == "--link-shared") {
          LinkMode = LinkModeShared;
        } else if (Arg == "--link-static") {
-diff -Naur llvm-9999.orig/utils/llvm-build/llvmbuild/main.py llvm-9999/utils/llvm-build/llvmbuild/main.py
---- llvm-9999.orig/utils/llvm-build/llvmbuild/main.py	2016-01-25 14:47:55.511301054 +0100
-+++ llvm-9999/utils/llvm-build/llvmbuild/main.py	2016-01-25 14:58:13.014228689 +0100
-@@ -393,6 +393,8 @@
- //
- //===----------------------------------------------------------------------===//
- 
-+#include "llvm/Config/config.h"
-+
- """)
-         f.write('struct AvailableComponent {\n')
-         f.write('  /// The name of the component.\n')
-@@ -413,7 +415,7 @@
-             if library_name is None:
-                 library_name_as_cstr = 'nullptr'
-             else:
--                library_name_as_cstr = '"lib%s.a"' % library_name
-+                library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name
-             if is_installed:
-                 is_installed_as_cstr = 'true'
-             else:
diff --git a/sys-devel/llvm/llvm-3.7.1.ebuild b/sys-devel/llvm/llvm-3.7.1.ebuild
index 347d8cc20119..9a53dea448dc 100644
--- a/sys-devel/llvm/llvm-3.7.1.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1.ebuild
@@ -258,7 +258,6 @@ multilib_src_configure() {
 
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
-		"${mycmakeargs[@]}"
 		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
 
 		-DBUILD_SHARED_LIBS=ON
diff --git a/sys-devel/llvm/llvm-3.8.0_rc1.ebuild b/sys-devel/llvm/llvm-3.8.0_rc1.ebuild
deleted file mode 100644
index 9a74e9a0792a..000000000000
--- a/sys-devel/llvm/llvm-3.8.0_rc1.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils eutils flag-o-matic multilib \
-	multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/${P/_}.src.tar.xz
-	clang? ( http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/compiler-rt-${PV/_}.src.tar.xz
-		http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/cfe-${PV/_}.src.tar.xz
-		http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/clang-tools-extra-${PV/_}.src.tar.xz )
-	lldb? ( http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/lldb-${PV/_}.src.tar.xz )
-	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P/_rc*}-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 kernel_FreeBSD"
-
-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-4.00.0:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes
-		!!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
-# 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-${PV%_rc*}.9999 )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	gold? ( sys-libs/binutils-libs )
-	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 xml )"
-
-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/${PN}-3.7.0-ocaml-multilib.patch
-	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.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
-
-	# Allow custom cmake build types (like 'Gentoo')
-	epatch "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
-
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	epatch "${FILESDIR}"/llvm-3.8-llvm-config.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	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.4-darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-
-		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
-			tools/clang/tools/scan-build/bin/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-3.8.patch
-		epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
-
-		# Do not force -march flags on arm platforms
-		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		epatch "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.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
-
-		pushd projects/compiler-rt >/dev/null || die
-
-		# Fix WX sections, bug #421527
-		find 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
-
-		popd >/dev/null || 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;BPF;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}
-
-		-DLLVM_LINK_LLVM_DYLIB=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 clang; then
-		mycmakeargs+=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-			# libgomp support fails to find headers without explicit -I
-			# furthermore, it provides only syntax checking
-			-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-		)
-	fi
-
-	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
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi; then
-		# Install man pages.
-		use doc || doman "${WORKDIR}"/${P/_rc*}-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 python ; then
-			pushd bindings/python/clang >/dev/null || die
-
-			python_moduleinto clang
-			python_domodule *.py
-
-			popd >/dev/null || die
-		fi
-
-		# AddressSanitizer symbolizer (currently separate)
-		dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-
-		popd >/dev/null || die
-
-		python_fix_shebang "${ED}"
-		if use static-analyzer; then
-			python_optimize "${ED}"usr/share/scan-view
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use clang && ! has_version 'sys-libs/libomp'; then
-		elog "To enable OpenMP support in clang, install sys-libs/libomp."
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.8.0_rc2.ebuild b/sys-devel/llvm/llvm-3.8.0_rc2.ebuild
new file mode 100644
index 000000000000..5fcf094f3307
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.8.0_rc2.ebuild
@@ -0,0 +1,511 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils eutils flag-o-matic multilib \
+	multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/${P/_}.src.tar.xz
+	clang? ( http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/compiler-rt-${PV/_}.src.tar.xz
+		http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/cfe-${PV/_}.src.tar.xz
+		http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/clang-tools-extra-${PV/_}.src.tar.xz )
+	lldb? ( http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/lldb-${PV/_}.src.tar.xz )
+	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P/_rc*}-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 kernel_FreeBSD"
+
+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-4.00.0:0=
+		dev-ml/findlib
+		dev-ml/ocaml-ctypes
+		!!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
+# 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-${PV%_rc*}.9999 )
+	clang? ( xml? ( virtual/pkgconfig ) )
+	doc? ( dev-python/sphinx )
+	gold? ( sys-libs/binutils-libs )
+	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 xml )"
+
+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/${PN}-3.7.0-ocaml-multilib.patch
+	# Do not build/install ocaml docs with USE=-doc, bug #562008
+	epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.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
+
+	# Allow custom cmake build types (like 'Gentoo')
+	epatch "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
+
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	epatch "${FILESDIR}"/llvm-3.8-llvm-config.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	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.4-darwin_prefix-include-paths.patch
+		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
+
+		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
+			tools/clang/tools/scan-build/bin/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-3.8.patch
+		epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+
+		# Do not force -march flags on arm platforms
+		# https://bugs.gentoo.org/show_bug.cgi?id=562706
+		epatch "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.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
+
+		pushd projects/compiler-rt >/dev/null || die
+
+		# Fix WX sections, bug #421527
+		find 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
+
+		popd >/dev/null || 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;BPF;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=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLLVM_LINK_LLVM_DYLIB=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 clang; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+			# libgomp support fails to find headers without explicit -I
+			# furthermore, it provides only syntax checking
+			-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+		)
+	fi
+
+	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
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD && use clang; then
+		rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	if multilib_is_native_abi; then
+		# Install man pages.
+		use doc || doman "${WORKDIR}"/${P/_rc*}-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 python ; then
+			pushd bindings/python/clang >/dev/null || die
+
+			python_moduleinto clang
+			python_domodule *.py
+
+			popd >/dev/null || die
+		fi
+
+		# AddressSanitizer symbolizer (currently separate)
+		dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+
+		popd >/dev/null || die
+
+		python_fix_shebang "${ED}"
+		if use static-analyzer; then
+			python_optimize "${ED}"usr/share/scan-view
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use clang && ! has_version 'sys-libs/libomp'; then
+		elog "To enable OpenMP support in clang, install sys-libs/libomp."
+	fi
+}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index f998ade61d72..14c5da5d4dec 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 PYTHON_COMPAT=( python2_7 )
@@ -142,45 +142,45 @@ 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/${PN}-3.7.0-ocaml-multilib.patch
+	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
+	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.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
+	eapply "${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
+	eapply "${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
+	eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
-	epatch "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
+	eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
 
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	epatch "${FILESDIR}"/llvm-3.9-llvm-config.patch
+	eapply "${FILESDIR}"/llvm-3.9-llvm-config.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
 	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
+		eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
 
 		# 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-3.8.patch
-		epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+		eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
+		eapply "${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
+		eapply "${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 \
@@ -196,7 +196,7 @@ src_prepare() {
 	fi
 
 	# User patches
-	epatch_user
+	eapply_user
 
 	python_setup
 
@@ -221,7 +221,6 @@ multilib_src_configure() {
 
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
-		"${mycmakeargs[@]}"
 		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
 
 		-DLLVM_LINK_LLVM_DYLIB=ON
@@ -396,7 +395,9 @@ src_install() {
 	multilib-minimal_src_install
 
 	# Remove unnecessary headers on FreeBSD, bug #417171
-	use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
+	if use kernel_FreeBSD && use clang; then
+		rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
 }
 
 multilib_src_install() {
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index dfcfa4b20b06..c57ee9cb8a9c 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,15 +1,3 @@
-DIST aufs3-standalone-3_p20150406.tar.xz 2863952 SHA256 e2de4fcdb086ab33bc182b084bf534891cc31a7d3ffc805d40dc087c37ab464b SHA512 c843999798f99fef5c16232935606ca438774104dc04c58982bb2b3f9ae371d9f2173b5454d366481de22fd3e658ee9e67f6981504c5c8157af20a8f15f269d1 WHIRLPOOL 0d2efaa6918c6f90339cae02a9ef3908921e8d1903364aaff9af034262f439886a02a639f9eaae27a28093fc6bf451bbc9fe7072a766a36e51f75c779378095d
-DIST aufs3-standalone-3_p20150420.tar.xz 2864092 SHA256 0f592b3c84b149d0842c518b83656be61a627f5bb9c953b824fd1631e24a2224 SHA512 ad383f37c5201a6a6e53e91f18d63648b3768b8327f07c36a207eb90b63b13779709a0f18696896c833866a30e1010c70ad8aa1259ae08dca5465a68f91d48e5 WHIRLPOOL 029f0cb665e0aa5f8d8bc2a93177e73d8ee7d80d68326f4f38018cec5678ff70378e70473f48bde1ba4f8096331eae4e40949b7c732f22789d09c690cd5cfce7
-DIST aufs3-standalone-3_p20150504.tar.xz 2886004 SHA256 f88435f8fa5d0316a5d87cc8c99012a5504e4f52deee518ae6d4b48152a38071 SHA512 acb863eb197a089e7720237f4b1f1a28be150eee751cb6930e16d96053c1dee84333479ac5f2e5eee2107fe73f9563fe4864c01d07a9de452cff1b7fd283844c WHIRLPOOL d6dcea3e86d0eb5636fe6026c9d8e887e8c15283f364aaf41fe1b7eb4ebfe51caae8dcad26162353e90a28e27587a777fa6d7d6e710c1d1006f2b597bd39c06e
-DIST aufs3-standalone-3_p20150511.tar.xz 2940252 SHA256 c3f67eff4fa23a1734e94733d7d7f9e7be1564525e70c8207995a02f96c75ab3 SHA512 c66c6450596f5f5dd6223b7945cbd5a6bf8117c2c0c98547a7debae6e78965cce1cc5e681d60efa798f93f94f67c0129c5372d9fbcbd313abfc5a6bbf89d28df WHIRLPOOL e56fbac3edff29bcc2653683ceaa6e94f18f0764d435e454e981b9f728b03a7cb7562f5a1005455a764cfaf001c7db87d3b74e9a433165d51d53097f45f9cf75
-DIST aufs3-standalone-3_p20150518.tar.xz 2967016 SHA256 f938bdcc461dacf2b59c807b31fca70f166007a3973c50076b60c6d2e53b163c SHA512 7aede4db3135949a7f3098a29ff9234e21eb78534c0aec3b8fdcd63782110f48c76734752857bd157b29cbd16fdb7e844cc50992e4750cfb05ccfba2d9247b64 WHIRLPOOL bdf559b43d2cede70c334621574f62f123a481cefbec091f3e9e3bd12a499ea985e885a941e24634c2d8e9e9a83acb2c149da29038db00562824647ca6e8db78
-DIST aufs3-standalone-3_p20150525.tar.xz 2988108 SHA256 117be76206e67425c4144174afaa347c4f9e9414200899b5c43a8ec0b91c7d03 SHA512 ea6031ff9231ce68b95450e428989ad81b1c6ce4a9a21f718f73dbafd3aa1e12191d7abd57829e0f80cc0cf0aa412e35b2cad4e14430078b88b2e17312d7b708 WHIRLPOOL 81aeff069ebc6122856c74fcdd38784bd7a231c99726a73ddaad04f145978053fd3ff8b788ac0995fa261cfbf62d461c43f8dca887525df887fdb0011a417f40
-DIST aufs3-standalone-3_p20150608.tar.xz 3015460 SHA256 cdf92d07f45becfeb70ea3314e554ea9c8766a2815c3aa6c8d634b5307c76d5d SHA512 4d29d2d4908cd7a4471bc3efe5c23e57d41765937c700eee8593a5c07d7e84e12e6093ef4338b6bd4e9e6f0e44674557a659fd5fa5257a79b381385d208c2209 WHIRLPOOL ccf68e64eb5bc1893c2e5d50c6fc3eaf4e71fd06949ae16e4343734dca39f7f016ab0a08796d444efe55947a8645193979c0dccce702d8c38e46207bfde4f1ad
 DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153
-DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f WHIRLPOOL 06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8
-DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 8d43e3c3c744ddfd250321d7a43ac98c77ff93d2775674f3c7a71183260702fb SHA512 0c0f261dc295d7b33560796f7baef761d802eac4de6b09be9a8f41689f3458149c271025e45d053fb188f56b6b2d6e5a02e159b0fefef090cbb0b44cfad78c4a WHIRLPOOL 1bcd9292362b27c564b5450c84b5f22bb16b2498b34507a78bf30df25c034bce4112ddec688f632f39cd935f1dd15dcf7f18213dc0d13a63aed1e2873da2d89b
-DIST aufs3-standalone-3_p20151109.tar.xz 3151124 SHA256 1fe9341fe93a469d3a17604c90f949304e035e687f1fc3fac4c9f76d93b9535d SHA512 3f3e018e5236e6e8d67c3d0dd13eb38dd9d72ec32c0e572bb9f3b4fb85b4ee7d9d50a5cf63bb6432c5625e8d98655e3f0c228bd66b79fae680dbe866553cbc40 WHIRLPOOL 28d853afe21c8ce5a1ae9a9b5394db87b823bd791e14c5c5d15f3943ff3c67b0ce2bf28b2287f4ce9fc79feeb44127f9a26ba888a8449859b9414880d6748762
-DIST aufs3-standalone-3_p20151116.tar.xz 3164412 SHA256 6702030b4a90b168d8ee227856caeaf999eec91e83bf96517d93cb1242d98ccd SHA512 40bdb947fd3da48d1d245c18cad3a23f61301e596e3b2b9b82b9915c239941af0b55c8491b408c66c07721385de365093601f764b43f096a432d76452f9d76e1 WHIRLPOOL e07ac272cc37eb74776b93030f3a201c8e2e0a7e73777c7e1140a41c83ac58b1e8c77fc4d52dfe9027d10442b5f6a1f11ea1a35a3b36ce8d87bd725f48cb5c3d
-DIST aufs3-standalone-3_p20151221.tar.xz 3174536 SHA256 2f84b85466244e11607680a9cc905f60c56fa4478c4b310366044999819ff58f SHA512 dadc95eea30c2e13ca0f4c316a5aa2a3ff7f8025eb7123a483713ee844a3f0eabe29ddd4c5497e368ba1b0f01008d3578f745eb0bdf5210fb71d2dd4ef54a711 WHIRLPOOL b6f2bde1de90074a238984d72041e27a6d8c7dfc828c055ebce9325d18c35b212770eae6a2ff619ad2b6e176d2833cdd9a184488fd0eb63acb15e5fece608bd6
-DIST aufs3-standalone-3_p20160118.tar.xz 3174824 SHA256 fc9d23a7769a44f0cf91020a5ca70d0fd25890d420ef8db52061610d5db39ad1 SHA512 91e5ad1bb1263a5a6ac48c2c91db75d79ece809f7571a24d8c324154a43cb202996d3534b7e6cc382b55790453dd5209fe841051e3525734c532f183415211b6 WHIRLPOOL abd6490808cd86fb65e5eb2469611799191eb9f36b75ab0c655c2a4cdd8cbe6b5d7341f6631fd97ba9af9f30cab0edc8934c038dc1fdef79042625761afe3f4d
-DIST aufs3-standalone-3_p20160215.tar.xz 3220152 SHA256 e1e468e799826a128ab9ffb5b15dade4c721a4703ffff522f305de91d7b81489 SHA512 ff57fe257575bd217622b408e89daaff1dad0954c2c0a599d4d4117f190a0b59aee9ac9c39f9b6d820604108fa2643d84833e78848cc12e0ea4b84e0dd9e9c7a WHIRLPOOL fa1037e6411c928b99e92e75a7b11aeb5acc0e5c31c45c05cdf21f3368f75fa4ccca199687964fb61ee50927a9df274ea624ea7b363600a4a943cfc171a417cc
+DIST aufs3-standalone-3_p20160219.tar.xz 3256736 SHA256 23652c6d8fd12a9a29454293f13add7e0f97f2ec542b69e5dfecbc99064c4247 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af WHIRLPOOL 1ed7042c9e1e8efc29fa36fcbd2f09a10ffa51cc9d6b349869f6f6947ed27399deb2fa1035df7dbaf69dcbfa7eddb6f240b934a343732ace26f77bcf2e72167a
+DIST aufs3-standalone-3_p20160223.tar.xz 3270932 SHA256 4e213e678991a028595893a2c3425894bef021cd374a6798f80ad8863bf7f593 SHA512 37805b54a2471def5948d3484349de7bfc4fee09788b36b9589aba2006484cf330bb642f27862d74a528999cf2e7fa4888b5d46b54bb3e7f8468c6857f34730f WHIRLPOOL 1e42d1a32a62b25923041b8f71b00f8ae1a8b8524752b1d796ae2fd2ada79792cbe2a35ad380e24ecad8374bbd432674763d69ffa9144dfc3074742b33d4d138
diff --git a/sys-fs/aufs3/aufs3-3_p20150406.ebuild b/sys-fs/aufs3/aufs3-3_p20150406.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150406.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150420.ebuild b/sys-fs/aufs3/aufs3-3_p20150420.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150420.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150504.ebuild b/sys-fs/aufs3/aufs3-3_p20150504.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150504.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150511.ebuild b/sys-fs/aufs3/aufs3-3_p20150511.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150511.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150518.ebuild b/sys-fs/aufs3/aufs3-3_p20150518.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150518.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150525.ebuild b/sys-fs/aufs3/aufs3-3_p20150525.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150525.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150608.ebuild b/sys-fs/aufs3/aufs3-3_p20150608.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150608.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151012.ebuild b/sys-fs/aufs3/aufs3-3_p20151012.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151012.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151102.ebuild b/sys-fs/aufs3/aufs3-3_p20151102.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151102.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151109.ebuild b/sys-fs/aufs3/aufs3-3_p20151109.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151109.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151116.ebuild b/sys-fs/aufs3/aufs3-3_p20151116.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151116.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151221.ebuild b/sys-fs/aufs3/aufs3-3_p20151221.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151221.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
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160118.ebuild b/sys-fs/aufs3/aufs3-3_p20160118.ebuild
deleted file mode 100644
index e98fe7f05fa8..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160118.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160215.ebuild b/sys-fs/aufs3/aufs3-3_p20160215.ebuild
deleted file mode 100644
index e98fe7f05fa8..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160215.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160219.ebuild b/sys-fs/aufs3/aufs3-3_p20160219.ebuild
new file mode 100644
index 000000000000..6e88f13f894a
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20160219.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=18
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".25+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs3/aufs3-3_p20160223.ebuild b/sys-fs/aufs3/aufs3-3_p20160223.ebuild
new file mode 100644
index 000000000000..6e88f13f894a
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20160223.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=18
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".25+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index a864b8488088..13c747177f71 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -1,17 +1,2 @@
-DIST aufs4-standalone-0_pre20150420.tar.xz 424360 SHA256 b570006f74faffa91906091ae07dd0441b57f0a1b90f3cbce3585d2b601c98b8 SHA512 51aff25489299e3c59457eea6076e15fb1179233292ad799b4b755368925500fe57fd336361f0cfe7f2d3b8d5469693c1049b8528038a5f0f1baa07b665af9ac WHIRLPOOL 7bd4f604613b3afa94b57eb273fa074334aa0273d21b9db139c8ad13e138defe9f86334d0784c2c3072f86cfcbdcaa5baaea621e72550524248ec1a733dba9e1
-DIST aufs4-standalone-0_pre20150504.tar.xz 466636 SHA256 b14bba141ead117ff9193a8a896a2bcefc418e11e642eb8547d4785833d70261 SHA512 c1299eb6ca179e60e60be2f7792001e2277f9507fd416994abd41c43e066be46ea508eaface45740153e4c34ccfcdcb3aa6a6118c840786fb1abf5aa56d6cc63 WHIRLPOOL 37bf469947c8ef5e0724e37fa40ec9535ff4065f81e64d45d924c16bb1d059d526ae853d0a73cd67de2aeacd3c41444a3a51545e9a12d08c0b8b27b526fa4dff
-DIST aufs4-standalone-0_pre20150511.tar.xz 501548 SHA256 a26e5e684c1878d0bd8e18c512979a6d0cccd9b1c8219746fe3d93ab1448f1be SHA512 da123ea8da38c840de76201284bf6846d794421e38e6193206ac753380eab3ecea33724c23c7b25d62f933c0c3d1e67082d17c1e702eefdb24c722808b88a69d WHIRLPOOL c7d2c81119933a55f0aa357fbc840f4a60597144386150c45260f2c7b99a0722d362595558df4b0db146c0fe65fb6886b002186e15a5e8cea00b3a04075a5500
-DIST aufs4-standalone-0_pre20150518.tar.xz 515624 SHA256 e2c2aeb02dce4f2b15da8459e92e90896c0fc795d6df829e2cab4eb2a82174a1 SHA512 4188d4d7928e1ee8ce88a7a079ee75c0ab9695c3e23db66952ff9d276ad3cfa5dbed1585dabe05856c5f3417d436fa3a1f93645ee68ebaa65a21610de8e34aca WHIRLPOOL 013672a12293ffe9067013d0295f6d797fafafa9f1ca49eb37a831fb77addac52dee804b9c809eadf4d18205a81e419be0b0b273d875a0f04e657498ccf95af8
-DIST aufs4-standalone-0_pre20150525.tar.xz 523720 SHA256 39abd01774e92eb717af89c57797601073c9237554d7e29ec509c7f61629a1e5 SHA512 3856eb2ca8bef3f0f54a8ea87ddb97c367cb96b10efff68b6edda7be1ec95a87742e1328e3d15f2c7a578659c9017187263c4e5371b602448d7ab5defdce43c2 WHIRLPOOL b5a91d900910bab24ccd01cc7b9626fd23cc92fdaf054f669e0fe2cefb5784065703b422a69379eda85d36c63cb8e9dc3a8018cdd277a85bab6886e68c62d60a
-DIST aufs4-standalone-0_pre20150608.tar.xz 532144 SHA256 8aaa1f348de3b6cfa86f21539d0ec44e5d0d18c27f0645719e3140462522a4e7 SHA512 1abd663b5f7997b93a865bf478c2900a3f69aff1d25149be683f8fd0f7362eaeccb7cdd9ce91ff08d1c4f2660414e03b7c9170fb7818c0839176b94c720d2896 WHIRLPOOL 36fa2691e8f5f27be41463c67df10d0e467892151e50df6f8396293c2572ad3d9229f00302bc47d816b48a08bdb64c92926381ba9d00c150dfb9f445dba8aeeb
-DIST aufs4-standalone-0_pre20150622.tar.xz 543932 SHA256 28de7f6968c62a48b78f4b6c9234dd4b7b134632e1d4e7d50e87da9e05c06343 SHA512 82f130ed3b43e2bfe42079c96dca70e868d7ce1df5511f68e7b85d343105d452c334fe7a15c1cd4e01450ca39dd527123c060b98b396d13c4250541ec464c2fc WHIRLPOOL e46a01857f2cbd52e6a3717bc5d076197443146fa9eab3b542aeb2698da652a45e8d40e1f9f50d9d4c3fc34d9a6da225712ac32f27f15eded4e8e3f23e113de8
-DIST aufs4-standalone-0_pre20150629.tar.xz 547808 SHA256 7c1d9a815c73e8cb1c9f909eee8f6945486c8e8feeea9cae4b3865b6032f17e5 SHA512 b7c734fb83515790b58a81b904acb286ef52124e0799dad1c7900dc8af3e0dc6f2875ba86805f1f39b8d04ce6660bf0c0307e4bbc1b58f2ca6171ead5e668a94 WHIRLPOOL b39f2cdeffd20b636c4a3aa5ec8e87cd6b1c8bdfdab071d1cabf53e10629beebffc919abf5fc90915ec0c14f4b4c45a510bbd303765564348a0e2d1688ddf79b
-DIST aufs4-standalone-0_pre20150928.tar.xz 649700 SHA256 614a7d36577d9c432deba647ae925a05f05468fcf9af54c84c553ee9f4b4ccb8 SHA512 69182e8ef0cd8bb251bd579e18aea1fdc5b38d16f9bd8a7dd23eaf84ae86bb24dd011871f90a0d0c1434a6136b9dcc70ed07b6f8301344d13083cd6a755c75ba WHIRLPOOL b43eb05904917f74ea38bd148543552dc1d40eb590cf5059a884dcba909e76943cb9e2d1b873300701ffbc6061beeb3efb76f8014e08a8742c48c38cd6c5fe53
-DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c9412b5c714645739beea9471db421d76f1af2af86d83 SHA512 abf1833a4902dc95cce203607cd715b6794b13e064c073139bc06facfd86ceb817d00d7bed0f5420d8f8f7c9205524a8ffc9431dc1c0d2da1e73393b7d89d33d WHIRLPOOL a8cb9e8fc4449dbc54e1bfab1c9acb61e7dc31c33c62d8a2e2feb407bc6d4a2ceb502fd85ac7519af1e9b028603525ee26763438e04736fee138420796c13e90
-DIST aufs4-standalone-0_pre20151102.tar.xz 677588 SHA256 5e0aa085e42dacc45991e49e485bf4f20cb911c71c8d5363ef2986733cb3d9ef SHA512 b4973078f31c50bb58afeb4fc5216a34d31b1dd4de60a5dd172962935becad60820146e22e39e88fc16a4c7a74e21923f02a77d6b0d8cd8aeef946806ed97932 WHIRLPOOL e04651079f1f04a74c330786ff3bbe72c367657ad8d0351ce251a4287ddee65231df410436f86474e6418b3e848eaa370f930376a2a1ad9fe57280b4d75be4cb
-DIST aufs4-standalone-0_pre20151109.tar.xz 697760 SHA256 6dc6341cf729106d0f53b36f100c8d561992985f8dd8000a0956d716b10321a9 SHA512 dcacf98040bd51ad974582e1129b1993d8945b19449dd1e9ce855a5eb1502b05ab67196fa0f61e10eb45a3496d9866c0137122486ef9021704a59a41a7ffa944 WHIRLPOOL 2fd61080044b11f05514d55c9edabb345109cd217a7fcafdae3cc9c2cf8322a998da0f6416e20782ae9dfebd9483d7d87c3280bdf86d718bc2df993e11f2925a
-DIST aufs4-standalone-0_pre20151116.tar.xz 741280 SHA256 362d56dac519b35e73cb93b0ed61442e9cfd01da463ab92579f7e231543dec66 SHA512 425adac57115b61af0d0db713cf60dfbd2820464b4e9beae84ae14bb2e37d99b4e940a67c82aae1fb7b1693a4c812e606239e7f7b254d62105da14973200b40e WHIRLPOOL 5d336ba26ffc4a9daa2675f28d88b53a306224bc42b2751f3cbe7d1fa2c34d93fb0babec82ff6aa844de56cfc5ddda17fc9deb5f1e6d43efc4b3a19389096be0
-DIST aufs4-standalone-0_pre20151221.tar.xz 782884 SHA256 7871f3159418956ab7498df800cf082c55ea84af82720c2fe254cfe0ddbb090f SHA512 a0f5e0af490209b3ac76bcb8c2ac31dcff05d881b9dad314c701ac84b990c26b0b5beb59f36ce5e373b6548052eeda1389bd8ba39a5be15b9eeea13dfc9b2c65 WHIRLPOOL 92cf2595e167a47f571d565a61e69dee779b8a7dc52400492eb52bf9107936787d570f48af517d935fedb8ef89cfafcdde0b8c0bae2968dd3e69a80b58e42f5d
-DIST aufs4-standalone-0_pre20160111.tar.xz 804572 SHA256 0ecba8c2f34443d316a3d8e49f4678005ec82cd5052afde4937020b6f5641853 SHA512 e42e0374b7325ae1d1c2d99c9bac726953431e91607352219d2861a0aae32fd016c7a2e1321f2410f26e2b61cbfadc748242f74e74d309e2024d899f2d48448b WHIRLPOOL e381244e327939a78ecc6ad4314090ebd1c790422db31bc9e70501d120df5ecfa9dd4235ff17b007a08e958218975226b61490fa1caacb6aa317a6aa705dc67b
-DIST aufs4-standalone-0_pre20160118.tar.xz 825208 SHA256 6c964c812470f9b85e3fc801e58a6dfb5b25ef6efbcb959b02000534a980ab74 SHA512 10b39a84aee7bec7e701576e73c8107381dd06ae200754cc7cc48a84cd806a7819659390b750459c50271886ed9055071acbdaaa5a0d3a72be53313180a3c85e WHIRLPOOL c6bf2a0fceaae478ef6da747df9e8abf0b2c6a4c76c0d9feb0a8670bbf6adec3c6422cfbe3c8997b0bfacb2da10e803c038138365d647c0da24fd9aeea8d5c42
-DIST aufs4-standalone-0_pre20160215.tar.xz 931276 SHA256 2303db1f8116762baf0aeadb8191c0bf9ed00380a5855b2297c92716a50fc2aa SHA512 e07dee042700edb6c4aafc995910181b59067e5a62d8bdcbb8992efdd1f5afcb0d38322e85a0efe57dfee465c0e74bb597928fb3bbf5db86c4d2007a9fd88c46 WHIRLPOOL ef611cbf47204b9691bd432a83898e5543754dcdf5597a18fb0327f3b269f3c7cfcfc2e0a46bc0ec0952eee114508d81decfa59c03a683a74292d123c24bea3d
+DIST aufs4-standalone-0_pre20160219.tar.xz 1049884 SHA256 22d0f723ff52190670da0e3dc4a3f0b81ba0b3b6f287484cf81165c6cd4b2040 SHA512 95999199ac0d430a6ab2dbda75f34d9640179865d5be3b1db119c1e613f5bd167193dd7cf662ebcea9d81ad8008d9dbd8dd835d5a7a297456f8587364e7f16b1 WHIRLPOOL a8b7a9c80c7715d0f75c9ee15e78bfbef2db11d4d9fea6ac1e8163f86b735c57b7e6a5612ac269fbcc2c483537a06c1e7704b9c3db2c7dff09b08d228ba607a1
+DIST aufs4-standalone-0_pre20160223.tar.xz 1072092 SHA256 46c9e0bb68902fb92028a435fab9d31a6193407af8c29d8ce0cdefd2e841b723 SHA512 adafd18416a43af076292ea216db73f0569f25ce34d03ebde5aea049745c47979cc4778eef8f671d48a5f7d7ac5751f788d286f467a106c6660412e88442b18e WHIRLPOOL c41763b4abb78afb291a4fbe7e1010ffc6c82a62a9d8b8b0cd23ecff65ae8f6142265f7de9f4e5ee260e0f98ca04f08881778ad7035ecde6e0c910d8a38e3be7
diff --git a/sys-fs/aufs4/aufs4-0_pre20150420.ebuild b/sys-fs/aufs4/aufs4-0_pre20150420.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150420.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150504.ebuild b/sys-fs/aufs4/aufs4-0_pre20150504.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150504.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150511.ebuild b/sys-fs/aufs4/aufs4-0_pre20150511.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150511.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150518.ebuild b/sys-fs/aufs4/aufs4-0_pre20150518.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150518.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150525.ebuild b/sys-fs/aufs4/aufs4-0_pre20150525.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150525.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150608.ebuild b/sys-fs/aufs4/aufs4-0_pre20150608.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150608.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150622.ebuild b/sys-fs/aufs4/aufs4-0_pre20150622.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150622.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150629.ebuild b/sys-fs/aufs4/aufs4-0_pre20150629.ebuild
deleted file mode 100644
index b1843ad3c533..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150629.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=1
-# highest supported version
-KERN_MAX_VER=2
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150928.ebuild b/sys-fs/aufs4/aufs4-0_pre20150928.ebuild
deleted file mode 100644
index e9d57d6b5a63..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150928.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=2
-# highest supported version
-KERN_MAX_VER=3
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151012.ebuild b/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
deleted file mode 100644
index e9d57d6b5a63..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=2
-# highest supported version
-KERN_MAX_VER=3
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151102.ebuild b/sys-fs/aufs4/aufs4-0_pre20151102.ebuild
deleted file mode 100644
index e9d57d6b5a63..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151102.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=2
-# highest supported version
-KERN_MAX_VER=3
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151109.ebuild b/sys-fs/aufs4/aufs4-0_pre20151109.ebuild
deleted file mode 100644
index e30e5f26aa7a..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151109.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151116.ebuild b/sys-fs/aufs4/aufs4-0_pre20151116.ebuild
deleted file mode 100644
index e30e5f26aa7a..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151116.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151221.ebuild b/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
deleted file mode 100644
index e30e5f26aa7a..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
+++ /dev/null
@@ -1,164 +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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160111.ebuild b/sys-fs/aufs4/aufs4-0_pre20160111.ebuild
deleted file mode 100644
index 08283b50ae37..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160111.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2016 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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160118.ebuild b/sys-fs/aufs4/aufs4-0_pre20160118.ebuild
deleted file mode 100644
index 08283b50ae37..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160118.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2016 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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160215.ebuild b/sys-fs/aufs4/aufs4-0_pre20160215.ebuild
deleted file mode 100644
index 08283b50ae37..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160215.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2016 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 readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
new file mode 100644
index 000000000000..391d3e9b7e3d
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=4
+# highest supported version
+KERN_MAX_VER=5
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".13+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
new file mode 100644
index 000000000000..391d3e9b7e3d
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=4
+# highest supported version
+KERN_MAX_VER=5
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".13+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/ddrescue/ddrescue-1.20.ebuild b/sys-fs/ddrescue/ddrescue-1.20.ebuild
index 66ab44044d75..701a1bfbdd46 100644
--- a/sys-fs/ddrescue/ddrescue-1.20.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86 ~amd64-linux"
 IUSE="static"
 
 DEPEND="$(unpacker_src_uri_depends)"
diff --git a/sys-fs/eudev/eudev-1.10-r2.ebuild b/sys-fs/eudev/eudev-1.10-r2.ebuild
index bb2853909e45..41e05887fbd5 100644
--- a/sys-fs/eudev/eudev-1.10-r2.ebuild
+++ b/sys-fs/eudev/eudev-1.10-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 KV_min=2.6.39
-WANT_AUTOMAKE=1.13
 
 inherit autotools eutils linux-info multilib multilib-minimal user
 
diff --git a/sys-fs/eudev/eudev-1.9-r2.ebuild b/sys-fs/eudev/eudev-1.9-r2.ebuild
index 74f024ff4910..f009fb6880e6 100644
--- a/sys-fs/eudev/eudev-1.9-r2.ebuild
+++ b/sys-fs/eudev/eudev-1.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-fs/eudev/eudev-3.1.2-r1.ebuild b/sys-fs/eudev/eudev-3.1.2-r1.ebuild
deleted file mode 100644
index f999da127ad3..000000000000
--- a/sys-fs/eudev/eudev-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.39
-WANT_AUTOMAKE=1.13
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
-	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"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	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(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd
-	gudev? ( !dev-libs/libgudev )"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# 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() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pre-rule-generator.patch
-	epatch "${FILESDIR}"/${PN}-3-rule-generator.patch
-
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	epatch_user
-
-	if use doc; then
-		gtkdocize --docdir docs || die "gtkdocize failed"
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix=/
-
-		$(use_enable gudev)
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-		use gudev && emake -C src/gudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-		use gudev && emake -C src/gudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-
-	if ! [[ ${PV} = 9999* ]]; then
-		insinto /usr/share/doc/${PF}/html/gudev
-		doins "${S}"/docs/gudev/html/*
-
-		insinto /usr/share/doc/${PF}/html/libudev
-		doins "${S}"/docs/libudev/html/*
-	fi
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-
-	ewarn
-	ewarn "You need to restart eudev as soon as possible to make the"
-	ewarn "upgrade go into effect:"
-	ewarn "\t/etc/init.d/udev --nodeps restart"
-
-	if use rule-generator && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit:"
-	elog "         https://www.gentoo.org/doc/en/udev-guide.xml"
-	elog
-
-	# 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
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-			if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-				return 0
-			fi
-			udevadm control --reload
-		fi
-	fi
-}
diff --git a/sys-fs/eudev/eudev-3.1.2-r10.ebuild b/sys-fs/eudev/eudev-3.1.2-r10.ebuild
deleted file mode 100644
index 88caac96f883..000000000000
--- a/sys-fs/eudev/eudev-3.1.2-r10.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.39
-WANT_AUTOMAKE=1.13
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc +hwdb +kmod introspection selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	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(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# 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() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	epatch_user
-
-	if use doc; then
-		gtkdocize --docdir docs || die "gtkdocize failed"
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix=/
-
-		--disable-gudev
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	if ! [[ ${PV} = 9999* ]]; then
-		insinto /usr/share/doc/${PF}/html/gudev
-		doins "${S}"/docs/gudev/html/*
-
-		insinto /usr/share/doc/${PF}/html/libudev
-		doins "${S}"/docs/libudev/html/*
-	fi
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-
-	ewarn
-	ewarn "You need to restart eudev as soon as possible to make the"
-	ewarn "upgrade go into effect:"
-	ewarn "\t/etc/init.d/udev --nodeps restart"
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit:"
-	elog "         https://www.gentoo.org/doc/en/udev-guide.xml"
-	elog
-
-	# 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
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-			if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-				return 0
-			fi
-			udevadm control --reload
-		fi
-	fi
-}
diff --git a/sys-fs/eudev/eudev-3.1.2.ebuild b/sys-fs/eudev/eudev-3.1.2.ebuild
index ff77e978d62c..f2851c67c889 100644
--- a/sys-fs/eudev/eudev-3.1.2.ebuild
+++ b/sys-fs/eudev/eudev-3.1.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 KV_min=2.6.39
-WANT_AUTOMAKE=1.13
 
 inherit autotools eutils linux-info multilib multilib-minimal user
 
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index a7458d2c2a89..e22df2f9bd72 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 KV_min=2.6.39
-WANT_AUTOMAKE=1.13
 
 inherit autotools eutils linux-info multilib multilib-minimal user
 
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 76c2d714048e..2c104028b054 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 KV_min=2.6.39
-WANT_AUTOMAKE=1.13
 
 inherit autotools eutils linux-info multilib multilib-minimal user
 
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 6df659adba35..8debc47da4a2 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,3 @@
-DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
 DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
 DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
+DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.initd b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
index a85021401a7d..a85021401a7d 100755..100644
--- a/sys-fs/lxcfs/files/lxcfs-0.13.initd
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.service b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
index ff737c7e78ce..ff737c7e78ce 100644
--- a/sys-fs/lxcfs/files/lxcfs-0.13.service
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
diff --git a/sys-fs/lxcfs/lxcfs-0.13.ebuild b/sys-fs/lxcfs/lxcfs-0.13.ebuild
deleted file mode 100644
index 24afca093d6c..000000000000
--- a/sys-fs/lxcfs/lxcfs-0.13.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
-
-inherit eutils systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus.  Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
-	dev-libs/glib:2
-	sys-fs/fuse
-"
-DEPEND="
-	sys-apps/help2man
-	${RDEPEND}
-"
-
-src_prepare() {
-	./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
-	econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# 	emake tests
-# 	tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
-	default
-	dodir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${P}.initd lxcfs
-	systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild b/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
new file mode 100644
index 000000000000..f27938250bf6
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+	UPSTREAM_PV=$(replace_version_separator 3 '.' )
+	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus.  Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+	dev-libs/glib:2
+	sys-fs/fuse
+	virtual/pam
+"
+DEPEND="
+	sys-apps/help2man
+	${RDEPEND}
+"
+
+src_prepare() {
+	./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+	econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# 	emake tests
+# 	tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+	default
+	dodir /var/lib/lxcfs
+	newinitd "${FILESDIR}"/${P}.initd lxcfs
+	systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
+}
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index c70827c67099..cb7f4e36f5ae 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -1 +1,2 @@
 DIST owfs-2.7p21.tar.gz 1247466 SHA256 070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d SHA512 ec6d372d32ebf59278c2c68d5fbed42664f52bc1702f4ea8e5506457594943413e37801d341102029cb48a9d8c3d6b3d68615a1dd517c93aa0a475a1bb06c4cf WHIRLPOOL 31901ae07a7431a368cdb4fa0a30a1885da29f55187dc601b53f2e9ebf4e11aba73de93d7f6308671ecb3afa8433548b41a2e79a9a0cc4771adee93a5a6a1ddd
+DIST owfs-3.1p1.tar.gz 1400962 SHA256 e69421ae534565c1f8530a2447f583401f4d0d4b1cf3cb8cf399a57133ed7f81 SHA512 f5c2694ce1076969cf4a6970a07b2c2edee42cfbc6886c1790d777d650cc0afe42cf3282328f8832d5286a0aa5827c48e3d4657412ba3391db5e26adfa890cf5 WHIRLPOOL 2a3a4ebeb3eebaf0d370a7dcc8a9a5fb95defa3e218039f9203b996e4ac2272c2a16323bb8e43da39df9a389dbd057e49c936f40bdc08de201076fbd8d2fdba4
diff --git a/sys-fs/owfs/files/owfs-3.1-vendordir.patch b/sys-fs/owfs/files/owfs-3.1-vendordir.patch
new file mode 100644
index 000000000000..2592e8ad0fd7
--- /dev/null
+++ b/sys-fs/owfs/files/owfs-3.1-vendordir.patch
@@ -0,0 +1,26 @@
+diff --git a/module/ownet/perl5/Makefile.am b/module/ownet/perl5/Makefile.am
+index 5823f4b..cebe1e6 100644
+--- a/module/ownet/perl5/Makefile.am
++++ b/module/ownet/perl5/Makefile.am
+@@ -8,7 +8,7 @@ OWNet/Makefile: OWNet/Makefile.PL
+ if HAVE_DEBIAN
+ 	cd OWNet; $(PERL) Makefile.PL INSTALLDIRS=vendor
+ else
+-	cd OWNet; $(PERL) Makefile.PL
++	cd OWNet; $(PERL) Makefile.PL INSTALLDIRS=vendor
+ endif
+ 
+ install-data-local: OWNet/Makefile
+diff --git a/module/swig/perl5/Makefile.am b/module/swig/perl5/Makefile.am
+index 8e5f583..49cd252 100644
+--- a/module/swig/perl5/Makefile.am
++++ b/module/swig/perl5/Makefile.am
+@@ -19,7 +19,7 @@ else
+ if HAVE_DEBIAN
+ 	( cd OW; $(PERL) Makefile.PL INSTALLDIRS=vendor )
+ else
+-	( cd OW; $(PERL) Makefile.PL )
++	( cd OW; $(PERL) Makefile.PL INSTALLDIRS=vendor )
+ if HAVE_FREEBSD
+ 	$(PERL) -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' OW/Makefile
+ 
diff --git a/sys-fs/owfs/files/owfs.initd-r1 b/sys-fs/owfs/files/owfs.initd-r1
new file mode 100644
index 000000000000..4d7f6d4d1b70
--- /dev/null
+++ b/sys-fs/owfs/files/owfs.initd-r1
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+INSTANCE=${SVCNAME#*.}
+PROGRAM=${SVCNAME%%.*}
+PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+depend() {
+	need owserver
+	use logger
+}
+
+start_pre() {
+	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
+		--pid-file ${PIDFILE} \
+		--background --error_print 1 \
+		${OWFS_OPTS:--m /var/lib/owfs/mnt --allow_other -s 127.0.0.1:4304}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -u ${OWUID}
+	eend $?
+}
diff --git a/sys-fs/owfs/files/owftpd.initd-r1 b/sys-fs/owfs/files/owftpd.initd-r1
new file mode 100644
index 000000000000..c79545a412e0
--- /dev/null
+++ b/sys-fs/owfs/files/owftpd.initd-r1
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+INSTANCE=${SVCNAME#*.}
+PROGRAM=${SVCNAME%%.*}
+PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+depend() {
+	need owserver
+	use logger
+}
+
+start_pre() {
+	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
+		--pid-file ${PIDFILE} \
+		--background --error_print 1 \
+		${OWFTPD_OPTS:---nozero -p 127.0.0.1:4381 -s 127.0.0.1:4304 --max_clients 5 --timeout_ftp 600}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -u ${OWUID}
+	eend $?
+}
diff --git a/sys-fs/owfs/files/owhttpd.initd-r1 b/sys-fs/owfs/files/owhttpd.initd-r1
new file mode 100644
index 000000000000..9ea39ffe3d39
--- /dev/null
+++ b/sys-fs/owfs/files/owhttpd.initd-r1
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+INSTANCE=${SVCNAME#*.}
+PROGRAM=${SVCNAME%%.*}
+PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+depend() {
+	need owserver
+	use logger
+}
+
+start_pre() {
+	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
+		--pid-file ${PIDFILE} \
+		--background --error_print 1 \
+		${OWHTTPD_OPTS:---nozero -p 127.0.0.1:4380 -s 127.0.0.1:4304}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -u ${OWUID}
+	eend $?
+}
diff --git a/sys-fs/owfs/files/owserver.initd-r1 b/sys-fs/owfs/files/owserver.initd-r1
new file mode 100644
index 000000000000..da47a82b73e3
--- /dev/null
+++ b/sys-fs/owfs/files/owserver.initd-r1
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+INSTANCE=${SVCNAME#*.}
+PROGRAM=${SVCNAME%%.*}
+PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+depend() {
+	use logger
+}
+
+start_pre() {
+	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
+		--pid-file ${PIDFILE} \
+		--background --error_print 1 \
+		${OWSERVER_OPTS:---nozero -p 127.0.0.1:4304 -d /dev/ttyS0}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -u ${OWUID}
+	eend $?
+}
diff --git a/sys-fs/owfs/metadata.xml b/sys-fs/owfs/metadata.xml
index abb9646d5261..1d6d9371db09 100644
--- a/sys-fs/owfs/metadata.xml
+++ b/sys-fs/owfs/metadata.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription>
-OWFS (One Wire File System) is an easy way to use the powerful 1-wire system
-of Dallas/Maxim. A simple and flexible program to monitor and control the
-physical environment. You can write scripts to read temperature, flash
-lights, write to an LCD, log and graph, ...
-</longdescription>
+	<longdescription lang="en">
+		OWFS (One Wire File System) is an easy way to use the powerful 1-wire system
+		of Dallas/Maxim. A simple and flexible program to monitor and control the
+		physical environment. You can write scripts to read temperature, flash
+		lights, write to an LCD, log and graph, ...
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">owfs</remote-id>
+	</upstream>
 	<use>
 		<flag name="ftpd">Enable building the OWFS FTP server (owftpd)</flag>
 		<flag name="fuse">Enable building the FUSE-based OWFS client (owfs)</flag>
 		<flag name="httpd">Enable building the OWFS web server (owhttpd)</flag>
-		<flag name="parport">Enable support for the DS1410E parallel port
-		adapter</flag>
+		<flag name="parport">Enable support for the DS1410E parallel port adapter</flag>
 		<flag name="server">Enable building the OWFS server (owserver)</flag>
 	</use>
-	<upstream>
-		<remote-id type="sourceforge">owfs</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/owfs/owfs-3.1_p1.ebuild b/sys-fs/owfs/owfs-3.1_p1.ebuild
new file mode 100644
index 000000000000..e444582c01de
--- /dev/null
+++ b/sys-fs/owfs/owfs-3.1_p1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 perl-functions user
+
+MY_P=${P/_/}
+
+DESCRIPTION="Access 1-Wire devices like a filesystem"
+SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
+HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
+
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0/1"
+LICENSE="GPL-2"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[cli] )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )
+	usb? ( virtual/libusb:0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/swig )
+	php? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+IUSE="debug ftpd fuse httpd parport perl php python tcl usb zeroconf"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-vendordir.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+pkg_setup() {
+	use perl && perl_set_version
+
+	enewgroup ${OWGID} 150
+	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
+}
+
+src_prepare() {
+	default
+
+	# Support user's CFLAGS and LDFLAGS.
+	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
+		module/swig/perl5/OW/Makefile.linux.in || die
+	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
+		module/swig/perl5/OW/Makefile.linux.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable owpython since we can build python anyway
+	# and without it, we don't have to fix the build ;)
+	local myeconf=(
+		$(use_enable debug)
+		$(use_enable fuse owfs)
+		$(use_enable ftpd owftpd)
+		$(use_enable httpd owhttpd)
+		$(use_enable parport)
+		$(use_enable perl owperl)
+		$(use_enable php owphp)
+		--disable-owpython
+		$(use_enable tcl owtcl)
+		$(use_enable zeroconf zero)
+		$(use_enable usb)
+	)
+
+	if use httpd || use ftpd || use fuse; then
+		myeconf+=( --enable-owserver )
+	else
+		myeconf+=( --disable-owserver )
+	fi
+
+	econf ${myeconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+		pushd module/ownet/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+
+		pushd module/swig/python > /dev/null || die
+		emake ow_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	default
+
+	if use httpd || use ftpd || use fuse; then
+		newinitd "${FILESDIR}"/owserver.initd-r1 owserver
+		newconfd "${FILESDIR}"/owserver.confd owserver
+
+		for i in httpd ftpd; do
+			if use ${i}; then
+				newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i}
+				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
+			fi
+		done
+
+		if use fuse; then
+			dodir /var/lib/owfs
+			dodir /var/lib/owfs/mnt
+			newinitd "${FILESDIR}"/owfs.initd-r1 owfs
+			newconfd "${FILESDIR}"/owfs.confd owfs
+		fi
+	fi
+
+	use perl && perl_delete_localpod
+
+	if use python; then
+		pushd module/ownet/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		pushd module/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if use httpd || use ftpd || use fuse; then
+		echo
+		if [[ ${OWUID} != root ]]; then
+			ewarn
+			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
+			ewarn "from and/or write to a 1 wire bus controller device, make"
+			ewarn "sure the user has appropriate permission to access the"
+			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
+			ewarn "by adding the user to the group 'uucp' (for serial devices)"
+			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb),"
+			ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb"
+			ewarn "for more information)."
+			ewarn
+			if use fuse; then
+				ewarn "In order to allow regular users to read from and/or write to"
+				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
+				ewarn "client and its filesystem mountpoint, make sure the user is"
+				ewarn "a member of the group '${OWGID}'."
+				ewarn
+			fi
+			echo
+		fi
+	fi
+}
diff --git a/sys-fs/pytagsfs/Manifest b/sys-fs/pytagsfs/Manifest
index 336394150837..b87040ba8b50 100644
--- a/sys-fs/pytagsfs/Manifest
+++ b/sys-fs/pytagsfs/Manifest
@@ -1,2 +1 @@
 DIST pytagsfs-0.9.2.tar.gz 221155 SHA256 8b4e8e50432e8fe5b0c7bca62540f946ecfb606d07eb5ad0a9aeb28d9017635c SHA512 1c9b8e1e6b40ac2114435b8c973168442ff125560f37cfae36e2bf70da229dc57eec74de77b8a3e35d28a5bd92cec6e559ff6d59b49fd09ba94599409805cac8 WHIRLPOOL d95c1e2da43d6636ff284907a829ca6f5d9ff6012dad5c76dd0230896198da8e1dcb472d653fd9219e38ea67178a281fc6a25144cb3b6d744c89bf8fd3beb6b5
-DIST pytagsfs-0.9.2rc2.tar.gz 221043 SHA256 5916c5cb7a8cdb4e9cfe0dd51e5f55fa8031b72edd923f38382995776d78d4ed SHA512 c869f808d06100c4d886c1d1c01d14b2cfae3abb2222fa500aa5777bf3fb6022b4d4dcef601b4d84432df12654966a0f729b22268a4333b5ebcab7451550eea9 WHIRLPOOL 0d85a5ef50dc245c0d7c19b225a7e1a043dbb8200302a882b33d0b06eed0b926c94a43178a7b76dc6b64c3b97c8bdaba8cfad0385a1cccb01c7d5798ade54723
diff --git a/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild b/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild
index 8d948d285dab..4bc47c23990e 100644
--- a/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild
+++ b/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-DISTUTILS_SRC_TEST="setup.py"
+EAPI="5"
 
-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=yes
+
+inherit distutils-r1
 
 MY_PV="${PV/_/}"
 MY_P="${PN}-${MY_PV}"
@@ -31,6 +29,7 @@ RDEPEND=">=dev-python/fuse-python-0.2-r1
 			app-admin/gam-server ) )
 	media-libs/mutagen"
 DEPEND="${RDEPEND}
+	dev-libs/libxml2[python]
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	test? ( dev-python/inotifyx
@@ -39,3 +38,7 @@ DEPEND="${RDEPEND}
 		media-sound/madplay
 		media-sound/vorbis-tools
 		media-libs/flac )"
+
+python_test() {
+	${PYTHON} setup.py test || die
+}
diff --git a/sys-fs/pytagsfs/pytagsfs-0.9.2_rc2.ebuild b/sys-fs/pytagsfs/pytagsfs-0.9.2_rc2.ebuild
deleted file mode 100644
index 58f6891fbb45..000000000000
--- a/sys-fs/pytagsfs/pytagsfs-0.9.2_rc2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* 2.7-pypy-* *-jython"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="File system that arranges media files based their tags"
-HOMEPAGE="https://launchpad.net/pytagsfs"
-SRC_URI="http://www.alittletooquiet.net/media/release/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="dev-python/fuse-python
-	>=dev-python/sclapp-0.5.2
-	|| ( dev-python/inotifyx
-		( dev-libs/libgamin[python]
-			app-admin/gam-server ) )
-	media-libs/mutagen"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	test? ( dev-python/inotifyx
-		dev-libs/libgamin[python]
-		app-admin/gam-server
-		media-sound/madplay
-		media-sound/vorbis-tools
-		media-libs/flac )"
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 6d6fede09c3d..1311971bb791 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,3 +1,3 @@
 DIST quota-3.17.tar.gz 439168 SHA256 253320993bb132814c724ca268a6346368be41846ad600f65ee4232ec8597d6f SHA512 7d200862f5ebee024295352289d940a1b728cb017e7c2c4f422a5a98d58ba8f62130640a4c08bdec02f94ea0f4abe146fb494c039b43021fd410ec17fd32b238 WHIRLPOOL e334f22a7c2f8097a2f7145217d1cf134a135a1b6705470121e3a9c0492d59677508bfaa06bcb4eecb9992491910f5b29068e005cafb5086df39da591e375613
-DIST quota-4.01.tar.gz 458123 SHA256 a36300bbc126b79b745bf937245092808b4585aa3309ef3335d4ab9d873cd206 SHA512 57f79efe7e538f3109d0e44e4f87388ec4e8134f34ba92a30acb5d223090e8fb0087dfc558a951facc7f9b4d2301b4e305b710576363c13f5e70b06c91194dda WHIRLPOOL ff4aba698fe067e33c7c4fcd2463d5b5b2f557e49d59cb98cceefb145a7e0d2ee371e411a6d8c4d51ddd28c102d34c95f03a733dac47dd52582ea4d31f102c31
 DIST quota-4.02.tar.gz 489289 SHA256 f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795 SHA512 547e08893b95928e5d183d29bee70d1932f85a675b96f64446e5a723d0759ad2d31223f8b6a5652cd698fce4907a15c294b91c18de32faddbef4975c9f22f2aa WHIRLPOOL eb102a14dfe780b7ed062c3c7abec1ef766beb31c18d92c5115ca703672ebb7e7bfb0479885c6c8c78520554aeb477bc1f4d48fbb76b0336047f42b55af49036
+DIST quota-4.03.tar.gz 564352 SHA256 9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8 WHIRLPOOL 4a6354f7732e6c60782dbfb60fbfae47c96c438315572dccaf7d2563b8dab5eb46072f999481abe237df8dafaf252b095c9bcd5d58beecdf75db6aca8d46f4ab
diff --git a/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl b/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl
new file mode 100755
index 000000000000..41c74d919d37
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl
@@ -0,0 +1,104 @@
+#!/usr/bin/perl -w
+
+# $0 -b "ou=People,dc=borgia,dc=com" -F '(attr=value)'
+
+# Synopsis
+# applyQuotas.pl is a script solely for making the quota set within LDAP take
+# affect by running the linuxquota tool edquota with the figures set in LDAP.
+# This tool is capable of applying standard LDAP filters to the user-supplied
+# base DN for applying multiple users' quotas at once. 
+
+# Examples:
+# Apply the quotas using the linuxquota tool edquota for user stefan
+# ./applySystemQuotas.pl -b "uid=stefan,ou=People,dc=borgia,dc=com"
+#
+# Apply the quotas using the linuxquota tool edquota for all People with description of Student
+# ./applySystemQuotas.pl -b "ou=People,dc=borgia,dc=com" -F "(description=Student)"
+
+use strict;
+use Net::LDAP;
+use Getopt::Long;
+
+chomp(my $Password = `cat /etc/ldap.secret`);
+my $Host = 'localhost';
+my $Port = '389';
+my $BindDN = 'cn=Manager,dc=borgia,dc=com';
+my $SSL = 0;
+my $edquota_editor = '/usr/sbin/edquota_editor';
+my $edquota = '/usr/sbin/edquota';
+
+my $b = '';
+my $F = '';
+GetOptions(
+        'b=s' => \$b,
+	'F=s' => \$F,
+);
+
+die "Usage: $0 -b basedn [-F '(extrafilter)']\n" unless $b;
+
+my $ldap = connectLDAP();
+
+my $search;
+$search = $ldap->search(
+	base => $b,
+	filter => "(&(objectClass=systemQuotas)$F)",
+	attrs => ['uid', 'quota'],
+);
+$search->code && die $search->error;
+my $i = 0;
+my $max = $search->count;
+for ( $i=0; $i<$max; $i++ ) {
+	my $entry = $search->entry($i);
+	my $editor = $ENV{'VISUAL'} if $ENV{'VISUAL'};
+	$ENV{'VISUAL'} = $edquota_editor;
+	$ENV{'QUOTA_USER'} = $entry->get_value('uid');
+	# Delete all existing quotas for QUOTA_USER
+	$ENV{'QUOTA_FILESYS'} = '*';
+	$ENV{'QUOTA_SBLOCKS'} = 0;
+	$ENV{'QUOTA_HBLOCKS'} = 0;
+	$ENV{'QUOTA_SFILES'} = 0;
+	$ENV{'QUOTA_HFILES'} = 0;
+	print "$ENV{'QUOTA_USER'}: $ENV{'QUOTA_FILESYS'}:$ENV{'QUOTA_SBLOCKS'},$ENV{'QUOTA_HBLOCKS'},$ENV{'QUOTA_SFILES'},$ENV{'QUOTA_HFILES'}\n";
+	qx(/usr/sbin/edquota -u $ENV{'QUOTA_USER'});
+	my @quotas = $entry->get_value('quota');
+	if ( $#quotas >= 0 ) {
+		foreach ( @quotas ) {
+			my @quota = split /:/;
+			$ENV{'QUOTA_FILESYS'} = $quota[0];
+			$ENV{'QUOTA_SBLOCKS'} = $quota[1];
+			$ENV{'QUOTA_HBLOCKS'} = $quota[2];
+			$ENV{'QUOTA_SFILES'} = $quota[3];
+			$ENV{'QUOTA_HFILES'} = $quota[4];
+			print "$ENV{'QUOTA_USER'}: $ENV{'QUOTA_FILESYS'}:$ENV{'QUOTA_SBLOCKS'},$ENV{'QUOTA_HBLOCKS'},$ENV{'QUOTA_SFILES'},$ENV{'QUOTA_HFILES'}\n";
+			qx($edquota -u $ENV{'QUOTA_USER'});
+		}
+	}
+	if ($editor) {
+		$ENV{'VISUAL'} = $editor;
+	}
+	else {
+		delete $ENV{'VISUAL'};
+	}
+}
+$search = $ldap->unbind;
+
+sub connectLDAP {
+        # bind to a directory with dn and password
+        my $ldap = Net::LDAP->new(
+                $Host,
+                port => $Port,
+                version => 3,
+#                debug => 0xffff,
+        ) or die "Can't contact LDAP server ($@)\n";
+        if ( $SSL ) {
+                $ldap->start_tls(
+                        # verify => 'require',
+                        # clientcert => 'mycert.pem',
+                        # clientkey => 'mykey.pem',
+                        # decryptkey => sub { 'secret'; },
+                        # capath => '/usr/local/cacerts/'
+                ); 
+        }
+        $ldap->bind($BindDN, password=>$Password);
+        return $ldap;
+}   
diff --git a/sys-fs/quota/files/ldap-scripts/edquota_editor b/sys-fs/quota/files/ldap-scripts/edquota_editor
new file mode 100755
index 000000000000..fdebd09e35a4
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/edquota_editor
@@ -0,0 +1,32 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+die "QUOTA_USER environment variable not set\n" unless defined $ENV{'QUOTA_USER'};
+die "QUOTA_FILESYS environment variable not set\n" unless defined $ENV{'QUOTA_FILESYS'};
+die "QUOTA_SBLOCKS environment variable not set\n" unless defined $ENV{'QUOTA_SBLOCKS'};
+die "QUOTA_HBLOCKS environment variable not set\n" unless defined $ENV{'QUOTA_HBLOCKS'};
+die "QUOTA_SFILES environment variable not set\n" unless defined $ENV{'QUOTA_SFILES'};
+die "QUOTA_HFILES environment variable not set\n" unless defined $ENV{'QUOTA_HFILES'};
+
+open FILE, $ARGV[0];
+my $qdata = join '', (@_=<FILE>);
+close FILE;
+open FILE, ">$ARGV[0]";
+print FILE &edit_quota_file($qdata, $ENV{'QUOTA_FILESYS'}, $ENV{'QUOTA_SBLOCKS'}, $ENV{'QUOTA_HBLOCKS'}, $ENV{'QUOTA_SFILES'}, $ENV{'QUOTA_HFILES'});
+close FILE;
+
+# edit_quota_file(data, filesys, sblocks, hblocks, sfiles, hfiles)
+sub edit_quota_file {
+	my($rv, $line, @line, $i);
+	@line = split /\n/, $_[0];
+	for ( $i=0; $i<@line; $i++ ) {
+		if ($line[$i] =~ /^\s+(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/ && ($1 eq $_[1] || $_[1] eq '*')) {
+			# new-style line to change
+			$rv .= "  $1 $2 $_[2] $_[3] $5 $_[4] $_[5]\n";
+		} else {
+			$rv .= "$line[$i]\n";
+		}
+	}
+	return $rv;
+}
diff --git a/sys-fs/quota/files/ldap-scripts/quota.schema b/sys-fs/quota/files/ldap-scripts/quota.schema
new file mode 100644
index 000000000000..b5e216f8db96
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/quota.schema
@@ -0,0 +1,18 @@
+##
+## schema file for Unix Quotas
+## Schema for storing Unix Quotas in LDAP
+## OIDs are owned by Cogent Innovators, LLC
+##
+## 1.3.6.1.4.1.19937.1.1.x - attributetypes
+## 1.3.6.1.4.1.19937.1.2.x - objectclasses
+##
+
+attributetype ( 1.3.6.1.4.1.19937.1.1.1 NAME 'quota'
+	DESC 'Quotas (FileSystem:BlocksSoft,BlocksHard,InodesSoft,InodesHard)'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} )
+
+objectclass ( 1.3.6.1.4.1.19937.1.2.1 NAME 'systemQuotas' SUP posixAccount AUXILIARY
+	DESC 'System Quotas'
+	MUST ( uid )
+	MAY  ( quota ))
diff --git a/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl b/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl
new file mode 100755
index 000000000000..90ab1e8076c9
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl
@@ -0,0 +1,140 @@
+#!/usr/bin/perl -w
+
+# $0 -b "ou=People,dc=borgia,dc=com" -Q /dev/with/quota=0:0:0:0 -F '(attr=value)'
+
+# Synopsis
+# setSystemQuotas.pl is a script solely for modifying the quota attribute in
+# LDAP.  It expects that the users you intend to have quotas already have the
+# systemQuotas objectClass set.
+# This tool is capable of applying standard LDAP filters to the user-supplied
+# base DN for modifying multiple users' quotas at once.
+
+# Examples:
+# Set quota on /dev/sda7 and /dev/sda8 for user stefan
+# ./setSystemQuotas.pl -b "uid=stefan,ou=People,dc=borgia,dc=com" -Q /dev/sda7=4000000:4400000:10000:11000 -Q /dev/sda8=4000000:4400000:10000:11000
+#
+# Set quota on /dev/sda8 for user all People with description of Student
+# ./setSystemQuotas.pl -b "ou=People,dc=borgia,dc=com" -Q /dev/sda8=40000:44000:1000:1100 -F "(description=Student)"
+#
+# Delete quotas for user stefan
+# ./setSystemQuotas.pl -b "uid=stefan,ou=People,dc=borgia,dc=com"
+
+use strict;
+use Net::LDAP;
+use Getopt::Long;
+
+chomp(my $Password = `cat /etc/ldap.secret`);
+my $Host = 'localhost';
+my $Port = '389';
+my $BindDN = 'cn=Manager,dc=borgia,dc=com';
+my $SSL = 0;
+
+my $b = '';
+my %Q = ();
+my $F = '';
+GetOptions(
+	'b=s' => \$b,
+	'Q=s' => \%Q,
+	'F=s' => \$F,
+);
+die "Usage: $0 -b userdn [-F '(extrafilter)'] [-Q /fs=sb:hb:sf:hf ...]\n" unless $b;
+foreach ( keys %Q ) {
+	local @_ = split /:/, $Q{$_};
+	unless ( $#_ == 3 ) {
+		print "Ignoring $_: invalid format\n";
+		delete $Q{$_};
+	}
+}
+
+my $ldap = connectLDAP();
+
+my $quota = {};
+my $search;
+$search = $ldap->search(
+        base => $b,
+        filter => "(&(objectClass=systemQuotas)$F)",
+        attrs => ['*', 'quota'],
+);
+$search->code && die $search->error;
+my $i = 0;
+my $max = $search->count;
+for ( $i=0; $i<$max; $i++ ) {
+        my $entry = $search->entry($i);
+	my $dn = $entry->dn;
+	if ( keys %Q ) {
+		$quota->{$dn} = 1;
+		foreach ( $entry->get_value('quota') ) {
+			my @quota = split /:/;
+			my $fs = shift @quota;
+			delete $quota->{$dn} if $quota->{$dn} == 1;
+			$quota->{$dn}->{$fs} = join ':', @quota;
+		}
+	} else {
+		$quota->{$dn} = 0;
+		delete $quota->{$dn} unless $entry->get_value('quota');
+	}
+}
+	
+foreach my $dn ( keys %{$quota} ) {
+	if ( ref $quota->{$dn} eq 'HASH' ) {
+print STDERR "Modify $dn:\n";
+		foreach ( keys %Q ) {
+print STDERR "\t$_:$Q{$_}\n";
+			$quota->{$dn}->{$_} = $Q{$_};
+		}
+		my @quota = map { "$_:$quota->{$dn}->{$_}" } keys %{$quota->{$dn}};
+		my $modify = $ldap->modify(
+			$dn,
+			replace => {
+				quota => [@quota],
+			},
+		);
+		$modify->code && warn "Failed to modify quota: ", $modify->error, "\n";
+	} else {
+		if ( $quota->{$dn} == 1 ) {
+			delete $quota->{$dn};
+print STDERR "Add $dn:\n";
+			foreach ( keys %Q ) {
+print STDERR "\t$_:$Q{$_}\n";
+				$quota->{$dn}->{$_} = $Q{$_}
+			}
+			my @quota = map { "$_:$quota->{$dn}->{$_}" } keys %{$quota->{$dn}};
+			my $modify = $ldap->modify(
+				$dn,
+				add => {
+					quota => [@quota],
+				},
+			);
+			$modify->code && warn "Failed to modify quota: ", $modify->error, "\n";
+		} elsif ( $quota->{$dn} == 0 ) {
+print STDERR "Delete $dn:\n";
+			my $modify = $ldap->modify(
+				$dn,
+				delete => ['quota'],
+			);
+			$modify->code && warn "Failed to modify quota: ", $modify->error, "\n";
+		}
+	}
+}
+$ldap->unbind;
+
+sub connectLDAP {
+        # bind to a directory with dn and password
+        my $ldap = Net::LDAP->new(
+                $Host,
+                port => $Port,
+                version => 3,
+#                debug => 0xffff,
+        ) or die "Can't contact LDAP server ($@)\n";
+        if ( $SSL ) {
+                $ldap->start_tls(
+                        # verify => 'require',
+                        # clientcert => 'mycert.pem',
+                        # clientkey => 'mykey.pem',
+                        # decryptkey => sub { 'secret'; },
+                        # capath => '/usr/local/cacerts/'
+                ); 
+        }
+        $ldap->bind($BindDN, password=>$Password);
+        return $ldap;
+}   
diff --git a/sys-fs/quota/files/ldap-scripts/setquota-ldap.pl b/sys-fs/quota/files/ldap-scripts/setquota-ldap.pl
new file mode 100644
index 000000000000..7cafc449d824
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/setquota-ldap.pl
@@ -0,0 +1,148 @@
+#!/usr/bin/perl
+
+# A Perl wrapper for setquota utility which updates LDAP accordingly.
+
+# /etc/fstab: usrquota,grpquota
+# mount -o remount /f/s
+# touch /f/s/aquota.{user,group}
+# chmod 600 /f/s/aquota.{user,group}
+# quotacheck -cguvamf
+
+use strict;
+use warnings;
+use Net::LDAP;
+use Net::LDAP::Entry;
+use Getopt::Long;
+Getopt::Long::Configure ("bundling");
+
+my $help = $#ARGV >= 0 ? 0 : 1;
+my $ldaphost = 'localhost';
+my $passwordfile = '';
+my $password = '';
+my $binddn = $ENV{BINDDN};
+my $basedn = $ENV{BASEDN};
+my $oc = 'systemQuotas';
+my $attr = 'quota';
+my %Q = ();
+my $F = 'cn=*';
+GetOptions(
+        'help|?' => \$help,
+        'oc|o=s' => \$oc,
+        'attr|a=s' => \$attr,
+        'quota|Q=s' => \%Q,
+        'filter|F=s' => \$F,
+        'ldaphost|h=s' => \$ldaphost,
+        'basedn|b=s' => \$basedn,
+        'binddn|D=s' => \$binddn,
+        'password|w=s' => \$password,
+        'passwordfile|W=s' => \$passwordfile,
+);
+die "Usage: $0 -b basedn [-o objectClass] [-a attr] [-F '(extrafilter)'] [-Q
+/f/s=sb:hb:gb:sf:hf:gf ...]\n" if $help;
+%Q = checkQ(%Q);
+
+my ($ldap, $bind);
+if ( $ldap = Net::LDAP->new($ldaphost, version => 3, timeout => 3) ) {
+        if ( $binddn && $password ) {
+                $bind = $ldap->bind($binddn, password=>$password);
+        } elsif ( $binddn && $passwordfile ){
+                $bind = $ldap->bind($binddn, password=>bindpw($passwordfile));
+        } else {
+                $bind = $ldap->bind();
+        }
+        die "Unable to connect to LDAP\n" if $bind->code;
+        undef $passwordfile;
+} else {
+        die "Unable to connect to LDAP\n";
+}
+
+my $search = $ARGV[0] ? $ldap->search(base=>$basedn, filter=>"uid=$ARGV[0]") : $ldap->search(base=>$basedn, filter=>$F);
+if ( $search->code ) {
+        die "LDAP Error: ", error($search), "\n";
+} elsif ( $search->count <= 0 ) {
+        die "0 results found in LDAP\n";
+} else {
+        my $i = 0;
+        for ( $i=0; $i<$search->count; $i++ ) {
+                my $entry = $search->entry($i);
+                my @oc = $entry->get_value('objectClass');
+                # objectClass: $oc
+                unless ( grep { /^$oc$/ } @oc ) {
+                        my $modify = $ldap->modify($entry->dn, add => {objectClass => $oc});
+                        if ( $modify->code ) {
+                                print STDERR "Failed to add objectClass $oc:", error($modify), "\n";
+                        }
+                }
+                # $attr: /f/s=sb:hb:sf:hf
+                if ( $entry->exists($attr) ) {
+                        my @attr = $entry->get_value($attr);
+                        if ( keys %Q ) {
+                                foreach my $fs ( keys %Q ) {
+                                        foreach ( @attr ) {
+                                                next unless /^$fs=/;
+                                                my $modify = $ldap->modify($entry->dn, delete => {$attr => "$_"});
+                                                if ( $modify->code ) {
+                                                        print STDERR "Failed to delete $attr: $_: ", error($modify), "\n";
+                                                }
+                                        }
+                                        my $modify = $ldap->modify($entry->dn, add => {$attr => "$fs=$Q{$fs}"});
+                                        if ( $modify->code ) {
+                                                print STDERR "Failed to add $attr: $fs=$Q{$fs}: ", error($modify), "\n";
+                                        } else {
+                                                print STDERR "Failed to setquota: $fs=$Q{$fs}\n" if setquota($entry->get_value('uid'), $fs, $Q{$fs});
+                                        }
+                                }
+                        } else {
+                                my $modify = $ldap->modify($entry->dn, delete => [($attr)]);
+                                if ( $modify->code ) {
+                                        print STDERR "Failed to delete $attr: ", error($modify), "\n";
+                                } else {
+                                        foreach ( @attr ) {
+                                                my ($fs) = m!^(/[^=]*)!;
+                                                $Q{$fs} = '0:0:0:0:0:0';
+                                                print STDERR "Failed to setquota: $fs=$Q{$fs}\n" if setquota($entry->get_value('uid'), $fs, $Q{$fs});
+                                        }
+                                }
+                        }
+                } else {
+                        if ( keys %Q ) {
+                                foreach my $fs ( keys %Q ) {
+                                        my $modify = $ldap->modify($entry->dn, add => {$attr => "$fs=$Q{$fs}"});
+                                        if ( $modify->code ) {
+                                                print STDERR "Failed to add $attr: $fs=$Q{$fs}: ", error($modify), "\n";
+                                        } else {
+                                                print STDERR "Failed to setquota: $fs=$Q{$fs}\n" if setquota($entry->get_value('uid'), $fs, $Q{$fs});
+                                        }
+                                }
+                        }
+                }
+        }
+}
+
+sub setquota {
+        $_[2] = '0:0:0:0:0:0' unless $_[2];
+        $_[2] =~ /^(\d+):(\d+):(\d+):(\d+):(\d+):(\d+)$/;
+        qx{/usr/sbin/setquota -u $_[0] $1 $2 $4 $5 $_[1]};
+        qx{/usr/sbin/setquota -T -u $_[0] $3 $6 $_[1]};
+        return 0;
+}
+
+sub checkQ {
+        my (%Q) = @_;
+        foreach ( keys %Q ) {
+                die "$_: invalid format\n" unless m!^(/[^=]*)! && $Q{$_} =~ /^(\d+):(\d+):(\d+):(\d+):(\d+):(\d+)$/;
+        }
+        return %Q;
+}
+
+sub bindpw {
+        my ($passwordfile) = @_;
+        open P, $passwordfile or die "Can't open passwordfile: $!";
+        chomp(my $password = <P>);
+        close P;
+        return $password;
+}
+
+sub error {
+        return $_[0]->error, "(", $_[0]->code, ")";
+}
diff --git a/sys-fs/quota/files/quota-4.01-cflags.patch b/sys-fs/quota/files/quota-4.01-cflags.patch
deleted file mode 100644
index 4e61855c29ad..000000000000
--- a/sys-fs/quota/files/quota-4.01-cflags.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Apr 21 10:36:28 UTC 2014
-Subject: respect CFLAGS in linking command wrt #446281
-
---- quota-tools/Makefile.in
-+++ quota-tools/Makefile.in
-@@ -105,37 +105,47 @@
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8
- 
- quotaon: quotaon.o quotaon_xfs.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- quotacheck: quotacheck.o quotacheck_v1.o quotacheck_v2.o quotaops.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXT2LIBS)
- 
- quota: quota.o quotaops.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- quotasync: quotasync.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- quot: quot.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- repquota: repquota.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- warnquota: warnquota.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDAPLIBS)
- 
- quotastats: quotastats.o common.o pot.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- xqmstats: xqmstats.o common.o pot.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- edquota: edquota.o quotaops.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- setquota: setquota.o quotaops.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- convertquota: convertquota.o $(LIBOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- ifneq ($(NETLINKLIBS),)
- quota_nld: quota_nld.o $(LIBOBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(NETLINKLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(NETLINKLIBS)
- endif
- 
- pot.o: pot.c pot.h
diff --git a/sys-fs/quota/files/quota-4.01-mnt.patch b/sys-fs/quota/files/quota-4.01-mnt.patch
deleted file mode 100644
index 1aa1590accb8..000000000000
--- a/sys-fs/quota/files/quota-4.01-mnt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3599717&group_id=18136&atid=318136
-
---- a/quotasys.c
-+++ b/quotasys.c
-@@ -642,7 +642,7 @@
- 		die(2, _("Cannot initialize mountpoint scan.\n"));
- 	while ((mnt = get_next_mount())) {
- #ifndef RPC
--		if (nfs_fstype(mnt->mnt_type))
-+		if (nfs_fstype(mnt->me_type))
- 			continue;
- #endif
- 		if (fmt == -1 || count) {
diff --git a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch b/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
new file mode 100644
index 000000000000..2ff519f2b846
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
@@ -0,0 +1,32 @@
+commit cd9dff0b5b53279442458360003831b6c14adc22
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Tue Jan 5 11:20:52 2016 +0100
+
+    Set -fPIC and -pie as default params when building
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/Makefile.am b/Makefile.am
+index 7c7a866..77f8400 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,5 @@
+ ACLOCAL_AMFLAGS = -I m4
++AM_LDFLAGS = -pie
+ 
+ BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
+ 
+diff --git a/configure.ac b/configure.ac
+index 1552c15..68d5924 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
+ # ================
+ # Check for cflags
+ # ================
+-CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC"
+ AC_ARG_ENABLE([werror],
+     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
+     [enable_werror="$enableval"],
diff --git a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
new file mode 100644
index 000000000000..83339159e0fb
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
@@ -0,0 +1,23 @@
+commit 861154efb90ed049e0473cc36935b8d03c78a869
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Mon Jan 4 13:01:36 2016 +0100
+
+    Distribute ldap-scripts directory too
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/Makefile.am b/Makefile.am
+index eb62617..a880ebe 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -52,7 +52,8 @@ EXTRA_DIST = \
+ 	$(man_MANS) \
+ 	$(rpcsvc_DATA) \
+ 	autogen.sh \
+-	Changelog
++	Changelog \
++	ldap-scripts
+ 
+ noinst_LIBRARIES = \
+ 	libquota.a \
diff --git a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
new file mode 100644
index 000000000000..e59341a702ac
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
@@ -0,0 +1,22 @@
+commit 776757a23e9930588950c7fcbc7827ec7a3e51c4
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Mon Jan 4 15:48:19 2016 +0100
+
+    Do not accidentaly override commandline passed CFLAGS.
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/configure.ac b/configure.ac
+index 3ba1386..1552c15 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
+ # ================
+ # Check for cflags
+ # ================
+-CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+ AC_ARG_ENABLE([werror],
+     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
+     [enable_werror="$enableval"],
diff --git a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
new file mode 100644
index 000000000000..29627c03ab32
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
@@ -0,0 +1,69 @@
+commit 6ccb66159a9eee6ca114b11b70eb06f4ac6900d7
+Author: Jan Kara <jack@suse.cz>
+Date:   Mon Jan 4 15:36:27 2016 +0100
+
+    Print explicitely disabled options properly
+    
+    Currently we printed only an empty string when some build option was
+    disabled explicitely via --disable-foo. Print 'no' in that case as well.
+    
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/configure.ac b/configure.ac
+index 39631c4..3ba1386 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ AC_ARG_ENABLE([ldapmail],
+ AS_IF([test "x$enable_ldapmail" != "xno"], [
+     build_ldap="yes"
+     AC_CHECK_LIB([ldap], [ldap_initialize], [], [
+-        build_ldap=no
++        build_ldap="no"
+         AS_IF([test "x$enable_ldapmail" = "xyes"], [
+             AC_MSG_ERROR([LDAP support required but library not found.]);
+         ])
+@@ -84,6 +84,8 @@ AS_IF([test "x$enable_ldapmail" != "xno"], [
+         AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
+         COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
+     ])
++], [
++    build_ldap="no"
+ ])
+ AC_SUBST(LDAP_LIBS)
+ 
+@@ -113,6 +115,8 @@ AS_IF([test "x$enable_ext2direct" != "xno"], [
+         AC_DEFINE([EXT2_DIRECT], 1, [Scanning of ext? filesystems using e2fslib])
+         COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT"
+     ])
++], [
++   build_ext2direct="no"
+ ])
+ AC_SUBST(EXT2FS_CFLAGS)
+ AC_SUBST(EXT2FS_LIBS)
+@@ -141,6 +145,8 @@ AS_IF([test "x$enable_netlink" != "xno"], [
+             AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.])
+         ])
+     ])
++], [
++    build_netlink="no"
+ ])
+ AM_CONDITIONAL([WITH_NETLINK], [test "x$build_netlink" != "xno"])
+ AC_SUBST(DBUS_CFLAGS)
+@@ -171,6 +177,8 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
+         AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
+         COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
+     ])
++], [
++    build_libwrap="no"
+ ])
+ AC_SUBST(WRAP_LIBS)
+ 
+@@ -199,6 +207,8 @@ AS_IF([test x"$enable_rpc" != "xno"], [
+ 	AC_DEFINE([RPC], 1, [Support for RPC])
+ 	COMPILE_OPTS="$COMPILE_OPTS RPC"
+     ])
++], [
++    build_rpc="no"
+ ])
+ AM_CONDITIONAL([WITH_RPC], [test x"$build_rpc" != "xno"])
+ 
diff --git a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
new file mode 100644
index 000000000000..ba838bfe2838
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
@@ -0,0 +1,85 @@
+commit 39fd30ce57e3c34c3649866bf9345a71f0b78667
+Author: Jan Kara <jack@suse.cz>
+Date:   Mon Jan 4 15:10:53 2016 +0100
+
+    Fix build with disabled ldap
+    
+    Reported-by: Tomas Chvatal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/warnquota.c b/warnquota.c
+index 3734f0e..e9868c1 100644
+--- a/warnquota.c
++++ b/warnquota.c
+@@ -109,13 +109,13 @@ struct configparams {
+ 	char *user_signature;
+ 	char *group_message;
+ 	char *group_signature;
++	time_t cc_before;
++#ifdef USE_LDAP_MAIL_LOOKUP
+ 	int use_ldap_mail; /* 0 */
++	int ldap_is_setup; /* 0 */
+ 	int ldap_starttls; /* 0 */
+ 	int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */
+ 	int ldap_vers; /* LDAP_VERSION3 */
+-	time_t cc_before;
+-#ifdef USE_LDAP_MAIL_LOOKUP
+-	int ldap_is_setup; /* 0 */
+ 	char ldap_host[CNF_BUFFER];
+ 	int ldap_port;
+ 	char ldap_uri[CNF_BUFFER];
+@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config)
+ 	}
+ 	maildev[0] = 0;
+ 	config->user_signature = config->user_message = config->group_signature = config->group_message = NULL;
++	config->cc_before = -1;
++
++#ifdef USE_LDAP_MAIL_LOOKUP
+ 	config->use_ldap_mail = 0;
+ 	config->ldap_starttls = 0;
+ 	config->ldap_tls = LDAP_OPT_X_TLS_NEVER;
+ 	config->ldap_vers = LDAP_VERSION3;
+-	config->cc_before = -1;
+-
+-#ifdef USE_LDAP_MAIL_LOOKUP
+ 	config->ldap_port = config->ldap_is_setup = 0;
+ 	config->ldap_host[0] = 0;
+ 	config->ldap_uri[0] = 0;
+@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config)
+ 				create_eoln(config->group_signature);
+ 				verify_format(config->group_signature, "GROUP_SIGNATURE");
+ 			}
++			else if (!strcmp(var, "CC_BEFORE")) {
++				int num;
++				char unit[10];
++
++				if (sscanf(value, "%d%s", &num, unit) != 2)
++					goto cc_parse_err;
++				if (str2timeunits(num, unit, &config->cc_before) < 0) {
++cc_parse_err:
++					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
++				}
++			}
++#ifdef USE_LDAP_MAIL_LOOKUP
+ 			else if (!strcmp(var, "LDAP_MAIL")) {
+ 				if(strcasecmp(value, "true") == 0) 
+ 					config->use_ldap_mail = 1;
+@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config)
+ 				else
+ 					config->ldap_starttls = 0;
+ 			}
+-			else if (!strcmp(var, "CC_BEFORE")) {
+-				int num;
+-				char unit[10];
+-
+-				if (sscanf(value, "%d%s", &num, unit) != 2)
+-					goto cc_parse_err;
+-				if (str2timeunits(num, unit, &config->cc_before) < 0) {
+-cc_parse_err:
+-					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
+-				}
+-			}
+-#ifdef USE_LDAP_MAIL_LOOKUP
+ 			else if (!strcmp(var, "LDAP_HOST"))
+ 				sstrncpy(config->ldap_host, value, CNF_BUFFER);
+ 			else if (!strcmp(var, "LDAP_PORT"))
diff --git a/sys-fs/quota/files/quota-4.03-no_rpc.patch b/sys-fs/quota/files/quota-4.03-no_rpc.patch
new file mode 100644
index 000000000000..c4f5007fca5d
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-no_rpc.patch
@@ -0,0 +1,57 @@
+From 07ec5c783ac16ed20735d6cb8ab167833f5877ee Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 15 Feb 2016 14:36:28 +0100
+Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested.
+
+This fixes a buch of undefined references:
+
+x86_64-pc-linux-gnu-gcc  -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa
+ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st
+yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_
+svc.o svc_socket.o libquota.a
+rquota_svc.o: In function `rquotaprog_2':
+rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args'
+rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args'
+rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args'
+rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args'
+rquota_svc.o: In function `rquotaprog_1':
+rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args'
+rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt'
+rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args'
+rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args'
+rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt'
+rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args'
+collect2: error: ld returned 1 exit status
+Makefile:901: recipe for target 'rpc.rquotad' failed
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 77f8400..6d7ea0e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -116,8 +116,11 @@ sbin_PROGRAMS = \
+ 	xqmstats \
+ 	edquota \
+ 	setquota \
+-	convertquota \
++	convertquota
++if WITH_RPC
++sbin_PROGRAMS += \
+ 	rpc.rquotad
++endif
+ if WITH_NETLINK
+ sbin_PROGRAMS += \
+ 	quota_nld
+-- 
+2.7.1
+
diff --git a/sys-fs/quota/files/quota-4.03-noldap_linking.patch b/sys-fs/quota/files/quota-4.03-noldap_linking.patch
new file mode 100644
index 000000000000..dbaca69bb7d3
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-noldap_linking.patch
@@ -0,0 +1,75 @@
+commit 1d9542df5d2ae5c21a1e96d100f899b3d7b2f27c
+Author: Jan Kara <jack@suse.cz>
+Date:   Tue Jan 19 11:40:15 2016 +0100
+
+    Don't link all binaries with ldap library
+    
+    The default action-if-found of AC_CHECK_LIB() is to append checked
+    library to LIBS. Thus check for ldap library resulted in unwanted
+    addition of -lldap to LIBS as [] is an empty string in M4 and the
+    default action is used.
+    
+    Fix the problem by providing proper action-if-found which was currently
+    just hidden behind the check. Also do similar cleanup for
+    AC_CHECK_HEADER check although there it didn't have any undesired
+    side-effect.
+    
+    Reported-by: Petr Písař <petrp@users.sf.net>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/configure.ac b/configure.ac
+index 68d5924..d17b18c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,18 +72,17 @@ AC_ARG_ENABLE([ldapmail],
+     [enable_ldapmail=auto]
+ )
+ AS_IF([test "x$enable_ldapmail" != "xno"], [
+-    build_ldap="yes"
+-    AC_CHECK_LIB([ldap], [ldap_initialize], [], [
++    AC_CHECK_LIB([ldap], [ldap_initialize], [
++	build_ldap="yes"
++        LDAP_LIBS="-lldap -llber"
++        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
++        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
++    ], [
+         build_ldap="no"
+         AS_IF([test "x$enable_ldapmail" = "xyes"], [
+             AC_MSG_ERROR([LDAP support required but library not found.]);
+         ])
+     ])
+-    AS_IF([test "x$build_ldap" = "xyes"], [
+-        LDAP_LIBS="-lldap -llber"
+-        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
+-        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
+-    ])
+ ], [
+     build_ldap="no"
+ ])
+@@ -163,8 +162,12 @@ AC_ARG_ENABLE([libwrap],
+     [enable_libwrap=auto]
+ )
+ AS_IF([test "x$enable_libwrap" != "xno"], [
+-    build_libwrap="yes"
+-    AC_CHECK_HEADER([tcpd.h],[], [
++    AC_CHECK_HEADER([tcpd.h], [
++    	build_libwrap="yes"
++        WRAP_LIBS="-lwrap"
++        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
++        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
++    ], [
+         build_libwrap="no"
+         AS_IF([test "x$enable_libwrap" = "xyes"] , [
+             AC_MSG_ERROR([tcpd.h not found and requested])
+@@ -172,11 +175,6 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
+             AC_MSG_WARN([tcpd.h not found])
+         ])
+     ])
+-    AS_IF([test "x$build_libwrap" != "xno"], [
+-        WRAP_LIBS="-lwrap"
+-        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
+-        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
+-    ])
+ ], [
+     build_libwrap="no"
+ ])
diff --git a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
new file mode 100644
index 000000000000..d4fffd4f03fa
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
@@ -0,0 +1,27 @@
+commit ab2bf5b51a1ca14cef63e8a7a88b039f173a210a
+Author: Eric Sandeen <sandeen@redhat.com>
+Date:   Mon Jan 18 20:11:01 2016 -0600
+
+    repquota: -F option takes an arg
+    
+    Commit a5876145 added a new -O option which takes an
+    argument, but in the process lost the argument specifier
+    for "F".  As a result, the use of "-F" segfaults when NULL
+    is sent to name2fmt() instead of the provided argument.
+    
+    Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/repquota.c b/repquota.c
+index 744af70..6fe9f0c 100644
+--- a/repquota.c
++++ b/repquota.c
+@@ -90,7 +90,7 @@ static void parse_options(int argcnt, char **argstr)
+ 		{ NULL, 0, NULL, 0 }
+ 	};
+ 
+-	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiFO:", long_opts, NULL)) != -1) {
++	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiF:O:", long_opts, NULL)) != -1) {
+ 		switch (ret) {
+ 			case '?':
+ 			case 'h':
diff --git a/sys-fs/quota/files/quota-4.03-respect_docdir.patch b/sys-fs/quota/files/quota-4.03-respect_docdir.patch
new file mode 100644
index 000000000000..214b3ad1f17a
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.03-respect_docdir.patch
@@ -0,0 +1,21 @@
+commit cac9a60c29106763cc6abd6f372f25f97d4122a3
+Author: Tomáš Chvátal <tchvatal@suse.com>
+Date:   Mon Jan 4 15:26:36 2016 +0100
+
+    Respect the docdir declaration and do not override.
+    
+    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
+    Signed-off-by: Jan Kara <jack@suse.cz>
+
+diff --git a/Makefile.am b/Makefile.am
+index a880ebe..7c7a866 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4
+ 
+ BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
+ 
+-docdir = $(datadir)/doc/@PACKAGE@
+ doc_DATA = \
+ 	README.mailserver \
+ 	README.ldap-support \
diff --git a/sys-fs/quota/quota-4.01.ebuild b/sys-fs/quota/quota-4.01.ebuild
deleted file mode 100644
index 337bb861d791..000000000000
--- a/sys-fs/quota/quota-4.01.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap netlink nls rpc tcpd"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
-	netlink? (
-		sys-apps/dbus
-		dev-libs/libnl:1.1
-	)
-	rpc? ( net-nds/rpcbind )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/quota-tools
-
-src_prepare() {
-	local args=(
-		-e '1iCC = @CC@' #446277
-	)
-	if ! use rpc ; then
-		args+=( #465810
-			-e '/^PROGS/s:rpc.rquotad::'
-			-e '/^RPCGEN/s:=.*:=false:'
-			-e '/^RPCCLNTOBJS/s:=.*:=:'
-		)
-	fi
-	sed -i "${args[@]}" Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-4.01-mnt.patch \
-		"${FILESDIR}"/${PN}-4.01-cflags.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable netlink) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota)
-}
-
-src_install() {
-	emake STRIP="" ROOTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-	rm -r "${ED}"/usr/include || die #70938
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	newinitd "${FILESDIR}"/quota.rc7 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		insopts -m0644
-		doins ldap-scripts/quota.schema
-
-		exeinto /usr/share/quota/ldap-scripts
-		doexe ldap-scripts/*.pl
-		doexe ldap-scripts/edquota_editor
-	fi
-}
diff --git a/sys-fs/quota/quota-4.03.ebuild b/sys-fs/quota/quota-4.03.ebuild
new file mode 100644
index 000000000000..074c8be5baf6
--- /dev/null
+++ b/sys-fs/quota/quota-4.03.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="http://sourceforge.net/projects/linuxquota/"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap netlink nls rpc tcpd"
+
+RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:3
+	)
+	rpc? ( net-nds/rpcbind )
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	# Patches from upstream
+	"${FILESDIR}/${P}-fix_build_without_ldap.patch"
+	"${FILESDIR}/${P}-distribute_ldap-scripts.patch"
+	"${FILESDIR}/${P}-explicitely_print_disabled_options.patch"
+	"${FILESDIR}/${P}-respect_docdir.patch"
+	"${FILESDIR}/${P}-dont_override_cflags.patch"
+	"${FILESDIR}/${P}-default_fpic_fpie.patch"
+	"${FILESDIR}/${P}-repqouta_F_option_arg.patch"
+	"${FILESDIR}/${P}-noldap_linking.patch"
+
+	# Patches not (yet) upstreamed
+	"${FILESDIR}/${P}-no_rpc.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable nls) \
+		$(use_enable ldap ldapmail) \
+		$(use_enable netlink) \
+		$(use_enable rpc) \
+		$(use_enable rpc rpcsetquota)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+	rm -r "${ED}"/usr/include || die #70938
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	newinitd "${FILESDIR}"/quota.rc7 quota
+	newconfd "${FILESDIR}"/quota.confd quota
+
+	if use rpc ; then
+		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
+	fi
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index aae6345260ab..8c65b49b6c64 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,3 +11,4 @@ DIST udev-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b
 DIST udev-224.tar.gz 3868075 SHA256 0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512 7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85ffffa7adafc9c0c0b94fd93784510792109240e22e6b963f198 WHIRLPOOL 645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
 DIST udev-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
 DIST udev-228.tar.gz 4034401 SHA256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 SHA512 e54f282f550854dc082a4788709905e5767b75d2057e18d749b54821f2e44e0a8d1349b1a9180036cc854ecccaf5ff86b3b1dba4d3c2ce1b1fc766930ea4c0ea WHIRLPOOL 16b28367edc29a74f5b08691839da39a02d55bf5bcdffef55bfb1a2e8065eeecbe22a2b661e2d5f161f008d05baa000aff60d662d65db380d6c3fe0c1380eea1
+DIST udev-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/sys-fs/udev/udev-229.ebuild b/sys-fs/udev/udev-229.ebuild
new file mode 100644
index 000000000000..f02642684d2b
--- /dev/null
+++ b/sys-fs/udev/udev-229.ebuild
@@ -0,0 +1,440 @@
+# 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+="
+			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.27.1[${MULTILIB_USEDEP}]
+	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 26 ]]; 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
+	export cc_cv_LDFLAGS__Wl__fuse_ld_gold=no #573874
+
+	# 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 c9d46a5646cc..f02642684d2b 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -104,7 +104,7 @@ pkg_setup() {
 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
+		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 26 ]]; then
 			eerror "The line count for secure_getenv() failed, see bug #443030"
 			die
 		fi
@@ -157,6 +157,7 @@ multilib_src_configure() {
 	tc-export CC #463846
 	export cc_cv_CFLAGS__flto=no #502950
 	export cc_cv_CFLAGS__Werror_shadow=no #554454
+	export cc_cv_LDFLAGS__Wl__fuse_ld_gold=no #573874
 
 	# Keep sorted by ./configure --help and only pass --disable flags
 	# when *required* to avoid external deps or unnecessary compile
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index e51bda4b7793..f1aea30f7ba7 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,50 +1,31 @@
-DIST aufs-sources-3.18.1+_p20160118.tar.xz 168952 SHA256 f6cb39f5be05bb497bf863cfbfe0a23f72503c2e1907f649865caeeafce32ca5 SHA512 1ce85cdcad82e4caad33d8e62e9b73106dd67c1555f195fa918346cbcc59670cec42bbee69cd8d2b2a183b58494eb8acca28918b1e8476fd5fc6bff2230ce168 WHIRLPOOL 1908bcf367a41b9dcb836b9de8bf017cb96a645713b418584f526ae0bbc94d9cdeab398d3f388d31b9f1ceac2c7fa82451b0820d1b10b72cdc4769c5eabc4497
-DIST aufs-sources-4.0_p20150518.tar.xz 166024 SHA256 da653585bfd610bbc874b9f51c76777511a9b15eb662917f653af1ef8d255936 SHA512 b7e7f681b8125c98f6ea28482243edeb16952ac0ba53ebb7992a0988d54066dd288bac732cce7b6f89485407fb69f6bce164f9bdd09f15b446acba1c28c2905b WHIRLPOOL ed3eeb9658d87714268b0f03bf1de80aedef697f51a80407211b68beed5af8efca77d14de0dbcc9873f30b71fc4b026c6270b6c75ac0fd7e22ec89432867d17a
-DIST aufs-sources-4.0_p20150629.tar.xz 166624 SHA256 af28e0752a1f9c0edf34519b58ed4aaea9e3538a3041110061d1fa55e25acfca SHA512 c68c077bf399d188c72f8c2c6ca4ce634fa710b84296275529f1a8a20c3c923ca7d418cd564d66651b5dbc3544bc556f763a5c3687e3fede55e36b13223a2bec WHIRLPOOL e3590e5da82ae5252c1e318dd775d950a14c3ac0f6235552cef0943f304361299ed33731e7365f6ef586e02e7d23be5dfdc613b40f48a042655b2a110638ca3e
-DIST aufs-sources-4.1_p20151012.tar.xz 166736 SHA256 05c5f7e565d58b98db443752c1f7b085be2ea6b3328a7ad43ad764c72c58c9be SHA512 95f43145dea8b2068319453450de434b44b1d07b947b1ca795e7ca44e8d2c5bfb619aeb1fc8eb2085351a4a078c30b5641716def5703c9e651613f4761404d78 WHIRLPOOL 05ea5374ff905113ffbda7b17964f82ea7f2a5df0126af887cb7524d68661c8e381d094c02e2592ae4ab7c97f553d866be988adf1c938fe1acf1eca253e03db4
-DIST aufs-sources-4.1_p20160118.tar.xz 168084 SHA256 6fb93b41c76ce80c09cc9e331da275f202ea4de91e3883009be976cbdff28219 SHA512 1bb4c2414ab180db27d37be470125a0828923b64830b3566968205369e9d75559ef150421f8f7ac3e48580f82978ce71c4adcb173ea820c7c531538ca151f0b8 WHIRLPOOL 75e357bbb83d7406557985a00157ce715e1b4d6b2b4df69585de87885552da7101b3b5163b08d15da53addd2348ad1a12dd5b4b00e01ddd68f9c09d61b3f4442
-DIST aufs-sources-4.3_p20160118.tar.xz 168440 SHA256 904f4f50d4f24ba563480f737a13696782d506e1d1a9ea915a09252b23b0d7c9 SHA512 5527b4614b3cd81ac23645117f52495f30484b43eeff80f1de3f382aa6daedae5c60c13a17e5e60eb00b9750c5f7731d95589aa8927603eab4b128fb3bcad149 WHIRLPOOL 7e7ed7e0738e535fe0a858aca31886d30225b40d9f6937e9e99efb4f45ad20624975ad6a5b5ee228e1c739b32d09a5c7391ab07ff99bee26e3723248b875c12e
-DIST aufs-sources-4.4_p20160118.tar.xz 168316 SHA256 9f28b43dc7ba8c70a61ecb1726debf087226e68c2381d10fce72161c7fd443bf SHA512 fbb0b4dc6fca6c3b8d8f43c610c2029bb117ed51f42dbd868fd8098c380480782517cae385618c46ec7a8f416298077b810285d57202a9fca157ca0dff846031 WHIRLPOOL 6f355b41e31e707f0674dcf957055e26a18769b7f576e48f79c40594c04a662655996a3911cc7128fd5fd07ab5f18ce0305b7e763a786b4cffb5f630bc0e5f80
+DIST aufs-sources-3.18.25+_p20160219.tar.xz 169620 SHA256 62e28c5f345182c324d4bab60eabe1e9a6ba98c3c6e9527e82162ea921fc66da SHA512 05cb10f1389feddd1f746542d544c9648bf6731a365ad807f540eb668334c10c86650786e43462a97950068d1bbb9cf3a91a2f38ea3ae99a56f10b633c836e28 WHIRLPOOL 12ff0727544a0e1fecd438b81add6fd8c391b98ea9e8a9679b64a82190257e41ede09cb63381bf27ea94d2bebeee23965180ef9e229c2728492c95bd3644dc67
+DIST aufs-sources-4.0_p20160219.tar.xz 168396 SHA256 16e4044f8bf83b0dbb8f6b087351de4d619f873b7023e22855f930bd2b55d10a SHA512 68cf371383250575afce395fbc368208db92b78168be31137ff9238017d40c141b29efbcbe68a850d54f8b4fa36d1556d243682a66417c67e28464b667ecd292 WHIRLPOOL 2b1008e8b76811537ed68a8b932cb488230736f3a89a815ee77cbd4d2a15a9ebaf98099fdc1aa9f084b8daad96d847e1b1decc195b5d2b0613a92512e7f9a3ef
+DIST aufs-sources-4.1.13+_p20160219.tar.xz 168840 SHA256 e4eac1836d9ad7860599b7c036168df8f2060bff834fd24dc168413c03c449bb SHA512 336da270576f83930bf338b063092e78949929ce53dcf0ad6f9d4072bba6978ff70a5b3dc1d1e358c904d49630fca9c3f82f34a9b44219ba62e30d4f8030b1e6 WHIRLPOOL 4a4530c4208ba5af675c41a0e6d61857a3cd67ca55e5f15b0a762aaec6246b480e52d43af39fa7ccb61bad651f0011cff445c0337d4e92213d7d2438e2a6fe40
+DIST aufs-sources-4.3_p20160219.tar.xz 169048 SHA256 6471c1ab669fd59f62f6d3b21ca6277c67f621ce6a362d87c2f603aa57824ad5 SHA512 b6640165c41db58ca4208cf1487d16b5fd0afc0358f3e759cd388fd952e3c7430d9e5457dd1712933e90f99d4d0baa9627d456d9d22c68db755a61bf12fa52f7 WHIRLPOOL d504577d772b5637986a0f645564b27efc0a914a265e3bde60ad0d6054e72b15ec50c6a48c9c32c1022b25614c1866509c04c6ed45852389084b063bf9abf139
+DIST aufs-sources-4.3_p20160223.tar.xz 169096 SHA256 8795ff9aa455d8e9effb980af422135d6cfd35928cc5f084e12ccd82fd13fdb4 SHA512 5e39fb0255cb6df12fafd1efa5ac9730ea29fffc9bdcfd296541821c42f34493ef59035344f6cf4ea9ccf4759f6e7dad35c162cca49864274732f868022d72f2 WHIRLPOOL 21737396487cadc0e7a13d4f87ca5464de50f18ef214512214ff5f5134d872a1f4b4822e8773e739e7f0a84ddaddfbd2eb545ed71c51b26fac8f71438aa1b657
+DIST aufs-sources-4.4_p20160219.tar.xz 168956 SHA256 f8d1b9bea2e69f73020aa43dde5b085444fbf346b68997db03a7a00140acfc2e SHA512 0da7257647838f3f7d2703ba8d8e2fb9f98a28dbdbaf4dd4f56727255759279f8774481fdb6ea7927a9b3b174056825416d7bf8e736625a98e024873f09a5933 WHIRLPOOL 5832a517fa0e231d4c1af9cb68192b7aca588a54efe34bde64260d172f0ed6c93335d577025174b9f3af50fab0ccb0973553bbab51abc29f410a3939f154deb7
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
-DIST genpatches-3.18-25.base.tar.xz 752676 SHA256 3ab39ed47165216251f369d816649995148936c1d70c2288a5a38a9601cc8197 SHA512 168d9bde976ed99d3ff5a6f83929c8c4b0b29b8216f1695a508c361c9d99ead9b3d6df81eb701bf8b70ea9a5ee6fc9784866f52353f1b4ca90cefab45d8d13eb WHIRLPOOL 9d31dd6261fecfde390306f2407dbe3e2f6f934f161ba66006297fde5191fce3073398b9a617b545a90756d414b4c1b1bea87ec6211f69a177dc1d544e374ab3
-DIST genpatches-3.18-25.experimental.tar.xz 61616 SHA256 467e1302e82f0a5afaa0f3687a0b5978524ef06d2c99ba36e76d6a8f130bea84 SHA512 a31df47bfb00f428d5419c17ae21e2bf58aded932b4f2ebe73b0f0aabdfb19f4599feaede611f31ee93a205519f7dd7f88b897c17ac4feff1a3228c887a58820 WHIRLPOOL 8dc0a5670864c84688272787fc284630980285003cef165629e0083ab1671b7dbb95c1278f1ebb7c80b37e69ec2806fe7067bc9ca4bbec6b30073de3965e13fc
-DIST genpatches-3.18-25.extras.tar.xz 16180 SHA256 276495f7316026a91cbb74abc7032bfa4531f209d6092226d1aab70ebb8973e0 SHA512 6c7a040b6f2ea7968f163fea171a51cfa4a0ee04a7a05a1592ed71b8d0e6554b4b2d8137ec2e41a2e703d5913fb2998a6e6f85087c3cb0d6855cebed6f341f8b WHIRLPOOL c0b43b808ece970290867356556fb2b3b9ce6b6621a3772e08eeaf07dd323d048c8d1efb4c2dbabdf77550fd912afdd74bcc9a33c3180dd97938cc2f0e6598c4
+DIST genpatches-3.18-28.base.tar.xz 820540 SHA256 def3cdebe118e6381465c7d61b4aeedbc55c63ffa5196f62afc40df6c1cf60d5 SHA512 dd48643fb5aa48539da83fabcc9423186e80ed7beabcb33a519eda876c5d925d910e0955f9b7d7592fbbec175a7948c11a9065a280e4f576b2618f156bbe00ec WHIRLPOOL cf7b3eb5635f0e1f7438cf87db2762471d78d2a4eb85d493ed2196c29df035ddbe6912fffe5cf126e81fbde5687aad11b1f3cae6c0d285468571ea01798fbcc0
+DIST genpatches-3.18-28.experimental.tar.xz 61612 SHA256 4ef8ff2340d16145f2177ef2f5e8ac43b37e57c9d9ac730bd0c992e99209a71e SHA512 94fd26d41de8a6a4d0ef82d9c261b3dd5b54ad58bfcf054e011f6495be788d687e589ae39e3012707cd48e836e678d237ccdd3dba6985c3f2086ae923616f2d0 WHIRLPOOL a325ec94646c9c05c33cb0338e9f3892804b1dc0277a2d80b1b1248c40f6ad6fe8de170f01639b8e79e86a9fe540ac1c8bf22c138dab85684dc76cbf7db5bbb3
+DIST genpatches-3.18-28.extras.tar.xz 16184 SHA256 7fe110961bc2fc65f0721d89af43d533a556f0ec567d84d40269549bdea089bb SHA512 5971522cdc227029414cd2b8e385dd857d7ce113c85c3bc18b575f97ac616fc1f586dbfe7a933ba4bcfff00e3c711d42b0e29289ba725c646bdee0efb4c1046f WHIRLPOOL 61d2bb69908c9458a03e25aeaabb5dc8b4129a0b8385199a51ba345a6e8af0994d60fe09e33b12e7fdf02ae83c1a31af9b7758ebf9d1c6c9e5527bee7e3e1f81
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
 DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04
 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085
-DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953
-DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952
-DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b
-DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9
-DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0
-DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
-DIST genpatches-4.1-20.base.tar.xz 452816 SHA256 74b7e3355fdd999b17ed0cd955a20551ddaa0cc4d8608f5b80d31f8059a79549 SHA512 fd2d6c1ce75c899254b944798d230144c25caa8e36103388fa4dd3aa1a1a9e310435b442535be13a933b16d1a142c125bd5e754fb4aa621573599c36b6ac4bfd WHIRLPOOL a22aa9175d0cdf315c345ab60655476b141a472c4ebe505838440402b1bd65802ab21e6ad897f7883bf2846b61b9b414b2f55af29ee9372ea30d62df3257fc73
-DIST genpatches-4.1-20.experimental.tar.xz 61652 SHA256 155bbcf04d07d2b02523c9e64323f000ea24fa2b06d1472ceaf125e70e2ece25 SHA512 5f03d99b5c35384a158a2568516a41b9bfba8c373f1b004e1493bb2071b4de321b66ddd623bf71cd6fd85f4c3af1d2d45316dd3b2424b113f292ff4104e976c3 WHIRLPOOL ff6668b2f2301e34ba3a387a1216d8ab65f720acc6b2a6218f2d883c2ac0c1fa608e1cd0b07033eb6e114e4ae9a88ad7e3ef6ce7a4f6da8b241149ae08a8ec23
-DIST genpatches-4.1-20.extras.tar.xz 16180 SHA256 8f44981c6574aedf1484c7e643cfa3dfc1362fdce415947382c77098082d34d7 SHA512 5ae28d62ece98e9f39b68e6ffbc205c3c7e47b9048a67e461f944f1b05e39de865973c11a4fa6dcf34dea65e2cf883f537be4aaf24c704ff311c0769c68a286a WHIRLPOOL 58c8389b43898e4700d81fd12496acbf954152e6879e0f2d0535686ebeded273032080569c18fd739a8e2c07c6b55f8fe58adc2ff21c436c33d20e2a8eed6fdf
-DIST genpatches-4.1-21.base.tar.xz 462148 SHA256 0ec07c9617ee2e5f9d1f4f071c5b5696274f2a0275508a7e527ee94565b81ac4 SHA512 59d306ed7275c20e41f2056b92b180c364be645af2d0a570e35b83dece8aa314a558503d1d9cec5c0113585ad6a72297d1396d16aa82ac7cb22fe83648b104c4 WHIRLPOOL f8f35d173c1ca70b9fc6e7acb39ddcec1fece29d7a6ee51e586147aef4c2d2f1846c98a35d0cf5024687fa5f2e87031b47f6b4819764fa7cef0916018b5ba411
-DIST genpatches-4.1-21.experimental.tar.xz 61644 SHA256 4237ac2effb4817c73a27a33f20cfa6704bbcc715a247754abf63dd980071f73 SHA512 8443ca5be9c2403d8d28a0ebeb3402f8d28b5f056564706addb9bb0e8255b8c095a2586b273186e1d6ca82b44fba73ffe5ed6590eb439603c5bed61809804a5c WHIRLPOOL a7b6c456e510569b3acfdeb675e51d902b39997d1d5923c66c6f446f634e45c219e7d7f90a66f0bad9267d1328a3a83a470cd7ee503884b201affea88340561b
-DIST genpatches-4.1-21.extras.tar.xz 16180 SHA256 f1e5767b655aa56d66b182001fbf5108294f8675bd022bbff5c470064b23c1d1 SHA512 8aacd4f8dd9fab6a106f4733872d37ce1784d309263eb4c55558bb80086ae944b85f47bc7d518f7a8798d620dd2b776ea9744f9c69d22b90a4298f5d930c4d7b WHIRLPOOL 12245af4d94106aabf55319a616cba3f089b7f11ead5cc9947e1a593ebace164bc29c813254e941f7ddfb0cc98ef6bd1844896d708f78efda06af4ba1e018610
-DIST genpatches-4.1-22.base.tar.xz 496068 SHA256 2e8bffcd6f12687fbf8af81182b68671b178aee11455330c173dbd60aabe01e7 SHA512 2949472a6ee6e03fe0c04a2ce34d8afae56f5c4b92397d73211852dee09aa70ffcc5cdcd1f730a6b19e1b6dbbba3cfe769edcc297a0afac145b2445e6d947681 WHIRLPOOL b46e4fc296556b9d70aca3af1bf02418cdcfab1f3afe1297fac2ae2282260cd76d3edda8f18c32baebda25caadca70f13e4876c284c04fdae7ce648de5ff5308
-DIST genpatches-4.1-22.experimental.tar.xz 61632 SHA256 dd10f3d0a034b8cc12fae479034384f4c19a06e3e990ed78b3c9a9df557a36ca SHA512 94a1ec19ee77c8a36918e0b4722d4c4df945dc23d36dcb26eb16476cad16ed07086277b623d347fac05afe8dba9531be8df183c328b2a9beced8679184054c53 WHIRLPOOL f99a2897a2cd9988bf6a25133427a32482d6ca044700517d268111bffa5e470e3a931e9734f132569c37b4dade8d25dbe15e5a62aa6360abd328bfb84dbadccf
-DIST genpatches-4.1-22.extras.tar.xz 16180 SHA256 c45029f048af2ef0a90db03f800f764559efa2eecb7c0e388424348d05adf906 SHA512 c75b4620aca4160946dc25ba7d8eb7657319a7528e126a90a5481f68a90e41284c6fcc695f611ef9f7ec0718b649242d4a69b0588730401273101b6744496e4a WHIRLPOOL 2432b7490691c813bc11410646cdbd95df791b19752997412edb087c5c8dc4bc9ef185804c3f750deeef8ee3c751909451927d15cce1b937ace0f3cc1a6c169e
-DIST genpatches-4.3-5.base.tar.xz 76536 SHA256 ef0d2bf2101d848ef6ef97ebb680dfb546aec91efdc17acb45bd234e4e7d2fe4 SHA512 635008532fc56f68e5867143367ecd7f3e277dda796d2c311e61459b6b1e454f0822664bfae02f59cce691246ba9a7d0f6ed6a5817230e512632c80b71ab6b7b WHIRLPOOL b467abff1276bb5884fcdeaed9d15ef7dd0a31f37e44b77c98214758bf406b21a5143b516a1c15056146af426122ec255736a33a643ad3bf10afd6d052070ccf
-DIST genpatches-4.3-5.experimental.tar.xz 61640 SHA256 487bb6919e05409308db7cbce48f0c059aa426e843cc92f92fee485b1b960d54 SHA512 a62b720a233628e593902fed82c7d60eee5b079e33bc313599f93228dfcee12159987cef8852a391aad2971252f728af914a8c7118ff8484393aab1193c2ffab WHIRLPOOL bcf996a05e20bd611382181b88b9ffa789b0d6665e48bb7e0f398e5f386598dd37ff39e33af0a4bcdb873cacf2b40a032e587adc5acd9117bf5f9e99ea18480c
-DIST genpatches-4.3-5.extras.tar.xz 16284 SHA256 79a6d10fba5a62519d4818cb16065476ae3ed6667012e77c84d4a5d61df2f26a SHA512 cfb85a6b475b1e53eec42b5fdde16372eaba7502f8ea783b3d7bffe369ea2bee6d4f65f5a7f32e8a485a0102090b7f0d9bd026c1c68fde1bca7190bd6647de61 WHIRLPOOL 90c1ff6e3a1d97d695f69e08d0a0fd8f7e48d215b74b3c98febc32b05333ab7bdc53c8f843f2371e1d0d7825d25eb12ebe5fd3f1c392415b5dfae45223458db6
-DIST genpatches-4.3-6.base.tar.xz 90396 SHA256 ca44364c8a8f4efa483926ad9c562f569c08fb713a1a3aaafa1e4adf10da6312 SHA512 1272acfc097f50af8af0906893a2054dfa86c5ea7a123ab63b0d43f9b403832bf043164b0c242ddb8ad61688d01d453442de4cf24cd5f1fb897763ace293ed1b WHIRLPOOL 310a5e84dff7e88613a563e6e791526f8e1766e81b084514153c8c69a615e6097e597f8ac967db929b79f0ddde5ff9dd843b54dded23cdf14642dccd26a3e949
-DIST genpatches-4.3-6.experimental.tar.xz 61624 SHA256 344f1cefc1e7738451d3433fbcce3974e5599c3e8a416473e4340806b8b8323f SHA512 44411406af51d593b6fdc30c883b85acbc38b3561849dc893fb0d25094a2d4db47e55eade394645724fa9529e79410219568b830f7160abab5ecca10313e3327 WHIRLPOOL 8105c64f9d6a2c2fa7529ef1ffae78b3ab48a2790a49d3436078155b33c719192ae11c7de76c46293ab5ad3214fcb3af10792eeef8f01645c5f4392a2862e7ed
-DIST genpatches-4.3-6.extras.tar.xz 16280 SHA256 fc90c37419df393f084a5fbbe2d681d80aa9620c13984fb6a68b578b79504ecf SHA512 a4e347ad2181d5f2e4031f2392c33e17fb3704215ae25420a5953f9a8f8f0e5168617537c3fa07ad684540b9a8d15c7d1cb5bed62dcd8c72e75d07595d053833 WHIRLPOOL d6d736e2a3f2b816ca232caf2f9baf5e5305c1343e78fafd75d1f985d158fcc4baa438ca09c5ad34aae8b38f159c1245ab68ae872ba1455c324b13e93a4a6d74
+DIST genpatches-4.1-23.base.tar.xz 572288 SHA256 8a46e42e2fa5e8a530bae36f330ec5e03886784228c649276e2d530b738d4f25 SHA512 176f6db507ffc7e8ccfec3c4af28a7dad4118b5b145490c4c0efa24a4b6e056cad9923aed69acf8a90a0e42626c437d54c3eac18285dca1fe7e067eea63ee178 WHIRLPOOL df45ea7924444b58b8aadeb2ceff448b29c9dc0f98b911eaf4051bbb9d18edaa283e684c2e471722f77b57d7a786a0c617108b7aa0ad72a18677153083481a36
+DIST genpatches-4.1-23.experimental.tar.xz 61656 SHA256 99f83b19eaae65c2a7f36721533e0dc229d3c319afa18a66629d1c9ba4780ca6 SHA512 4be89a9aea2269dc0d77e92921df66c429eb7bed808663a511d08cab20fded79175c6c2f8874844c2d85c77ab726459f86d3682cbcfe4604a3fdb5929a42cbd9 WHIRLPOOL 2d29b6b08edf7a34f5629f75a3d5b62be691bbf518d0482d1d92e7b15551139ca353df120fbe8c9a9ef47fed1060d19f6606aa4450ca823a39a6e9134dc40416
+DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d355c7876ff4a75dd30c486a8ec334f84df2 SHA512 ed74a9ab953dbacc10b6c246578c78681d36544497a296f9cf76e4e43d447b4f9a6d4354ae9074fd081e748fec0b3769b193e0ccff3953070eeeccf0ed2820ec WHIRLPOOL 6a978a5093c0258d65c511b53f42ce28ed7d19fea2f9171b5265a1050d977de9855501869a98bf5f96615bcd7b39e3522835b4876d7c5d43f80646688e5772d5
 DIST genpatches-4.3-7.base.tar.xz 137724 SHA256 f45b2b6bd27dd6ba0ce82f4b143078cdb99f729d344773ef31f42fff339f295d SHA512 3a910f0c0a41b1658190b005ca6cbfd82ddea72a65f09e26b4173371f5ff1f65a1712cd35633d0692f74fd8ff0d0fdb4163113ccca8c1de197d1ee52356fbad5 WHIRLPOOL 67611446db6eb94c59842874762797cd2986399e7304eb3adcdfd9a72b104a10dbdde7a22de87381f416ebe07ab312b80dc1a8946077a003bf5646db65aaedd9
 DIST genpatches-4.3-7.experimental.tar.xz 61640 SHA256 963f0c524dfb50dd9c8d9b211d672eeaaaa3f8fd5a1ae623dd9c4f1ad32513e0 SHA512 757630a3b74653fc9cbe0009069a3ac81eb7b989d02411234a328cb6ae4363afe5e0dfc4bd8d84828d8450951ed50a6b476d2b130f49bc32fa4251d0599b51c0 WHIRLPOOL 43fdb49d7d8fdd42775cd13c976cfc621ef879f9adaad5db971ed7f28ffdd5d8b5bb35cd0c6be3e01cbf3744ccd70f70dcc4a9fc82583c62b6e63e5c9a0415dc
 DIST genpatches-4.3-7.extras.tar.xz 16284 SHA256 11fe6eb76d8cfbda95001b05ee1c78243c7394d0a4e12600b3fbdfb69574c9b8 SHA512 503936e84af45909eb4df1b6b4968ca48cb65ed7617340270b41cfc41ad209b22a20ae63dd720901b750d905fa7215912a8c8d271c9544fbf2b3c1ca70adece5 WHIRLPOOL eb7beae6d4bd324b7b4e0daeb292891a53ba9072f30eb2c038e8b74af14643d20a577142c0fce72a36324866868582c8574700c1e86ad06aaa8ce4a7ff5fcb9d
-DIST genpatches-4.4-2.base.tar.xz 4416 SHA256 fbcbba8098ffea5957652a91de15ac41eb197443e7403b7aeb32b38b8a0d8bc7 SHA512 65cf7fc10a76be780134680811ebdbb2ed2deede73203688e5b32bef764eb2dec6bfc3399eb245082204cf571b06742dec90f9ee7cea6b34692f694cf0bc7bc6 WHIRLPOOL 554b3287f7011c62e3efe4a8e06cf635bd3768f9228fdabe25fb01b6f1acc1a47a7c96587fffe79e8aadcfe181b934c59512918453cfb27f867d5dd2d3a022d6
-DIST genpatches-4.4-2.experimental.tar.xz 4904 SHA256 f1b7bf2d00c34b573d195e841efe5dfb29354d901d2b73066e57c19fd9c7b8fe SHA512 5c98ea98c4648dd2fecaf7cfc364da04d136f4b084d9c1b0b2527deb7cb52d226d5709ab0324e22d75e56d44e42cffc66add0a432639a817b59e97b275f9c232 WHIRLPOOL ab0e36bc830de699d59be6f08d6293283668a3742f216f8189dcb695ccb293c3a60ea468836321835d0bfe3336f6731647698d8252630d06f8fd96886099d2e3
-DIST genpatches-4.4-2.extras.tar.xz 16272 SHA256 707735f41624d33489b10c771db536f119bcc5f0d13cbcc38e91977b8b12ec41 SHA512 4f3d9463a9e6f618e6a3a66d4b9f1ca7ffbafa2d0c13308493dd5abbb23147abbc37c0e68a38b0c11c1f424fa1b2086aae88e820a824a1313ea9531507f7f91b WHIRLPOOL d9aeba2ce4e4db0697813bf116e27ec6e91f614316b8643539fefc28f5f522532fd746a56c91e706cf6f9e621019f050dd22f60f420d2aa15d2121383fdcfe1d
-DIST genpatches-4.4-3.base.tar.xz 26508 SHA256 76f5685698b02b81643d6b2edcd53217e0f6fa00e068a138f2eb3bc596dec2e5 SHA512 255e2ef79c56699e5b032fa392b2748570ce96c74f1172f4a4c1b4d22f8b8b0a9462c388028a0cad92e821815d39cfa6450f171d81fed5f274dce03979c39322 WHIRLPOOL 6da9edc7936f8857b929e589b2adcb17363a76ec5d85b3406fcb8308d6cb2da924f1f9af5062f85ddf4d415ca9d9524b731e8c4e0cde756e14ccc122a6e75c74
-DIST genpatches-4.4-3.experimental.tar.xz 4904 SHA256 e43014cc7aebea9e8d4f9e5c53e8e7a670f24693dbf6bc4b53dd17bb255f950a SHA512 60ae488e44c2e04e50cd456f3476548caad305b5807c0ce21251b7afdee4f4db300a68d14fb37984a1e4ea0be121c23cc8f145fa2964369fb83c0f2f32909feb WHIRLPOOL a5ff3f4e5adb1257a3c034e69fa639041051ea15080241fcd4c10201e8024575394f19e1bd36f046f3789a0d4ab4d26519cf142c52694b37105509423fef17c4
-DIST genpatches-4.4-3.extras.tar.xz 16284 SHA256 c0da41d2dca58113b257f2d21faa456867f2010a903dfd2b95639789c44c2c5b SHA512 150de4f7e7f81f12cdbb57a47802f9878ce0efad3553847a7f64e3428be45b22be432a51f6546daa156019f9480c3fab03b0871d255ca962a79037a10867f0e5 WHIRLPOOL 2a6ea3032726ab49ff78b7d01315a0099de9ba5addcbcb3fc88fd7ece137d6cd4e79a9737b05be60c4857ef6a37b71237e09d3cd19cb4a441e1d173fdc77a000
+DIST genpatches-4.3-8.base.tar.xz 196548 SHA256 9246ac430ca198817f177093cdb628bb3eea3fad8ac0723adb38a02502cfb89a SHA512 ce2dd67fa2fba9583b9cd309d68e63b937e718cfabd9f3eb882ebc23b3139d59ff3c84beb3cf770dca367284fff6ca2bc85cf9e114da4621b7f6865b2d69dc0e WHIRLPOOL 0c5640f03d44b1219c23a7eff655b8f1749e20b30b89473c06c3a6fb0f34d30094534382ee1a1e4b5fbdffbbcce20dbe4e377410e390b8b5586ad1da9efb57fa
+DIST genpatches-4.3-8.experimental.tar.xz 61636 SHA256 8f1297df01d21d8ff121549061b8a8cfb463130edb1a873c6daba6ad8c3d7894 SHA512 19df4ca02e4552befbadef8f0824eb09cccfe10fc00e48d1e684bc7e7761f4d896e605f0153c5ad7d8f96575166c4823f08d9a5f7be3df23128b39d97a685c57 WHIRLPOOL 4d6661b13be1002d9610bbd19618d77f251f6672e286ecdd9a19fccc335ccf0c3dbc9572e60919f50b562249b9589082786762cae0b961a92f056da206b17dbc
+DIST genpatches-4.3-8.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
+DIST genpatches-4.4-4.base.tar.xz 63520 SHA256 1a682ab2279d2b57cf1575e10f70d4cd411bb209189ff9fcfd1270291f311fcf SHA512 040f590980aac0bba3805e959344f93ee9d32d4fc9e667e3cc2ab1b5375cef5043a4a0228c3fb34457af79579b96f5f587b9b0874ee066105acbe0250780c956 WHIRLPOOL 2f1bdacc234c18be10e0d3f61f3852d21cd6259d015146d7e274499f4fb9643e7e83151f3682d25c1f5a0adea507163dbcbb5e269f7f73b6e226b178a603201d
+DIST genpatches-4.4-4.experimental.tar.xz 4896 SHA256 e3c5381823db06220d1b464a8b8db3fb0efc0cae87cbe9695ccaefc956f9a17a SHA512 9ae08e11750d27a012c7b6019d14133decc14fb004d7152b83e71b0f400c3ed8bdfdf7d9f6538c8a0689efc5ff27760f79a34176275e79a99b6021a4c4db646d WHIRLPOOL 2cd692e0d14c04034f74c7742e7fea330e7a2741fc03220589d1e978e42998f4e23790e9719d38843d9dc0291f87b196ac026472a232793f10f594458c2866f4
+DIST genpatches-4.4-4.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.25-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.25-r1.ebuild
deleted file mode 100644
index 18469d2132b4..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.25-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 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="25"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=3.18.1+_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-3*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.27.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.27.ebuild
new file mode 100644
index 000000000000..34a2023ed56b
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.27.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 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="28"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+detect_version
+detect_arch
+
+AUFS_VERSION=3.18.25+_p20160219
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-3*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.0.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.4.ebuild
deleted file mode 100644
index 4e5fce4832e7..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.0.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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="6"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.0_p20150518
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.0.9-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.9-r1.ebuild
new file mode 100644
index 000000000000..04761640edbf
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.0.9-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 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="11"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+detect_version
+detect_arch
+
+AUFS_VERSION=4.0_p20160219
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.0.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.9.ebuild
deleted file mode 100644
index e889bd4c5276..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.0.9.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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="11"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.0_p20150629
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild
deleted file mode 100644
index 0e6da31766e3..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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="16"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20151012
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.15-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.15-r1.ebuild
deleted file mode 100644
index cbd54e8f5023..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.15-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 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="20"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.16.ebuild
deleted file mode 100644
index 5db3662b4887..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.16.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 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="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.17.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.17.ebuild
deleted file mode 100644
index 41cbb563496d..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.17.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 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="22"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.18.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.18.ebuild
new file mode 100644
index 000000000000..ffac785eccce
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.1.18.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 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="23"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+detect_version
+detect_arch
+
+AUFS_VERSION=4.1.13+_p20160219
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.3-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.3-r1.ebuild
deleted file mode 100644
index 35b8f0fc17c5..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 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="5"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.3_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.4.ebuild
deleted file mode 100644
index 318a5fac8d44..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.3.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 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="6"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.3_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.5-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.5-r1.ebuild
new file mode 100644
index 000000000000..0b05998a911e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.3.5-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 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="7"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+detect_version
+detect_arch
+
+AUFS_VERSION=4.3_p20160219
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.5.ebuild
deleted file mode 100644
index 49b74483664a..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.3.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 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="7"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.3_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.6.ebuild
new file mode 100644
index 000000000000..e908fae73d9e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.3.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 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="8"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+detect_version
+detect_arch
+
+AUFS_VERSION=4.3_p20160223
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.0-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.0-r1.ebuild
deleted file mode 100644
index d32433f7c74f..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 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="2"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.4_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.1.ebuild
deleted file mode 100644
index fa5c762f2205..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 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="3"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.4_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.2.ebuild
new file mode 100644
index 000000000000..032e28ce9129
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 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="4"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+detect_version
+detect_arch
+
+AUFS_VERSION=4.4_p20160219
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 5b37186bd33f..6238ab1cd37c 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,90 +1,47 @@
 DIST 3.10-sched-bfs-440-r1.patch 244053 SHA256 0b921d45036d411c4e04b5f6334dee3e7bfd9f131a46742aae748607a30f59d9 SHA512 c8c9f76e780f8f4c631ce161373f6a3d69ac785db080ae30d64d53b249025394d77293e074c2bed624627ecb0fb47e4745fb0676ccc2df004abf4d9f73cfc83b WHIRLPOOL 6001792a570366829d478fb5e84d33a68eff181c4a29d2ef4e2049336e1b2bf011b0d07c38c446f4acbc461a244571b78bf07b4d43a8ff1b8edb34a602917cfa
 DIST 3.14-sched-bfs-447.patch 245314 SHA256 cf71ec72daeaa1ae757e8aaea10a53f972b62548774e3c9bae95d388c7c158bb SHA512 b8ee8d42eeab19c4229a7cd391af6b732c2e8a179f5ed969f1cc8863dfed68d09a6c6e61860df103a5c9535768d8852f7ce2acdc0618b529acc98e2e33be9b0e WHIRLPOOL bfbf8b1e5c43f4908fdf8a115ce708ea68accfe9e9c8f530be43ecaca3df7abfe966164da52545f40c80fc5138e5deb152b8acb49882238899452e51d89e88ba
 DIST 3.18-sched-bfs-460.patch 250534 SHA256 f42551429eaeb544d24b658d86c24fa56acf6991b48762a48c1420d5c49baef2 SHA512 a7a6025c9062c935f024681a487d9087db9d3baf431f6534e9293174568e81f439400170f96a6060fd8b99453132e0e529eb2cd4fb795eaedda92cd8aaf65526 WHIRLPOOL e1431d93d772965139d5a67acee2c11819c5b1a09b8cfd16ecbab6c3dd086d81359b5e4be81d4bb73ef7273f495bf6c00978bae90652e1ecf1eae24f951e8f6e
-DIST 3.19-sched-bfs-461.patch 250797 SHA256 d0c8edd972a87118ea8cf37b48a6d127adce835c49228c3f3f79774675ae137a SHA512 957cdf7b41266a1209925312f3062d36f2f3be4015ef2bc11c9f3742b1b5f0b29d413d4bd24d0438e0ab36f9aa19a84ea5fb5c19ca63baf151de706e41012bdc WHIRLPOOL 9fbd6c51ade6910f6c191ddf0535d3b8b1e45f0feb76ebc3dc2735bb08b65a526b3b17647845f19abcd9bedfe47f78c643f03ef7fed42862edcacc4536709875
 DIST 3.4-sched-bfs-424.patch 238668 SHA256 0faf4dd97ed903599db83d83b79b811d171ae6d1e916ad88ca32e55290fab32d SHA512 70f788b837fb26fc03503eab15eb958f1e86ab682bba394874c75275bfa4fec225ba16df5e77bffed24afcd99d6e13c3be608c81870d4d141bd9c86cd97b64d4 WHIRLPOOL 26f65771a3bc3df5b396d66755bc9b6af5bf200f6c84bae989de0d32f806df3a581c8aea2271163fe3aca54527d34a050bea9249a3db9b9f39f17330939a81df
-DIST 4.0-sched-bfs-462.patch 252390 SHA256 0cf6fb4ec74ab142c2ad89b055340b3851b98abbac0646b1e1efacf5cd1ca320 SHA512 576f7383bc4ade80a9180859d235d5d9c273a927ffbd4b36e0d7abd223b5998d628ce2a061025c5506ecf21b57dd10cb08bf9ef40e26f7203f84c01466d98d3a WHIRLPOOL d146e6d0f4aed20922f3042792205ab666a875c9a014f35654b2abab2941cae1a163c5ae2e5284eea47c9d5d948d08b2a1cf0ecee75298899c8e3ecabbad6632
-DIST 4.1-sched-bfs-463.patch 252364 SHA256 9cc1303ee4a4cb6a4bf3da9108875a1973dc3e4ce3a72c33eda52b577978b15d SHA512 2809c0bc258461cf9d3cfae3179b2d880fae842d2ea0892358f76cb62c56f8258dfca368b5f173a9e043b508328517976110b2e81315c4a79eb5ba44f93c0133 WHIRLPOOL d6d33b85abe63da5e19afa2c6a7648f5716fcd0cc31686884bd655c0937da65d523d7d7a2ea30ebd15fc623b2300eb8aa95bc99251e22db816cdbeacaa39b0de
 DIST bfs424-grq_urwlocks.patch 26428 SHA256 2bf41081dc175776100ce8c3ac909c1a77b314903c82a73cf1b8603ad7c841c4 SHA512 9784d7382b41484623cd410a4a6cebb70aaec39076fff62622f51084b7ca59707f9790b0a53ae0cfd2974d5120c849c542346746d243c59d1d79979141cfc900 WHIRLPOOL bfb8f5ffefd8da7e72e11884833cc742cb3652c32c0022c29a2a786a43b3c9788cf34a9d5d10ed65907de4aee990766bb03c4082cae19e6ae41d22666103ba57
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
 DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
-DIST deblob-3.19 129098 SHA256 b0e121e80f02676bc023df1470691b94bd0495ae09aa349d1e6edddf7d1b34a2 SHA512 8f9327d5bb56fbc24f72622d579232003db95695c0cd22b4ce0b4692c9757b639c1253548d943f7cbdde9652cf51814f4b4fdf92055e8ae1c9d75acdc68d9a32 WHIRLPOOL bc3ed9eeec3ab77e2f18ec4a2a536a58b4bf2091a50219220c4d1d21de6956709c97dbb098eba64eacb2fac45f410020f6c37a3f890e6e820d5d8faebc3f3b3c
 DIST deblob-3.4 108298 SHA256 b005dd372b8e55b19fc583fd99a3e95e44844b56305fdff7fdbd5f924a6c0308 SHA512 ce3df3c4850f0da821286acfa1b6c94e16350578f76a4df93284d2fe201dd78ce15dfb5c56727d8f90012062db180d5e9ee81ac3372f5b46e0deabdcfc03ca19 WHIRLPOOL 79386c1e04ca84709fce6ec4ea5eb308876d86f04a1b28f1eda4653d4917b3b9aa9b8a6b82605da3456d29e800dd5bbfcb27c124f1a01057d25b18871bc8770d
-DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
 DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
+DIST deblob-4.3 137019 SHA256 317eb90f128fc05bcf0a01eb7f167f9b5447563b0af4cef4270b774ad64dbdf8 SHA512 e1f98cfcac9cbbe3e7042bc427c1afb5024088d0846a1eb806c7c46616ee77cbbeb63c52f7c1229ff54cda74605f9a6775833e1f5d7ba35a9ae554ca05fd7fc0 WHIRLPOOL 9d42765fd0592f7c8e01f5df78510deafbfff2b60128ad26c2412bdab4b02c72fc8dd0c7c0180176b5399de66cc85f625abf2968c049f8a3b9ebeb5d8c5c71f0
 DIST deblob-check-3.10 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
 DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
-DIST deblob-check-3.19 659945 SHA256 df5a9b11b095b0d8c3204c9b24118d77689900fc4ef4c3256b13fe86aee0d185 SHA512 f7fc86ebc8e1c61c16d7ce6831368832862346522676b65f4702c77bb2e9b08691f2c67cf88e92929908d5300d53913e7e5365baf3378b1cbe3aca59ec80c672 WHIRLPOOL e5e33da007c07af4ca5713d583f992d9da8c6745761e1956a246de429a44aa972a94cc1db51e67d0ba1aad9b8476ef694d846e8157a85411bcbc1809f20f633a
 DIST deblob-check-3.4 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
-DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
 DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
-DIST genpatches-3.10-88.base.tar.xz 1217916 SHA256 b4037ba6e57270215f951e56f8961058a52d421cdd8ac932b95eb0fb7f5447db SHA512 2b01cc729ceedb77b5daeadd34705a5221ac9ad8fd1f920ce10b85739a5b3c67de3b76366982c8eb216932abbcb4040d4909b6f2908a3633997617987cfe2dd1 WHIRLPOOL 515def87c16a3e28dda0816695d6d8d3981232c31bc4f01df9607c9f4aabf950ad675cdc7cea1bb09e3a41101afb2bb9c48b28ae1957e3e8c206c1cb2efab052
-DIST genpatches-3.10-88.experimental.tar.xz 60188 SHA256 d779f799a398f07377f1d7cc140b3f07b43b3afdb13f94c8ef4366ba47c9f78c SHA512 abd1d1d6b4fa175c8a0e70bd57690f674e8b588e22ed18459e5433e9065336b165e404eb320dfd3e62b78978a9961c2f011aa9d758f9bdbe27b87ef008210a11 WHIRLPOOL 1667a6d965a315b7bc2b31f6d6fbad65c8c3bb66ce978c97562ad8255815eaee2b895a5bd5a8a8dbe0505e29763b8553a70ae10c7d75d853bd2af97ea3b957aa
-DIST genpatches-3.10-88.extras.tar.xz 17844 SHA256 3caee8fd80d824dbe855f52524a70c8911baf8996626eb48b82391956f39c58b SHA512 7fdd240c093e1837816358f98328cbeffdbafde8f3dedd9f31dee39d4f491cc3764dbdb30549477eb820e16ace063d6958d6fe487f4b184b96f6799ed959b95f WHIRLPOOL 9ab75dde01eb128f586d192d70cc308353f1a2cda67d949af6d955c2bbd34c4b09b0e8e1cc1c1909daca6b0006d706380806d209ba8baa4422b8edb107355778
-DIST genpatches-3.10-89.base.tar.xz 1229720 SHA256 86adf7b1a4d27a1770180410652b52d91366cbd80819b6b99794c606725b4f41 SHA512 fbb93ff58f24598db3d48125ea38b85712090b517ac7a4258d252812256cf25388bb27a18e9dd7737a61fd969609a744f6749b134035b4899c27c76af9b6d80e WHIRLPOOL 2781580b3042563b5d4958d8048796d7bce09f541d33d4f284147df0504b53e9a7c1ad71ec7c93ce06efcb3b486832d0f1c98b7444b0c6f063f077f9748c603d
-DIST genpatches-3.10-89.experimental.tar.xz 60188 SHA256 9cbcb6187fbad49c04ca926394bc725440fb6948763f5a745c7e42a947354ceb SHA512 3afc230b86653e84803cef9bb24ee2ad0d0763e42feb2fd4886810858661c6ab82110beb200370b05991fe3a630db5fcf72ae997c355db89416848b4cc9e25ec WHIRLPOOL aaa0cb729f93cced59daaa4f01e8e024189db933e78ba4d9745866f2290d9a8202d500e260c0837c5b85054173d3c03e4fbc5ea388df8ccc6030eb328abc8ff8
-DIST genpatches-3.10-89.extras.tar.xz 17832 SHA256 4f55ddccc80d9c849165929d726cd24759601db9f5c39de5f2f34413ce1f10fc SHA512 4de9603d0099e8f001721dcbf2e135e6153dba535cc1a949d7a3992d976fd6119f35c8bb026413e25f9aaa59e329e6abbaa269fb5c0278d502e37b7751b08086 WHIRLPOOL 4d33ab1225144f45c0072fc8d9a1832772ebe0b5413acc0f0827ab130148619f146fb3ef2f58ea8735ef749510d5b8408181d1a163929d4c1d6444309767b0a6
-DIST genpatches-3.10-91.base.tar.xz 1255848 SHA256 7620aefe7534b6643bcfae8a6af9d595c3b37ccd94f532e48078fe874ffe3836 SHA512 d37274bdcadadec3bc15cbe6b2477cfe6dd07aca458b52da3ff015e6cc07603c572554d80d93eaed936fe70a74a03383765b27eb4a3d37bbef8b6d2ca349c872 WHIRLPOOL 1fb71cb356f84f5c764aadf5672f7a48a42c8353499442857cf0dadd3c92dfe5adb06d134bcc67dffed45199d96c74764bd18afa9ced6b69d0e2691ef3c8ec03
-DIST genpatches-3.10-91.experimental.tar.xz 60184 SHA256 8028875798adecee5c5419ae58fef9f2c222c42b63b1bbb884a69a38b7e00a59 SHA512 1727952b1c8c9e94bc84c1d4d02f3946a8aa99498016f3258399cb08f22fd0f69245240c2252934377de30c87f755df3af19b46e9500f6b0532bc1f64be44bfa WHIRLPOOL c3e539d142cf6559ffd2aec7b9ad87bf874f5936395d5895293065d0ed63176daeacf592d1e1820e6a2f5a09c8a00d04c88026bbdf11e01c8dce7d2e3455b2d9
-DIST genpatches-3.10-91.extras.tar.xz 17836 SHA256 c0530ffe58e5b4f654224b09cde9af2b8aaa1d1644f18355c3c855b16847f2bd SHA512 709263ecc2be794c7c2e6f314625d9cf4920e6b52348160191f2589bead14a28ac8c1ec812a1fd21d86fa77acde037e9be42b49c4833e04590efa6c634ce404c WHIRLPOOL 0b3a830a1e304c39bafd28c25569051d8c3eaf79c0717aed2c4b824ab8a6a7faa284c464ee7b590ff25fb1df2f7571eea7e858827fc4cf85dda0c2216a345a23
-DIST genpatches-3.10-92.base.tar.xz 1264772 SHA256 85914172a3d7399f2f055a7f4a5547f97b8fdb215af9783a447511a152a3a9b5 SHA512 8f98ade2bae7b7cb034702d9938f105da801278f9f31dc2d8a23b65428719eb40d368f3e616b57518bcdebed76e5f278043e7401a60d64c02c6ad90fe669c46f WHIRLPOOL 81c1ddcf5f8218929bf67a31be9a141d0d1b4890bc6248704a54fa1c87357fb6e1c1131180ca7f4026d2f464a7fcac84d001ee7242356218c031bd07500f33d6
-DIST genpatches-3.10-92.experimental.tar.xz 60184 SHA256 8028875798adecee5c5419ae58fef9f2c222c42b63b1bbb884a69a38b7e00a59 SHA512 1727952b1c8c9e94bc84c1d4d02f3946a8aa99498016f3258399cb08f22fd0f69245240c2252934377de30c87f755df3af19b46e9500f6b0532bc1f64be44bfa WHIRLPOOL c3e539d142cf6559ffd2aec7b9ad87bf874f5936395d5895293065d0ed63176daeacf592d1e1820e6a2f5a09c8a00d04c88026bbdf11e01c8dce7d2e3455b2d9
-DIST genpatches-3.10-92.extras.tar.xz 17836 SHA256 c0530ffe58e5b4f654224b09cde9af2b8aaa1d1644f18355c3c855b16847f2bd SHA512 709263ecc2be794c7c2e6f314625d9cf4920e6b52348160191f2589bead14a28ac8c1ec812a1fd21d86fa77acde037e9be42b49c4833e04590efa6c634ce404c WHIRLPOOL 0b3a830a1e304c39bafd28c25569051d8c3eaf79c0717aed2c4b824ab8a6a7faa284c464ee7b590ff25fb1df2f7571eea7e858827fc4cf85dda0c2216a345a23
-DIST genpatches-3.14-52.base.tar.xz 984136 SHA256 01318999e36187e937f9108fb7b5642f05ffdf61946981cc2d3a35f2c84139ae SHA512 e691210e2ae8184e6cdbb7dd381dfa850189aa7adb58bb33f6f0c6f9cb35e04097b97ef7ec5a0806c70d4d6aa4fae39cd6fe74b04cac4aa117340bc93c785049 WHIRLPOOL f0ddafcdee7c2f7b90f2f94b859afed000d860d259fe059cb4916b1bb71ecf146c943d279ad8b00f6fcee33c0faca3fb2e0e5d9eaa69619dd1da487f2c25f583
-DIST genpatches-3.14-52.experimental.tar.xz 60316 SHA256 49f617c5ed285358514cbc6a8d5d63c76806a29f64081220797b127dad4c8cc3 SHA512 a7801b33b07d04a0bd7dd2dde5b5567ad20356a0cbce1c0ec4b58b750d54a46a8f17d380d5bfaf331798bef10fee4f35530e1597ce48b6b4376d38beb35f9f6c WHIRLPOOL 93e45f1dd19aa902e8698b514175073f062b4facc26edabef7ed47f55d26e4b9fda005d318dd69f19ab52a3760e574965b1bcd2f580ce887a6e7772a364284f1
-DIST genpatches-3.14-52.extras.tar.xz 18268 SHA256 eb8fecb29c0c64ff14f7f530ca0f4b6a414643e8bcde1e6ab2932bddc8682a63 SHA512 fbf92e198092d580fa7918725863434a784b60341e5d973d8eebc9f7b454cf25de4d362c8fd039cdafbb4a5a2782b869ca3671c1d79613294d443afb25f5d065 WHIRLPOOL c42bb5d6b6c20736af7445786a4664b4e2adad60174ff11434039db111834811d80cf71711dac6e3fe93c4a42c480752e78efe1bef62ffcb1a3cbf0549f7d93f
-DIST genpatches-3.14-54.base.tar.xz 1000384 SHA256 31496c9d1175b58ddea2e7e832cc0a1d6485754b0876bf10395de151b113bc26 SHA512 8c41346830512bedf1efa20914aa4c0a5895a78a8442e7f6749845986518a01bf0ef4d8759887b8368735c7c3cf5537717bd31ea9b2bd02c30204358a2e1adfa WHIRLPOOL 7aac6195994ca15659a7c8d73ae23fdcc0391f1a0260f795ec7c10833ef3dba90caf7fe1a8b1debcf314739515d180635e3a37721943083181a4784a8f38a30b
-DIST genpatches-3.14-54.experimental.tar.xz 60308 SHA256 d65996f339e190d74e5ec1279b7e7e50712a75c36a83d71fa030c6a91cf402d9 SHA512 a51652a814070674c106bbff39acf2a65b6f011b676a7963138ea9279fb0dfc35842efea5fbf5d02e57db53a20535edf62afdb433a31282226b3fcfb10d525f3 WHIRLPOOL a6696e0271df7ae8c4c16c1fb9450b8e3383c330967ba131e988569d67481c1d7a124094573e1522a01df8bcae0453f1a722456c637efe0531fd96b0b34e97df
-DIST genpatches-3.14-54.extras.tar.xz 18268 SHA256 082caa7769237e2105c3aedcc3be569809cdaa3dfa7a99107aaddc7f5830d5ef SHA512 8b238352a15587c7ce44ae90311b5cb7e49e05abfda5af2a777757306464316527527c2f47d81f4689acc9998d3059a3e7854b38b9ce2929de2383cdfd321d65 WHIRLPOOL d7c633218de7299be91eb3c01f5e3c5a00d348dc00612de52381ae3c4385717d9424670e8e2e0c2de94b032c50af732371f090c7189915877d6e7ef0e6896945
-DIST genpatches-3.14-56.base.tar.xz 1032792 SHA256 8f227c2a9d1c6945604b67708088484fcfeb3075a4ea984495f8b1bec5a62476 SHA512 3ed7b6b68756b7f2abbeb78e50a9735a06d4d6d5b099edfa990cc26c3894731da97df37b580d469f48f5758eab5d3aa70e4efb9300f6daacee2d8def7a918fbb WHIRLPOOL c8a55f43db1fb4a28eb87f4e5eb50d98d0c0caa76a47b06f26be0e4a2e08d8c54282a5ca46e7e89ff1c8b6d9ada44bfe319b717e76683b8fb1e68822bbb1f816
-DIST genpatches-3.14-56.experimental.tar.xz 60296 SHA256 58be5067a3830fc533800e5105aefbf6808b06258f7b64c667e8e0a59cc7eb1b SHA512 24d1b4c310bd53ff6172f69ccb73137af9d3aa6fdc5462a33afbf0e8459976b2965d3b64eace6c86f3ad05380f0b27ed3b4088177c60c2376438ee0dddbd7543 WHIRLPOOL fd90bee201267d1a4e22f6396328f8c32fc65306c30996a42721a768b13a15f91295e64e6621eddb03cbbaede55b25b50849beacd29906c46100ec8e9a6fd983
-DIST genpatches-3.14-56.extras.tar.xz 18260 SHA256 12f3e13a55a2d7cd26d12f7fd4b9f9918a58e03f1bca9db240cc2bc5f6f8dbb5 SHA512 fa64c4084b013dce25f14ce3a25a88bec3aac57f10d38b0a1871ef72d578dac6fa0613bd394bd3fda7151ad6b145285993c3e579becfac9053b59896ed7e40ef WHIRLPOOL 0ce89895abc7d3fd71a454778a996be4c08d1fc155a33ad3d2a6d6b58db050fcc87052f89dba93a2b89b7f4bc352dc0be6cdfd7698f609e47004d9e83072354f
-DIST genpatches-3.14-57.base.tar.xz 1045724 SHA256 0b68357d14cddc6349711a57b66730c45dccfc4c4598626ffc07f0949f37d286 SHA512 0610c4367e139f9b6af7ef1f5ada82ceb17cf6c53f2b2e7a95e4b44f99a279a4fe29fd1dbc597e09512c5b9c5a23ebc6091c9e62d695507044cd68adc9ae863b WHIRLPOOL 0b19e424203d24b291d5b6941b9c39800b90eac54677d2f079040eec6577c454522f83840a6e5ebd5a72743ac5f7122dc38debeaf85e757792e845355b0b32cb
-DIST genpatches-3.14-57.experimental.tar.xz 60308 SHA256 f3d49287f18f19dfdbb45c1f51d42ee63912a98568605561bfea52968f38a2b8 SHA512 781a83eb21cfa3798fe0c458e607c006cf69c7b3c3574d05e6100b5442b4b57f7b878732cdbcbca4db081aa6834c7cb7a730bbd620bb69c6f29b28e3d2ecca9a WHIRLPOOL c87d6a60449670fcaa5189be5e673e2de8dc8ea343129769fa5d33f90dda217a6d1501e7cd853f9ce6ddc836378d1514e74c7d628d98d8b0731bf205bf26b5a4
-DIST genpatches-3.14-57.extras.tar.xz 18252 SHA256 c7fab5340d2c59c203ee6b84749396b851ad5273ed9826a6305bd36823576f54 SHA512 d4d4e451713064dbc612bd33d4a8b815fe9c77a483a47eda0a35f30f159c4c538f9a7a751df2185ac7d336b80bd1297c8609980757447a3f0e3cd7491d619337 WHIRLPOOL 936d0c3a6ae981cd08d03c17d0673bbe3d706544c6bafb33a23ae1348d0fdb7ef8522333357a3b28bc5004a3062634782bda900057d8e264dbfb84f6ae032927
-DIST genpatches-3.18-16.base.tar.xz 444356 SHA256 9868f2d0a808026bbbe276193ef98a5bb65e881f6dbf347940d338e347b5a269 SHA512 6e10a76c0dbb53e82775f271dcc2077a4fa3681c92df7ed7c7d3abffcb31b19221fbf17f031e884235a62223b9a8c2ebb8c4998c1e692e3808b56c5bd7d4c1b9 WHIRLPOOL 3992b4bcf377fc4d4ba450fc7487c8be18de9bf37b49661f51a57587c2e6e4721e46c5f961a39396d7f94793fac30aa0e6a21a39ed3344b8f789fdb000d5a093
-DIST genpatches-3.18-16.experimental.tar.xz 61624 SHA256 1bab18d2a9e3995dc466533d8df2bff16ebac6170e11bf31b6c51de3170b5696 SHA512 551c1f9745f078fb5094240e7fc58fb877f6af601bff6c4dc742ecac5f0b9a1f0ec98752b7c47e56a05e2f7f9f6b79103e5ba8881ef80a5e83cd6208091307c7 WHIRLPOOL 357c25ac76680ce5a1844ce368149cb3b33eb73748b244ed6cc9d0afcdd518d643ff9c80808ac4c52871f633f104f368557c5af7e8186ae3219174ee2530bb4e
-DIST genpatches-3.18-16.extras.tar.xz 16188 SHA256 0861244845ec3dc87c5cc070ad413ac98fb435e51bc20cd41354cef8967216b9 SHA512 59b830567f423c20f0c2c8b3123c44c61ab81dae1d35f4e62a5dd291f4b34772bf5116405086228aa5ed3712721e33309d1783d2921eac49c413f7e8b4cdc5d0 WHIRLPOOL 05cc5027107bc1c0f32b3189f84432b5ccbf2ed93792709ef52859fe1cd75018714f893ffca52c675af82b88398d8c072a9cfbe1a6703fd9b7ba6ea121cdcee3
-DIST genpatches-3.18-19.base.tar.xz 591336 SHA256 346d9ce9b825e024cb448c768b9e994ef27a4693cd7eb596295f1419dd3cbca9 SHA512 5d8c4550dc8afc0687d309f586200e908d2e71ce0ec6dfc86bbe26b3437e46927a6041278b97ed2087d8aafefddbb5d6162d9e22fa566c7f9eb1e57017dad6d4 WHIRLPOOL d9f29c9dc5b3995ff59b7e4f93617ad360ecb32c6fe6702daa4826277e98ef35ca3a1fd9817cf011ba43eedc14a54ebed6134f348245fceb56298baee6b73ece
-DIST genpatches-3.18-19.experimental.tar.xz 61628 SHA256 7a34377e5c43214cc03c00e983a1996e955b3fdfc53be01ac1f84b9578c25287 SHA512 4ac764f6b11985fd63a4b392791e1a4467867ffe00f464115e8982a199cafc6a45489c704aee2a1ef9afefab93a1b110f8ccec597e6b4bf61e61f5b996d5fd36 WHIRLPOOL f2cbcf0efbe7929b0c1360b53c15bd9d6502916d664eec23aeda56e5c626d49fc2caa833e793a5a4ffed20591ff48e944ecff11c997fb5ef4aaaec066e745236
-DIST genpatches-3.18-19.extras.tar.xz 16176 SHA256 b1a797dba4a735d95a635bfd40b03e2cb83e0fedb0d50735a3eaa2cfe7898c68 SHA512 d77e4f337621b8e424f93e4433628f065895e8568f87daee82a46dfba12f7547d50edf71ece0dd9bc6356dfb9af356fc334111923c29aa61218ecf797b5bff2c WHIRLPOOL ab37e325b7be6a5a1dd9f959f9db3f46cfee3d903721c1ee1c896f66495d46ec908367cecac13a279756ab528c7f3788c90689ba717122874b430f7ec445b0fc
-DIST genpatches-3.19-9.base.tar.xz 257836 SHA256 94ca8760c25b14e705dbdc4584c78b4ba71655bcb3529c9fed3a24c41e144231 SHA512 118bd7d89bd7652ae44cd01042f865a846668ac2976f2344e9f72d6dadb4c3fdfda738e7a971656519831cbfdb6cc07a8c9b4513c88be707c3eb707d6e75a8f8 WHIRLPOOL 38df4344680cb3d38c384ac6a7ec2dfaf591cccca3795a1a1150cbf410ec4e4e8affa816c5dc3448b0310dd2b9c12e220aa6b85820fd9c68c8441ad6c2846e73
-DIST genpatches-3.19-9.experimental.tar.xz 61632 SHA256 c1668cb0ebe2c04a5f9d837cd0b42378ec9c1c53cacc4b02272462bd9e773c88 SHA512 86738abd9ce9eb007c96388a18710d8005760f5f2c36d12388af6d88cea2b60f81c2debe8d3e0af8f4ac83619a4797aa5a77b73c83adca1cbc6f397005c66561 WHIRLPOOL 8c8c5931b69a99106f38309df1367db16f6935357db1ed48a2fbeff5c266ac4801803485446d5a8a292c1c29d851c1b32dcc8ce161c6646227b9f1e75ae7621b
-DIST genpatches-3.19-9.extras.tar.xz 16280 SHA256 f0b77c7754741f000933a1450c39027c509ca66b44e78add44b100b02e415e5c SHA512 764e704d43573b80604f090b35b4c5913cc8d8abcb8f94590621df879668fdd0607db1a711a6fb24dd7b2ad709dff1110381e4b8072ad435ef7356639d8baacf WHIRLPOOL 6e8243526c27642cade7d1e9b36c6453c7a5ea63e99abae77ebd866365543930d1ee685b7a447f38e40bc8cfcbe84b01cbc8f5a6e443fe732b8e14ff3487a45d
-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
-DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04
-DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085
-DIST genpatches-4.0-9.base.tar.xz 193344 SHA256 9d7c65367c1d2f24c6e4c8f8b4b9170a7ddeaa24d6563c5ba5dc41201a7b6e17 SHA512 646814e63b3b1d78adc172c6f8c0c2605cc9f368bb368be72e169049938617c5c6e738ddcfcbe1e10b58ccd3f9fa09984b03f70076ce0b15137f376594b9066a WHIRLPOOL 0eecbfe1b2b02f00edcab0c975b06bd69a5ff1032fe0c4249d79de555f92f2375d337b2417bddb566e9a1fc66859918b6cbfff6c2c73aea02818434213b0cda1
-DIST genpatches-4.0-9.experimental.tar.xz 61640 SHA256 94b3548a1154fff360c04b72e10cdd065dcba8531624b8edc3b0cbb918d22a7d SHA512 03ca661197a858e7a99419dddcab4ec1d9680652273df608d21d1df21a90dc7a59f6512a18c445e4b04fc531414bf29ed37f8f9973c3936688f8182492b4fff8 WHIRLPOOL e3018f7b855647bd6233761f9f10d9d69c0bbd138555eaa755b9964af0a1271caf64b025269d919e68f18c57fe86125a3b071c9ea1d046742fbd2cda83934401
-DIST genpatches-4.0-9.extras.tar.xz 16284 SHA256 18f2b5d62d0c9295ea28db9d589fef5f06afea2c2105f085ecf4082dd5e899d2 SHA512 69199530ddd179efa47e38cf32e39bac1819d788dc628bbc3b6cf2dd4d7149b33c0de06b304aaecb7fd92ed68f631c9638d55282174f1d1c51b8edb4dcfff336 WHIRLPOOL ac598ab6c14df8ca4a6b793abb41cddb27f6719ef5dcc4f5c7cf91b9dedabe2b2c8a19107340d1e55b3a05da2d59a99192ed81b9c666e46dbe62f7e2ebb1338d
-DIST genpatches-4.1-10.base.tar.xz 210140 SHA256 d0ac2a9175fe72d0ddf23307a9c8d06102f48220886468e4c19c92855024d829 SHA512 fadf51efbda55e959cd4636e88c2a159ed967156acbe719b15056e9e56cf01652b0ac6b515203d4821853939fe8dc4dfb6e075e55530489d5a96e44e6dfe1be7 WHIRLPOOL e384c68de2b4a4e23934cdaba6f8d02942931ea721b1730bd6e99e02547c28f6219bb6a38425c5c04bd1ee13afbf091dcb9eedadc2aca2246e05e465c07cb974
-DIST genpatches-4.1-10.experimental.tar.xz 215988 SHA256 b4ab62875339a60623db576533638e12342815ba93091d16dca7a975c10ebf4c SHA512 e51eadd26e1db63ec558fa0f4a83b8e5fb40902c9e7c96e269b4102d048b9f90defc071f42faa058605af047790bc410b2186d6c06a5fd2b8f6fe957da8cfc96 WHIRLPOOL 3061975198673a38775b78004dcdf088fd01fdc2ce784aead81425d25f6b831267e9840fee56db96253a09290ab09d01bd4fcb916b8fbe654ac32027c702d4bc
-DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d314bd52566832acdb1d01362e03472945da SHA512 da4163afcc52c5385ff3869105afdc0bdd021e1967b6461d3ced62bfb22ae5e9f31a4493d93ce6ab33fdb23b92df6eaef14007bc53d77de63e76802e9d65c77a WHIRLPOOL 24318d0cd07b3c3cd7d752e3619883ffcf63cec3ec7b90ba5f327bbd204e1cb2e3a7cd91c8607a988e13a23ccff25cfe8b484b8596bfe6cbf365f18e7de180e8
-DIST genpatches-4.1-7.base.tar.xz 59032 SHA256 9106e15001e0c286ef929d5e4505507ccdefb0aecdd094b73d57d587070d3288 SHA512 da1e3ef03874ab0fd3af811d6b72e791117dd7490ecbd8698e24e98424175c0ad7228182976fdadbc62a3ef69bf721f82d99cc1760417c4ba3401844fe3c8db4 WHIRLPOOL d3d3623112f118f98db870f48bc3181d6f510fdb4d916a88a832065a2e0df99c1bc5e04db6f7dd09c505f0253b76037965bbaa27103263dd95a713d0428db5ba
-DIST genpatches-4.1-7.experimental.tar.xz 214944 SHA256 1812d9b5cfa6a974cf36bb44a14bec26d021b29d386ce3139b50b99e3175143f SHA512 9704ae5529610afa2d6e62a123cba0a1891a18229a97ad5214449f23cf870e70932acd3a2ce32c5a30bd2cf89a64a012b23ee2591b699120cbffba3cb1cb0509 WHIRLPOOL cad56926d233a7b75dc4e915c1256a10864d356b6124b272f9af7eb59ae77871fd0c58ee810fdaf8d86820fdef1c0670ff7a463142cd7daa9fe9586983fc3fb9
-DIST genpatches-4.1-7.extras.tar.xz 16180 SHA256 39569583e833ff338b8126a52ae46a9a9b335d701006abbca7ed239bb84e7129 SHA512 4a5be5d19474a4679f83135ddfbb9af4b2c2c2d614ae95911c641c4d6fea8de9e25ebc1f4eefc2d9b1976c46b880e8717a0ca6987c64d2ccff969af5d6a84387 WHIRLPOOL 4509fef31139f79d7609e31d37b29f636471ba471c6ab47d6d4fcdd661b9a20d13e292b57a668b40a885a3aad4e2f831a1c3861aafbc3c85dd47f235b0ed09a6
-DIST genpatches-4.1-9.base.tar.xz 177624 SHA256 ebb16ec588dfc98222f5a5298de76e693e9d24ac8905af4b1d022b13e3fb9734 SHA512 59de6e58d054ae5b9ed096d800b8ba8323f8595f505dcae235d88deb6dba5b063239c3d2f9e08092a0c70f14d029936066765b680c44286caa2ea4f10b640bae WHIRLPOOL 1dc51a7a931a0744f824fdab9a463de7cd08127da0bd3424900c2b61f6c78feec2ae83ae4ec9558ad5a74c21e3ddd6a7b7f69c0af3b5f183671e3570c681a0c7
-DIST genpatches-4.1-9.experimental.tar.xz 214932 SHA256 7b2c86323056d3de7e6ea8674598686fe2b00eddda94f3d7dbee1ddc957d3000 SHA512 383ca9a2a92907dda40e2a76cd79880e72cea95898857d8e1a75aece590432b695cc2ec588f8f50f682bc3c36e721d6de8e22a507b10fd55c0d10210fc820831 WHIRLPOOL 9c383f81e5122064d09d181b0feaf9235069ddac5c56c8b824ca712cf3340319b3e4a090c95b46fe4343be840b921a330c32dcc521831d728597e1c93911caa3
-DIST genpatches-4.1-9.extras.tar.xz 16180 SHA256 1d4028868b4b7b5903898bda53156b068bcd8e3b7821908dbeabc4780aa4dda0 SHA512 506a3f570018fc2b6392ceddec558e980dccf292c3e119a1c5bd823c740c594f77a3fa6adc181687c658e447a9e6ea75a3a8883139a1baa5d47ee19351267b0c WHIRLPOOL df0366a4a5aac3530acc042813b643f922f84761d6c1a1a7d33a6701f03f868d9b1ba1915fb544d445df2665027652582a03336fad35c029a18f7dbc463d93e9
+DIST deblob-check-4.3 688368 SHA256 9dff222415c2ead1edba2f6755926d6786225814d87dc3624605f99a4b760a5a SHA512 2029b4765a4f83b71370dc4439526daff57be32f8692a329d500df82019a5381849ca979c0ae3761c2efcc04590c031560f0e25de50e71f476618df529a1445a WHIRLPOOL 6dbdcfe6653e751ff00ad91f45c803bdb196fdb9c895ddffaec18a111a19720d50a77485ff8ce228287217ad2e98b6f9e9c65a3c6476f195cbf9e3b7969be34a
+DIST genpatches-3.10-102.base.tar.xz 1339328 SHA256 86fa1f503db7c635d86bb9dfa61617ccc19aab486c8955a68344ecf2014520da SHA512 2bc6c3119cd4e16ebecf4f5d79769a4b0da81b60d0ca648234be146174ce5c693dadc33f022cab63b45e5b395e3e0c7fc1f57ff8d16e3636617592448a3d2cba WHIRLPOOL f111313c467967e4f56f1fa085ef030dfc53ad939a624ecdb3e2b246ecc6328cb4ee9abce124ed283f47870cdbbf0d43a1da425fbed5225aef71de2240d6eb81
+DIST genpatches-3.10-102.experimental.tar.xz 60172 SHA256 a95384e826182e9be3a70e0d7884e24abb34d3112b9c607ee35de94047d99332 SHA512 0cfaac8739e3192089d54ac795be0e78f882e74187e60170eaf7b95b60f4e218b1dabb5abe4965db8b3d2e9bc6a164fc36d8b351204ce87b190d95a394be1cd3 WHIRLPOOL c3fa228389169e256b5b253489ac8c080d236c8ea10b8b48519057ffa5ca4952ed26facfd3a936d1ed872b76d1e7769b94af072f129d07a18e90763656554ce3
+DIST genpatches-3.10-102.extras.tar.xz 17828 SHA256 e174353e2bf0ded175f756e49e86042bd6028caf7a2ecb295f7721edd051cd6b SHA512 0716e1c32548dfd764629074df0bd9f008685aff85d4bdb5b18f0cffccaad9ed331ac906206e3089a467d95d8f0fbcd87e36f441ef31585eba518852a541230f WHIRLPOOL 1bef33927aa4275f77d3ba0c5f8d5b69aa0f02a45abc28cb16b25994ffbee230505932199247d99d0bc6295e199871629d367250bd0c71bb6cdca856566be832
+DIST genpatches-3.14-68.base.tar.xz 1155456 SHA256 1ebb9070b0b2805724537a99c48d873292d8ed7b1b1a17174fba3a6ea035e64a SHA512 ab424e476ea9a91cb96b91d6547113345804426f7dbc9dd4a53d8e7dacb586bd497c3616ecc90ea59f0eed5964a4ba758afb03b61dd69ada034c350edd6e129f WHIRLPOOL b535f7cefdda9ae6d85c0969c4951efb17bfe1bec0f096854e79d2b4afc4ba23f658ba5e4332d4a8b8ee29eb32a2f976c0067618eece3b4da92f4eca6dc0a08e
+DIST genpatches-3.14-68.experimental.tar.xz 60300 SHA256 b8a435771533563dd7b9980e5970ec2f50fe6b1fef9f4350b368d256b2c17491 SHA512 60bff2845130e2be1384cfa617811f56cb981dbbfe057bf447d3bbde5567f5e61d902995a00128b3f40d5cb9274276b30ddfd04f693e103e28ffe78297fc446c WHIRLPOOL 9c71fa482160b95297f1cfeaa35538d08088a95f1fc0f5953f2bebb92535f3942a5cf1d10792831a7d48a39968fc71aaa38a96d6e8b8f4bbd0d3045c08698b36
+DIST genpatches-3.14-68.extras.tar.xz 18268 SHA256 28ccde71dae2369d818357074bedf279387e454e65cc6549e5f4b4a811216db1 SHA512 afbd8150f795d0d2a4921dea12a4d1af95e606b183f53b5a55c89b95e3b88d55bc2a879ce32e297eef7a04bd450584971ee2a1e7e262b5e3ea617a87d098af98 WHIRLPOOL df0b8e915bafdc007c4e035b5dec67b5ebc479e5f0cc9a41c54ec769f72ed69145c7fa34dd3a2987cbc86ca6f337f2b7f9071e362e85e1e22326a87afa868a5a
+DIST genpatches-3.18-28.base.tar.xz 820540 SHA256 def3cdebe118e6381465c7d61b4aeedbc55c63ffa5196f62afc40df6c1cf60d5 SHA512 dd48643fb5aa48539da83fabcc9423186e80ed7beabcb33a519eda876c5d925d910e0955f9b7d7592fbbec175a7948c11a9065a280e4f576b2618f156bbe00ec WHIRLPOOL cf7b3eb5635f0e1f7438cf87db2762471d78d2a4eb85d493ed2196c29df035ddbe6912fffe5cf126e81fbde5687aad11b1f3cae6c0d285468571ea01798fbcc0
+DIST genpatches-3.18-28.experimental.tar.xz 61612 SHA256 4ef8ff2340d16145f2177ef2f5e8ac43b37e57c9d9ac730bd0c992e99209a71e SHA512 94fd26d41de8a6a4d0ef82d9c261b3dd5b54ad58bfcf054e011f6495be788d687e589ae39e3012707cd48e836e678d237ccdd3dba6985c3f2086ae923616f2d0 WHIRLPOOL a325ec94646c9c05c33cb0338e9f3892804b1dc0277a2d80b1b1248c40f6ad6fe8de170f01639b8e79e86a9fe540ac1c8bf22c138dab85684dc76cbf7db5bbb3
+DIST genpatches-3.18-28.extras.tar.xz 16184 SHA256 7fe110961bc2fc65f0721d89af43d533a556f0ec567d84d40269549bdea089bb SHA512 5971522cdc227029414cd2b8e385dd857d7ce113c85c3bc18b575f97ac616fc1f586dbfe7a933ba4bcfff00e3c711d42b0e29289ba725c646bdee0efb4c1046f WHIRLPOOL 61d2bb69908c9458a03e25aeaabb5dc8b4129a0b8385199a51ba345a6e8af0994d60fe09e33b12e7fdf02ae83c1a31af9b7758ebf9d1c6c9e5527bee7e3e1f81
+DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f
+DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f
+DIST genpatches-4.1-23.base.tar.xz 572288 SHA256 8a46e42e2fa5e8a530bae36f330ec5e03886784228c649276e2d530b738d4f25 SHA512 176f6db507ffc7e8ccfec3c4af28a7dad4118b5b145490c4c0efa24a4b6e056cad9923aed69acf8a90a0e42626c437d54c3eac18285dca1fe7e067eea63ee178 WHIRLPOOL df45ea7924444b58b8aadeb2ceff448b29c9dc0f98b911eaf4051bbb9d18edaa283e684c2e471722f77b57d7a786a0c617108b7aa0ad72a18677153083481a36
+DIST genpatches-4.1-23.experimental.tar.xz 61656 SHA256 99f83b19eaae65c2a7f36721533e0dc229d3c319afa18a66629d1c9ba4780ca6 SHA512 4be89a9aea2269dc0d77e92921df66c429eb7bed808663a511d08cab20fded79175c6c2f8874844c2d85c77ab726459f86d3682cbcfe4604a3fdb5929a42cbd9 WHIRLPOOL 2d29b6b08edf7a34f5629f75a3d5b62be691bbf518d0482d1d92e7b15551139ca353df120fbe8c9a9ef47fed1060d19f6606aa4450ca823a39a6e9134dc40416
+DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d355c7876ff4a75dd30c486a8ec334f84df2 SHA512 ed74a9ab953dbacc10b6c246578c78681d36544497a296f9cf76e4e43d447b4f9a6d4354ae9074fd081e748fec0b3769b193e0ccff3953070eeeccf0ed2820ec WHIRLPOOL 6a978a5093c0258d65c511b53f42ce28ed7d19fea2f9171b5265a1050d977de9855501869a98bf5f96615bcd7b39e3522835b4876d7c5d43f80646688e5772d5
+DIST genpatches-4.3-8.base.tar.xz 196548 SHA256 9246ac430ca198817f177093cdb628bb3eea3fad8ac0723adb38a02502cfb89a SHA512 ce2dd67fa2fba9583b9cd309d68e63b937e718cfabd9f3eb882ebc23b3139d59ff3c84beb3cf770dca367284fff6ca2bc85cf9e114da4621b7f6865b2d69dc0e WHIRLPOOL 0c5640f03d44b1219c23a7eff655b8f1749e20b30b89473c06c3a6fb0f34d30094534382ee1a1e4b5fbdffbbcce20dbe4e377410e390b8b5586ad1da9efb57fa
+DIST genpatches-4.3-8.experimental.tar.xz 61636 SHA256 8f1297df01d21d8ff121549061b8a8cfb463130edb1a873c6daba6ad8c3d7894 SHA512 19df4ca02e4552befbadef8f0824eb09cccfe10fc00e48d1e684bc7e7761f4d896e605f0153c5ad7d8f96575166c4823f08d9a5f7be3df23128b39d97a685c57 WHIRLPOOL 4d6661b13be1002d9610bbd19618d77f251f6672e286ecdd9a19fccc335ccf0c3dbc9572e60919f50b562249b9589082786762cae0b961a92f056da206b17dbc
+DIST genpatches-4.3-8.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
-DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c WHIRLPOOL 76a17bb3d7c30cee19e135940f3607106efb2984061f946f0da9a2ddd602dc1bfc7e6f8970975cfb113d13f23a75415f39938204af266e2819e7a239b6f46778
 DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
-DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
+DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST patch-3.10-ck1-r1.bz2 57305 SHA256 7b7835ba32c3ce1afa81139c848b7f6ec13540ba00f64ef4290c56eea52808c4 SHA512 d58dd603f02853c945d5980630e5123f7cc5fd012e0c61508cd08962cbdd4e35dfb3a6dbdd9452d8b936e6c1ec2cb552b39dc3bc6dfc29e8d020c1e2ad92825f WHIRLPOOL 322da3c72ed3641f0ec8c071dd6fe79c5a860e87a3f023df9c1fd582ed16ffaf6ba67fa93806b7545658551bbb311235dfdae8db1f09b4fb7882c79827768b11
 DIST patch-3.14-ck1.bz2 58269 SHA256 8b5924a8aa17876d394cdeb84740d96317e94d2430caddf753c416100b917d3c SHA512 d745370376e660245e0a5cc4512f0c584a4c782ddb0747637d6ec60021d95afa09d5728f44756c48843b398ba3072823bea99b1713c0833c941a522da0b6f305 WHIRLPOOL 7a9dda7e0a20b2c2ee373d957441af83f2148cfdf224ba20fe699a1f319f898493534d4b3115ed09851604760b767d2cb4c97e7f01501e0e261fa68f21937572
 DIST patch-3.18-ck1.bz2 59246 SHA256 e603c2752c160c124ae54dba8a4a9820d86912e5685b3bf6cd99705d7b147552 SHA512 c1ffbbc641cf9ef3c666a1fe5ddff1ab9ed02eb2d8d229d5ce4c11487609ef81beee456c211a658355c2061a108042929b9ad62914395a22077754ade4eb6a23 WHIRLPOOL 3562ad8e8859fa4845af99639a69cd45b73a5bcdcc3cb5bf473eeff3708c77aaf5ca6f0816e57010285bf1fdb6724d5736dc2ae74392d96cebccfd266b08d2bf
-DIST patch-3.18.14-15.xz 54756 SHA256 5d33a75024798b7842936ee61f3652a1cebbc2c4818df7f67751e942a834859d SHA512 2b7e45dcd66e6e5471d3fc81b92ea8557c3025b0d82bad7d964a1ba0e1c3912e20afb9e3cb4cf6d176986afd4d4364cf0ef043ee981076a37264334be4d8ab9f WHIRLPOOL 8c14b99d0e1909b8aa559713400e722de98217697092bc6b60a7dd51efa2e11789622d23103a6c5b9b25685b730e077b3753d1774e84324d381afdb840072a2d
-DIST patch-3.18.15-16.xz 864 SHA256 8a6d93b8737957a87a242fe25e71e87bf53d83cc028227b360316ac086e6c97a SHA512 ee99969d142c92c529cddc9521d44ced9f00eb533d3a1295c196bf74b6932ee032c6f4e0cd16697c6f378cffdbcfbdc6ceabddf23c13b2ed0b78ab9cd33df3a1 WHIRLPOOL 536b4a531f7671d4f70b8d5dceedb07a12dc8fb75b486e3cdcb6ba4d2a060bb9c16ea6b1a1dd02aa01528b1ba117117295b254a13bf2e4c6e23d1c35166b8752
-DIST patch-3.19-ck1.xz 62632 SHA256 6d3043360485bbf3b8b6b780d62ff529074489e6a4d0086607de873d1278c031 SHA512 e8d172b93597ad9023c00e07d6825ace8cb5bf421c7b8b77941262c95908dbe3129a7dfe6215dcd34b92f5e08cf7c58571b6b166aee24c1f9807fe74963b3806 WHIRLPOOL b0f8d6e56f96271499a557ad334e42c6cb6cb5f14f70579bc310e6580ad5cb2a9cd4b36f6a590ce950a2ea4360bcf5f503c0fc0c28d8876b955fee5c9c1474a7
 DIST patch-3.4-ck3.bz2 58930 SHA256 97a05793e15836866f7eabeeb08abec06dccbc23cfdd521c7e2c6c5baee20601 SHA512 f72c88f0b3570e3aa0f9c36cae5d535282c2e5aa29b3c0ac9e13db492f9df310f1fedbbcff5ea68ec872ea53c7cd968cff8e60746ccbeebb87f48a8a8a8d0c78 WHIRLPOOL 351be52877128717a40cdadf5c13aaddd688994f4654c901d905233cf41d5f0daf4aa771bf62da52d3d0acd98fcfa49234efbd0f705f4f34becd7b1ea22ddeb3
-DIST patch-4.0-ck1.bz2 59968 SHA256 be3ca32d048428a0cbd476bfe467e0d46d1848b95d4d7b70ab57b522d19f6cd2 SHA512 97f392e0bed2e6622aed7eb344f0ed499bb58ee118e62e28b67080df6ef02c7b874596e70d7db970a2f58f9f94faa3406c8a29eb5f6871ddc8d290ecd6aaf0b5 WHIRLPOOL 0efdd12ff388fdbbdcf6aacd910b27651f0834b3e8533c9a460e726c090fbaf7e926f8636f754960b54821cafcfadc665a3ad53884549ba2fe8975d76123628e
-DIST patch-4.1-ck1.bz2 60192 SHA256 d383e24325333b0045ddbfee4cfc2491ab25d9a6446094dbe0e5ad7ed3de133a SHA512 0679eab9ac50714beff50bb4551bdd01d29f3287e4438a1d88ce74ce11286dfb1ec8d2c8f07d0dd765ed3171488b52320e976e50eeb47c8da9b18ad8d7b3a233 WHIRLPOOL 7ddeb29822eaeb6cddd4e4ebf60a5fbf2f925f994627948520fe8138ae6324c62669460e823a0dcd70a181914247b7ba72bb4ff1b01a61718f4c1deb4651559b
 DIST patch-4.1-ck2.bz2 59887 SHA256 87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428 SHA512 356e144f858b6015415b2c3f781ca534e5f77b818302e404c3d3b35c088f4a4163356b67f98bfc95175bd52bd8b3e9a9a3e336cbcd8adf6c2d388700ce630d4d WHIRLPOOL 2d54fa390adefd51bab2a3253881617a76c0c808464f0d67590fa9fa52b2100987b910bedc8a6d292d1712be5369ae0b1ed492317faf36ffcb29a7a66fc3a431
+DIST patch-4.3-ck3.xz 64000 SHA256 483c12e130285cbcb49648012416323a5cb8dd8a477fa064d96c2f53019f1b31 SHA512 f13dd22d44ec51b03f9213ea7e75262197c9e9057d1acc7c2648ad802321a59b93dc2be75e402978d972dd2fa450699076cd51387ada928db93c4693ca9f960d WHIRLPOOL c1bcf18886f5a539b6a74889a78525d4bd829eced3a74bc0e15875cf656ed3b87c9320ade1cd2b94fade33431846ef9d8653430adac74d73c93736b01481770c
 DIST urw-locks.patch 7451 SHA256 09c7faed0234aabb5af6dd156eb99f2a2855b4adfec3a0a2dd9e6b6ef47d4cdd SHA512 dc5dd6f36ec8de68ad723174728df28137dbbecf81b9aca07cdeaec2d6410f42e5b5b14cd1d7fafbad44c4ab0f420db9285b3df28b990a43bc3a05327ef92e4c WHIRLPOOL 625444ada085ae324a1032e9c4d1b88376df9cd05ca613571799e96645eb58217ffd93c47d33e4ce4f0cc15eb82b572a00aee6edca93a371cf39474f54dee242
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.82.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.82.ebuild
deleted file mode 100644
index 75ea949648e7..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.10.82.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="88"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="440"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
-	${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
-	${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7)--------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.83.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.83.ebuild
deleted file mode 100644
index ca67e0ec7524..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.10.83.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="89"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="440"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
-	${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
-	${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7)--------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.86.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.86.ebuild
deleted file mode 100644
index 8bc8ddd47d73..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.10.86.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="91"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="440"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
-	${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
-	${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7)--------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.87.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.87.ebuild
deleted file mode 100644
index e795126b26b5..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.10.87.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="92"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="440"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
-	${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
-	${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7)--------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild
new file mode 100644
index 000000000000..c82c40413051
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="102"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="440"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
+	${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
+	${CK_LVER_URL}/patches/${BFS_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... (3.7)--------------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.46.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.46.ebuild
deleted file mode 100644
index c90a3750f611..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.14.46.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="52"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="447"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.48.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.48.ebuild
deleted file mode 100644
index 91bcd97a1bd5..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.14.48.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="54"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="447"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.50.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.50.ebuild
deleted file mode 100644
index f9c07435580f..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.14.50.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="56"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="447"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.51.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.51.ebuild
deleted file mode 100644
index 10149de8e41a..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.14.51.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="57"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="447"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild
new file mode 100644
index 000000000000..6f14fdf178ea
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="68"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="447"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-kernel/ck-sources/ck-sources-3.18.16.ebuild b/sys-kernel/ck-sources/ck-sources-3.18.16.ebuild
deleted file mode 100644
index c0b968278be6..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.18.16.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="16"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN="14"
-XTRA_INCP_MAX="15"
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="460"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).xz"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.18.19.ebuild b/sys-kernel/ck-sources/ck-sources-3.18.19.ebuild
deleted file mode 100644
index f8133f22ddc7..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.18.19.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="19"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="460"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).xz"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild b/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild
new file mode 100644
index 000000000000..ff06a24a4a27
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="28"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="460"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).xz"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-kernel/ck-sources/ck-sources-3.19.8.ebuild b/sys-kernel/ck-sources/ck-sources-3.19.8.ebuild
deleted file mode 100644
index 27a3532bfc0e..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.19.8.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="9"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="461"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.4.107.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.107.ebuild
deleted file mode 100644
index 418d6b4ee1ba..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.4.107.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly experimental urwlocks"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="90"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="3"
-BFS_VERSION="424"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-XPR_1_FILE="bfs${BFS_VERSION}-grq_urwlocks.patch"
-XPR_2_FILE="urw-locks.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-XPR_1_URI="${CK_LVER_URL}/patches/${XPR_1_FILE}"
-XPR_2_URI="${CK_LVER_URL}/patches/${XPR_2_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... -------------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -----------------
-
-PRE_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch"
-POST_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch ${FILESDIR}/${PN}-3.4.9-calc_load_idle-aCOSwt_P3.patch"
-POST_CK_FIX="${POST_CK_FIX} ${FILESDIR}/${PN}-3.4.81-update_cpu_load-aCOSwt_P9.patch"
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )
-	experimental? (
-		urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-if use experimental ; then
-	if use urwlocks ; then
-		UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
-	fi
-fi
-
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild
new file mode 100644
index 000000000000..06bb20e4e42b
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly experimental urwlocks"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="93"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="3"
+BFS_VERSION="424"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+XPR_1_FILE="bfs${BFS_VERSION}-grq_urwlocks.patch"
+XPR_2_FILE="urw-locks.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
+XPR_1_URI="${CK_LVER_URL}/patches/${XPR_1_FILE}"
+XPR_2_URI="${CK_LVER_URL}/patches/${XPR_2_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... -------------------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly -----------------
+
+PRE_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch"
+POST_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch ${FILESDIR}/${PN}-3.4.9-calc_load_idle-aCOSwt_P3.patch"
+POST_CK_FIX="${POST_CK_FIX} ${FILESDIR}/${PN}-3.4.81-update_cpu_load-aCOSwt_P9.patch"
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )
+	experimental? (
+		urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+if use experimental ; then
+	if use urwlocks ; then
+		UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
+	fi
+fi
+
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.0.7.ebuild b/sys-kernel/ck-sources/ck-sources-4.0.7.ebuild
deleted file mode 100644
index 4ab521b8800a..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.0.7.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="9"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="462"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX="( ${FILESDIR}/bfs462-rtmn-fix.patch
-	${FILESDIR}/bfs462-update_inittask.patch )"
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.0.9.ebuild b/sys-kernel/ck-sources/ck-sources-4.0.9.ebuild
deleted file mode 100644
index 387a974d7c17..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.0.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="11"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="462"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX="( ${FILESDIR}/bfs462-rtmn-fix.patch
-	${FILESDIR}/bfs462-update_inittask.patch )"
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.1.18.ebuild b/sys-kernel/ck-sources/ck-sources-4.1.18.ebuild
new file mode 100644
index 000000000000..3dedd8c0e9be
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.1.18.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="23"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="2"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... ---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX}"
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.1.3.ebuild b/sys-kernel/ck-sources/ck-sources-4.1.3.ebuild
deleted file mode 100644
index 0872594f7fbf..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.1.3.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"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="7"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="463"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild b/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild
deleted file mode 100644
index 80f71d6e98fb..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="9"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="2"
-#BFS_VERSION="464"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-#BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-#BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}"
-#	!bfsonly? ( ${CK_URI} )
-#	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-#if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-#else
-#	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-#fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.1.6.ebuild b/sys-kernel/ck-sources/ck-sources-4.1.6.ebuild
deleted file mode 100644
index 0d9bcf75bd05..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="10"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="2"
-#BFS_VERSION="464"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-#BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-#BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}"
-#	!bfsonly? ( ${CK_URI} )
-#	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-#if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-#else
-#	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-#fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.3.6.ebuild b/sys-kernel/ck-sources/ck-sources-4.3.6.ebuild
new file mode 100644
index 000000000000..d6c317d225e4
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.3.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="8"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="3"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... ---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX}"
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1ab8929d3556..de3bd0dca426 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -6,12 +6,18 @@ DIST genpatches-3.10-100.extras.tar.xz 17844 SHA256 fcfeae8c28d10aa043b86c5f2721
 DIST genpatches-3.10-101.base.tar.xz 1325420 SHA256 dd44cc559f5455df5d8ce2688e6f5845ccb9bc99fa52c196631f4f6218104ed0 SHA512 6b2ada4c50ead2d9c9c0f80b21cab074c4c0d038c77694268e9192ede67c62cfbae41f5f0b7b735a217aa40b6d4d32b0602f06d961c9be1196c7d8593a137558 WHIRLPOOL 15087cf3b91260cc654948bc18096d325e1bbafe2dbf4a326901ab80aca858cb554785a9cb1b657a08b06793b8f9d953f267fcbdbf8fcb70cf317d800d8a4938
 DIST genpatches-3.10-101.experimental.tar.xz 60168 SHA256 fa5c074ab75f9c94a071563b175a42c8389ddde754746d767d66cd1bc8f7c059 SHA512 8dd11081e628dbfb93a32588b1ab050949c5e9a40fefa40fec4d3afb4a798d5485eb6dd2ca0a4f4fbfb7cfc6527ff80667134569ce4c92985a3d97f6cd28e61e WHIRLPOOL 6a2e809dddb2773e9c6ed4439e39f16c32931bb7f96d42f80a9ebf749ddae290a200e6b204c18233dc18f22c7649a8de94ae42297745c0f20f8a06f48be904e2
 DIST genpatches-3.10-101.extras.tar.xz 17836 SHA256 58f17423532eb7df2560d0a75a3c991104dbc9d68af126e1bfe3c16f200d4fa4 SHA512 4a1aabc645fbe69a2c0dc8d6c6aca36b99fca98ab8faa5e0cbdae7be9b6069477bb26b0bf3f94c30cb83d1efca51b48a611a2156730869d9f7d560f3eb3ba205 WHIRLPOOL c7e6dbfd8042a8af6927cbdc573e6a200ae306d63d5f8049fdeeb3d176f98da48217fbb547fa229c4f3e5b647797134489580b084aa6d8e439098a747aa80666
+DIST genpatches-3.10-102.base.tar.xz 1339328 SHA256 86fa1f503db7c635d86bb9dfa61617ccc19aab486c8955a68344ecf2014520da SHA512 2bc6c3119cd4e16ebecf4f5d79769a4b0da81b60d0ca648234be146174ce5c693dadc33f022cab63b45e5b395e3e0c7fc1f57ff8d16e3636617592448a3d2cba WHIRLPOOL f111313c467967e4f56f1fa085ef030dfc53ad939a624ecdb3e2b246ecc6328cb4ee9abce124ed283f47870cdbbf0d43a1da425fbed5225aef71de2240d6eb81
+DIST genpatches-3.10-102.experimental.tar.xz 60172 SHA256 a95384e826182e9be3a70e0d7884e24abb34d3112b9c607ee35de94047d99332 SHA512 0cfaac8739e3192089d54ac795be0e78f882e74187e60170eaf7b95b60f4e218b1dabb5abe4965db8b3d2e9bc6a164fc36d8b351204ce87b190d95a394be1cd3 WHIRLPOOL c3fa228389169e256b5b253489ac8c080d236c8ea10b8b48519057ffa5ca4952ed26facfd3a936d1ed872b76d1e7769b94af072f129d07a18e90763656554ce3
+DIST genpatches-3.10-102.extras.tar.xz 17828 SHA256 e174353e2bf0ded175f756e49e86042bd6028caf7a2ecb295f7721edd051cd6b SHA512 0716e1c32548dfd764629074df0bd9f008685aff85d4bdb5b18f0cffccaad9ed331ac906206e3089a467d95d8f0fbcd87e36f441ef31585eba518852a541230f WHIRLPOOL 1bef33927aa4275f77d3ba0c5f8d5b69aa0f02a45abc28cb16b25994ffbee230505932199247d99d0bc6295e199871629d367250bd0c71bb6cdca856566be832
 DIST genpatches-3.12-49.base.tar.xz 1545256 SHA256 f9503fdf958458692b841b95fcdbc561a7ef4ecceeab1c2e532c0740305a25d1 SHA512 4475cc1e1faee3975598115937869564274053cff1a9dfbefe41b9535846f1dae04abd784541af5925e805e9878ce1590cc2eea999c06cb3ca67b80df94f23e5 WHIRLPOOL 25758cf3bad2a875668950923edd3ab481c8fe7f4faa2512a2ad70acf3f4f360dfad0c10bd4599efa60bcb681c29cfb2db5f4b3f8bc82cc792a369517891bf02
 DIST genpatches-3.12-49.experimental.tar.xz 46536 SHA256 927d367eeddb6823534004c5a4c96093fe822acd5856d262003045935617a741 SHA512 3ab1222cbd073437af8697b9407ff2dd4a1890be5acaf70d9e14ff6c6e908615a7f6c8a8b3c0def7660e925edca457c6b31fea64b2ec73200c36512df6efa3f1 WHIRLPOOL 7d600343ae9e5109e04507176b7914ce2421bf250e2a5f9812122820760060093fbf9112fa9e906f8185c99eb14fd873f198f38da4a3ed7b92c884ce0ff01358
 DIST genpatches-3.12-49.extras.tar.xz 18232 SHA256 5800be892a1828498d914ca9315cc5315c2493f900390eb493f7ef45bc7d346c SHA512 b3cad4524b15e15867ed4ae56efed8e59be1d570fe9e822ac381dff7d5c7cfe35af730511a1693ee6f82a48f2e2dc9718b39c37f5530aa00fe18f23d142df4e9 WHIRLPOOL fd8b5bef919d3c155aa49d7c4587c3e3af785ccf1bbff47d0e67fe05fd3d9e4abae8626ba7d44bcded366acac04f4f0ed3244a8ccbcfd886840ebc1663fa7bbf
 DIST genpatches-3.12-50.base.tar.xz 1551936 SHA256 eb40c56edf96dafec5b5227ef7c4cd0dbd2ab49c74b508b368ff8fa3e1c63f98 SHA512 94477809b95255094da6dfdf265d7bfb624e3f4684cd4113bae1d45097aae0fde444e82ec3fa80754b40a0fd01e425ee99de43e95385925a7c34b91833f26053 WHIRLPOOL 37803093789e9d39edab75d3f3854d2ebb4016788bc119e3628db61db7699714e0d85fbad6b9e6d69ea62cb9dc953f7338f6ce7a156f0f19192adb0cb3a7fcef
 DIST genpatches-3.12-50.experimental.tar.xz 46516 SHA256 8238d87fa7172327a9e9f19b493567f3d163f51918493c1940c426b350a75d38 SHA512 74f12da4009d9ff5ded22344ba7ccd6fd935a9089da30d6b53da8cb8367d028b10571572030f1f6ff9e6342f0cf19212be564041cb1c6ac587c904ababd034fc WHIRLPOOL 62830c30f29d41ae1da58d1df9fbc20a4d487f8807ec1430de4e2e1a71e67a309b3f6174131d181d0296fa52677de219287a842716e485adaca90fcbdaea2786
 DIST genpatches-3.12-50.extras.tar.xz 18236 SHA256 ace6077b7076364db90f1d3ad307910ac8a60fa4389156570f51b5838b4c62c1 SHA512 cb34ceb42a6efd5897d9adc11fff3c9acab6224b631b363e5729671b5b1d57c7f9213548aa77713c8678ad76ab8be2be954a718a594827a557ca154b2f343e07 WHIRLPOOL f978baa8ac3e6adc2ae0a37075a2283417f1774b2f83dee286efa4442587d27d5003a85f7af9ceac7c93e57db320ac69e239891585d10ff1a94c9c7c2a8b9945
+DIST genpatches-3.12-51.base.tar.xz 1564420 SHA256 6b9ce4b6d8ea8c12539db8af48e44f443c43ced27f370409f04f17b34c32694a SHA512 c22bc2e4399f501135a211c47ba47ba39a03d6738099637763c282d6f1ad55dfa3d9b4e9a284bcc45fcd1228b45ce1c0fb25cfe1ff929c71397fc29883228c76 WHIRLPOOL f7b3f277fd06f70df94684f408a6cc3f09b38f95b71bcc0d1e07ae9b1bc0ad32599ab96c574b41afb88408e8bb2a426ed9958a29656dbd2f864860da1889e94e
+DIST genpatches-3.12-51.experimental.tar.xz 46528 SHA256 03142b654f7e6188161db86ae706ad119ed60ca91cbe902c4daeb4aa5e1c03bc SHA512 7ee759d0700509d6a4aac1036f4e91aed618d5352004cc025731f2a300a05939931dace7dd02ed502c9a43a38177b06e1d318c7f0467f71fed0578e6fe216ae3 WHIRLPOOL eaafba8acf5ab253aeea151de39894440b0e980afc6dfcf0ded52f34c806c0acf2aecf224b967d17f5117f1a4f6e530b0acc6c67e837294bfe925bca6b5b2574
+DIST genpatches-3.12-51.extras.tar.xz 18228 SHA256 ccad2245cf0878017cebfe04de06676989d223a5ad94e8410bc8eb036f59fbd8 SHA512 1d45f03b6f0b49d2b98ca5776e7388e4ef44ef8b3807e0f2d8cb76d22d93105e4d42d9662dfbc757632be9a71790ec566b2d0a6064d969e00e5601674e14dff5 WHIRLPOOL 56c0c9c82cd25115837aeedd5be4ec913d19db96c0148e44661468789d68944ebe8ea03fed73c2d033a2166fa98e97b0bf01bb9bee46ec23f7488dc9cc30210a
 DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0
 DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76694cecb391e4de657810b2de2a9092bbb0eeb SHA512 c2125a73aba4fe51c1efc6a73a86088964bff398c2409e256148d0f13e8106b56e6c8137e0943332be2524b3230f522e0b76b265d20ef075d852a5a3ca21edf0 WHIRLPOOL 5042375ab3541e65f609deb48a03d186b53d583b4512c27ece06130c0ac4fcebeb8256bf9cb38276720e8fc6610dc8663819ec5acd3bdcc57232a1d2082f25b5
 DIST genpatches-3.14-65.extras.tar.xz 18256 SHA256 9220e49d4a95d876373ec40fae2e026bcd76efb5e33106bf2350026120b28244 SHA512 2699115a2a176a34570b1045f1ca6f5f23e46eb974c9c4953607919f7e5668e1b317b197cd39aa375347460110e9c67231b0315eddb9ed4d8fb631b453f802bf WHIRLPOOL ecb98ae1bca845efbd5dc32bfba31268bef55c73ad35092796c8c4d3661a72341e1a179833ef76d701ede477b9d436a2c45c16ca9b2bc23bec413e0186848285
@@ -21,12 +27,18 @@ DIST genpatches-3.14-66.extras.tar.xz 18256 SHA256 ca4d2b5f371c96a85c29f5ecf6a74
 DIST genpatches-3.14-67.base.tar.xz 1138556 SHA256 a819c786bd71515e5d5902006928d79d9dfce892262d0a93e0f5ea4e85fdb516 SHA512 4080face8149012a6d02bb3c03c84630765093fba7046a222495a586a53d59c7cbd8fff81232baed4933410e44d8553d3a22acdf3b4dcdcb1bf52d8fe869c9b8 WHIRLPOOL 6af00f0b00f9c05dfb300ad42f007bad37eecbbc2c210bf77b9da79d4e5621167206c94cb177b6695717178464a1d2a1d868b57024dbcd40e3c5a943d9f06eeb
 DIST genpatches-3.14-67.experimental.tar.xz 60300 SHA256 83f59b98310b1431c30e42477a3917b87965a0e788980bc3b18974babe84bdba SHA512 b0b3a45d269d266385f7f1648a095b6aae6d2fcc42e36ca1018a037141edf59a75dffba9eb8fdc15a4108dffc62275f85412fb5aff7bcc676b3b57ecd91deaff WHIRLPOOL 3bb077e6a9494c5ebae0563ad150d5286896b98b8096f2b8f69914d572dd3b157f9d77ef3cde4d608f573a16543819e735da0e0c6fd4ab9e836af0c9a8488ae3
 DIST genpatches-3.14-67.extras.tar.xz 18264 SHA256 ff318819ba6582a815744df921309d73cebafd44909c42b06129cc2a1a4dd86c SHA512 2418fe4474e5e09d4ba506d6d6efe6ab4255d4c85a8a764721bf676c4122ee592caab2f30b23ff9f5675b501ad47e88fe02e31efc0ad249e9458d5bfb5a529d0 WHIRLPOOL d8d08960ed8fb58e532b0563d2f5c3ce771a4acef33ec5123a4045e8153ec2dfc26faabbcd77246997ff24c48cb5b63c4701c1da9524e617acca83336dd48bf3
+DIST genpatches-3.14-68.base.tar.xz 1155456 SHA256 1ebb9070b0b2805724537a99c48d873292d8ed7b1b1a17174fba3a6ea035e64a SHA512 ab424e476ea9a91cb96b91d6547113345804426f7dbc9dd4a53d8e7dacb586bd497c3616ecc90ea59f0eed5964a4ba758afb03b61dd69ada034c350edd6e129f WHIRLPOOL b535f7cefdda9ae6d85c0969c4951efb17bfe1bec0f096854e79d2b4afc4ba23f658ba5e4332d4a8b8ee29eb32a2f976c0067618eece3b4da92f4eca6dc0a08e
+DIST genpatches-3.14-68.experimental.tar.xz 60300 SHA256 b8a435771533563dd7b9980e5970ec2f50fe6b1fef9f4350b368d256b2c17491 SHA512 60bff2845130e2be1384cfa617811f56cb981dbbfe057bf447d3bbde5567f5e61d902995a00128b3f40d5cb9274276b30ddfd04f693e103e28ffe78297fc446c WHIRLPOOL 9c71fa482160b95297f1cfeaa35538d08088a95f1fc0f5953f2bebb92535f3942a5cf1d10792831a7d48a39968fc71aaa38a96d6e8b8f4bbd0d3045c08698b36
+DIST genpatches-3.14-68.extras.tar.xz 18268 SHA256 28ccde71dae2369d818357074bedf279387e454e65cc6549e5f4b4a811216db1 SHA512 afbd8150f795d0d2a4921dea12a4d1af95e606b183f53b5a55c89b95e3b88d55bc2a879ce32e297eef7a04bd450584971ee2a1e7e262b5e3ea617a87d098af98 WHIRLPOOL df0b8e915bafdc007c4e035b5dec67b5ebc479e5f0cc9a41c54ec769f72ed69145c7fa34dd3a2987cbc86ca6f337f2b7f9071e362e85e1e22326a87afa868a5a
 DIST genpatches-3.18-26.base.tar.xz 753528 SHA256 0a3d2a302b64284353accbff19ff1a78128e900f0d4cbb0e70920034b68b4bba SHA512 723a29074dbd6970b43974655539902a92b5ba3447cba754f5719971848e2d2ca450d888a83d41fe35770806e842615bb5c5425aebf8a7118e5cd39470aafcac WHIRLPOOL 17e49e01f19a9710e6c3f6b6bb3b50ab96829a18dd60a57eb10058656845ba8e497ba4c3043f3824d69f79cb5c911c5fab6f4b8e28aa39acaa5083fca732dad0
 DIST genpatches-3.18-26.experimental.tar.xz 61608 SHA256 e72de3a8865519ed658a2a769b42e2b4592ba5a6e5c98a699fbe4109f3567532 SHA512 75cd10ac41180cd5f4a1e70ea49b260a141b875f3f46dfa5edd668e507b27fe7244033c76d1e895dea58c8fc69c43ce21dc8e711884438c10b686d53c0b4c8a4 WHIRLPOOL 267a2c1abcda2d41ebf64a6034c60e73249dc4c0984326f516ac92eb16145f493549e690bfcf8f6c515984ab56368437e392fba3648f4bcc57db0351d5ee6863
 DIST genpatches-3.18-26.extras.tar.xz 16188 SHA256 af0d5013a7cb6e0ec78bb5821bb4f83048d953cd10734b57085439fcdc44683d SHA512 effb9ef5722a956a9db49582b3c8aa85f5838a8573138ce867e0575348a291ccc6163e7bb8ce1698f9b5d799e81e151546c1bad59388f80b984e86f98ee8424a WHIRLPOOL 52adaba3ba161e7d1bcc8234edc9efd06bedca2211085990069b1ea8e1a35ab443e5ebfb49a7d56c3d572f9e7e69de1bdfc463abf455ba7e3155eabcdff3786a
 DIST genpatches-3.18-27.base.tar.xz 764516 SHA256 29cd0592d1a4d624e64dcdb350d3cc4b00f1fe0fd62333d0e81623b5bb5f68fe SHA512 4632dd3e969740c24f6029a25168d2695187260a98454c19ce7134997a8045444fbd1efb55548895e259ade6f03da261503ee120dfdf849ecd5e279e71124cbc WHIRLPOOL c8826d9d34630b5e6352150afa29fdd0d7a551e00ac9f41c1285928725e40f5a924542009ef90993ddbbe5ae977114aa365ba33bbee474f47927bcd7a4c47b1f
 DIST genpatches-3.18-27.experimental.tar.xz 61600 SHA256 76ac7cca3294f4b7d9ec31bdf0a41de3945525abfef2f5f1ad2098df578a1be4 SHA512 b1f14561847a1c9184fe2fbd52065d257b0f434cc689a9f6e01e119fdd0c48f16ffc3b1617d2360a52b23d2167bf8f32b7a9eb9a6777ea6552c93db8c3e436bf WHIRLPOOL f6f8283f62b54f7fa01424d1ec8dcbf32d015616ff023fd2c38a9903f0b99b4806a3383bbb4e87fdc7e3badce296da20758a9128313ef9854f14523395969c1f
 DIST genpatches-3.18-27.extras.tar.xz 16200 SHA256 78a1358e063256533eda9c283de9af5eb77d668273e6a982234bdecefc6319d1 SHA512 ead77b9d950e02f3419dc23e92df6dfae95e1989732261da10f316dc039f8c07768df6e02fd117ef4d8fb60cb121a2239465fb5ce0a9165e48ba276024f68a8e WHIRLPOOL aed79224a0c70d85a23713b1036acb3146400f8690a7f3fa2b21452cccc7e6bb8ae1148cec5b588f05cbff3643ca3295c1e7554c063aadd1611fca7fb2738d7d
+DIST genpatches-3.18-28.base.tar.xz 820540 SHA256 def3cdebe118e6381465c7d61b4aeedbc55c63ffa5196f62afc40df6c1cf60d5 SHA512 dd48643fb5aa48539da83fabcc9423186e80ed7beabcb33a519eda876c5d925d910e0955f9b7d7592fbbec175a7948c11a9065a280e4f576b2618f156bbe00ec WHIRLPOOL cf7b3eb5635f0e1f7438cf87db2762471d78d2a4eb85d493ed2196c29df035ddbe6912fffe5cf126e81fbde5687aad11b1f3cae6c0d285468571ea01798fbcc0
+DIST genpatches-3.18-28.experimental.tar.xz 61612 SHA256 4ef8ff2340d16145f2177ef2f5e8ac43b37e57c9d9ac730bd0c992e99209a71e SHA512 94fd26d41de8a6a4d0ef82d9c261b3dd5b54ad58bfcf054e011f6495be788d687e589ae39e3012707cd48e836e678d237ccdd3dba6985c3f2086ae923616f2d0 WHIRLPOOL a325ec94646c9c05c33cb0338e9f3892804b1dc0277a2d80b1b1248c40f6ad6fe8de170f01639b8e79e86a9fe540ac1c8bf22c138dab85684dc76cbf7db5bbb3
+DIST genpatches-3.18-28.extras.tar.xz 16184 SHA256 7fe110961bc2fc65f0721d89af43d533a556f0ec567d84d40269549bdea089bb SHA512 5971522cdc227029414cd2b8e385dd857d7ce113c85c3bc18b575f97ac616fc1f586dbfe7a933ba4bcfff00e3c711d42b0e29289ba725c646bdee0efb4c1046f WHIRLPOOL 61d2bb69908c9458a03e25aeaabb5dc8b4129a0b8385199a51ba345a6e8af0994d60fe09e33b12e7fdf02ae83c1a31af9b7758ebf9d1c6c9e5527bee7e3e1f81
 DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f
 DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
@@ -47,6 +59,9 @@ DIST genpatches-4.1-21.extras.tar.xz 16180 SHA256 f1e5767b655aa56d66b182001fbf51
 DIST genpatches-4.1-22.base.tar.xz 496068 SHA256 2e8bffcd6f12687fbf8af81182b68671b178aee11455330c173dbd60aabe01e7 SHA512 2949472a6ee6e03fe0c04a2ce34d8afae56f5c4b92397d73211852dee09aa70ffcc5cdcd1f730a6b19e1b6dbbba3cfe769edcc297a0afac145b2445e6d947681 WHIRLPOOL b46e4fc296556b9d70aca3af1bf02418cdcfab1f3afe1297fac2ae2282260cd76d3edda8f18c32baebda25caadca70f13e4876c284c04fdae7ce648de5ff5308
 DIST genpatches-4.1-22.experimental.tar.xz 61632 SHA256 dd10f3d0a034b8cc12fae479034384f4c19a06e3e990ed78b3c9a9df557a36ca SHA512 94a1ec19ee77c8a36918e0b4722d4c4df945dc23d36dcb26eb16476cad16ed07086277b623d347fac05afe8dba9531be8df183c328b2a9beced8679184054c53 WHIRLPOOL f99a2897a2cd9988bf6a25133427a32482d6ca044700517d268111bffa5e470e3a931e9734f132569c37b4dade8d25dbe15e5a62aa6360abd328bfb84dbadccf
 DIST genpatches-4.1-22.extras.tar.xz 16180 SHA256 c45029f048af2ef0a90db03f800f764559efa2eecb7c0e388424348d05adf906 SHA512 c75b4620aca4160946dc25ba7d8eb7657319a7528e126a90a5481f68a90e41284c6fcc695f611ef9f7ec0718b649242d4a69b0588730401273101b6744496e4a WHIRLPOOL 2432b7490691c813bc11410646cdbd95df791b19752997412edb087c5c8dc4bc9ef185804c3f750deeef8ee3c751909451927d15cce1b937ace0f3cc1a6c169e
+DIST genpatches-4.1-23.base.tar.xz 572288 SHA256 8a46e42e2fa5e8a530bae36f330ec5e03886784228c649276e2d530b738d4f25 SHA512 176f6db507ffc7e8ccfec3c4af28a7dad4118b5b145490c4c0efa24a4b6e056cad9923aed69acf8a90a0e42626c437d54c3eac18285dca1fe7e067eea63ee178 WHIRLPOOL df45ea7924444b58b8aadeb2ceff448b29c9dc0f98b911eaf4051bbb9d18edaa283e684c2e471722f77b57d7a786a0c617108b7aa0ad72a18677153083481a36
+DIST genpatches-4.1-23.experimental.tar.xz 61656 SHA256 99f83b19eaae65c2a7f36721533e0dc229d3c319afa18a66629d1c9ba4780ca6 SHA512 4be89a9aea2269dc0d77e92921df66c429eb7bed808663a511d08cab20fded79175c6c2f8874844c2d85c77ab726459f86d3682cbcfe4604a3fdb5929a42cbd9 WHIRLPOOL 2d29b6b08edf7a34f5629f75a3d5b62be691bbf518d0482d1d92e7b15551139ca353df120fbe8c9a9ef47fed1060d19f6606aa4450ca823a39a6e9134dc40416
+DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d355c7876ff4a75dd30c486a8ec334f84df2 SHA512 ed74a9ab953dbacc10b6c246578c78681d36544497a296f9cf76e4e43d447b4f9a6d4354ae9074fd081e748fec0b3769b193e0ccff3953070eeeccf0ed2820ec WHIRLPOOL 6a978a5093c0258d65c511b53f42ce28ed7d19fea2f9171b5265a1050d977de9855501869a98bf5f96615bcd7b39e3522835b4876d7c5d43f80646688e5772d5
 DIST genpatches-4.3-5.base.tar.xz 76536 SHA256 ef0d2bf2101d848ef6ef97ebb680dfb546aec91efdc17acb45bd234e4e7d2fe4 SHA512 635008532fc56f68e5867143367ecd7f3e277dda796d2c311e61459b6b1e454f0822664bfae02f59cce691246ba9a7d0f6ed6a5817230e512632c80b71ab6b7b WHIRLPOOL b467abff1276bb5884fcdeaed9d15ef7dd0a31f37e44b77c98214758bf406b21a5143b516a1c15056146af426122ec255736a33a643ad3bf10afd6d052070ccf
 DIST genpatches-4.3-5.experimental.tar.xz 61640 SHA256 487bb6919e05409308db7cbce48f0c059aa426e843cc92f92fee485b1b960d54 SHA512 a62b720a233628e593902fed82c7d60eee5b079e33bc313599f93228dfcee12159987cef8852a391aad2971252f728af914a8c7118ff8484393aab1193c2ffab WHIRLPOOL bcf996a05e20bd611382181b88b9ffa789b0d6665e48bb7e0f398e5f386598dd37ff39e33af0a4bcdb873cacf2b40a032e587adc5acd9117bf5f9e99ea18480c
 DIST genpatches-4.3-5.extras.tar.xz 16284 SHA256 79a6d10fba5a62519d4818cb16065476ae3ed6667012e77c84d4a5d61df2f26a SHA512 cfb85a6b475b1e53eec42b5fdde16372eaba7502f8ea783b3d7bffe369ea2bee6d4f65f5a7f32e8a485a0102090b7f0d9bd026c1c68fde1bca7190bd6647de61 WHIRLPOOL 90c1ff6e3a1d97d695f69e08d0a0fd8f7e48d215b74b3c98febc32b05333ab7bdc53c8f843f2371e1d0d7825d25eb12ebe5fd3f1c392415b5dfae45223458db6
@@ -56,12 +71,18 @@ DIST genpatches-4.3-6.extras.tar.xz 16280 SHA256 fc90c37419df393f084a5fbbe2d681d
 DIST genpatches-4.3-7.base.tar.xz 137724 SHA256 f45b2b6bd27dd6ba0ce82f4b143078cdb99f729d344773ef31f42fff339f295d SHA512 3a910f0c0a41b1658190b005ca6cbfd82ddea72a65f09e26b4173371f5ff1f65a1712cd35633d0692f74fd8ff0d0fdb4163113ccca8c1de197d1ee52356fbad5 WHIRLPOOL 67611446db6eb94c59842874762797cd2986399e7304eb3adcdfd9a72b104a10dbdde7a22de87381f416ebe07ab312b80dc1a8946077a003bf5646db65aaedd9
 DIST genpatches-4.3-7.experimental.tar.xz 61640 SHA256 963f0c524dfb50dd9c8d9b211d672eeaaaa3f8fd5a1ae623dd9c4f1ad32513e0 SHA512 757630a3b74653fc9cbe0009069a3ac81eb7b989d02411234a328cb6ae4363afe5e0dfc4bd8d84828d8450951ed50a6b476d2b130f49bc32fa4251d0599b51c0 WHIRLPOOL 43fdb49d7d8fdd42775cd13c976cfc621ef879f9adaad5db971ed7f28ffdd5d8b5bb35cd0c6be3e01cbf3744ccd70f70dcc4a9fc82583c62b6e63e5c9a0415dc
 DIST genpatches-4.3-7.extras.tar.xz 16284 SHA256 11fe6eb76d8cfbda95001b05ee1c78243c7394d0a4e12600b3fbdfb69574c9b8 SHA512 503936e84af45909eb4df1b6b4968ca48cb65ed7617340270b41cfc41ad209b22a20ae63dd720901b750d905fa7215912a8c8d271c9544fbf2b3c1ca70adece5 WHIRLPOOL eb7beae6d4bd324b7b4e0daeb292891a53ba9072f30eb2c038e8b74af14643d20a577142c0fce72a36324866868582c8574700c1e86ad06aaa8ce4a7ff5fcb9d
+DIST genpatches-4.3-8.base.tar.xz 196548 SHA256 9246ac430ca198817f177093cdb628bb3eea3fad8ac0723adb38a02502cfb89a SHA512 ce2dd67fa2fba9583b9cd309d68e63b937e718cfabd9f3eb882ebc23b3139d59ff3c84beb3cf770dca367284fff6ca2bc85cf9e114da4621b7f6865b2d69dc0e WHIRLPOOL 0c5640f03d44b1219c23a7eff655b8f1749e20b30b89473c06c3a6fb0f34d30094534382ee1a1e4b5fbdffbbcce20dbe4e377410e390b8b5586ad1da9efb57fa
+DIST genpatches-4.3-8.experimental.tar.xz 61636 SHA256 8f1297df01d21d8ff121549061b8a8cfb463130edb1a873c6daba6ad8c3d7894 SHA512 19df4ca02e4552befbadef8f0824eb09cccfe10fc00e48d1e684bc7e7761f4d896e605f0153c5ad7d8f96575166c4823f08d9a5f7be3df23128b39d97a685c57 WHIRLPOOL 4d6661b13be1002d9610bbd19618d77f251f6672e286ecdd9a19fccc335ccf0c3dbc9572e60919f50b562249b9589082786762cae0b961a92f056da206b17dbc
+DIST genpatches-4.3-8.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
 DIST genpatches-4.4-2.base.tar.xz 4416 SHA256 fbcbba8098ffea5957652a91de15ac41eb197443e7403b7aeb32b38b8a0d8bc7 SHA512 65cf7fc10a76be780134680811ebdbb2ed2deede73203688e5b32bef764eb2dec6bfc3399eb245082204cf571b06742dec90f9ee7cea6b34692f694cf0bc7bc6 WHIRLPOOL 554b3287f7011c62e3efe4a8e06cf635bd3768f9228fdabe25fb01b6f1acc1a47a7c96587fffe79e8aadcfe181b934c59512918453cfb27f867d5dd2d3a022d6
 DIST genpatches-4.4-2.experimental.tar.xz 4904 SHA256 f1b7bf2d00c34b573d195e841efe5dfb29354d901d2b73066e57c19fd9c7b8fe SHA512 5c98ea98c4648dd2fecaf7cfc364da04d136f4b084d9c1b0b2527deb7cb52d226d5709ab0324e22d75e56d44e42cffc66add0a432639a817b59e97b275f9c232 WHIRLPOOL ab0e36bc830de699d59be6f08d6293283668a3742f216f8189dcb695ccb293c3a60ea468836321835d0bfe3336f6731647698d8252630d06f8fd96886099d2e3
 DIST genpatches-4.4-2.extras.tar.xz 16272 SHA256 707735f41624d33489b10c771db536f119bcc5f0d13cbcc38e91977b8b12ec41 SHA512 4f3d9463a9e6f618e6a3a66d4b9f1ca7ffbafa2d0c13308493dd5abbb23147abbc37c0e68a38b0c11c1f424fa1b2086aae88e820a824a1313ea9531507f7f91b WHIRLPOOL d9aeba2ce4e4db0697813bf116e27ec6e91f614316b8643539fefc28f5f522532fd746a56c91e706cf6f9e621019f050dd22f60f420d2aa15d2121383fdcfe1d
 DIST genpatches-4.4-3.base.tar.xz 26508 SHA256 76f5685698b02b81643d6b2edcd53217e0f6fa00e068a138f2eb3bc596dec2e5 SHA512 255e2ef79c56699e5b032fa392b2748570ce96c74f1172f4a4c1b4d22f8b8b0a9462c388028a0cad92e821815d39cfa6450f171d81fed5f274dce03979c39322 WHIRLPOOL 6da9edc7936f8857b929e589b2adcb17363a76ec5d85b3406fcb8308d6cb2da924f1f9af5062f85ddf4d415ca9d9524b731e8c4e0cde756e14ccc122a6e75c74
 DIST genpatches-4.4-3.experimental.tar.xz 4904 SHA256 e43014cc7aebea9e8d4f9e5c53e8e7a670f24693dbf6bc4b53dd17bb255f950a SHA512 60ae488e44c2e04e50cd456f3476548caad305b5807c0ce21251b7afdee4f4db300a68d14fb37984a1e4ea0be121c23cc8f145fa2964369fb83c0f2f32909feb WHIRLPOOL a5ff3f4e5adb1257a3c034e69fa639041051ea15080241fcd4c10201e8024575394f19e1bd36f046f3789a0d4ab4d26519cf142c52694b37105509423fef17c4
 DIST genpatches-4.4-3.extras.tar.xz 16284 SHA256 c0da41d2dca58113b257f2d21faa456867f2010a903dfd2b95639789c44c2c5b SHA512 150de4f7e7f81f12cdbb57a47802f9878ce0efad3553847a7f64e3428be45b22be432a51f6546daa156019f9480c3fab03b0871d255ca962a79037a10867f0e5 WHIRLPOOL 2a6ea3032726ab49ff78b7d01315a0099de9ba5addcbcb3fc88fd7ece137d6cd4e79a9737b05be60c4857ef6a37b71237e09d3cd19cb4a441e1d173fdc77a000
+DIST genpatches-4.4-4.base.tar.xz 63520 SHA256 1a682ab2279d2b57cf1575e10f70d4cd411bb209189ff9fcfd1270291f311fcf SHA512 040f590980aac0bba3805e959344f93ee9d32d4fc9e667e3cc2ab1b5375cef5043a4a0228c3fb34457af79579b96f5f587b9b0874ee066105acbe0250780c956 WHIRLPOOL 2f1bdacc234c18be10e0d3f61f3852d21cd6259d015146d7e274499f4fb9643e7e83151f3682d25c1f5a0adea507163dbcbb5e269f7f73b6e226b178a603201d
+DIST genpatches-4.4-4.experimental.tar.xz 4896 SHA256 e3c5381823db06220d1b464a8b8db3fb0efc0cae87cbe9695ccaefc956f9a17a SHA512 9ae08e11750d27a012c7b6019d14133decc14fb004d7152b83e71b0f400c3ed8bdfdf7d9f6538c8a0689efc5ff27760f79a34176275e79a99b6021a4c4db646d WHIRLPOOL 2cd692e0d14c04034f74c7742e7fea330e7a2741fc03220589d1e978e42998f4e23790e9719d38843d9dc0291f87b196ac026472a232793f10f594458c2866f4
+DIST genpatches-4.4-4.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.97.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.97.ebuild
new file mode 100644
index 000000000000..66979baa64a8
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.97.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 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="102"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.54.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.54.ebuild
new file mode 100644
index 000000000000..39101cbee7cc
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.54.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 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="51"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.61.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.61.ebuild
new file mode 100644
index 000000000000..bc06152b55a2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.61.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 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="68"
+K_DEBLOB_AVAILABLE="0"
+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="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.27.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.27.ebuild
new file mode 100644
index 000000000000..390501a69afa
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.27.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 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="28"
+K_DEBLOB_AVAILABLE="0"
+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="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.18.ebuild
new file mode 100644
index 000000000000..aba24a338f9c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.18.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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="23"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+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="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.3.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.3.6.ebuild
new file mode 100644
index 000000000000..c99e31e9d32c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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="8"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+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="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.2.ebuild
new file mode 100644
index 000000000000..657c83154336
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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="4"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+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="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/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 24eeb169a956..7c13b88b787e 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,3 +2,5 @@ DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f1
 DIST patch-4.5-rc1.xz 7967940 SHA256 e85df921d461dd39c488ddd4f14b29ce1478b3df5551c6edda074690afe7e047 SHA512 0c7be6f7253d5542032c828a77e3fdd4d7728c3832378206684c9e2bc1d53087193f078970a1dbc0af33259bfb144807bd21dd50286ac60e3fabd492a4de4fd3 WHIRLPOOL ccb9e96626869183a87b6ec9dfb4edf0869adf3f6f4d8d7b3064196ff3347977435bed3995e6b14384f751aa4ec8bf0748a0c430a3669784f71b6351c96aaa5e
 DIST patch-4.5-rc2.xz 8030184 SHA256 b5d3194bf8f22fd63cf185f1b1dd25fca65bbf562773e22b6fd2538f43cf2df6 SHA512 7c589b7ec8c9a66204b10afd6a9865c6020bce2c4d616aad1e62bf362254522846b7f60a497656631aebda052b316e1896c302faad91d9b27bc1645919c017b1 WHIRLPOOL d061e4df5f5cbf23a1532e01de670d394ef3b87c7a0566d8ccbcc80dc22fb927c7a5bdc53d625615f4aa744f5b8314388b2799a4716afaf3346d239abfbc4d65
 DIST patch-4.5-rc3.xz 8339492 SHA256 151b54060f1c1be5236f5effc8668ad1812fe2eb9bc8153ccab70cc4fa42fcf3 SHA512 ff36ea4cf4bfdc1cec10f7c5910e3741faa7ced203d917c73f90d11d9ed24a37c380daf6cac89a89c164a494590759797f3c2600058ed4e9918361eeda0e655d WHIRLPOOL 42118a11aaf2e606fc75006e6e6ee3edda369706a13e16843416abb8cdafc2c5a513b65388b01d8b93951de8c8df75bcacb4137855ddd1a9e785d3f92db4f784
+DIST patch-4.5-rc4.xz 8397260 SHA256 d3f536316fd51162a0f67013821737fb7f724f27b2574241f11ed7513d54853c SHA512 6d4ec1ccfdcbd7187535b3440f7f3c3f25585e2e9b2759d38967e56880963b0b1da4e23512d940ef603cacb1f560b613e760c9fcc4d8f96de07627894f35545f WHIRLPOOL 03c445cbc3b356a89d60d93c3b4361cd4658174c80ece3add646ff734117130690ee0e4b4c9b118520a5c933bf9aa5ff1a863a785414a4b06b294d106cd6957d
+DIST patch-4.5-rc5.xz 8430188 SHA256 2625ae21341a70c4208a380cbfac96602b44c59ec8ab6eef7e4a5a0e97528f05 SHA512 a354900d29855dc8e9a1be629f06c7ef7875764eb4cb930a826306278d9e963941eeb3c393798314bf80b415645f881c8dd2b555da808388bfe54ff7551651f3 WHIRLPOOL 057349165c0680526fa0f14dc53faefb5a999e58ad0ebe8daa0e40a193f6f0c699377483ff9547b4e3da854c46618001c66650c42d8c5d7c95ab2d630912c414
diff --git a/sys-kernel/git-sources/git-sources-4.5_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.5_rc4.ebuild
new file mode 100644
index 000000000000..cedf6831acf4
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.5_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.4"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/git-sources/git-sources-4.5_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.5_rc5.ebuild
new file mode 100644
index 000000000000..cedf6831acf4
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.5_rc5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.4"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 29f29b524c5e..ff1cdfc2ea38 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,14 +1,22 @@
 DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
+DIST deblob-4.2 134706 SHA256 fc6f631436d0a8ce8ef338a6ff5e612cd1bec679386f7129e70e4dc09c7aa9da SHA512 83ee4763e7eae7549a81f1ea9c2a549a36d57288acea15a228d5bb1aea0316b96f8622fe6729a3dec23714443711ad9959e899a8da962c56af8956a87d3263a1 WHIRLPOOL 1e6212af3d7244139b4fea1ef3fc705d6eb695d9902bae561a5b700ef335254cb50a4ee500f241669e0fafcfab752cf7df663d02ee2663e6ee7282008871da22
 DIST deblob-4.3 137019 SHA256 317eb90f128fc05bcf0a01eb7f167f9b5447563b0af4cef4270b774ad64dbdf8 SHA512 e1f98cfcac9cbbe3e7042bc427c1afb5024088d0846a1eb806c7c46616ee77cbbeb63c52f7c1229ff54cda74605f9a6775833e1f5d7ba35a9ae554ca05fd7fc0 WHIRLPOOL 9d42765fd0592f7c8e01f5df78510deafbfff2b60128ad26c2412bdab4b02c72fc8dd0c7c0180176b5399de66cc85f625abf2968c049f8a3b9ebeb5d8c5c71f0
+DIST deblob-4.4 137370 SHA256 7cf11c8594db0d2a10a1b02390c9ff8916f1d2a1fe9d59058ca45485500c5274 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a WHIRLPOOL bedd494be2032ce4b8911f25df906055d019af31ea6548b885482f870cd5313e09e7fb544fc8db268b3498cc18c199ae5701023839c972b48dbd8128239eeb75
 DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
+DIST deblob-check-4.2 681496 SHA256 8b72723b3f5c651ba45017f557372dd25a43a1ce1b9ba622948399c20a5c318f SHA512 63e86dc0a4e676b4d0d4497d275e9885bda57ee63453a4e9e08fa4327f51b10b80da70d3f1d688e7c447632b31a388eed98470d88f88f60b50c0d53f4803cd94 WHIRLPOOL 4ad1b38354e7ed7e5c82f348956bda5cfa704b21e6f395a3b53a7ae61806c9df593ee9e560d4ad60d1501f6c5381dc6d79194b4aed6810908616e795fc757fc9
 DIST deblob-check-4.3 688368 SHA256 9dff222415c2ead1edba2f6755926d6786225814d87dc3624605f99a4b760a5a SHA512 2029b4765a4f83b71370dc4439526daff57be32f8692a329d500df82019a5381849ca979c0ae3761c2efcc04590c031560f0e25de50e71f476618df529a1445a WHIRLPOOL 6dbdcfe6653e751ff00ad91f45c803bdb196fdb9c895ddffaec18a111a19720d50a77485ff8ce228287217ad2e98b6f9e9c65a3c6476f195cbf9e3b7969be34a
+DIST deblob-check-4.4 694225 SHA256 e142bafdd5a05280d5280fbf109aadab3af9ce71152ab2d27ad41e96766e0c3e SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5 WHIRLPOOL 414f60a64a2c14f01eedebc84f5adfabf0562bcf76545a57e757cb6ac914ffc49c90c329eedd1aafb1ee752bfc082fd4f6af173774f4f853ddd637525fbeeb9b
 DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6
+DIST genpatches-4.2-9.base.tar.xz 216388 SHA256 16e1a0fdc0c8b36b87477ba11913cd9b83d5cf96651814fb017c7ebe57b65d8f SHA512 3d8d1a25571a969e1e47d37dc87657b409a03200c2d3ee8ffe2cba19344795626225374128cdb7f09df9bd4cb0035a3c8645c2cca9fbab2024f6ea1875a3591c WHIRLPOOL 13254f0c939584052aa7ac736410796bfc37b5b0ca050a0c6c63c4de7c3e84a2ebf649ea87c141702f4a53af4b946aadd1b6eb9a551a620b7d89596f2fd5958a
 DIST genpatches-4.3-4.base.tar.xz 75572 SHA256 c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512 a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1 WHIRLPOOL 04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3
 DIST genpatches-4.3-7.base.tar.xz 137724 SHA256 f45b2b6bd27dd6ba0ce82f4b143078cdb99f729d344773ef31f42fff339f295d SHA512 3a910f0c0a41b1658190b005ca6cbfd82ddea72a65f09e26b4173371f5ff1f65a1712cd35633d0692f74fd8ff0d0fdb4163113ccca8c1de197d1ee52356fbad5 WHIRLPOOL 67611446db6eb94c59842874762797cd2986399e7304eb3adcdfd9a72b104a10dbdde7a22de87381f416ebe07ab312b80dc1a8946077a003bf5646db65aaedd9
+DIST genpatches-4.4-3.base.tar.xz 26508 SHA256 76f5685698b02b81643d6b2edcd53217e0f6fa00e068a138f2eb3bc596dec2e5 SHA512 255e2ef79c56699e5b032fa392b2748570ce96c74f1172f4a4c1b4d22f8b8b0a9462c388028a0cad92e821815d39cfa6450f171d81fed5f274dce03979c39322 WHIRLPOOL 6da9edc7936f8857b929e589b2adcb17363a76ec5d85b3406fcb8308d6cb2da924f1f9af5062f85ddf4d415ca9d9524b731e8c4e0cde756e14ccc122a6e75c74
 DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
+DIST hardened-patches-4.2.7-1.extras.tar.bz2 1678777 SHA256 80a4ae498b15e7aeaefbc68f7f7983120a6b0065516510f8f631f94de3ea7eee SHA512 42c4911f0001ae4acc02cf8beb52d95f5e2860950d6f202728d4f099d06ff4fac27850168032d88bd2978471e4942a777c625667371484a0a261479a8d669386 WHIRLPOOL 891febe584c06b8fd2d8e7e9f2bdb3d0a8b10f2576e7d79359ddc50804fffe4b094ca1692ff533bf0279da1580c73ed89070436eb1a30b9cdf6e90cb0facfcb1
 DIST hardened-patches-4.3.3-5.extras.tar.bz2 1649484 SHA256 2a62a5eb4b98f4fbeb43511a0573d58226277d3112401abec37355d85e01ae23 SHA512 09b7272af44fb1e29cba857f7c3305d97f8997881f228a2f2eb56dda909ae5402a69336c6fccdf3920f8788a7922f10b0977517f5918d44702e1a9b668c708c7 WHIRLPOOL efc152c7680b84b682f9f6857b8c6b2b66b6d505f76b311a8e3289a606f46d4944d90478ff93e3656f41c367fdbcd65dcf3043842354b26b669b462ce49f3471
-DIST hardened-patches-4.3.3-8.extras.tar.bz2 1669500 SHA256 55abfccb978e838266de327e020d47bb8f7bcf7ff6d6a89c993f18518ab6ffaa SHA512 bccae396966a3a00eac4763312e7c4a05f3cbc68f42675819ad90e3f43337713a7ee132ba5fe6874fffa55da9b8640e2d349793904736b9f62b178bdc5474ad9 WHIRLPOOL 76eceb3d204e3ed588fd40d773aa38f4450c0a3727aad75b231ed2795548ef3ef316fc3aeb174eabd79641fa43c4c2c56d184f6dd23f47980256e468c3cc6d2b
-DIST hardened-patches-4.3.5-2.extras.tar.bz2 1688809 SHA256 4859f8f42d14f79920613ccb195f2b4d65e1ba84cffccb338fe4c5cecb6d56ca SHA512 63128c8279077226292212de45b581d3de0cc9e866ae4907ba70e8cc9928324a4aada0429b1b102dcb72dccd75c26b2a5aa3880a6210e97c9871e7d6c32754cd WHIRLPOOL ee7f762935fbf211fded180921a80b4d9b2efd02be084df5636103c5a0bf8cf2ced5f59a9be3488cc4519969ae6d18783d7a704d5ea6a7140e7c83ae9a942203
 DIST hardened-patches-4.3.5-3.extras.tar.bz2 1689168 SHA256 97624ccc3a92cbb57fd2783a58436347fb5a6373e3f04a14c179ae6b291ac9f9 SHA512 1fb2acd51e39fe173783bfa693458242fbc7e16ec403741d4f86d8eadf401d1e238726c6834024f8c7ebe90d7ee22f531937bc5c2cf48073adafc70eedff664d WHIRLPOOL beec44858cc473f424fe9d9d647d8d9e8a61510c628c81256cdcd3f1372911c5dbb65b343e1e829bbf451f6bf3183d8714a309ca4d76268e3ed47ac2ae4c60cb
+DIST hardened-patches-4.4.2-1.extras.tar.bz2 1721230 SHA256 81f1417d210e0a6d9f5e180b9f828beb87ddc27571a16c40552d0fa1979982ec SHA512 599dedbef6fa26efc2a62c19e0536accedff6c60968294e9a7246c9844b26491b4414b1b40106eee9bb7540f8cd4ae74ab3720029b0730ce5541e005ba60cb9b WHIRLPOOL 84e22467a6dcc738043e47274ab2476b69f1796f1f23e3ca4ed8e244dd73a7e4998de683c1d93baccdd41eb232327d4ef1eb07d01b8a790510b8690334032f02
 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 linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
+DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.7.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.7.ebuild
new file mode 100644
index 000000000000..24bb297eb65a
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	1600_dm-crypt-limit-max-segment-size.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r7.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r7.ebuild
deleted file mode 100644
index 0546f550f088..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="4"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-8"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.5-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.3.5-r1.ebuild
deleted file mode 100644
index f59b31ab2b18..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.3.5-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="7"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	1520_keyring-refleak-in-join-session-CVE-2016-0728.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.4.2.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.4.2.ebuild
new file mode 100644
index 000000000000..7b857ddb6324
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.4.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="3"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild b/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild
index 4ff470ca2559..fde451ebe91f 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20151207.ebuild
@@ -9,10 +9,10 @@ if [[ ${PV} == 99999999* ]]; then
 	inherit git-2
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
index 5e46814b5541..3e9962fd3c01 100644
--- a/sys-kernel/linux-headers/linux-headers-4.3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
@@ -13,7 +13,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index ebca98bb8238..81e5db0be977 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -3,3 +3,4 @@ DIST patch-042stab108.5-combined.gz 52741774 SHA256 9909c8565b17fdd5f0f6694ea1e5
 DIST patch-042stab108.8-combined.gz 52745522 SHA256 3a08fe55caf39a012e00f434bbcc2fa590728186eeac4843d2937d1cd983c6a0 SHA512 dc2b8e11084d3f11fb8b9f37f1a0d444881558982c1d9d4d7716c8bbe1ca5f594d2be0954ad57d8413075e431020b87eef2d11e9783f4dc22276b9ac892368c5 WHIRLPOOL 540a101279087c9cb992803188371e2082fe3d107b8c106a2dcd82bbc3c8895388c3fb15788e71d3b3438c0830da1c7f923a547fdcabf2b867aff4ecaa83bfe7
 DIST patch-042stab111.12-combined.gz 52812755 SHA256 d427fb467f6ee2eb895c6ec54f3c7ef674a525e5e68f2c850763bb5e7916710c SHA512 6cf071a8d7fe405e9a4907b2c8577c663cca3f799d3a4c03d79aea1ceec264abe336bf21e8f115a2ee13f4ba1b11abc1157cf231dcf55c4c89689985a07a86bf WHIRLPOOL d1d2b435ca53377adfe0dc85b040415928ce93cde33bc628fa0683824d8090238f8cb682fcac12b1f834edc3220a07486ddb9c63a0c8f3e9061829a49111b10e
 DIST patch-042stab112.15-combined.gz 64328107 SHA256 10309105a1cedba25e122294cb918622d666fd3421656b0579dbc5e81f96f44f SHA512 3c7ad792c9f8b13d61c0d9ed173e9fd9e2915a73d0533c32357c7caee1d213e42f891dc4ee1509b2bb4a7a19985f757ab52c3023169e341b45bb3ea6fb8bf8be WHIRLPOOL 1c0f6c35a66342cbbe602107b269c04cf048e6efb4bbaf60210f6ee0eee30eb652d30518da6e85b9c37fead769b9bfd7d8a7410482c778a5b634d88b10c76c6c
+DIST patch-042stab113.11-combined.gz 64331474 SHA256 00baf6ddb8fd50cf415d402fb4bfac064008ff7320183fee8985739401b6c002 SHA512 87f9551d37f0f4c1dcbef251acf402c95c454c377300851d83d47bc100614cbda35767d32376827dd38d3daa72c3c80ed3b9504ce92924aa1d7b74c804fa1031 WHIRLPOOL 0141f853f1c0a7dad084a2f5889113b1a17ac24fcb2d66d19569a9f03368817f489adeddee00ab4b906ad4d31d744fae08acdf41142b09764c5be539afc8fcf6
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.113.11.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.113.11.ebuild
new file mode 100644
index 000000000000..d145a19a1616
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.113.11.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 versionator
+
+OVZ_KV="$(get_version_component_range 4).$(get_version_component_range 5)"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+EXTRAVERSION=-${PN/-*}-${OVZ_KV}
+ETYPE="sources"
+KV_FULL=${CKV}${EXTRAVERSION}
+if [[ ${PR} != "r0" ]]; then
+	KV_FULL+=-${PR}
+	EXTRAVERSION+=-${PR}
+fi
+S=${WORKDIR}/linux-${KV_FULL}
+
+# ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
+KV_MAJOR=$(get_version_component_range 1 ${OKV})
+KV_MINOR=$(get_version_component_range 2 ${OKV})
+KV_PATCH=$(get_version_component_range 3 ${OKV})
+
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.xz"
+
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE=0
+inherit kernel-2
+#detect_version
+
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DESCRIPTION="Kernel sources with OpenVZ patchset"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://download.openvz.org/kernel/branches/rhel6-${CKV}/042stab${OVZ_KV}/patches/patch-042stab${OVZ_KV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-042stab${OVZ_KV}-combined.gz"
+
+K_EXTRAEINFO="This openvz kernel uses RHEL6 patchset instead of vanilla kernel.
+This patchset considered to be more stable and security supported by upstream,
+but for us RHEL6 patchset is very fragile and fails to build in many
+configurations so if you have problems use config files from openvz team
+http://wiki.openvz.org/Download/kernel/rhel6/042stab${OVZ_KV}"
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 819431828bd7..3db7a9fb5ab9 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -1,10 +1,4 @@
-DIST raspberrypi-image-3.10.24_pre-r20131212.tar.xz 10686516 SHA256 0e9b4af7ccfdb9a9b80d3a0996bdd522670c00412af3dd5b301fc47c2ddeaa50 SHA512 5001ac5722e91528a1c8fd83fc775afaa5d0917d4b19e0b07870c34b102de0ccae6f52eb734e2ec7f2a84fa6a6b47c1852de505382e6027a5c048dc310f7d961 WHIRLPOOL 531ae1c94bd4c0e71eb954dce64c7b8ac50e63447c2e9ad19802280b0ac26acf43f6df0eb3269563866d57a66d03e18e95fb5290e03ec43babbc2ff05047af46
-DIST raspberrypi-image-3.10.38_pre-r20140427.tar.xz 10834816 SHA256 9f00d57e4f14233329f713110991b62b3c4cb22ae5024e82dd4a6856b5667dc3 SHA512 d61c6698a4b52b77a2967ea80766519db84f61388e7e32018a3ceb5f77d8bbee24f409a79bbbfbdace2dc154d873e8a5498f3b957db836fef43f6688de84d95d WHIRLPOOL ba21788cc709e0b6e8c1f286c8e213fad6221b6ef97db6ea3e80cf08370998c0224b0272216685eabd5ff2efdaac72e256655b395a5e3f1e7a4fce6691cc2d8f
-DIST raspberrypi-image-3.12.36_pre-r20150206.tar.xz 11038896 SHA256 999db53f2b0293de377db5b4fbe00a3990a0e29f4eece1c145c2a921edbfddeb SHA512 c0254bb1da52651ef6d308b3204397c441f4bf8f6272cceefde0fa1e755397b252be55d2e7e397b352b319722d9195c0b9b7fed8ae301da4fa4c0d2c04618d7c WHIRLPOOL 20e0b529bcc01902ed453b8e6f0ae152a38e61ae6b07a95e398f830a98c8d199b574ca15b46728b683139a288a5f6eabcc8a08e75c007bd5a3e1fb53263c5d46
-DIST raspberrypi-image-3.18.10_pre-r20150330.tar.xz 12976572 SHA256 ea35d0a90b06951e5919ec5a5918291e1ad1c26fb486b103b4be6f6232126556 SHA512 4a9f3ea141a4135d890d6e52867f533293f9ec9237f5be370674599f17cf4edc626ab38de5e493ae0b013e8768eaf5126b2e18662e40cb5cd4587b49ffe8547a WHIRLPOOL a88dcefdd785a68f88f8d882f7e516eb857670dae11150f2000551f9adb316b35cf17f584bce228602e5a518cbbc46c81c65e74d738cf1b5b0c24e95c26e373b
-DIST raspberrypi-image-3.18.14_pre-r20150520.tar.xz 12998340 SHA256 f7d5400f06314cc174b3ff5ad57ac75bdff9d63c7a6aededfcc149bff4540eb6 SHA512 3e7721a207ea7f88e5e68af471c76948b68c1a92acb974a648b5e3ef911c63caa96646cb556323975cfce845576546812ef508bd711e674c3e0d98959e2010aa WHIRLPOOL 5bd3aa413d2f8a97ecce867780fe3a05eb28337e818335d26993db2fbabde78f9a3f64f37fe769dc1d9a73df908da473f6f61520cff40ee27edcec4464b6a1aa
-DIST raspberrypi-image-3.19.3_pre-r20150327.tar.xz 12973956 SHA256 c1025b57a2423a1c2d98c136a5e332139a6734b2ddb3a605526c62d51ba1000d SHA512 5293ff2b75dc6f38f0e4dea5bb8322fdae9a799a1dc2e7f9791d8383e70e2ed39131a8e211514f74d72266b2570c8707abb735905a97f0ecf1c4ca595ac99fd6 WHIRLPOOL 0ef71e26e52014e4fba91edad94fb8bda315ecddf16108c713c4a2303e8a61de2df5626d41c2b45f7b7812252893d74fbb86c28ae1f85eb0441746924598ec93
-DIST raspberrypi-image-3.19.3_pre-r20150413.tar.xz 12976080 SHA256 e7cca8243839e80a6fe358c57289ba8c149bdd38e4f2e6a10c8d6f31b8da3743 SHA512 141e245273713f95f85c0c474fd0aaf9b01b67c412574756f6cf4d820013706160b872f0435fa139c96110c8a6b0f2d9b68f71e31ddf05964cb6fcf7014a960a WHIRLPOOL 3fe2fa6fb2284bd155458ee201130a9b3d6dc69a76033c6512f30963e3d379bbcc68e2701e8d60b88827fdbb498048934de624a0b859d468ad4b03f425679497
+DIST raspberrypi-firmware-1.20160209.tar.gz 114792438 SHA256 ca6a88db72e90ef821b8ca7755bbee9c1d5bdb9a621a45eb029af195d2d29751 SHA512 281092c11d422d821e5e2b0479c3b8f891f8df66cfbf931992902d759c99ed40cbb2d9fada1f944372e5bcd8af69784739e79e9912db3482892b10bf668611f2 WHIRLPOOL 81974a53562ee91544d7a01dc9f4f4173a6e882891f8cf744b700162ddd8f8607b1cfcbbde04cafe2bcea47489f9ea4fd8840adf776e806bef0dba574448e76e
 DIST raspberrypi-image-4.0.4_pre-r20150523.tar.xz 13052304 SHA256 3cbe55ffccb6e7067f37b57a3bbcc7676ed89ae639f8663e17c94f0c8ec99d31 SHA512 c33517321769e5267d7084e82b54d9548bed77fed1755fd5985ac648cb5721fc462f2c062d0e003171eb4b0ccd3e5b0d7b41fc6783c6dd85f86089f54d8bbe60 WHIRLPOOL ef9359919e3da0de0edce3bacc16c70cb36fa66dc13051bde8c4dcb7c47782cd18fe8ed65ff992ae00454b109293ecbee4d71699adc78a7d17e903d1e91cd603
 DIST raspberrypi-image-4.1.17_pre-r20160209.tar.xz 13642752 SHA256 ad4c1069d19c34a05272fab1c326996b32510baac66bda5e50fb7356638849d0 SHA512 ac260fbb6dc3f8417d87624b2771b219f5a754618242cfa80c0e465902140c5715aca75a09e8827d096bb99688e0ac2b262bbadb98f1a47998a0febb0b99a96a WHIRLPOOL a3c44e28a07def36578de77352f76135a1c33de3148ad118fe466076c30dc06f6298b4fcffeb885c85f6e07330fd3dae2a608a2b6247ee193c586ad879d82e83
 DIST raspberrypi-image-4.4.1_pre-r20160209.tar.xz 13982668 SHA256 1f92aa045148c406491a1d83494e6d4463480f5ec4139f51d91fe81de5889658 SHA512 3ec1913c5d09110912a92aac546e5ec4965b7e5ae98f2561ca569982c5707a1377c47bff55f5c0c8e4db3b6a9b65b09d8ac6bb4112cff5b9396874c33be8c5de WHIRLPOOL 3ce35c3b6fd45d70d522c09fd0db2eb9c836a1c3b6f546d82d9fbc57ab2a5c4d94416b81c9705e3c1977813717bb5423cb7c17115c566a9a5a7a35fce31feafc
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.24_pre-r20131212.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.24_pre-r20131212.ebuild
deleted file mode 100644
index 1dc67d760714..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.24_pre-r20131212.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks mirror strip"
-
-src_prepare() {
-	#hide kernel vectors
-	chmod go= boot/System* || die
-	# on a filesystem with permissions
-	mv boot/System* lib/modules/* || die
-	elog "System.map has been moved to $(ls -d lib/modules/*)"
-}
-
-src_install() {
-	mv -v boot "${D}" || die
-
-	dodir /lib
-	mv -v lib/modules "${D}"/lib || die
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.38_pre-r20140427.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.38_pre-r20140427.ebuild
deleted file mode 100644
index 1e4eef4c795a..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.38_pre-r20140427.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks mirror strip"
-
-src_prepare() {
-	#hide kernel vectors
-	chmod go= boot/System* || die
-	# on a filesystem with permissions
-	mv boot/System* lib/modules/* || die
-	elog "System.map has been moved to $(ls -d lib/modules/*)"
-}
-
-src_install() {
-	mv -v boot "${D}" || die
-
-	dodir /lib
-	mv -v lib/modules "${D}"/lib || die
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.9999.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.9999.ebuild
deleted file mode 100644
index 4c7c673e4195..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit git-2 versionator
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-EGIT_REPO_URI="https://github.com/raspberrypi/firmware.git"
-EGIT_PROJECT="raspberrypi-firmware.git"
-EGIT_BRANCH="master"
-
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="${PV}"
-KEYWORDS=""
-IUSE="doc"
-
-RESTRICT="binchecks strip"
-
-src_install() {
-	MY_PV=$(awk '{ print $3 }' extra/uname_string)
-	insinto /boot
-	local suffix
-	for suffix in "" "_emergency" ; do
-		newins boot/kernel${suffix}.img kernel-${MY_PV}${suffix}.img
-		newins extra/System${suffix}.map System-${MY_PV}${suffix}.map
-		newins extra/Module${suffix}.symvers Module-${MY_PV}${suffix}.symvers
-	done
-
-	insinto /lib/modules
-	doins -r modules/${MY_PV}
-
-	if use doc ; then
-		dohtml documentation/ilcomponents/*
-	fi
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.12.36_pre-r20150206.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.12.36_pre-r20150206.ebuild
deleted file mode 100644
index 1e4eef4c795a..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.12.36_pre-r20150206.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks mirror strip"
-
-src_prepare() {
-	#hide kernel vectors
-	chmod go= boot/System* || die
-	# on a filesystem with permissions
-	mv boot/System* lib/modules/* || die
-	elog "System.map has been moved to $(ls -d lib/modules/*)"
-}
-
-src_install() {
-	mv -v boot "${D}" || die
-
-	dodir /lib
-	mv -v lib/modules "${D}"/lib || die
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.18.10_pre-r20150330.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.18.10_pre-r20150330.ebuild
deleted file mode 100644
index 1e4eef4c795a..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.18.10_pre-r20150330.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks mirror strip"
-
-src_prepare() {
-	#hide kernel vectors
-	chmod go= boot/System* || die
-	# on a filesystem with permissions
-	mv boot/System* lib/modules/* || die
-	elog "System.map has been moved to $(ls -d lib/modules/*)"
-}
-
-src_install() {
-	mv -v boot "${D}" || die
-
-	dodir /lib
-	mv -v lib/modules "${D}"/lib || die
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.18.14_pre-r20150520.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.18.14_pre-r20150520.ebuild
deleted file mode 100644
index 1e4eef4c795a..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.18.14_pre-r20150520.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks mirror strip"
-
-src_prepare() {
-	#hide kernel vectors
-	chmod go= boot/System* || die
-	# on a filesystem with permissions
-	mv boot/System* lib/modules/* || die
-	elog "System.map has been moved to $(ls -d lib/modules/*)"
-}
-
-src_install() {
-	mv -v boot "${D}" || die
-
-	dodir /lib
-	mv -v lib/modules "${D}"/lib || die
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.19.3_pre-r20150327.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.19.3_pre-r20150327.ebuild
deleted file mode 100644
index 1e4eef4c795a..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.19.3_pre-r20150327.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks mirror strip"
-
-src_prepare() {
-	#hide kernel vectors
-	chmod go= boot/System* || die
-	# on a filesystem with permissions
-	mv boot/System* lib/modules/* || die
-	elog "System.map has been moved to $(ls -d lib/modules/*)"
-}
-
-src_install() {
-	mv -v boot "${D}" || die
-
-	dodir /lib
-	mv -v lib/modules "${D}"/lib || die
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.19.3_pre-r20150413.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.19.3_pre-r20150413.ebuild
deleted file mode 100644
index 1e4eef4c795a..000000000000
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-3.19.3_pre-r20150413.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Raspberry PI precompiled kernel and modules"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PVR}"
-KEYWORDS="~arm -*"
-IUSE=""
-
-S=${WORKDIR}
-
-RESTRICT="binchecks mirror strip"
-
-src_prepare() {
-	#hide kernel vectors
-	chmod go= boot/System* || die
-	# on a filesystem with permissions
-	mv boot/System* lib/modules/* || die
-	elog "System.map has been moved to $(ls -d lib/modules/*)"
-}
-
-src_install() {
-	mv -v boot "${D}" || die
-
-	dodir /lib
-	mv -v lib/modules "${D}"/lib || die
-}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.17_p20160209.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.17_p20160209.ebuild
new file mode 100644
index 000000000000..d9d0daed8635
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-4.1.17_p20160209.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="Raspberry PI boot loader and firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+MY_PV="1.20160209"
+SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV} -> raspberrypi-firmware-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="${PVR}"
+KEYWORDS="~arm -*"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/firmware-${MY_PV}
+
+RESTRICT=""
+
+pkg_preinst() {
+	if [ -z "${REPLACING_VERSIONS}" ] ; then
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e "${ROOT}"/boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e "${ROOT}"/boot/config.txt ] ; then
+			msg+="/boot/config.txt "
+		fi
+		if [ -n "${msg}" ] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove(backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+
+	if ! grep "${ROOT}boot" /proc/mounts >/dev/null 2>&1; then
+		ewarn "${ROOT}boot is not mounted, the files might not be installed at the right place"
+	fi
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/modules
+	doins -r modules/*
+	insinto /boot
+	newins boot/kernel.img kernel-${PV}.img
+	newins boot/kernel7.img kernel7-${PV}.img
+
+	readme.gentoo_create_doc
+}
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 404d76c1bb11..d695dcf03030 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,12 +7,12 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
-DIST patch-3.10.96.xz 1218176 SHA256 3b4a759bb2197a22658ac5638fff9d2fbd4951f97c283d08944a4c0ad03ed39f SHA512 a414cb7e7bd5d9f205910c0c46dbe8da7597574c8f12ca517f6a6fc972d392755823f075a94e009a3b45f1398632d276f55d101055023db194b92b0f9df8ccf2 WHIRLPOOL 6fdd3134bee19d701f744915853be93bb7de865d67acb5238f797fd9c4aa8d2fd273a083dd26ec56f29c70040adbda95e2964580efec8be6db97d2f7d7e272c1
-DIST patch-3.12.53.xz 1429316 SHA256 f49100081c33923cdc5fb97a5a9ff91a975deaa4b75642079c43c4b474c17fc5 SHA512 de956741c328c5149656d96eafd9553d731dd52c2c9aebf00af1857765a86b658affe5f5f8e3769210575b3610d6d0440b9c2dc7555c48498ea4685cbd222807 WHIRLPOOL 72db9fe35f22e30b6ade6765d9364455f9e1a84e596fbb6ab0f7416383218c8616735ff7c233de18f696de8934294455a482cded82782c87685295bb3dacc03a
-DIST patch-3.14.60.xz 1058440 SHA256 946b8c7185a0f6ac2cc87b0cb7906c2735029e76a447ace23da1444348fb3247 SHA512 333e54671404377621deac87dc980632eef00d41eb3f05f7032a26c6641b5a218e348a08e39f13c99fb1ad089668a45550c6b44f4e105356a8e83b713fdd268c WHIRLPOOL d8f4fbf46d36e5274ad8f7d2fed0b878b80be8bf2cad6310a5b3c61e5bc81a8150879971883d89570b4a962eecda3456e743a069e7e725483018b65c79f83903
-DIST patch-3.18.26.xz 727736 SHA256 6f9c8f7a2add5df97a9e6fcdad1a4f8da584fc1d421d7551eb4fe44f47167834 SHA512 3b039c3a1ba1c3bdaa2e2348c7a622aae394fb994ab48e34f54e08279af23cfd2e8ed8d8bc1bc30c527909ad1fcff6328f9db520326750c5f2f4724f72deac98 WHIRLPOOL 2c825990ba7b564234b46781cc684667a3e769f0c2437e1043e9fc8f0163de9a8ac01cad001ff173d53dc085de8266c557a1a4c9a0d764102d001730bab43938
-DIST patch-3.2.76.xz 1533024 SHA256 20503f0737eebd867e67c07e1d50234a5ed69ce4748d7fcf3862a3acb9ecdd56 SHA512 692974f32d5eeabea8e1213d261547bb9b6056599e29ba29742cd994533e94bd65080d8d024bbb90f8cffc1e420ed1d3b225f6295b5b9375e56fc34c2f6a0dec WHIRLPOOL 147af8c143955f3e46eab1c760c84f5673544b1ffab393eafefa850803622047bc67de642c2199b4b6a40f3532a92f44effbd8f74d967524ea6a339127d156ce
+DIST patch-3.10.97.xz 1230652 SHA256 242f7bc6212411a3d15919bebab3a6fc119e4e340b8eb4065598a5b962a3590f SHA512 b7d8967575097c0f8f608fa4aded844381b76533ebd8fcd1411788a2e0aaff1c6693d58c33b9cb4007340804e769f400396aa04219ec5cf205a9be7ad9b75cdf WHIRLPOOL f8e5bbe60d71c89a68469e837cf10e4a631c57195589a661de730b958204e2dea296e3826757a9fdae26ad1879f94620cb2f755442c981bd4f7ca5f9c4f7e67d
+DIST patch-3.12.54.xz 1439708 SHA256 c4fce8304d1f70645e23599100f0ba092d270df16a758086bed0cc662f720fb3 SHA512 c841db51a4dc9c9f7faa95045c660d8a40867eee748c2811d30011cc08a7613676636fef22160b037148102854847eb660fc8cf9e9a24a1414f18208e955a760 WHIRLPOOL 15b1f88aa6e3e13f99e530150dc55b4bb9f2516a726437e995690c2d618f1ea3cc67548b3eab49b85427af1bb4e8edf358a88d730ce58553f0fcb28642d2c9dd
+DIST patch-3.14.61.xz 1073844 SHA256 843605d381a536dbce120b3a6a363f324a9a999320b61efd931377d603bc52b7 SHA512 961bf5566289231643cbd67b04f6dc5c452ee7691f1be87c34cdcef809d1a939fd475f875bc3cee17511ad0f6fb06e45b46296197aae0e902bcb35ad7de239ef WHIRLPOOL 423806f288fdfd25c03e4dfad749d88b5fb51c5bc482502834991cb9399cfca59bcca2a16df49d1cb029e42a4ff94c724e0854beee7dc3a127eaaa805d6a9ec6
+DIST patch-3.18.27.xz 780340 SHA256 5ab0f1f24a494fc8d208d9d1efb2d7d516f99a320b05a3201fa39706fd33473e SHA512 a0ddeda9fe9905743afd3475dcb8eed6602d959afaa50684c585ba0e84a34ecd66a3cdeeebdbf61094c32b731cf3f98cd0e96904c3327ed8be20982a1bcc3208 WHIRLPOOL f75e9c2c678b4e8cb71a53b1c14774c454e4c2a941f9b597b27b09649ed8958bdef872a4b542096c9388283cd8722541acba03646ce2787c4e48c27d1e43009f
+DIST patch-3.2.77.xz 1547932 SHA256 ca1a13c650fa446d8af8eb11ae41befedea57926b1e47bb263223e16779c0920 SHA512 6d2cac1816166f1d603b1682fb39473d1f27c3a3b574d3862aa51d38451d7d44a8b7036b688b4afe3cb38fb7fc7d7dc570a5ffa36b0dfafec7decbea6d7938d1 WHIRLPOOL c060c97b5bd7441c97fc2d217a6b42df9d193d9112cb3740813b885146bf5b9ce937dead8ec0ef0f221207a104499d4515b5ab694740ad31abf9df117ab1c0f5
 DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca
-DIST patch-4.1.17.xz 474660 SHA256 60e5c4fb93705a1e7d075d528975661303d3a87c522f731b69da2e00f3170b10 SHA512 fa8675bac395ad7255693728ee601cd84a02aeee660ee5f2bf5684a6af053c9cf07afb0abb3324b1eb149305701a0bb9252053e840edc2aebb6499139dc12edd WHIRLPOOL d15eee4cb5e6fde37e82c9f1cde38aca8ca3004c8078bbc0cf00eefc350fee21bcecb771e66fa4937afa982e3531b641c0661b8f0cbe9221af56638c500dce4d
-DIST patch-4.3.5.xz 133248 SHA256 637b55eca2fe7b46cec0856bb60ce162a22b4d855e40fa0dff956561e70ce4ee SHA512 70509a0c42153c8fcad5346ddc10d1e8c92737cf36eca808e403c607fa020004d843168d774ae5f82a726ab2dae89aa866387ab157134a67c163e10d84a588a3 WHIRLPOOL 09f4005dfaa3dd7fb20ace143f1908cb922098efd98802353a9b9e6597a96c65a60e5272f1510c6bd41a6488f4ce04045004558da4917be1e5ca9a4fd43e9ee2
-DIST patch-4.4.1.xz 23612 SHA256 c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48 SHA512 b117b6f88dd713a33691306e483d5c42bcf61091d91f7248e1537ac7f7b96380f5f7df81f399cecda13d9388ad7aa52ed2e6d46f7b27706d2f197b8e64c330b3 WHIRLPOOL 988a5cd6fc39577eda1baae93fda94deab93fa6d5245aa90f3c6ae032151b1a9e23458ee822d558643f23e0aabf1bd5962d36a72180a04bcecba74287ace776a
+DIST patch-4.1.18.xz 547140 SHA256 c69cbff479740d6bbd452d2264ba0afefa99ae51bb7ae52bfbde348ea8d8b20c SHA512 b95b82452206c2ef19e9fb1b01dcd6880c74f1b1fb9d8e1f209add734ba342d7c65401f3a4a2101eaa6b20b653b265ebc863052de71e01fa886ff7d7b1c1ad17 WHIRLPOOL 3a47222b9349ebfe8820e79b70c50c145283a31c01d3a63b6ae08ee0a008ee85a408c44aa1711fc1dd808d9c7ccf090fee35b23abe9d85bc34650e7db39986e7
+DIST patch-4.3.6.xz 190488 SHA256 a68b16b1f6841e2be6d492c8502cb0d0a709097b55c400ad7d90b60fa4355d6b SHA512 d0b8c278a0c7b4e829d4e98884d9c2ed6cbc4bbd6e21f3d7b6fc0f1e50a267ad871a0b82723fc4bc5e560748af4ba07e8af8f9c28a0b01307d8e6f8fcdbff0d7 WHIRLPOOL bc0323e041c666243312737b0eee284636d783acbdf36ee2ba831fa9a20396a386a772f0a2e2a41efec1df802fa241f77cf5a6e6ece04962c8389e209469c833
+DIST patch-4.4.2.xz 60144 SHA256 5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c SHA512 3222ddc913d14cd4b4ae999890afb580db9a79337dcd42876db6bbf08d351982bb1849fd97152915b570a3408ddd2be645e851736615f90ad8354244116ae12c WHIRLPOOL 3ca5d83d1a02d41e311a88a8b7e6df59586ebfd49528640e9716a3470bb88c6f02f1c79a054b3d8b246fade3a4ef248bc580b5dd7891d68cd6848c140e56a473
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.96.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.97.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.10.96.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.10.97.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.12.53.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.12.54.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.12.53.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.12.54.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.60.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.61.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.14.60.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.14.61.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.26.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.27.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.18.26.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.18.27.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.76.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.77.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.2.76.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.2.77.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.18.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.1.17.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.1.18.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.3.5.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.3.6.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.3.5.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.3.6.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.2.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.1.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.2.ebuild
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
deleted file mode 100644
index 02e7a00ec11c..000000000000
--- a/sys-kernel/vserver-sources/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-DIST deblob-2.6.35 93556 SHA256 58a36ea1899cac2ceb1c7b545a922d7cb76c7648f86ba5224679a0a629eed469 SHA512 e7a94ba2e54def3749611cd5491a5dffd61d621bc1c9883612369082d0a215ee543732952575cd7babd447604a3e79af65bf15106d2e409dc2c347980804c369 WHIRLPOOL e59cf751f05e915a8f69c94a8748e7a5c22277ea3607fdadcf03eedd0091e9b8911748462440bb9a5d2c5576c61e89ad984b2806dd26da24d1db13e2ac2ba7d4
-DIST deblob-check-2.6.35 558238 SHA256 3cfe6a5d4048999924c78630fc050f50035606d2555327fd126c7309ea2e256c SHA512 3fce9cc56df0da5b7fce308026657afb65aec97a0249e5894286c52637ddf8de33b573e24ec377dcc8eed3341b4cc56bc4a32da7348e3b0aece4e9c0179d133a WHIRLPOOL bb9885ac9c53f37347024793184fcf6baf34ab82369cde5867829af98e98196c76cf9c1953f9ebe1fdfd5f468502e7dff56e1c6e9c6eaa5d64829e83797d8365
-DIST genpatches-2.6.35-9.base.tar.xz 121780 SHA256 a28626d39d3314e4cdfab45a77d69bb524028dc3ff4b6d6de9872ad161b2eacc SHA512 faef1bb0320d6ace83e0d7258201c80d06c07cde6ec852a450c654c04002ae9a9a2148682e46ebe1368ef897ee34bac789d1fa83156442ecf54a927b9944f4ec WHIRLPOOL 255394d394cbfb50d0a642eb2c46ed2b2d1baaa54bfa0cfa904bbaeda625757b705278aebe29c30e2b868e4faee525a65db9990a06187c2fa6dd85b601280a77
-DIST genpatches-2.6.35-9.extras.tar.xz 15244 SHA256 b79a0a3327abf8db8a9dd3b59c568ea9f50ed590ef24a06a46d5f72ae37dec58 SHA512 47b84be6640b3de08ef35b0051af171351cf52a5a2c1a4b49c441270929da2721c2cc56a8f461753105e5dc9aef639d73d0434e73fbe19a87a5cf90cb96f1cc9 WHIRLPOOL d7aa2f4b87cb261b5d7ee2d8ae8e2b603bc8d7a85650b6cc974713edcef41722d3de851d5005926f5cd8a3d27ea6ae413f081418699edb463e6f59eaaeda237c
-DIST linux-2.6.35.tar.xz 56921708 SHA256 195c14b6b2785900b1e3c051916a29bc08f4862b65a599a500aae50711fe96c1 SHA512 7fb9bd9c2a246282400333742301fb8463d21a6dc52542054eeb455c0f19e7a3462a0744aea05189cb841a017aa81521d31b865684173553a33a8bd8e2d82d4b WHIRLPOOL a3d5b4891afdec6410971c7371bcf72f48ae8711f2979298796b32f67a57e5903c1d99b50a46c6e272aa04e9d6bc2329b29607d9c4c31c87d036d8f85a9156e8
-DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
-DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
-DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
-DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
-DIST linux-3.9.tar.xz 72104164 SHA256 60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f31b8ed624e16fad53f54541 SHA512 77fa521f42380409f8ab400c26f7b00e225cb075ef40834bb263325cfdcc3e65aef8511ec2fc2b50bbf4f50e226fb5ab07d7a479aaf09162adbbf318325d0790 WHIRLPOOL 668a8de30c7c3ccf6558cf0f29570f15e37ca7d599d1453afc3cab113d1b05fbd5b32646dd9ed798ceb61405a8754345da0740a53f467b825445028cda4bc698
-DIST patch-3.10.40-vs2.3.6.8.diff 748146 SHA256 3842a7770119a237016d8bdc5ade4d9388604bb6a87f73749a34dfe2b3182393 SHA512 bb24cae59e42e2681aebcfabf65ead8613fb4df4aa1a0ab3e71ece62aa9f70f65ad2c7ba7d7869f69e07ea61a5260894d92c1c493856d9cf9438bc471dd5fd0a WHIRLPOOL 6e38fd36f9669dd9aa8cee65e8c509f7378b40cb9f5b3c594274d17294adea262e3b1e4a085c98526171e97c72122fe9925aadb4219638febaad361020e33740
-DIST patch-3.10.40.xz 686216 SHA256 ca4514f17cfc0c1b9ef17066465f044f06452a2b3da5e5a0eca8a841df42c634 SHA512 21890114e7853a99e62bf8fbfe131459cba0bc1c0d731719102a155125dbc980b962f3c9b3fd4c060dd4c9198c007d5b7eb2c4ded2c66e6602c13add24c555ef WHIRLPOOL ac9984aa6eac0eff8a0587315d2ca69d24b873253d7288ce0a7eac684d7daca570e10283b32ade4fe43bbedf582f2f335a88f0dcde00c3a142abba96b9f9759b
-DIST patch-3.13.11-vs2.3.6.11.diff 725618 SHA256 1ec7e22f6fb69e5ea91d56203889e7c81b8f058bd90fadc3f1d8b0abf782af11 SHA512 05b8a72ca55621beb6ddc59e545f50f735f9b01fbdd577efe1201c274a5ccea97e085bf774ad58a8ddf7eefa7aa2a1476acdf7fc7da412155484bf78cbd473be WHIRLPOOL 18ab7b319713e3dad7660567fc1c18231e7b06ff490461ca1d99bcbc6f1f01386bc5a83414512405495be9b541ad30e4296d7f536ff55c4ae9c7b5d315eab394
-DIST patch-3.13.11.xz 278568 SHA256 0c481b0abee4ba6779fe168f98dcca6481a033d393d66ff6b9caaed7f0307231 SHA512 31a85e07ed75f68507d4d264d36314877c6304f4c9afb18173d70255c1c5514772989bcbc3582756e57c22d28dc84a610acc56edbb6d06045d9c63505fcfbc1b WHIRLPOOL 814ca09d577a8fd0ccb2a41353aebb93f18209b2b3c51a2b5c76353cb474ea58ba88be805d4e0d316eb0442b9ee50637ac9d25a05fa0b4a8453cdea8273aa50b
-DIST patch-3.14.27-vs2.3.6.14.diff 723058 SHA256 e2ea623bbabf341fb5f00fb8a778f3331132f304e9284fbae575988d65ca6e05 SHA512 f4546b51f1e9ae5ab2a800ded41eb38ca0da5efa6598bf29a8494c9aaa93a55b5b66ee2f2c4d330bd70a318e2b8ddf2e4318ed57fe60bf128bc6d0f1ed987279 WHIRLPOOL 86f8061ee417b091b91f845e19d4ee937f0a1ea9b18a6089dcc0ccdd8fcc328c8c456feb09ccb67b7a96bfbb7ab0065aeccaa44fd045c9eb62f3c754979a43cd
-DIST patch-3.14.27.xz 671988 SHA256 5f84a4ff394444486d1715d5283383a8461ff089ed9b9fdc5dde2ed65531d21e SHA512 1191ef739905b2e5057c5273e5cf026baea1ea4855dca8375dbe4ecaa7e6d2d38b8103e2781554f2d9ecf9026fdad1086c6b9d8f0b41fcb8e39aca0612e208e7 WHIRLPOOL 0e2e6dab6bd76db8a04c6643d46a5049d48ef0149fd06f1e4abb0067f0618e60b1b065107d6ddbfd24b42c5a9876d9b2ffe8ddd2585d556f3769d83761b5ea33
-DIST patch-3.18.5-vs2.3.7.3.diff 718451 SHA256 498e7d9066262021169efdf173e18be6704261fafe9ec7941471fbe4b782fd95 SHA512 fa717dcaaa0fed50357be12e4fb79148d92867d9091504b304500017b44e48d751f7b1848cc90b3e1485884ae6b33a5d6ff6ac5fff574afe432712c5e2a80b0b WHIRLPOOL f29b2f94b38b288eba784b9f971d05816685d7dc29ffc0fed738c48412f4eee911aaeae7dcd8162fd9182bf98288c6b5644fec9610f58cf87846c39f83234322
-DIST patch-3.18.5.xz 165412 SHA256 9e261632e11f629705c3f1b2f07c611284e5f9972c42f6740131e8e2471c349a SHA512 273b5e4917bcd8520d8c81869f41572275a181ae4cb2c3d7309507d47da29903eb2104703e4402f07f6c20477665a82ef57d8a1c34e19ecc10b0e1a4c0f8fd14 WHIRLPOOL 28cc9043c47c945e7e64cd703a3c9c66edb29f179822156875fbe6036b2119f05e9922a2249bf530f1bd7a2f992d324b34a0c7d04bea0e2e655a24bf57485ca6
-DIST patch-3.18.7-vs2.3.7.4.diff 721087 SHA256 d9182298b3d139402687202bc0c10d5fccea76ad3450c93bd905f0c2b8cfda33 SHA512 6691a8337c0baefd90308c4d3c7d5821e3dafd10b07b67924748e5ddc58cb84cc04f5f8a3a5d2f7fde7d0d5096a5b5b66a8c1d77e57e8e2df05789a410927eaa WHIRLPOOL fbbec19ff7e397dc764440a3eb459b6f412251d32e2a6c3320ab7126e27013dc094abcfaaf9126fe9bcdc075ab1602afae8b1a672518fa443093adc9fb9049c1
-DIST patch-3.18.7.xz 201656 SHA256 2267eee27227c85c6c7aee1ed6a14e1d7f11d70c3048c96bcb1e848fc5ab31ca SHA512 a63f56818a3d16f7e39b9967ed751fd6f49837668d533e32ae5bbad7f834e0f3641d9829c27acaf7e65b10581dd1e7d15a05127550627edcd7f9ec7fb5780600 WHIRLPOOL 5a2a611641e34267506afab88b22d28fa0346194074669fe92279ae2873d27c8257d0a7bbc39e32e60f4b4b1f0d31c44f8597afa8c15326ebb350a7c7a49c0c1
-DIST patch-3.9.10-vs2.3.6.5.diff 749393 SHA256 5446b3dc35929744008ab9f9ec65ec043739ba1dc024d272a285742689e23091 SHA512 97dd894742b0e348a1159a540f802bb38b8fb720a3c2cfaf8da8df5da8aa4628e7b63a8a0c1f20544995dc618f244209238ed46502d53a705fb168fcc6d462af WHIRLPOOL f33d77b5992286c82698820c2ec3aa8376a5fee4965b49ccd0dadb3852fe01c42d32e5fbc6d00c2ee0872bdab2689243d254bbab48891e2f27256a467e3c172d
-DIST patch-3.9.10.xz 210652 SHA256 917a1c08ee87c11911ab73af438cf27eb36ab42cae9b84bc60aa18c4a72ba3b6 SHA512 27976b68034376ad2ae9185ad6e5d35668af34aee4e856ee4d1c07657e397d956f8570db66bd032eb391ebb1fa10d12bbda56546036ac5e0ad7897b507be0929 WHIRLPOOL 38f86c546d89396ba68a2adde268a4666385296a23aebec0c2e801a51f76446a6b9651918db7effb3ef7030020ca0ac349183f70dc01a5abe97653b986491df8
-DIST vserver-patches-2.6.35_2.3.0.36.32.tar.bz2 139594 SHA256 4cc1ba13d6bb1491d48e53590a8abb2c0e3f2eb8f560ab74800c6cde9bf74b12 SHA512 8d755f239314c33e8804fa703966af857b30de71b42ffde2eb1be59d1b42daf4ef7c5a73e2c19fae1905471e925f7f99676a176f4a7340fcc0c35453c2e72053 WHIRLPOOL b83c84cfa7a7a55e8018d51709daaa4615e43bb90001bf0b49ac8632915a6b2c35158905e8e10773649f7fc0af87f15f35ee5d91b69d9b7e88a4ebbd0cb24e1f
diff --git a/sys-kernel/vserver-sources/metadata.xml b/sys-kernel/vserver-sources/metadata.xml
deleted file mode 100644
index c12617b7a3b2..000000000000
--- a/sys-kernel/vserver-sources/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription>
-		The basic concept of the Linux-VServer solution is to separate the
-		user-space environment into distinct units (sometimes called Virtual Private
-		Server) in such way that each VPS looks and feels like a real server to the
-		processes contained within.
-	</longdescription>
-	<use>
-	  	<flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.32.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.32.ebuild
deleted file mode 100644
index 7cf49fbc9304..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.0.36.32.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"
-
-ETYPE="sources"
-CKV="2.6.35"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="9"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-MY_PN=${PN/-sources/-patches}
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Gentoo and Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:VPS"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-	https://dev.gentoo.org/~hollow/distfiles/${MY_PN}-${CKV}_${PVR}.tar.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.6.11.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.6.11.ebuild
deleted file mode 100644
index 1427b17e762b..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.6.11.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"
-
-ETYPE="sources"
-CKV="3.13.11"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:VPS"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
-UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.6.14.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.6.14.ebuild
deleted file mode 100644
index 794d200fe4f0..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.6.14.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"
-
-ETYPE="sources"
-CKV="3.14.27"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:VPS"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
-UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.6.5.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.6.5.ebuild
deleted file mode 100644
index 82da9d90d367..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.6.5.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"
-
-ETYPE="sources"
-CKV="3.9.10"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:VPS"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
-UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.6.8.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.6.8.ebuild
deleted file mode 100644
index 645a24c62f04..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.6.8.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"
-
-ETYPE="sources"
-CKV="3.10.40"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:VPS"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
-UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.7.3.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.7.3.ebuild
deleted file mode 100644
index 999f24dba6c4..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.7.3.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"
-
-ETYPE="sources"
-CKV="3.18.5"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:VPS"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
-UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.7.4.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.7.4.ebuild
deleted file mode 100644
index c46757124b3a..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.3.7.4.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"
-
-ETYPE="sources"
-CKV="3.18.7"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:VPS"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
-
-UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
-UNIPATCH_STRICTORDER=1
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index ab7bf592e111..a84b8dc09f43 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,2 +1,2 @@
 DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd
-DIST efivar-0.22.tar.bz2 67384 SHA256 74f9700039c2c77b468ab2e174c17eb97bd5ee427d22b68a0ae0dbf8fd2d6e32 SHA512 45b1b33e6928415f60de460086e6015e62ee65cab531b578b5a7ea78fd9c593220d8df00ee262171eb1ae3fc1bd1b733ce2c87c1dd91c2ac16a59c2764146e81 WHIRLPOOL 7000191aea4dd37639168e279e00ac4493683c956775d5887f37a860b25a76d3b1d1347b596f2cbb321673de7be3e77fcd10a3f155d483c06a0883a6b47fa8ee
+DIST efivar-0.23.tar.bz2 67558 SHA256 9ca81f56b0c9177b6536c8187c9cf5974723abcaf57cd34173500c80bff3caa4 SHA512 ff95c735425708cef0f85f1e9f8909e64651d10c303927d9e77d44fcb0a02ec90e4a364b0315cc3f5e30d77059ed2d8f43cc1efbed2db09a695ef7a6f1bb58f4 WHIRLPOOL 35207e4040041c03d105bbf7b2f7f103f1415dbc51dce9614ddba99786b6cacdf88136ab3a888551cf494c3d55685c7991c72fac1c6223255128c7c191e0318c
diff --git a/sys-libs/efivar/efivar-0.22.ebuild b/sys-libs/efivar/efivar-0.22.ebuild
deleted file mode 100644
index e811cf339e46..000000000000
--- a/sys-libs/efivar/efivar-0.22.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18"
-
-src_prepare() {
-	epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch"
-	epatch "${FILESDIR}/0.22-flags.patch"
-	epatch_user
-}
-
-src_configure() {
-	tc-export CC
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-}
-
-src_compile() {
-	# Avoid building static binary/libs
-	opts=(
-		BINTARGETS=efivar
-		STATICLIBTARGETS=
-	)
-	emake "${opts[@]}"
-}
-
-src_install() {
-	emake "${opts[@]}" DESTDIR="${D}" install
-}
diff --git a/sys-libs/efivar/efivar-0.23.ebuild b/sys-libs/efivar/efivar-0.23.ebuild
new file mode 100644
index 000000000000..85de05520083
--- /dev/null
+++ b/sys-libs/efivar/efivar-0.23.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhinstaller/efivar"
+SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.18"
+
+src_prepare() {
+	tc-ld-disable-gold
+	epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch"
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC
+	export libdir="/usr/$(get_libdir)"
+	unset LIBS # Bug 562004
+}
+
+src_compile() {
+	# Avoid building static binary/libs
+	opts=(
+		BINTARGETS=efivar
+		STATICLIBTARGETS=
+	)
+	emake "${opts[@]}"
+}
+
+src_install() {
+	emake "${opts[@]}" DESTDIR="${D}" install
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 29644d4e8d0f..379656c2e0fe 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -8,6 +8,10 @@ DIST glibc-2.19.tar.xz 12083312 SHA256 2d3997f588401ea095a0b27227b1d50cdfdd41623
 DIST glibc-2.20-patches-5.tar.bz2 55986 SHA256 3d3eec9ac9b5d0530f9e05614f4646d64ff93a48865b42c156990bea69247cda SHA512 409f59a028127e02f0c9f91107715b540d8d234475830adc17108a02664be232098d119b43bcc8df9b328ab50c1fffb0868d510e6487ce1c34ec2c7c7a78375b WHIRLPOOL b3c41b01af5d8ae8e901ac48ae124e13ff1c76fbeb35315cb9630c648c03d7abbfb753294cbdfe1dc939bda260e24d8450ffb19cfe5c255b32f8c5500f2c43f3
 DIST glibc-2.20.tar.xz 12283992 SHA256 f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 SHA512 7a8eea8b71d3ccba766c3f304cab61055446d451ef063309476b26dc40d880562dc33b1b68fbedeedb4b55b84c26415b9202311aaa71ef8c141b6849a814d2fa WHIRLPOOL 042f74d75c62a655ae35348c9cd0bed0845ab199e37a76635eb74c04ed927b5eca77723c38d2dc46f12fca62c1004001887b43946a914b079ad22f6a9cc8daaa
 DIST glibc-2.21-patches-5.tar.bz2 34237 SHA256 8f6a5dd094ad2c4b82368ef4b081ce6c634f61ea2783cdc68bcd9250d61682e1 SHA512 19b0e706cee387aa3a9ed40dd20081ffe98eaaf9a5ca027ee4abd3e46c3403af06c5189bd764d8d477cb356507e1142b5fde852ec710cf24e108c307f5843837 WHIRLPOOL 96c4ec00af41c60c238f681ea5448cec4db11dc59b4853eed5ba700aa21f804de2443166aa48d30f76af6b1a2eb74a47a7d1163e2067e5bbdcdbe3e4bf2a38c4
+DIST glibc-2.21-patches-7.tar.bz2 46894 SHA256 49126df6f4b819f2c315cca0a07e9b8ee7e279257148506d336ccfef5766bbcb SHA512 e4cca3d753c0b9d213c0ed85e3d08cbbf6517862b3a48af987e010abaf5a022b47330040ced183d30b5b934de7587e97b4342e51a6df3d5cfa768bdd8b43b756 WHIRLPOOL b5f4bffdcaf629d735e7498f509bf2130acb18194b18e69747bb6c3e403b221f2163eea3770bb19c05253d7134f70ed4657d7c30c5978f7b5571a3482f9521ad
 DIST glibc-2.21.tar.xz 12322092 SHA256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 SHA512 8cded6693618bec115f678fcbd0b77556f97dfa8337608f66e37224aefa55b38765ba61cb4d58beea37b5934e5ec8e30bad58613707388484906f2a0ce77997d WHIRLPOOL d07fec32bd92eade065a3b6170932b8bd41d07df4aa69dd5a860ebb9678c22bd1e20bf88b1fc05c3ecc18e709c0a63118e12525dc668e0399d7ef7fe4454702d
+DIST glibc-2.22-patches-10.tar.bz2 54312 SHA256 0cf9935301d2cf427e35c7b3866dd0036e0ec473ba5ff1cf6684c424ed5638aa SHA512 ebb4230705e61675ec0d70ad66816956479bd3ab7c20a3d970ba18d01b79de73e202cafe361c7f509cbfbc89bd99b19f75d5d3f3b9bb46d6f1fba6851ae0bf44 WHIRLPOOL 4fc98a7572070f1556410b8d20d078557a9786720d6a3425e2d924e6f86448810433911a4b3df2b8022f46e8b8e475f61bad12528efc988516422b89aee7e2cc
 DIST glibc-2.22-patches-9.tar.bz2 37781 SHA256 724ebd9c068af2740b2058dfe6685e4c496c845a9e927efdacd763c22d5d9fbd SHA512 dda6ce3908f4261744178c0a345c016a3b0a7ca1d75063e1b216b6b95aea663f1741391e71966e0ed8018eea1a628786ccd026c6616def721bbedb961d5245e8 WHIRLPOOL 9725fabb933d3b48cdce5df4e5e9ed9bc58f737836405e1345849764ae6013cd2a2ac73a23137e87964d940bd79115f82b777bc807ce4c58a28a247cdf22f68f
 DIST glibc-2.22.tar.xz 12969072 SHA256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 SHA512 a8719f3a4f8aa5fa81711116fdafbea5082c6dfd85bd8c4cdce60571910263ab422b35bb8b55a84d37ccb146442133ba60a84d453ca4a439c8ccd35419bd051b WHIRLPOOL f7e707b3776fc197a2e7bf5633721925507237b154bbc1f94b9fc303c87e6fc039ff0758da6ee55b4c1a0daaa87c6e594a6c96e7b00a7ba8ae98ee29918709a7
+DIST glibc-2.23-patches-1.tar.bz2 209934 SHA256 381b378542046e5570d11e70d985b4bcc961a5b64d5ff77a27e90035e21200a4 SHA512 285941d993dee962d43f42ade4d8f8d7f6e2bdaa0e428831155666d58c219ddffeef6dc9e3836936453595cc4389521827e9200e4465d78fe92d9588d8d12c33 WHIRLPOOL f1a9b269959c5c00cdade8673b006d1f087d026bf42fae48cb1dd072d17a3678babc078e88d259d01c3e38c8c483415f6016c37b6c88dc80357e08a2a8e30f26
+DIST glibc-2.23.tar.xz 13455260 SHA256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512 b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf WHIRLPOOL 7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71
diff --git a/sys-libs/glibc/glibc-2.21-r2.ebuild b/sys-libs/glibc/glibc-2.21-r2.ebuild
new file mode 100644
index 000000000000..76e250beb6fa
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.21-r2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
+	EGIT_SOURCEDIRS="${S}"
+	inherit git-2
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+GCC_BOOTSTRAP_VER="4.7.3-r1"
+PATCH_VER="7"                                  # Gentoo patchset
+: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
+
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+# Why SLOT 2.2 you ask yourself while sippin your tea ?
+# Everyone knows 2.2 > 0, duh.
+SLOT="2.2"
+
+# General: We need a new-enough binutils/gcc to match upstream baseline.
+# arch: we need to make sure our binutils/gcc supports TLS.
+DEPEND=">=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	sys-apps/gentoo-functions
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-4.6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-4.6
+		virtual/os-headers"
+	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/https://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
+SRC_URI=$(
+	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
+	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
+)
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()    { eblit-run src_unpack    ; }
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_compile()   { eblit-run src_compile   ; }
+src_test()      { eblit-run src_test      ; }
+src_install()   { eblit-run src_install   ; }
+
+# FILESDIR might not be available during binpkg install
+for x in pretend setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-pre() {
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+}
+
+eblit-src_prepare-post() {
+	cd "${S}"
+
+	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
+	if use hardened ; then
+		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
+		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
+		epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
+
+		# We don't enable these for non-hardened as the output is very terse --
+		# it only states that a crash happened.  The default upstream behavior
+		# includes backtraces and symbols.
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
+
+		if use debug ; then
+			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile || die
+		fi
+
+		# Build various bits with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			*/Makefile || die
+	fi
+
+	case $(gcc-fullversion) in
+	4.8.[0-3]|4.9.0)
+		eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
+		eerror "glibc.  See https://bugs.gentoo.org/547420 for details."
+		die "need to switch compilers #547420"
+		;;
+	esac
+}
diff --git a/sys-libs/glibc/glibc-2.22-r2.ebuild b/sys-libs/glibc/glibc-2.22-r2.ebuild
new file mode 100644
index 000000000000..00c14a734f5a
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.22-r2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
+	EGIT_SOURCEDIRS="${S}"
+	inherit git-2
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+GCC_BOOTSTRAP_VER="4.7.3-r1"
+PATCH_VER="10"                                 # Gentoo patchset
+: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
+
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+# Why SLOT 2.2 you ask yourself while sippin your tea ?
+# Everyone knows 2.2 > 0, duh.
+SLOT="2.2"
+
+# General: We need a new-enough binutils/gcc to match upstream baseline.
+# arch: we need to make sure our binutils/gcc supports TLS.
+DEPEND=">=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	sys-apps/gentoo-functions
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-4.6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-4.6
+		virtual/os-headers"
+	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/https://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
+SRC_URI=$(
+	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
+	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
+)
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()    { eblit-run src_unpack    ; }
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_compile()   { eblit-run src_compile   ; }
+src_test()      { eblit-run src_test      ; }
+src_install()   { eblit-run src_install   ; }
+
+# FILESDIR might not be available during binpkg install
+for x in pretend setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-pre() {
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+	# Bug 558636 we don't apply the pie works around for 2.22. It shoud have the support. #558636
+	GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
+	GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
+}
+
+eblit-src_prepare-post() {
+	cd "${S}"
+
+	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
+	if use hardened ; then
+		# We don't enable these for non-hardened as the output is very terse --
+		# it only states that a crash happened.  The default upstream behavior
+		# includes backtraces and symbols.
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
+
+		if use debug ; then
+			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile || die
+		fi
+
+		# Build various bits with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			*/Makefile || die
+	fi
+
+	case $(gcc-fullversion) in
+	4.8.[0-3]|4.9.0)
+		eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
+		eerror "glibc.  See https://bugs.gentoo.org/547420 for details."
+		die "need to switch compilers #547420"
+		;;
+	esac
+}
diff --git a/sys-libs/glibc/glibc-2.23.ebuild b/sys-libs/glibc/glibc-2.23.ebuild
new file mode 100644
index 000000000000..919748fcb299
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.23.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
+	EGIT_SOURCEDIRS="${S}"
+	inherit git-2
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+GCC_BOOTSTRAP_VER="4.7.3-r1"
+PATCH_VER="1"                                  # Gentoo patchset
+: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
+
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+# Why SLOT 2.2 you ask yourself while sippin your tea ?
+# Everyone knows 2.2 > 0, duh.
+SLOT="2.2"
+
+# General: We need a new-enough binutils/gcc to match upstream baseline.
+# arch: we need to make sure our binutils/gcc supports TLS.
+DEPEND=">=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	sys-apps/gentoo-functions
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-4.7
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-4.7
+		virtual/os-headers"
+	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/https://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
+SRC_URI=$(
+	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
+	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
+)
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()    { eblit-run src_unpack    ; }
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_compile()   { eblit-run src_compile   ; }
+src_test()      { eblit-run src_test      ; }
+src_install()   { eblit-run src_install   ; }
+
+# FILESDIR might not be available during binpkg install
+for x in pretend setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-pre() {
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+	# Bug 558636 we don't apply the pie works around for 2.22. It shoud have the support. #558636
+	GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
+	GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
+}
+
+eblit-src_prepare-post() {
+	cd "${S}"
+
+	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
+	if use hardened ; then
+		# We don't enable these for non-hardened as the output is very terse --
+		# it only states that a crash happened.  The default upstream behavior
+		# includes backtraces and symbols.
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
+
+		if use debug ; then
+			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile || die
+		fi
+
+		# Build various bits with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			*/Makefile || die
+	fi
+
+	case $(gcc-fullversion) in
+	4.8.[0-3]|4.9.0)
+		eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
+		eerror "glibc.  See https://bugs.gentoo.org/547420 for details."
+		die "need to switch compilers #547420"
+		;;
+	esac
+}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index f4c4b1488ce1..d2b9c01ed965 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -76,13 +76,13 @@ RDEPEND="!sys-kernel/ps3-sources
 if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND+=" !crosscompile_opts_headers-only? (
 		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.6
+		>=${CATEGORY}/gcc-4.7
 	)"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
 else
 	DEPEND+="
 		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.6
+		>=sys-devel/gcc-4.7
 		virtual/os-headers"
 	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
 	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 5a1f85499afa..afdac3e0fa24 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,2 +1 @@
-DIST gpm-1.20.6.tar.lzma 1280871 SHA256 27abb8a9142d3f7c31aeade2f2f1ed4b76bc760e181f552c504a7a9be00a868f SHA512 6f12d49cb690506ed116251376f0a2c946d86d323e93e11b9c71e7c40212fcc25b9ed364cd4dca3e5f0666fc7d9c38f1c3cdf6e80924cc68aef8623b39c0e623 WHIRLPOOL 05bee4c9156bbde78ea6ee06d7c4afba39899d2877a90a72e60bdab8c921fca9041cbebe5fa0afcc055a1cec2b0674392bcb9b3f1712103f236172e54e15b3b9
 DIST gpm-1.20.7.tar.lzma 789691 SHA256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9 WHIRLPOOL d3d142c3aa385e2ef4b16c96e0f94c04b3666376d893c516d439737c2f3016a12fff7884a8f18b5e6b58e4ba21d82379204b18621a2f338d8ab6d478e4e1ec1a
diff --git a/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch b/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch
deleted file mode 100644
index b6c7809c0eb5..000000000000
--- a/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b184152761d8a4dbf73adcffaddac85709949c2f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 15 Feb 2009 16:16:51 -0500
-Subject: [PATCH] daemon: use sys/ioctl.h for ioctl()
-
-Including stropts.h for the ioctl() prototype is weird and breaks some
-systems that do not implement stropts.h.  Use sys/ioctl.h like normal.
-
-URL: http://bugs.gentoo.org/222099
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Reported-by: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
----
- src/daemon/open_console.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
-index 27b62e2..98297c9 100644
---- a/src/daemon/open_console.c
-+++ b/src/daemon/open_console.c
-@@ -21,7 +21,7 @@
- 
- #include <fcntl.h>                  /* open and co.      */
- #include <sys/stat.h>               /* stat()            */
--#include <stropts.h>                /* ioctl             */
-+#include <sys/ioctl.h>              /* ioctl             */
- 
- /* Linux specific (to be outsourced in gpm2 */
- #include <linux/serial.h>           /* for serial console check */
--- 
-1.6.1.3
-
diff --git a/sys-libs/gpm/files/0001-fixup-make-warnings.patch b/sys-libs/gpm/files/0001-fixup-make-warnings.patch
deleted file mode 100644
index c55d2f826d01..000000000000
--- a/sys-libs/gpm/files/0001-fixup-make-warnings.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1bee81778e7355e6b902986b6e0fc5750546444a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 16 Feb 2009 15:43:40 -0500
-Subject: [PATCH] fixup make warnings
-
-Split the toplevel dep target to use normal make dependencies and use the
-$(MAKE) var rather than hardcoding `make`.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile.in |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 90b92d0..89cbb5e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -26,9 +26,11 @@ SUBDIRS = src doc contrib
- 
- all: do-all
- 
--dep:
--	touch src/$(DEPFILE) # to prevent unecessary warnings
--	make -C src dep
-+src/$(DEPFILE):
-+	touch $@ # to prevent unecessary warnings
-+
-+dep: src/$(DEPFILE)
-+	$(MAKE) -C src dep
- 
- check: all
- 
--- 
-1.7.3.1
-
diff --git a/sys-libs/gpm/files/gpm-1.20.5-abi.patch b/sys-libs/gpm/files/gpm-1.20.5-abi.patch
deleted file mode 100644
index 28980151e7a3..000000000000
--- a/sys-libs/gpm/files/gpm-1.20.5-abi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-the SONAME upstream was bumped to try and sort out the 1.19.x/1.20.x mess, but
-since we've always had 1.20.x in our tree, we dont care about that breakage.
-
-http://lists.linux.it/pipermail/gpm/2008-June/001026.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473496
-
---- gpm/configure
-+++ gpm/configure
-@@ -1736,2 +1736,2 @@
--abi_lev="2"
--abi_age="1"
-+abi_lev="1"
-+abi_age="20"
diff --git a/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch b/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch
deleted file mode 100644
index cb51a71e6e91..000000000000
--- a/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b28e69f92f0b0a690e01a7a9b9bc08ffa9e9bc5e Mon Sep 17 00:00:00 2001
-From: Sean McGovern <gseanmcg@gmail.com>
-Date: Mon, 27 Aug 2012 01:00:44 -0400
-Subject: [PATCH] configure: don't build static libgpm by default
-
----
- configure.ac    |   11 +++++++++++
- src/Makefile.in |    6 ++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7245826..899b92d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,6 +79,16 @@ AC_CHECK_HEADERS(sys/sysmacros.h linux/major.h linux/tty.h)
- # Required headers
- AC_CHECK_HEADERS(sys/socket.h,,[AC_MSG_ERROR([Required header file missing])])
- 
-+AC_ARG_ENABLE([static],
-+[  --enable-static         build static libraries @<:@default=no@:>@])
-+
-+LIBGPM_A=
-+
-+AS_IF([test "x$enable_static" = "xyes"], [
-+        LIBGPM_A=lib/libgpm.a
-+])
-+
-+
- AC_ARG_WITH(curses,
- [  --without-curses        disable curses support even if curses found])
- 
-@@ -138,6 +148,7 @@ AC_SUBST(ELISP)
- AC_SUBST(SHLIB)
- AC_SUBST(PICFLAGS)
- AC_SUBST(SOLDFLAGS)
-+AC_SUBST(LIBGPM_A)
- AC_SUBST(CURSES_OBJS)
- AC_SUBST(SHARED_LIBS)
- AC_SUBST(lispdir)
-diff --git a/src/Makefile.in b/src/Makefile.in
-index da35a5d..d3b1dcd 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -79,7 +79,7 @@ prog/%:	prog/%.o
- #		| $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
- 
- # Do it all!
--all:	gpm lib/libgpm.so.@abi_lev@ lib/libgpm.a $(PROG)
-+all:	gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
- 
- gpm:	$(GOBJ)
- 	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
-@@ -105,7 +105,9 @@ installdirs:
- 
- install:	check 
- 	$(INSTALL_PROGRAM) gpm $(sbindir)/gpm
--	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a
-+	if [ -f lib/libgpm.a ] ; then \
-+	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a ; \
-+	fi
- 	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
- 	# POSIX requires the range of a for loop be nonempty and Bash
- 	# 2.x goes along; unfortunately that means an additional
--- 
-1.7.8.6
-
diff --git a/sys-libs/gpm/files/gpm.rc6 b/sys-libs/gpm/files/gpm.rc6
deleted file mode 100644
index 7a3328cb62ce..000000000000
--- a/sys-libs/gpm/files/gpm.rc6
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#NB: Config is in /etc/conf.d/gpm
-
-depend() {
-	need localmount
-	use hotplug logger
-}
-
-checkconfig() {
-	if [ -z "$MOUSEDEV" ] || [ -z "$MOUSE" ] ; then
-		eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	local params=""
-	[ -n "$RESPONSIVENESS" ] && params="$params -r $RESPONSIVENESS"
-	[ -n "$REPEAT_TYPE" ]    && params="$params -R$REPEAT_TYPE"
-	[ -n "$APPEND" ]         && params="$params $APPEND "
-	
-	ebegin "Starting gpm"
-	start-stop-daemon --start --quiet --exec /usr/sbin/gpm \
-		-- -m ${MOUSEDEV} -t ${MOUSE} ${params}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping gpm"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gpm.pid
-	eend ${?}
-}
diff --git a/sys-libs/gpm/gpm-1.20.6-r1.ebuild b/sys-libs/gpm/gpm-1.20.6-r1.ebuild
deleted file mode 100644
index ddebd1dc338f..000000000000
--- a/sys-libs/gpm/gpm-1.20.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI=4
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux static-libs"
-
-CDPEND="sys-libs/ncurses"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/yacc"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-gpm )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
-	epatch "${FILESDIR}"/0001-fixup-make-warnings.patch #206291
-	epatch "${FILESDIR}"/${P}-disablestatic.patch #378283
-
-	# fix ABI values
-	sed -i \
-		-e 's/^abi_lev=.*$/abi_lev="1"/' \
-		-e 's/^abi_age=.*$/abi_age="20"/' \
-		configure.ac || die
-
-	# workaround broken release
-	find -name '*.o' -delete
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean
-	emake EMACS=:
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP=""
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc BUGS Changes README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-}
diff --git a/sys-libs/gpm/gpm-1.20.6.ebuild b/sys-libs/gpm/gpm-1.20.6.ebuild
deleted file mode 100644
index 3a923a97dd5d..000000000000
--- a/sys-libs/gpm/gpm-1.20.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="selinux"
-
-DEPEND="sys-libs/ncurses
-	app-arch/xz-utils
-	virtual/yacc"
-RDEPEND="selinux? ( sec-policy/selinux-gpm )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.20.5-abi.patch
-	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
-	epatch "${FILESDIR}"/0001-fixup-make-warnings.patch #206291
-
-	# workaround broken release
-	find -name '*.o' -delete
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean || die
-	emake EMACS=: || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP="" || die
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc BUGS Changes README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-}
diff --git a/sys-libs/gpm/gpm-1.20.7-r1.ebuild b/sys-libs/gpm/gpm-1.20.7-r1.ebuild
deleted file mode 100644
index c2024fd74700..000000000000
--- a/sys-libs/gpm/gpm-1.20.7-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI="4"
-
-inherit eutils systemd toolchain-funcs autotools
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="selinux static-libs"
-
-RDEPEND="sys-libs/ncurses
-	selinux? ( sec-policy/selinux-gpm )"
-DEPEND="sys-libs/ncurses
-	app-arch/xz-utils
-	virtual/yacc"
-
-src_prepare() {
-	# fix ABI values
-	sed -i \
-		-e '/^abi_lev=/s:=.*:=1:' \
-		-e '/^abi_age=/s:=.*:=20:' \
-		configure.ac.footer || die
-	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
-	./autogen.sh
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean
-	emake EMACS=:
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP=""
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-	systemd_dounit "${FILESDIR}"/gpm.service
-}
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index a041ff271b92..af8bb4ae2669 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 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="selinux static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
diff --git a/sys-libs/gpm/gpm-1.20.7.ebuild b/sys-libs/gpm/gpm-1.20.7.ebuild
deleted file mode 100644
index 6cc573ca7c92..000000000000
--- a/sys-libs/gpm/gpm-1.20.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# emacs support disabled due to #99533 #335900
-
-EAPI="4"
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux static-libs"
-
-RDEPEND="sys-libs/ncurses
-	selinux? ( sec-policy/selinux-gpm )"
-DEPEND="sys-libs/ncurses
-	app-arch/xz-utils
-	virtual/yacc"
-
-src_prepare() {
-	# fix ABI values
-	sed -i \
-		-e '/^abi_lev=/s:=.*:=1:' \
-		-e '/^abi_age=/s:=.*:=20:' \
-		configure.ac.footer || die
-	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
-	./autogen.sh
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-src_compile() {
-	# make sure nothing compiled is left
-	emake clean
-	emake EMACS=:
-}
-
-src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP=""
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-}
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 73f67f76868d..7bb83329f01e 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,5 +1,3 @@
-DIST ldb-1.1.12.tar.gz 1110134 SHA256 b6444a1bfc9b8c8f43df171b12b5a581c44a64b4d92062d4959fed17e4cf1b4c SHA512 e00af0367b99b8829bbca636859beee75c1c0828fc15f760a2b2fed6e4fadd850b55bfa6a57e4c6cc3a698fec70f1446635b152ed3a0559ef4483907e5a2102c WHIRLPOOL ebf339d27b0a14b56dcb9e4fe85af9e034f0670567b982edb9927fa808e8eac51c672083d76e747d58d29067b441d158e78d1cb2ee343589aba44bf9aa11689b
-DIST ldb-1.1.15.tar.gz 1121684 SHA256 6bd8317e82747461394ab8ad1ee5873589d9a46d12f021571aca9fac45de8997 SHA512 48aada749986cf636aa8ae259c9ba1f07899e136129414752f2e4932f396348d56eef987fa96595c940bd159f8c03795973ba66fc49f00e204339986bf49a970 WHIRLPOOL 683e5abf53817527d42bff83330b5b8e6b07b0d2b5936ee7ac794d037091dd85b4f6674ef8538a7d6489933473908ed2026265b4b6db8a253ff711f86a9661a6
-DIST ldb-1.1.17.tar.gz 1177926 SHA256 b9a312aad19e9463716d257d8f2529fd7fc1a5ef24f6dcdc0c4a1930d7bdb6e6 SHA512 bbdb79bc584bb26e053d21c47457b0c10c62080034e44d41ae9c0a6225f6d30f6976b30617f57fc4cb0776af770a4e9c569726d2385a8ec4545b1f732d366f17 WHIRLPOOL 56cbe6763010eba49c94146b1cb7748d643d2233eb5d26a1bf0a8aa02fcf2afa11b9d22a13608b753385a9817ee37804281651e47668bdc61eefd5ffa200a8c0
 DIST ldb-1.1.24.tar.gz 1258405 SHA256 45e9f52473f0d013f0ea090cce35d6836a6e67e8d4dcdd7077dabdf8b1314b21 SHA512 7b574d1a832fb19a4e8506a1bd702fddf3610b94e170999c9d7b5f3047a4667fb701fa0d367fd19febc2b3e70d1325a1944081ce1067d88271e70f8370aeb278 WHIRLPOOL c8a4e140533bbe1388988b413bdb0a3b6806aa28b551ab195ec509acc66581a75bd6f4729dc7c009f5fae80c45a2a36f817c9a1bd6476bf8125ab8b2216b9f79
 DIST ldb-1.1.25.tar.gz 1259961 SHA256 bf74783ecee42408250146e384a918176178318ef398f816a64d1c1ad22b7c12 SHA512 b0b264a7c4e1d2c13a15f604a7ff8038fa47868c0275c0515bcc15a03a1087cf930572614fe36b0cfce67258bfe4261a9d5a2638143e5d454538fed85159d4dd WHIRLPOOL 5a7ac99ce252c9d1be23a520180dd4e37784585d9fe5e1b8a666a4dc79cff3f35e258f5bffd1e8e286eee239ff848788b431f763c63e26709f98a29ebc93d677
+DIST ldb-1.1.26.tar.gz 1262660 SHA256 8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6 SHA512 484689c5b87f223820e3613c056de5528a87736baef7b884df506fc47a3412b35ba2ef8e85f62e2d3da803fdab6b37bb328d4347a20bfc8fef8ed557646b6bbe WHIRLPOOL eb72c85faaf4aaf5fa647c084f9ceb8938e940390618b1dfc486b6bc8f344d1296314cb4f07770a04de3c6597798420347fdb90ede380db9e29a04a35c88bfcb
diff --git a/sys-libs/ldb/ldb-1.1.12.ebuild b/sys-libs/ldb/ldb-1.1.12.ebuild
deleted file mode 100644
index a97456cecd89..000000000000
--- a/sys-libs/ldb/ldb-1.1.12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_REQ_USE="threads"
-
-inherit python waf-utils multilib
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.7[python]
-	>=sys-libs/tevent-0.9.17[python(+)]
-	>=sys-libs/tdb-1.2.10[python]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	python_need_rebuild
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--disable-rpath \
-		--disable-rpath-install --bundled-libraries=NONE \
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules \
-		--builtin-libraries=NONE
-}
-
-src_compile(){
-	waf-utils_src_compile
-	use doc && doxygen Doxyfile
-}
-
-src_test() {
-	WAF_MAKE=1 \
-	PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${S}"/bin/shared/private/:"${S}"/bin/shared waf test || die
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use doc; then
-		dohtml -r apidocs/html/*
-		doman  apidocs/man/man3/*.3
-	fi
-}
-
-pkg_postinst() {
-	python_need_rebuild
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.15.ebuild b/sys-libs/ldb/ldb-1.1.15.ebuild
deleted file mode 100644
index 070e04fca954..000000000000
--- a/sys-libs/ldb/ldb-1.1.15.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_REQ_USE="threads"
-
-inherit python waf-utils multilib
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.8[python]
-	>=sys-libs/tevent-0.9.17[python(+)]
-	>=sys-libs/tdb-1.2.11[python]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	python_need_rebuild
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--disable-rpath \
-		--disable-rpath-install --bundled-libraries=NONE \
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules \
-		--builtin-libraries=NONE
-}
-
-src_compile(){
-	waf-utils_src_compile
-	use doc && doxygen Doxyfile
-}
-
-src_test() {
-	WAF_MAKE=1 \
-	PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${S}"/bin/shared/private/:"${S}"/bin/shared waf test || die
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use doc; then
-		dohtml -r apidocs/html/*
-		doman  apidocs/man/man3/*.3
-	fi
-}
-
-pkg_postinst() {
-	python_need_rebuild
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.17-r1.ebuild b/sys-libs/ldb/ldb-1.1.17-r1.ebuild
deleted file mode 100644
index 994170394728..000000000000
--- a/sys-libs/ldb/ldb-1.1.17-r1.ebuild
+++ /dev/null
@@ -1,77 +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
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.1.0[python]
-	>=sys-libs/tevent-0.9.21[python(+)]
-	>=sys-libs/tdb-1.2.12[python]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	${PYTHON_DEPS}
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--disable-rpath \
-		--disable-rpath-install --bundled-libraries=NONE \
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \
-		--builtin-libraries=NONE
-}
-
-src_compile(){
-	waf-utils_src_compile
-	use doc && doxygen Doxyfile
-}
-
-src_test() {
-	WAF_MAKE=1 \
-	PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${S}"/bin/shared/private/:"${S}"/bin/shared waf test || die
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use doc; then
-		dohtml -r apidocs/html/*
-		doman  apidocs/man/man3/*.3
-	fi
-}
-
-pkg_postinst() {
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.24-r2.ebuild b/sys-libs/ldb/ldb-1.1.24-r2.ebuild
deleted file mode 100644
index d3323d376b19..000000000000
--- a/sys-libs/ldb/ldb-1.1.24-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 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-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.5[python,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.26[python(+),${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.8[python,${MULTILIB_USEDEP}]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	${PYTHON_DEPS}
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-optional-python.patch
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-rpath \
-		--disable-rpath-install --bundled-libraries=NONE \
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile(){
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -r apidocs/html/*
-		doman  apidocs/man/man3/*.3
-	fi
-}
-
-pkg_postinst() {
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.26.ebuild b/sys-libs/ldb/ldb-1.1.26.ebuild
new file mode 100644
index 000000000000..e9a49b471e1b
--- /dev/null
+++ b/sys-libs/ldb/ldb-1.1.26.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 waf-utils multilib-minimal eutils
+
+DESCRIPTION="An LDAP-like embedded database"
+HOMEPAGE="http://ldb.samba.org"
+SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.5[python,${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.27[python(+),${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.8[python,${MULTILIB_USEDEP}]
+	net-nds/openldap
+	!!<net-fs/samba-3.6.0[ldb]
+	!!>=net-fs/samba-4.0.0[ldb]
+	${PYTHON_DEPS}
+	"
+
+DEPEND="dev-libs/libxslt
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.24-optional-python.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-rpath \
+		--disable-rpath-install --bundled-libraries=NONE \
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile(){
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/*
+	fi
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 52418a019012..1f99af65e2f3 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,6 +1 @@
-DIST libcap-ng-0.6.6.tar.gz 367231 SHA256 89589a29a6b19068edd650dd4f626c10e84bfe63eacae7b1fd1f98f3ac8ea00d SHA512 383aaa9e315e2498c779a17bef35df6aee072c42598d07d92bdd7a2328a3bcd22d5ec46d600babc467aa4d1b01e9dd660493dafba3b06c7ac81f35df9d4d6e3e WHIRLPOOL c1a72480d545b45ae385065449098f0878f8c8d138f1d9bd9b3445d1146fd6a227bb9b0ac0148542995c5b6683c7c5998d0cd61a369b9f5c84fb39a9dc5cf8a3
-DIST libcap-ng-0.7.3.tar.gz 392613 SHA256 5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1 SHA512 f03a35c54b5998ef2e712540caa1f4ade37f9abe60992a1e727142b26815a4b8a7ce86ea94466fe692e4798c7297e5e1bbd338e5afe05689905ee9e0c0f16ef2 WHIRLPOOL 7752a70ea348dfc52537f67d5dccab03d598a112a7263a8811987453b53cda58643e938b4651c5cd8d0ea02f20fddc10bff2ac8bc23f68f97c9ab8c5791429ab
-DIST libcap-ng-0.7.4.tar.gz 407007 SHA256 48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b SHA512 443b92f44cffd4b436a2651eb3539c560382102d918faf63f993d3b6627c03e80f7b4a5105ddb040890ef82122a42ca6881795ab0639de337f693705f5506cf0 WHIRLPOOL 3d62f26fad8c9e7756374022982a4f2fcdde5af5532474dfa7eb6ba1bc7f97984691bdda8975ef32423b8e86af2462ef672ba3175a3121a484c46096cc8f10b2
-DIST libcap-ng-0.7.5.tar.gz 409426 SHA256 7ba01e73c027e4f17bff6cdd77c01b25987e58ed14e422a437e14df6e2dbca31 SHA512 947ec84037c6c383e47d7e15168058b01a0a6eddf73c94cea7e1d4c8b27af1d646b483abdf14d3aa8ecb35fda2ead803f8596aed023a7e5ff9396690313c24a1 WHIRLPOOL 8dc79529034f5ad2c4c8cc514157adfd9097b902647240134be82bd2bc2eb590adadb74c71f4324788702a0694d612ab0f5bdb9c0ddfc688407505ad23a39132
-DIST libcap-ng-0.7.6.tar.gz 417329 SHA256 9de3caebcc6248f3e9f8c278068253dee89c39d7ffcd284a10fc6ce2b06a2dff SHA512 838b8731d10c4adcfbc5fd1199d60f831dcb4e69cb3a645bd9e5c284c883ddbdc48289d696ecbed47a782112403210b685816935d2eec38f344adc1051d357fe WHIRLPOOL 3863f22d74e22cdfd88fc329a8f616fda1e846ed8489dcfe3a5bceeb76d847fce4b7fc3ac4166429b1e1c37691ac5b085e08c790b1c274b52551678797b7d4c3
 DIST libcap-ng-0.7.7.tar.gz 420178 SHA256 615549ce39b333f6b78baee0c0b4ef18bc726c6bf1cca123dfd89dd963f6d06b SHA512 eb049b29fdd31aa31c6c14ca023df62c2910504c1edd1242dba13579d0befae5b98249c22c145517bd5451969a0b186390dc11b2269e58001336e10c855e920c WHIRLPOOL 5d376b8d12ed8c19ca649095297e6016e86e5ad6112fd12685929bdd5f3c34bbcdf9c1c61cad44f44d3784192ca37df1a77c478e5fc15dacb20a2561ee945652
diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch b/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch
deleted file mode 100644
index bfeef6e2da39..000000000000
--- a/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-utils/proc-llist.c: include <unistd.h>
-
-proc-llist.c references pid_t and uid_t types but does not include <unistd.h>.  This
-works on glibc and uClibc because of the way their headers stack, but on musl (and
-possible other libc) this fails.  POSIX mandates that <unistd.h> provides these.  See
-Issue 6 at http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/unistd.h.html.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Nuar libcap-ng-0.7.5.orig/utils/proc-llist.c libcap-ng-0.7.5/utils/proc-llist.c
---- libcap-ng-0.7.5.orig/utils/proc-llist.c	2015-02-18 17:13:33.000000000 -0500
-+++ libcap-ng-0.7.5/utils/proc-llist.c	2015-05-25 13:39:32.196624248 -0400
-@@ -24,6 +24,7 @@
- #include "config.h"
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include "proc-llist.h"
- 
- void list_create(llist *l)
diff --git a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
deleted file mode 100644
index 5de6541e7487..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit autotools flag-o-matic python
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="python static-libs"
-
-RDEPEND="sys-apps/attr
-	python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	# Disable byte-compilation of Python modules.
-	>py-compile
-
-	# Python bindings are built/tested/installed manually.
-	sed -i -e "/^SUBDIRS/s/ python//" bindings/Makefile.am || die
-
-	eautoreconf
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with python)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources bindings/python
-
-		building() {
-			emake \
-				CFLAGS="${CFLAGS}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir bindings/python building
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	default
-
-	if use python; then
-		testing() {
-			emake \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				TESTS_ENVIRONMENT="PYTHONPATH=..:../.libs" \
-				check
-		}
-		python_execute_function -s --source-dir bindings/python testing
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir bindings/python installation
-
-		python_clean_installation_image
-	fi
-
-	dodoc AUTHORS ChangeLog README
-
-	rm -f "${ED}"/usr/lib*/${PN}.la
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize capng.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup capng.py
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
deleted file mode 100644
index 9d49df92a5ed..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit autotools flag-o-matic python
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-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"
-IUSE="python static-libs"
-
-RDEPEND="python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	# Disable byte-compilation of Python modules.
-	>py-compile
-
-	# Python bindings are built/tested/installed manually.
-	sed -i -e "/^SUBDIRS/s/ python//" bindings/Makefile.am || die
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with python)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources bindings/python
-
-		building() {
-			emake \
-				CFLAGS="${CFLAGS}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir bindings/python building
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	default
-
-	if use python; then
-		testing() {
-			emake \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				TESTS_ENVIRONMENT="PYTHONPATH=..:../.libs" \
-				check
-		}
-		python_execute_function -s --source-dir bindings/python testing
-	fi
-}
-
-src_install() {
-	default
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir bindings/python installation
-
-		python_clean_installation_image
-	fi
-
-	rm -f "${ED}"/usr/lib*/${PN}.la
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize capng.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup capng.py
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild
deleted file mode 100644
index 642fdc22aa79..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools-utils flag-o-matic python-r1
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-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"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	autotools-utils_src_prepare
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python
-	)
-
-	# set up the library build
-	autotools-utils_src_configure
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_compile() {
-			local CFLAGS=${CFLAGS}
-
-			python_is_python3 || CFLAGS+=" -fno-strict-aliasing"
-
-			emake "${@}" \
-				-C "${BUILD_DIR}"/bindings/python
-		}
-
-		# help build system find the right objects
-		python_foreach_impl python_compile \
-			VPATH="${BUILD_DIR}"/bindings/python \
-			LIBS="${BUILD_DIR}"/src/libcap-ng.la
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	autotools-utils_src_test
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_compile -C bindings/python check \
-			VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_install -C bindings/python \
-			VPATH="${BUILD_DIR}"/bindings/python
-	fi
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
deleted file mode 100644
index 8dcd469deca9..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools-utils flag-o-matic python-r1
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-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"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-unistd_h.patch
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	autotools-utils_src_prepare
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python
-	)
-
-	# set up the library build
-	autotools-utils_src_configure
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_compile() {
-			local CFLAGS=${CFLAGS}
-
-			python_is_python3 || CFLAGS+=" -fno-strict-aliasing"
-
-			emake "${@}" \
-				-C "${BUILD_DIR}"/bindings/python
-		}
-
-		# help build system find the right objects
-		python_foreach_impl python_compile \
-			VPATH="${BUILD_DIR}"/bindings/python \
-			LIBS="${BUILD_DIR}"/src/libcap-ng.la
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	autotools-utils_src_test
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_compile -C bindings/python check \
-			VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_install -C bindings/python \
-			VPATH="${BUILD_DIR}"/bindings/python
-	fi
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild
deleted file mode 100644
index df1d0b49c063..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools-utils flag-o-matic python-r1
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-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"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.5-add-unistd_h.patch
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	autotools-utils_src_prepare
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python
-	)
-
-	# set up the library build
-	autotools-utils_src_configure
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_compile() {
-			local CFLAGS=${CFLAGS}
-
-			python_is_python3 || CFLAGS+=" -fno-strict-aliasing"
-
-			emake "${@}" \
-				-C "${BUILD_DIR}"/bindings/python
-		}
-
-		# help build system find the right objects
-		python_foreach_impl python_compile \
-			VPATH="${BUILD_DIR}"/bindings/python \
-			LIBS="${BUILD_DIR}"/src/libcap-ng.la
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	autotools-utils_src_test
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_compile -C bindings/python check \
-			VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_install -C bindings/python \
-			VPATH="${BUILD_DIR}"/bindings/python
-	fi
-}
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 b485acb82f1e..451ccbf2f470 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/libosinfo/libosinfo-0.3.0.ebuild b/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
index 22316c4d9ec1..53dacd5634ef 100644
--- a/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection +vala test"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2:2
diff --git a/sys-libs/libselinux/libselinux-2.4.ebuild b/sys-libs/libselinux/libselinux-2.4.ebuild
index 8f366146c484..5889b3e83a15 100644
--- a/sys-libs/libselinux/libselinux-2.4.ebuild
+++ b/sys-libs/libselinux/libselinux-2.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 
 IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20"
 
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 01b4776a0127..76ec5a6ff089 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libsemanage/files/libsemanage-2.4-build-paths.patch b/sys-libs/libsemanage/files/libsemanage-2.4-build-paths.patch
new file mode 100644
index 000000000000..7eeb9befb318
--- /dev/null
+++ b/sys-libs/libsemanage/files/libsemanage-2.4-build-paths.patch
@@ -0,0 +1,35 @@
+there's no point in using -I/-L flags to the system paths and this breaks
+cross-compiling.  just drop them.
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -60,7 +60,7 @@
+ SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno-shadow \
+ 		-Wno-unused-parameter
+ 
+-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE 
++override CFLAGS += -I../include -D_GNU_SOURCE
+ RANLIB=ranlib
+ 
+ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
+@@ -82,17 +82,17 @@
+ 	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+ $(SWIGSO): $(SWIGLOBJ)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage -L$(LIBDIR)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage
+ 
+ $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage -L$(LIBDIR)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage
+ 
+ $(LIBA): $(OBJS)
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ 
+ $(LIBSO): $(LOBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -lustr -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
+ 	ln -sf $@ $(TARGET)
+ 
+ $(LIBPC): $(LIBPC).in ../VERSION
diff --git a/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
index b949d14907aa..9e0890f8c6a7 100644
--- a/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE="python"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
@@ -70,6 +70,7 @@ src_prepare() {
 		"${FILESDIR}/0003-libsemanage-Add-file_contexts-and-seusers-to-the-sto.patch" \
 		"${FILESDIR}/0004-libsemanage-save-homedir_template-in-the-policy-stor.patch" \
 		"${FILESDIR}/0005-libsemanage-store-users_extra-in-the-policy-store.patch"
+	epatch "${FILESDIR}"/${PN}-2.4-build-paths.patch
 
 	epatch_user
 
@@ -111,8 +112,8 @@ multilib_src_install() {
 
 pkg_postinst() {
 	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' /etc/selinux/config);
-	if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ; then
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
 		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
 		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
 		ewarn "If there are any issues, it can be done manually by running:"
@@ -123,7 +124,7 @@ pkg_postinst() {
 
 	# Run the store migration without rebuilds
 	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${ROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
+		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
 			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
 			/usr/libexec/selinux/semanage_migrate_store -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
 		fi
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 5132051ba8c2..687be201666c 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -76,6 +76,7 @@ src_prepare() {
 		# If wanted for live builds, please use /etc/portage/patches
 		epatch "${FILESDIR}/0001-libsemanage-do-not-copy-contexts-in-semanage_migrate.patch"
 	fi
+	epatch "${FILESDIR}"/${PN}-2.4-build-paths.patch
 
 	epatch_user
 
@@ -117,8 +118,8 @@ multilib_src_install() {
 
 pkg_postinst() {
 	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' /etc/selinux/config);
-	if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ; then
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
 		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
 		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
 		ewarn "If there are any issues, it can be done manually by running:"
@@ -129,7 +130,7 @@ pkg_postinst() {
 
 	# Run the store migration without rebuilds
 	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${ROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
+		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
 			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
 			/usr/libexec/selinux/semanage_migrate_store -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
 		fi
diff --git a/sys-libs/libsepol/libsepol-2.4.ebuild b/sys-libs/libsepol/libsepol-2.4.ebuild
index 5f7b16f8e659..de5f0ce17bd9 100644
--- a/sys-libs/libsepol/libsepol-2.4.ebuild
+++ b/sys-libs/libsepol/libsepol-2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index a3182a615cbd..32a347350b09 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libtrash/Manifest b/sys-libs/libtrash/Manifest
deleted file mode 100644
index 2e5b68efa201..000000000000
--- a/sys-libs/libtrash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libtrash-3.2.tgz 98138 SHA256 c1bb4b941ed0eef29f9acf9f4101f8695bdb49763f80ed41647b01063d6e946f SHA512 b79d26f8414016044de36359fc98b261dd850a550003d13bf910be7ab5faad42820c4c7f06be6fd5aad34f9aacd0e234ee24d72d43b37eb80d69b197b25442cd WHIRLPOOL 1ede1936d6e41a1a7097e8980f9dcbc76180cb0c43ed52bb876c66ad1eea707e05c6e0a400c9503465f4950daf72714e6ef2c276ebca318b92d9cb1e282e49a3
diff --git a/sys-libs/libtrash/files/cleanTrash.cron b/sys-libs/libtrash/files/cleanTrash.cron
deleted file mode 100644
index e9686119ac44..000000000000
--- a/sys-libs/libtrash/files/cleanTrash.cron
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Uncomment the following if you want
-# your Trash cleaned out regularly.
-#
-# This is part of the libtrash package.
-#
-
-#if [ -x /usr/sbin/ct2.pl ]
-#then
-#	/usr/sbin/ct2.pl > /dev/null
-#fi
diff --git a/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch b/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch
deleted file mode 100644
index f1dba6b03917..000000000000
--- a/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur libtrash-3.2.orig/cleanTrash/ct2.pl libtrash-3.2/cleanTrash/ct2.pl
---- libtrash-3.2.orig/cleanTrash/ct2.pl	2003-12-08 04:11:49.000000000 +0900
-+++ libtrash-3.2/cleanTrash/ct2.pl	2008-12-30 10:13:12.000000000 +0900
-@@ -39,7 +39,8 @@
- ### CONFIGURATION
- ##########################################################################
- # Trash-directory relative to home-dir
--$TRASH_DIR       = '/Desktop/Trash';
-+#$TRASH_DIR       = '/Desktop/Trash';
-+$TRASH_DIR       = '/Trash';
- 
- # Trash-history file relative to home-dir
- $TRASH_HIST_FILE = '/.trashhist';
-@@ -52,7 +53,8 @@
- 
- # minimum user number (by convention on many Linux systems, 'real' users
- # have UIDs >= 500).  Set to zero to process all users
--$MIN_USER        = 500;
-+#$MIN_USER        = 500;
-+$MIN_USER        = 1000;
- 
- ##########################################################################
- ### PROGRAM
-diff -Naur libtrash-3.2.orig/libtrash.conf libtrash-3.2/libtrash.conf
---- libtrash-3.2.orig/libtrash.conf	2007-12-04 08:33:34.000000000 +0900
-+++ libtrash-3.2/libtrash.conf	2008-12-30 10:16:12.000000000 +0900
-@@ -286,8 +286,8 @@
- # through the use of the UNCOVER_DIRS environmental variable (see
- # below).
- 
--UNREMOVABLE_DIRS =
--#UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/sbin;/usr
-+#UNREMOVABLE_DIRS =
-+UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/lib32;/lib64;/sbin;/usr;/opt
- 
- # This is a convenience configuration variable: it simply instructs
- # libtrash to temporarily remove the listed directory(ies) from the
-diff -Naur libtrash-3.2.orig/src/Makefile libtrash-3.2/src/Makefile
---- libtrash-3.2.orig/src/Makefile	2008-01-23 21:41:24.000000000 +0900
-+++ libtrash-3.2/src/Makefile	2008-12-30 10:21:10.000000000 +0900
-@@ -1,5 +1,5 @@
- CC=gcc
--CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT
-+CFLAGS+=-Wall -W -Wmissing-prototypes -D_REENTRANT
- 
- INSTLIBDIR=/usr/local/lib
- SYSCONFFILE=/etc/libtrash.conf
-@@ -32,10 +32,11 @@
-         -o libtrash.so.${VERSION} -ldl
- 
- install-libtrash: 
--	TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION}
--	TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so
--	TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE}
--	ldconfig	
-+	TRASH_OFF=YES install libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.${VERSION}
-+	TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so
-+	TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.3
-+	TRASH_OFF=YES install libtrash.conf.sys --mode a=r $(DESTDIR)${SYSCONFFILE}
-+#	ldconfig	
- 
- clean:
- 	rm -f *~
diff --git a/sys-libs/libtrash/files/libtrash-3.2-ldflags.patch b/sys-libs/libtrash/files/libtrash-3.2-ldflags.patch
deleted file mode 100644
index b8c3917132a6..000000000000
--- a/sys-libs/libtrash/files/libtrash-3.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2013-02-26 01:16:14.367046358 +0400
-+++ src/Makefile	2013-02-26 01:16:26.054046729 +0400
-@@ -28,7 +28,7 @@
- 	python ../scripts/get_symbol_versions.py
- 	rm -f linking-helper
- 	perl -w ../scripts/genconf.pl
--	$(CC) $(CFLAGS) $(SRC) -nostartfiles -shared -fPIC -Wl,-soname,libtrash.so.${MAJOR} \
-+	$(CC) $(CFLAGS) $(SRC) -nostartfiles -shared -fPIC $(LDFLAGS) -Wl,-soname,libtrash.so.${MAJOR} \
-         -o libtrash.so.${VERSION} -ldl
- 
- install-libtrash: 
diff --git a/sys-libs/libtrash/libtrash-3.2-r1.ebuild b/sys-libs/libtrash/libtrash-3.2-r1.ebuild
deleted file mode 100644
index c8c9c9e6c85f..000000000000
--- a/sys-libs/libtrash/libtrash-3.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Provides a trash can by intercepting certain calls to glibc"
-HOMEPAGE="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
-SRC_URI="http://pages.stern.nyu.edu/~marriaga/software/libtrash/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack "${A}"
-
-	# now let's unpack strash too in cash anyone is interested
-	cd "${S}/cleanTrash" || die "cd failed"
-	unpack ./strash-0.9.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-ldflags.patch" # bug 334833
-	sed -i -e "/^INSTLIBDIR/s:local/lib:$(get_libdir):" src/Makefile || die "sed on Makefile failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dodir /etc /usr/$(get_libdir)
-	emake DESTDIR="${D}" install
-
-	dosbin cleanTrash/ct2.pl
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}/cleanTrash.cron"
-
-	dodoc CHANGE.LOG README libtrash.conf TODO config.txt
-
-	docinto cleanTrash
-	dodoc cleanTrash/README cleanTrash/cleanTrash
-
-	# new strash installation stuff
-	dosbin cleanTrash/strash-0.9/strash
-	docinto strash
-	dodoc cleanTrash/strash-0.9/README
-	doman cleanTrash/strash-0.9/strash.8
-}
-
-pkg_postinst() {
-	elog
-	elog "To use this you have to put the trash library as one"
-	elog "of the variables in LD_PRELOAD."
-	elog "Example in bash:"
-	elog "export LD_PRELOAD=/usr/$(get_libdir)/libtrash.so"
-	elog
-	elog "Also, see /etc/cron.daily/cleanTrash.cron if you'd like to turn on"
-	elog "daily trash cleanup."
-	elog
-}
diff --git a/sys-libs/libtrash/metadata.xml b/sys-libs/libtrash/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/sys-libs/libtrash/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index a4d38038c3f9..ffea79c0fed2 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1 +1,2 @@
 DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
+DIST musl-1.1.14.tar.gz 894971 SHA256 35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5 SHA512 9016246b44a7e6ef51477f0a246373c79f3e796c70031c3323be1b6c4c0518a2d4578f1aa712adfd9a80cdc1d71918bd7a35855052a0452b854755bf0cc2424e WHIRLPOOL e675ed13888021376812c65addf245906bfca00c5291ca5979cb4894cbe72b3a1b69c0fd793bd49f9cef2154131f717b15b52398b43c68fcfb7c5530b1258e72
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
deleted file mode 100644
index e846f5f32a78..000000000000
--- a/sys-libs/musl/files/musl-1.1.11-fix-codeset.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
index 239a045a3676..574b31f421a1 100644
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
 HOMEPAGE="http://www.musl-libc.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
diff --git a/sys-libs/musl/musl-1.1.14.ebuild b/sys-libs/musl/musl-1.1.14.ebuild
new file mode 100644
index 000000000000..98e65f4623af
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.14.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 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-r3
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, 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"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+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 || die
+	$(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_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 obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	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}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${FILESDIR}"/getent
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		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-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 016d210b7bdf..85bdc9b32d9b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
 HOMEPAGE="http://www.musl-libc.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
@@ -32,6 +32,9 @@ IUSE="crosscompile_opts_headers-only"
 
 RDEPEND="!sys-apps/getent"
 
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
@@ -78,7 +81,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake include/bits/alltypes.h
+	emake obj/include/bits/alltypes.h
 	just_headers && return 0
 
 	emake
diff --git a/sys-libs/nss-db/Manifest b/sys-libs/nss-db/Manifest
deleted file mode 100644
index 6415d1c5c6d5..000000000000
--- a/sys-libs/nss-db/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST nss_db-2.2.3pre1-dbopen.patch.bz2 258 SHA256 9d7bf1ef17ca91c59c234bfa96d4b9e3f866a792c609a02cc6d9daa601dee1d3 SHA512 59c9c375150f217e5d98d6f12cde5f9227a4734721b1352bd8bae33579bccfc208cfe43af57e20081a25fb7c32b5926fe0344a16fab497cb7a0de0a2b37c9a60 WHIRLPOOL f1dfc1355bc6f40cbf3414665cf3704e751db56376d8e26dec64f59505ca224e87889064997201c9a3b135167819ca292731e51bdef7baf692fbf69560157639
-DIST nss_db-2.2.3pre1-dbupgrade.patch.bz2 263 SHA256 31052eb79cc4aa60f639a3a57d9225630327ee6c728d62eda1d9c91ea7d70dc3 SHA512 f3c787d2ccec66039e2af08d18f69890192aa95670c9e26066d94249f1f6f3a3f2df17c35b6ba214f9ac9522642c3adce8a9bea98562f33efc907b16334c2512 WHIRLPOOL 73cda93849598dd9b3b86a391dbab7679358eb4084f82d723a58812726c2c9215c7636aeef3756ea0e129efd5fb7d90b4193f2428b094cc5790e946f091a5313
-DIST nss_db-2.2.3pre1-external.patch.bz2 1870 SHA256 dbc45a4dc7c977fae2193e0a14fdb862a5f42479ac40da0d4772d5d66e95ade0 SHA512 6f1c6ed373130c9fa5e4ba7c57d110f42be235b20a30f2fe971de09f8be255e59ac319bd95cc46af50f0ce11e0af482f496cdd6db2318028ad2e7ac2ed4fdc3e WHIRLPOOL de050b229134d60d1c24efdff36c0625b7ffc8f256521a2f3380c6a4dcf3e136e99df5ae41319a7e3a1626477c84dabdfd463cf7aa7f6c41003fd62ce3641092
-DIST nss_db-2.2.3pre1.tar.gz 235360 SHA256 0c5d677a49c7bf6b9318bf40adf335839a668d1c7509e9b1915bd22a9e0ac694 SHA512 f8839cd0bea11e349be1afd7189560993b320d33f9c70da25c8aae03bae91cd6a48b597462d636021cf0e4e477c2bdb37952100bc6b871049c2650d5ee7853ae WHIRLPOOL 3695650757a9f6c5b3cd28f866c0bd0334d686aac2770b1567d0be9658797b32e3bdc4a5e3774fadddbffd9e9eedf40b6eb86058e1b0789dad6925275ccde0a0
diff --git a/sys-libs/nss-db/files/db3.patch b/sys-libs/nss-db/files/db3.patch
deleted file mode 100644
index 2da6ecbd5550..000000000000
--- a/sys-libs/nss-db/files/db3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -u nss_db-2.2.orig/configure.in nss_db-2.2/configure.in
---- nss_db-2.2.orig/configure.in	2003-06-27 11:41:13.000000000 +0200
-+++ nss_db-2.2/configure.in	2003-06-27 11:44:30.000000000 +0200
-@@ -43,22 +43,28 @@
- AC_CHECK_HEADER(db.h,, AC_MSG_ERROR([
- *** Could not find Berkeley DB headers.]))
- 
--AC_CHECK_LIB(db, db_version,, AC_MSG_ERROR([
-+
-+AC_CHECK_LIB(db-3, db_version,, 
-+  AC_CHECK_LIB(db, db_version,,AC_MSG_ERROR([
- *** Could not find Berkeley DB library.]))
-+)
- 
- AC_CACHE_CHECK([Berkeley DB version], nss_db_cv_db_version,
-   [AC_TRY_CPP(
-     [
--#    include <db.h>
--#    ifndef DB_VERSION_STRING
--#     error "Unknown"
--#    endif
--#    if DB_VERSION_MAJOR < 2
--#     error "Too old"
--#    endif
--#    if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 4
--#     error "Too old"
--#    endif
-+    include <db.h>
-+    ifndef DB_VERSION_STRING
-+     error "Unknown"
-+    endif
-+    if DB_VERSION_MAJOR < 2
-+     error "Too old"
-+    endif
-+    if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 4
-+     error "Too old"
-+    endif
-+    if DB_VERSION_MAJOR >= 4
-+     error "Too new"
-+    endif
-     ],
-     nss_db_cv_db_version="ok",
-     nss_db_cv_db_version="not ok")
diff --git a/sys-libs/nss-db/files/nss-db-2.2.3_pre1-root-upgrade-only.patch b/sys-libs/nss-db/files/nss-db-2.2.3_pre1-root-upgrade-only.patch
deleted file mode 100644
index e2db2342e2a4..000000000000
--- a/sys-libs/nss-db/files/nss-db-2.2.3_pre1-root-upgrade-only.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -NuarwbB nss_db-2.2.3pre1.orig/src/db-compat.c nss_db-2.2.3pre1/src/db-compat.c
---- nss_db-2.2.3pre1.orig/src/db-compat.c	2005-06-07 00:08:39.000000000 -0700
-+++ nss_db-2.2.3pre1/src/db-compat.c	2005-06-07 00:53:00.000000000 -0700
-@@ -20,6 +20,9 @@
- #include <assert.h>
- #include <db.h>
- #include <fcntl.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+
- 
- #if DB_VERSION_MAJOR > 2
- 
-@@ -39,8 +42,13 @@
-   if (err)
-     return err;
- 
-+  uid_t uid = geteuid();
-+
-+  if(uid == 0) {
-   /* Make sure we upgrade, in case this is an older database */
-+	  /* However we need root access to do so */
-   db->upgrade(db, file, 0);
-+  }
- 
-   err = db->open (db, NULL, file, NULL, type, flags, mode);
-   if (err)
diff --git a/sys-libs/nss-db/files/nss-db-2.2.3_pre1-symlinkvuln.patch b/sys-libs/nss-db/files/nss-db-2.2.3_pre1-symlinkvuln.patch
deleted file mode 100644
index 54a67b58499b..000000000000
--- a/sys-libs/nss-db/files/nss-db-2.2.3_pre1-symlinkvuln.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -urNad libnss-db-2.2.3pre1~/src/db-XXX.c libnss-db-2.2.3pre1/src/db-XXX.c
---- libnss-db-2.2.3pre1~/src/db-XXX.c	2010-03-30 10:41:48.026483855 -0700
-+++ libnss-db-2.2.3pre1/src/db-XXX.c	2010-03-30 10:41:48.216484130 -0700
-@@ -56,6 +56,7 @@
- 
- /* Maintenance of the shared handle open on the database.  */
- 
-+static DB_ENV *dbenv;
- static DB *db;
- static int keep_db;
- static int entidx;
-@@ -69,7 +70,7 @@
- 
-   pthread_mutex_lock (&lock);
- 
--  status = internal_setent (DBFILE, &db);
-+  status = internal_setent (DBFILE, &db, &dbenv);
- 
-   /* Remember STAYOPEN flag.  */
-   if (db != NULL)
-@@ -89,7 +90,7 @@
- {
-   pthread_mutex_lock (&lock);
- 
--  internal_endent (&db);
-+  internal_endent (&db, &dbenv);
- 
-   /* Reset STAYOPEN flag.  */
-   keep_db = 0;
-@@ -112,7 +113,7 @@
-   /* Open the database.  */
-   if (db == NULL)
-     {
--      status = internal_setent (DBFILE, &db);
-+      status = internal_setent (DBFILE, &db, &dbenv);
-       if (status != NSS_STATUS_SUCCESS)
- 	{
- 	  *errnop = errno;
-@@ -194,7 +195,7 @@
-     }
- 
-   if (! keep_db)
--    internal_endent (&db);
-+    internal_endent (&db, &dbenv);
- 
-   return status;
- }
-diff -urNad libnss-db-2.2.3pre1~/src/db-alias.c libnss-db-2.2.3pre1/src/db-alias.c
---- libnss-db-2.2.3pre1~/src/db-alias.c	2010-03-30 10:41:47.996483420 -0700
-+++ libnss-db-2.2.3pre1/src/db-alias.c	2010-03-30 10:41:48.216484130 -0700
-@@ -34,6 +34,7 @@
- 
- /* Maintenance of the shared handle open on the database.  */
- 
-+static DB_ENV *dbenv;
- static DB *db;
- static int keep_db;
- static unsigned int entidx;	/* Index for `getaliasent_r'. */
-@@ -47,7 +48,7 @@
- 
-   pthread_mutex_lock (&lock);
- 
--  status = internal_setent (_PATH_VARDB "aliases.db", &db);
-+  status = internal_setent (_PATH_VARDB "aliases.db", &db, &dbenv);
- 
-   /* Remember STAYOPEN flag.  */
-   if (db != NULL)
-@@ -68,7 +69,7 @@
- {
-   pthread_mutex_lock (&lock);
- 
--  internal_endent (&db);
-+  internal_endent (&db, &dbenv);
- 
-   /* Reset STAYOPEN flag.  */
-   keep_db = 0;
-@@ -92,7 +93,7 @@
-   /* Open the database.  */
-   if (db == NULL)
-     {
--      status = internal_setent (_PATH_VARDB "aliases.db", &db);
-+      status = internal_setent (_PATH_VARDB "aliases.db", &db, &dbenv);
-       if (status != NSS_STATUS_SUCCESS)
- 	{
- 	  *errnop = errno;
-@@ -165,7 +166,7 @@
-     status = NSS_STATUS_NOTFOUND;
- 
-   if (! keep_db)
--    internal_endent (&db);
-+    internal_endent (&db, &dbenv);
- 
-   return status;
- }
-diff -urNad libnss-db-2.2.3pre1~/src/db-compat.c libnss-db-2.2.3pre1/src/db-compat.c
---- libnss-db-2.2.3pre1~/src/db-compat.c	2010-03-30 10:41:47.956483550 -0700
-+++ libnss-db-2.2.3pre1/src/db-compat.c	2010-03-30 10:41:48.216484130 -0700
-@@ -27,15 +27,14 @@
- 
- int
- db_open (const char *file, DBTYPE type, u_int32_t flags, int mode,
--	 void *dbenv, void *dbinfo, DB **dbp)
-+	 DB_ENV *dbenv, void *dbinfo, DB **dbp)
- {
-   DB *db;
-   int err;
- 
--  assert (dbenv == NULL);
-   assert (dbinfo == NULL);
- 
--  err = db_create (&db, NULL, 0);
-+  err = db_create (&db, dbenv, 0);
-   if (err)
-     return err;
- 
-diff -urNad libnss-db-2.2.3pre1~/src/db-compat.h libnss-db-2.2.3pre1/src/db-compat.h
---- libnss-db-2.2.3pre1~/src/db-compat.h	2001-04-29 18:07:41.000000000 -0700
-+++ libnss-db-2.2.3pre1/src/db-compat.h	2010-03-30 10:41:48.216484130 -0700
-@@ -2,5 +2,5 @@
- 
- #if DB_VERSION_MAJOR > 2
- extern int db_open (const char *__file, DBTYPE __type, u_int32_t __flags,
--		    int __mode, void *__dbenv, void *__dbinfo, DB **__dbp);
-+		    int __mode, DB_ENV *dbenv, void *__dbinfo, DB **__dbp);
- #endif
-diff -urNad libnss-db-2.2.3pre1~/src/db-netgrp.c libnss-db-2.2.3pre1/src/db-netgrp.c
---- libnss-db-2.2.3pre1~/src/db-netgrp.c	2010-03-30 10:41:47.996483420 -0700
-+++ libnss-db-2.2.3pre1/src/db-netgrp.c	2010-03-30 10:41:48.216484130 -0700
-@@ -35,6 +35,7 @@
- static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
- 
- /* Maintenance of the shared handle open on the database.  */
-+static DB_ENV *dbenv;
- static DB *db;
- static char *entry;
- static char *cursor;
-@@ -46,7 +47,7 @@
- 
-   pthread_mutex_lock (&lock);
- 
--  status = internal_setent (DBFILE, &db);
-+  status = internal_setent (DBFILE, &db, &dbenv);
- 
-   if (status == NSS_STATUS_SUCCESS)
-     {
-@@ -72,7 +73,7 @@
- {
-   pthread_mutex_lock (&lock);
- 
--  internal_endent (&db);
-+  internal_endent (&db, &dbenv);
- 
-   pthread_mutex_unlock (&lock);
- 
-diff -urNad libnss-db-2.2.3pre1~/src/db-open.c libnss-db-2.2.3pre1/src/db-open.c
---- libnss-db-2.2.3pre1~/src/db-open.c	2010-03-30 10:41:47.996483420 -0700
-+++ libnss-db-2.2.3pre1/src/db-open.c	2010-03-30 10:42:24.127733451 -0700
-@@ -21,6 +21,9 @@
- #include <db.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <libgen.h>
- 
- #include "db-compat.h"
- 
-@@ -45,35 +48,46 @@
-    handle in *DBP and return NSS_STATUS_SUCCESS.  On failure, return
-    the appropriate lookup status.  */
- enum nss_status
--internal_setent (const char *file, DB **dbp)
-+internal_setent (const char *file, DB **dbp, DB_ENV **dbenvp)
- {
--  DB *db;
-+  char *filecopy = NULL, *home;
-+  DB_ENV *dbenv = NULL;
-+  DB *db = NULL;
-   int err;
-   int fd;
- 
-   if (*dbp)
-     return NSS_STATUS_SUCCESS;
- 
--  err = db_open (file, DB_BTREE, DB_RDONLY, 0, NULL, NULL, &db);
-+  err = db_env_create(&dbenv, 0);
-   if (err != 0)
--    {
--      if (err > 0)
--	errno = err;
--      return NSS_STATUS_UNAVAIL;
--    }
-+    goto fail;
-+  filecopy = strdup(file);
-+  home = dirname(filecopy);
-+  err = dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0);
-+  if (err != 0)
-+    goto fail_env;
-+  err = db_open (file, DB_BTREE, DB_RDONLY, 0, dbenv, NULL, &db);
-+  if (err != 0)
-+   goto fail_env;
- 
-   /* We have to make sure the file is `closed on exec'.  */
-   err = db->fd (db, &fd);
-   if (err)
--    goto fail;
-+    goto fail_db;
-   if (set_cloexec_flag (fd) < 0)
--    goto fail;
-+    goto fail_db;
- 
-+  *dbenvp = dbenv;
-   *dbp = db;
-   return NSS_STATUS_SUCCESS;
- 
-- fail:
-+ fail_db:
-   db->close (db, 0);
-+ fail_env:
-+  dbenv->close (dbenv, 0);
-+ fail:
-+  if (filecopy) free(filecopy);
-   if (err > 0)
-     errno = err;
-   return NSS_STATUS_UNAVAIL;
-@@ -81,8 +95,9 @@
- 
- /* Close the database *DBP.  */
- void
--internal_endent (DB **dbp)
-+internal_endent (DB **dbp, DB_ENV **dbenvp)
- {
-+  DB_ENV *dbenv = *dbenvp;
-   DB *db = *dbp;
- 
-   if (db != NULL)
-@@ -90,4 +105,9 @@
-       db->close (db, 0);
-       *dbp = NULL;
-     }
-+  if (dbenv != NULL)
-+    {
-+      dbenv->close (dbenv, 0);
-+      *dbenvp = NULL;
-+    }
- }
-diff -urNad libnss-db-2.2.3pre1~/src/nss_db.h libnss-db-2.2.3pre1/src/nss_db.h
---- libnss-db-2.2.3pre1~/src/nss_db.h	2001-04-29 18:07:41.000000000 -0700
-+++ libnss-db-2.2.3pre1/src/nss_db.h	2010-03-30 10:41:48.216484130 -0700
-@@ -26,9 +26,9 @@
- /* Open the database stored in FILE.  If succesful, store the database
-    handle in *DBP and return NSS_STATUS_SUCCESS.  On failure, return
-    the appropriate lookup status.  */
--extern enum nss_status internal_setent (const char *file, DB **dbp);
-+extern enum nss_status internal_setent (const char *file, DB **dbp, DB_ENV **dbenvp);
- 
- /* Close the database *DBP.  */
--extern void internal_endent (DB **dbp);
-+extern void internal_endent (DB **dbp, DB_ENV **dbenvp);
- 
- #endif	/* nss_db.h */
-
diff --git a/sys-libs/nss-db/files/remake-all-db b/sys-libs/nss-db/files/remake-all-db
deleted file mode 100644
index eab57a5e7ed8..000000000000
--- a/sys-libs/nss-db/files/remake-all-db
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Written by Robin H. Johnson <robbat2@gentoo.org>
-# 16 Feb 2004
-/usr/bin/make -f /usr/share/nss-db/db-Makefile all
diff --git a/sys-libs/nss-db/files/sandbox.d_50nss-db b/sys-libs/nss-db/files/sandbox.d_50nss-db
deleted file mode 100644
index f8cfba24dd74..000000000000
--- a/sys-libs/nss-db/files/sandbox.d_50nss-db
+++ /dev/null
@@ -1 +0,0 @@
-SANDBOX_PREDICT="/var/db/aliases.db:/var/db/automount.db:/var/db/bootparams.db:/var/db/ethers.db:/var/db/group.db:/var/db/hosts.db:/var/db/netgroup.db:/var/db/netmasks.db:/var/db/networks.db:/var/db/passwd.db:/var/db/protocols.db:/var/db/rpc.db:/var/db/services.db:/var/db/shadow.db"
diff --git a/sys-libs/nss-db/metadata.xml b/sys-libs/nss-db/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/sys-libs/nss-db/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild
deleted file mode 100644
index 5c7e9624e25a..000000000000
--- a/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator multilib autotools
-
-MY_PN="${PN/-/_}"
-MY_PV="${PV/_}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Allows important system files to be stored in a fast database file rather than plain text"
-HOMEPAGE="https://sources.redhat.com/glibc/"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/old-releases/${MY_P}.tar.gz
-		 mirror://gentoo/${MY_P}-external.patch.bz2
-		 mirror://gentoo/${MY_P}-dbupgrade.patch.bz2
-		 mirror://gentoo/${MY_P}-dbopen.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-# awk and make ARE needed at runtime!
-# and this didn't compile on BSD libc either
-RDEPEND=">=sys-libs/db-4
-		 sys-devel/make
-		 >=sys-libs/glibc-2.3
-		 !>=sys-libs/glibc-2.15"
-# We really do need gettext to compile always :-(
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_P}"
-
-db_getver() {
-	local DBPKG
-	DBPKG="$(best_version '>=sys-libs/db-4')"
-	echo "${DBPKG//sys-libs\/db-}"
-}
-
-db_getversym() {
-	local DBVER DBSYMSUFFIX
-	[ -n "${1}" ] && DBVER="${1}" || DBVER="$(db_getver)"
-	DBVER=($(get_version_components "${DBVER}"))
-	if has_version '>=sys-libs/db-4.3'; then
-		DBSYMSUFFIX=""
-	else
-		let DBSYMSUFFIX=(${DBVER[0]}*1000)+${DBVER[1]}
-		DBSYMSUFFIX=_${DBSYMSUFFIX}
-	fi
-	echo "${DBSYMSUFFIX}"
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-external.patch.bz2
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbupgrade.patch.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbopen.patch.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-root-upgrade-only.patch
-
-	# make sure we use the correct version of DB
-	cd "${S}"
-	DB_PV="$(db_getver)"
-	DB_SYM="$(db_getversym ${DB_PV})"
-	DB_PV_MAJORMINOR="$(get_version_component_range 1-2 ${DB_PV})"
-	sed -i configure.in \
-		-e "s!db.h!db${DB_PV_MAJORMINOR}/db.h!g" \
-		-e "s!db, db_version!db-${DB_PV_MAJORMINOR}, db_version${DB_SYM}!g"
-
-	# fix ancient broken-ness
-	for f in po/Makefile.in.in ./intl/Makefile.in; do
-		egrep -q '^mkinstalldirs = .*case.*esac' ${f} && \
-		sed -i ${f} \
-			-e '/^mkinstalldirs = /s,\(mkinstalldirs =\).*,\1 $(top_builddir)/./mkinstalldirs,'
-	done
-
-	# Fixes thanks to Flameeyes
-	cp /usr/share/gettext/config.rpath . # missing
-	sed -i -e '/makedb_LDADD/i makedb_CFLAGS=$(AM_CFLAGS)' src/Makefile.am
-	sed -i -e '/AC_PROG_CC/a AC_PROG_CC_C_O' configure.in
-	eautoreconf
-
-	# This is an evil target and we don't like it
-	sed -i -e '/^install-data-am:.*install-data-local/s,install-data-local,,g' "${S}"/src/Makefile.in
-}
-
-src_compile() {
-	econf -C --libdir=/$(get_libdir) `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" slibdir="/$(get_libdir)" install || \
-		die "failed emake install"
-
-	into /usr
-	insinto /usr/share/${PN}
-	doins db-Makefile
-
-	dosbin "${FILESDIR}"/remake-all-db
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS
-
-	dodir /usr/$(get_libdir)/
-	mv "${D}"/$(get_libdir)/*.la "${D}"/usr/$(get_libdir)/ || \
-		die "failed to set up .la"
-}
diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild
deleted file mode 100644
index 799de9494f85..000000000000
--- a/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator multilib autotools
-
-MY_PN="${PN/-/_}"
-MY_PV="${PV/_}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Allows important system files to be stored in a fast database file rather than plain text"
-HOMEPAGE="https://sources.redhat.com/glibc/"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/old-releases/${MY_P}.tar.gz
-		 mirror://gentoo/${MY_P}-external.patch.bz2
-		 mirror://gentoo/${MY_P}-dbupgrade.patch.bz2
-		 mirror://gentoo/${MY_P}-dbopen.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-# awk and make ARE needed at runtime!
-# and this didn't compile on BSD libc either
-RDEPEND=">=sys-libs/db-4
-		 sys-devel/make
-		 >=sys-libs/glibc-2.3
-		 !>=sys-libs/glibc-2.15"
-# We really do need gettext to compile always :-(
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_P}"
-
-db_getver() {
-	local DBPKG
-	DBPKG="$(best_version '>=sys-libs/db-4')"
-	echo "${DBPKG//sys-libs\/db-}"
-}
-
-db_getversym() {
-	local DBVER DBSYMSUFFIX
-	[ -n "${1}" ] && DBVER="${1}" || DBVER="$(db_getver)"
-	DBVER=($(get_version_components "${DBVER}"))
-	if has_version '>=sys-libs/db-4.3'; then
-		DBSYMSUFFIX=""
-	else
-		let DBSYMSUFFIX=(${DBVER[0]}*1000)+${DBVER[1]}
-		DBSYMSUFFIX=_${DBSYMSUFFIX}
-	fi
-	echo "${DBSYMSUFFIX}"
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-external.patch.bz2
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbupgrade.patch.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbopen.patch.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-root-upgrade-only.patch
-
-	# make sure we use the correct version of DB
-	cd "${S}"
-	DB_PV="$(db_getver)"
-	DB_SYM="$(db_getversym ${DB_PV})"
-	DB_PV_MAJORMINOR="$(get_version_component_range 1-2 ${DB_PV})"
-	sed -i configure.in \
-		-e "s!db.h!db${DB_PV_MAJORMINOR}/db.h!g" \
-		-e "s!db, db_version!db-${DB_PV_MAJORMINOR}, db_version${DB_SYM}!g"
-
-	# fix ancient broken-ness
-	for f in po/Makefile.in.in ./intl/Makefile.in; do
-		egrep -q '^mkinstalldirs = .*case.*esac' ${f} && \
-		sed -i ${f} \
-			-e '/^mkinstalldirs = /s,\(mkinstalldirs =\).*,\1 $(top_builddir)/./mkinstalldirs,'
-	done
-
-	# Fixes thanks to Flameeyes
-	# missing
-	cp /usr/share/gettext/config.rpath .
-	sed -i -e '/makedb_LDADD/i makedb_CFLAGS=$(AM_CFLAGS)' src/Makefile.am
-	sed -i -e '/AC_PROG_CC/a AC_PROG_CC_C_O' configure.in
-	eautoreconf
-
-	# This is an evil target and we don't like it
-	sed -i -e '/^install-data-am:.*install-data-local/s,install-data-local,,g' "${S}"/src/Makefile.in
-}
-
-src_compile() {
-	econf -C --libdir=/$(get_libdir) `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" slibdir="/$(get_libdir)" install || \
-		die "failed emake install"
-
-	into /usr
-	insinto /usr/share/${PN}
-	doins db-Makefile
-
-	dosbin "${FILESDIR}"/remake-all-db
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS
-
-	dodir /usr/$(get_libdir)/
-	mv "${D}"/$(get_libdir)/*.la "${D}"/usr/$(get_libdir)/ || \
-		die "failed to set up .la"
-
-	insinto /etc/sandbox.d/
-	newins "${FILESDIR}"/sandbox.d_50nss-db 50nss-db
-}
diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r4.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r4.ebuild
deleted file mode 100644
index 17076c91ccd5..000000000000
--- a/sys-libs/nss-db/nss-db-2.2.3_pre1-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator multilib autotools
-
-MY_PN="${PN/-/_}"
-MY_PV="${PV/_}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Allows important system files to be stored in a fast database file rather than plain text"
-HOMEPAGE="https://sources.redhat.com/glibc/"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/old-releases/${MY_P}.tar.gz
-		 mirror://gentoo/${MY_P}-external.patch.bz2
-		 mirror://gentoo/${MY_P}-dbupgrade.patch.bz2
-		 mirror://gentoo/${MY_P}-dbopen.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-# awk and make ARE needed at runtime!
-# and this didn't compile on BSD libc either
-RDEPEND=">=sys-libs/db-4
-		 sys-devel/make
-		 >=sys-libs/glibc-2.3
-		 !>=sys-libs/glibc-2.15"
-# We really do need gettext to compile always :-(
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_P}"
-
-db_getver() {
-	local DBPKG
-	DBPKG="$(best_version '>=sys-libs/db-4')"
-	echo "${DBPKG//sys-libs\/db-}"
-}
-
-db_getversym() {
-	local DBVER DBSYMSUFFIX
-	[ -n "${1}" ] && DBVER="${1}" || DBVER="$(db_getver)"
-	DBVER=($(get_version_components "${DBVER}"))
-	if has_version '>=sys-libs/db-4.3'; then
-		DBSYMSUFFIX=""
-	else
-		let DBSYMSUFFIX=(${DBVER[0]}*1000)+${DBVER[1]}
-		DBSYMSUFFIX=_${DBSYMSUFFIX}
-	fi
-	echo "${DBSYMSUFFIX}"
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-external.patch.bz2
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbupgrade.patch.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbopen.patch.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-root-upgrade-only.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-symlinkvuln.patch
-	# make sure we use the correct version of DB
-	cd "${S}"
-	DB_PV="$(db_getver)"
-	DB_SYM="$(db_getversym ${DB_PV})"
-	DB_PV_MAJORMINOR="$(get_version_component_range 1-2 ${DB_PV})"
-	sed -i configure.in \
-		-e "s!db.h!db${DB_PV_MAJORMINOR}/db.h!g" \
-		-e "s!db, db_version!db-${DB_PV_MAJORMINOR}, db_version${DB_SYM}!g"
-
-	# fix ancient broken-ness
-	for f in po/Makefile.in.in ./intl/Makefile.in; do
-		egrep -q '^mkinstalldirs = .*case.*esac' ${f} && \
-		sed -i ${f} \
-			-e '/^mkinstalldirs = /s,\(mkinstalldirs =\).*,\1 $(top_builddir)/./mkinstalldirs,'
-	done
-
-	# Fixes thanks to Flameeyes
-	# missing
-	cp /usr/share/gettext/config.rpath .
-	sed -i -e '/makedb_LDADD/i makedb_CFLAGS=$(AM_CFLAGS)' src/Makefile.am
-	sed -i -e '/AC_PROG_CC/a AC_PROG_CC_C_O' configure.in
-	eautoreconf
-
-	# This is an evil target and we don't like it
-	sed -i -e '/^install-data-am:.*install-data-local/s,install-data-local,,g' "${S}"/src/Makefile.in
-}
-
-src_compile() {
-	econf -C --libdir=/$(get_libdir) `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" slibdir="/$(get_libdir)" install || \
-		die "failed emake install"
-
-	into /usr
-	insinto /usr/share/${PN}
-	doins db-Makefile
-
-	exeinto /usr/sbin
-	dosbin "${FILESDIR}"/remake-all-db
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS
-
-	dodir /usr/$(get_libdir)/
-	mv "${D}"/$(get_libdir)/*.la "${D}"/usr/$(get_libdir)/ || \
-		die "failed to set up .la"
-
-	insinto /etc/sandbox.d/
-	newins "${FILESDIR}"/sandbox.d_50nss-db 50nss-db
-}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 493cf84889d3..44e64fb49ee2 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -2,7 +2,7 @@ DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 WHIRLPOOL 8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3
 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
 DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda
-DIST readline-7.0-beta.tar.gz 2930514 SHA256 a1b44129c77d4869ba1ea837b301df73b806ee8176465c7256a49f8bbd4f37cd SHA512 aee5326e5fc402240defdfaf0fb0e8d29688bec96f479294842129049d2efc07ec5e5f38d3d19d3df3d88d0ba91e942b95eac222b852a761a848514be44161ad WHIRLPOOL c0139d3a9a9887839e3404678e6d22492a1e3e9fd602ba6a5fd7486e47f615ba2529ed848b28a495e2f38570e923cafe2b2e8ab5f481ff96366772d64e831236
+DIST readline-7.0-rc1.tar.gz 2897058 SHA256 bb7e9cd745e9e6609a560ae458c61c22e641cd731eed2c2a2b7bdd93ff80beac SHA512 2a7b0e54bb79824c164f993839c585deff0bcf823cde38b8d48e2a13601df692123d40e0af39959b3b7e5c408b07876aac2d4422279cd18cd2802559a8cdb1f5 WHIRLPOOL 333e330e2d0dd0998d627bf845b24abaee6206c5449dfeab7ad89637014dec90678be9df32f47a5a48515a883ddd86c684dfb3b2e5ed61dbbdd48dab7a852887
 DIST readline43-001 1126 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955 SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc WHIRLPOOL 080c0cffb0637bba2f6819524291c8efd1832b42b7ca619fda551b00ed82558d9c03a6f739b350b8a1de2c32e6ab92fd86137a9620473439c5b6ced6d3a06f91
 DIST readline43-002 738 SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226 SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2 WHIRLPOOL d3b43145a4ed207f353c5b95b52bdb81be31bd5b077ad60152799333ca582c7524c5587a4e0d9a0fc9246a114552f0c26933d2bc8f60e9de2536a8b6ec9f2cda
 DIST readline43-003 2202 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e WHIRLPOOL 076d101812e7a98d445fd447d816fd0b15c9690869f4a567d76287c495c257f85e4e79f11f7e6e8354093613ca1c0a758514672cec98d303279daf597dee2577
diff --git a/sys-libs/readline/readline-7.0_beta.ebuild b/sys-libs/readline/readline-7.0_beta.ebuild
deleted file mode 100644
index 0296a6acda79..000000000000
--- a/sys-libs/readline/readline-7.0_beta.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-case ${PV} in
-*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
-*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/7"  # subslot matches SONAME major
-#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"
-IUSE="static-libs utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--cache-file="${BUILD_DIR}"/config.cache \
-		--docdir=/usr/share/doc/${PF} \
-		--with-curses \
-		$(use_enable static-libs static)
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE=${S}/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
-			ln -sf ../../lib${l}.a lib${l}.a
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc USAGE
-	dohtml -r doc/.
-	docinto ps
-	dodoc doc/*.ps
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
-}
diff --git a/sys-libs/readline/readline-7.0_rc1.ebuild b/sys-libs/readline/readline-7.0_rc1.ebuild
new file mode 100644
index 000000000000..da06224cf867
--- /dev/null
+++ b/sys-libs/readline/readline-7.0_rc1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+case ${PV} in
+*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
+*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/7"  # subslot matches SONAME major
+#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"
+IUSE="static-libs utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--cache-file="${BUILD_DIR}"/config.cache \
+		--docdir=/usr/share/doc/${PF} \
+		--with-curses \
+		$(use_enable static-libs static)
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE=${S}/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
+			ln -sf ../../lib${l}.a lib${l}.a
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc USAGE
+	dohtml -r doc/.
+	docinto ps
+	dodoc doc/*.ps
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
+}
diff --git a/sys-libs/talloc/talloc-2.1.5-r1.ebuild b/sys-libs/talloc/talloc-2.1.5-r1.ebuild
index 98398ca802c6..4f61bf00cb0b 100644
--- a/sys-libs/talloc/talloc-2.1.5-r1.ebuild
+++ b/sys-libs/talloc/talloc-2.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,6 +44,8 @@ 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
+
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 2608a1ae1d79..138f3e9385ed 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,3 +1,2 @@
-DIST tevent-0.9.21.tar.gz 550606 SHA256 f2be7463573dab2d8210cb57fe7e7e2aeb323274cbdc865a6e29ddcfb977f0f4 SHA512 d1d76402bf32c4da9394ec5e0eb149abefa3f4dc86e5d22529f5cc4f30b1d3071e7a00aac3bd5707532e68dfed5a03dc5a267ea367c8fbe0aaead9df63beafdf WHIRLPOOL 4b4525394cdc06a5ce2535216eea8fdcf44dc0b4ab7964506042df3ee67ce9463d82e9b6be3bdd4cd9983ce92a62e3dfc69c6abf66d30b9b6466e863b2c1d7cd
-DIST tevent-0.9.25.tar.gz 573357 SHA256 fedeb0d55a11b3593b562ec09b32e44bd67619ed10e5fa10d1868adb1649c669 SHA512 5cc477bf7a67b2a80c5d663a8382c0006395b17396f5e7ac44ed24b40b58b8a498497b08ed050a2ea838140ad36d60ad3256552c60b3339bf307244f9de4704e WHIRLPOOL 359557ed7cfa3046a141c2a263fea5382576f7554636a1f13b1ba102650d6f8222ac5fa478db4e81fcc31bec01157cd701a8580e635c5ba1823307e45e692b56
 DIST tevent-0.9.26.tar.gz 581664 SHA256 262c14d78ede13f2c4fc5e61485ae7250a201782d94735a1d8412652453370bd SHA512 cc841e4267cdda52d4e236040a82852a29a29427d7d374170cc74b4ff8ec0652f521580a1f69a9b4f2a66d8b2a6e3fcd34f21b2e94d0512dae848d271c090ec1 WHIRLPOOL df159329f30c9bd014be9b33b2f2e6ed1a47b7dd5af7fb964952d1e9aa7d7b72fc3028122b464c933c93253fd72b2f6248af5e7cfbb6d8cfb9259454804618d7
+DIST tevent-0.9.27.tar.gz 580967 SHA256 fbc9ed76aa92f333629b61a1bfa616819704896885937a855e07d3bc0b65c913 SHA512 9e03cbafe738de3bba95ee14f7acb708ba4fc1848d1ebe9ce6b54650db64e34b6fb1eb399d78c6f925d3be38e119303085467c40e448190ed8fd82b6819f494c WHIRLPOOL fd127622050f427c85c64fa10963f0bbb2a2315e0636c859886f9db43ca6738df38b18033a164b603b74119a1d49645e0d30d3423448a460e4fff8fc5e078298
diff --git a/sys-libs/tevent/tevent-0.9.21-r1.ebuild b/sys-libs/tevent/tevent-0.9.21-r1.ebuild
deleted file mode 100644
index d1fadd3a934d..000000000000
--- a/sys-libs/tevent/tevent-0.9.21-r1.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
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="Samba tevent library"
-HOMEPAGE="http://tevent.samba.org/"
-SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
-
-LICENSE="GPL-3"
-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="python"
-
-RDEPEND=">=sys-libs/talloc-2.1.0[python?,${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
-"
-# build system does not work with python3
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		$(multilib_native_usex python '' '--disable-python')
-}
-
-multilib_src_compile() {
-	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
-	unset MAKEOPTS
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	multilib_is_native_abi && use python && python_domodule tevent.py
-}
diff --git a/sys-libs/tevent/tevent-0.9.25.ebuild b/sys-libs/tevent/tevent-0.9.25.ebuild
deleted file mode 100644
index f4ba223c7bac..000000000000
--- a/sys-libs/tevent/tevent-0.9.25.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
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="Samba tevent library"
-HOMEPAGE="http://tevent.samba.org/"
-SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
-
-LICENSE="GPL-3"
-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="python"
-
-RDEPEND=">=sys-libs/talloc-2.1.2[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
-"
-# build system does not work with python3
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		$(multilib_native_usex python '' '--disable-python')
-}
-
-multilib_src_compile() {
-	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
-	unset MAKEOPTS
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	multilib_is_native_abi && use python && python_domodule tevent.py
-}
diff --git a/sys-libs/tevent/tevent-0.9.27.ebuild b/sys-libs/tevent/tevent-0.9.27.ebuild
new file mode 100644
index 000000000000..5bbd329d57f7
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.9.27.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="http://tevent.samba.org/"
+SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+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="python"
+
+RDEPEND=">=sys-libs/talloc-2.1.5[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	${PYTHON_DEPS}
+"
+# build system does not work with python3
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 74588556428b..7144a3ca08af 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,2 +1,3 @@
 DIST upower-0.99.2.tar.xz 428668 SHA256 e9dc453adf96b89c92ccccd33f2b6543258344f7c8ba89460dc0a92a8180946f SHA512 a7859c91078140f460556ecf998a706b403d5ed2ff073fffa93730c95e62a8ec00b91f6669d74afd8d0ada73d75b27320d52a3589765712dc078f78a28ea527b WHIRLPOOL 42abf07947bcd1709045d3a0c945161b98a422e90c31ebda7a69783ee8915ecd9d048713412b3f1e26d4db96f85a4bf6e1d63b310f9fc5aa20519bb2e3c51f32
 DIST upower-0.99.3.tar.xz 429252 SHA256 697199bcc113bb069e6fb6bf4135536a702ba9847e46c5fc6df87d19624ddd38 SHA512 665b5b03605910b3a2d3f32e4846c2b2ab4c91ba91c55dde8c5b8ab3856f3d6fea5efac20fdb608050b57979ed344ef630c76acc0b3f858e8c5168f6adeb2d64 WHIRLPOOL c6543518d64c1628763695a10f81d6ae9b48f252c7a7ee68deb1249489329414101a620c1f529c8f76e460713faeb0077c75489466c6aeb54008590b49441181
+DIST upower-0.99.4.tar.xz 426292 SHA256 9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0 SHA512 b3fdee5ccf5f4d0c69e227f543272f6952119132814e27bc8f112716b8d36b5e07741a87bcf02203e80ef910cad9ddffa1adecb338c9a9aaa5e1038b62be07f3 WHIRLPOOL f203682b272e2f9ff7b48a1b4ee359569cbce2314edc599bfc82182e274d95446a8b59228e1dc250db9b823efdd8129cb99022b498f6d7af3b79bbc7ccb42f0f
diff --git a/sys-power/upower/upower-0.99.4.ebuild b/sys-power/upower/upower-0.99.4.ebuild
new file mode 100644
index 000000000000..844b4ac8f68a
--- /dev/null
+++ b/sys-power/upower/upower-0.99.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="http://upower.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
+
+COMMON_DEPS="
+	>=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.34:2
+	sys-apps/dbus:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	kernel_linux? (
+		virtual/libusb:1
+		virtual/libgudev:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-1:=
+			)
+		)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPS}
+	doc? ( dev-util/gtk-doc )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/intltool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+DOCS="AUTHORS HACKING NEWS README"
+
+src_prepare() {
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+}
+
+src_configure() {
+	local backend myconf
+
+	if use kernel_linux; then
+		backend=linux
+	elif use kernel_FreeBSD; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	econf \
+		$(use_enable doc gtk-doc) \
+		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable introspection) \
+		--disable-static \
+		${myconf} \
+		--enable-man-pages \
+		--disable-tests \
+		--with-backend=${backend} \
+		$(use_with ios idevice) \
+		"$(systemd_with_utildir)" \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}
diff --git a/sys-process/audit/audit-2.4.3-r1.ebuild b/sys-process/audit/audit-2.4.3-r1.ebuild
index 87c829ff5933..100921de60cb 100644
--- a/sys-process/audit/audit-2.4.3-r1.ebuild
+++ b/sys-process/audit/audit-2.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ldap python"
 # Testcases are pretty useless as they are built for RedHat users/groups and
 # kernels.
diff --git a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild b/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
index 49a72261b304..745fd7a616aa 100644
--- a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
+++ b/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index c0cae6b038a0..31b2147ca1e3 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,3 +1,4 @@
 DIST Glances-2.2.1.tar.gz 3458958 SHA256 81d2a9b7132d70b4a156a61a724201bd70ab2edea01bf32e1b279fc4f765f7d5 SHA512 c7fa7431f0c503adae89702b52e51f7dc2f2beaa42d43a849896673d26e94a40a60f2511adb4404b31c8d91ef07244b8b0292924a5df8433afe1d2e2b656b383 WHIRLPOOL a32fd1a12eccb34d4616c23262535fd6a47fa334a5505ea601e560206f3ec5f32f4726ada28a736ed47b6ca81ec6cbada491e6d58a47385bc6b8433a4932aa8d
 DIST Glances-2.3.tar.gz 3918915 SHA256 b56bb17505b72862358b2d31b6b9a7c0f9045105454d1de0ffed416ad2883612 SHA512 e331ea09200c87311c0dd7fb60efda6a0015ebd8773624ed5cb519bbfa37152fb9d2d0d3aa3e7bef3ce617c4ea5dbf05a019bf857126637364119a7f9d70ebfa WHIRLPOOL 99c8ff2e254abf65ed5c86604fc2baaf8ad973cf9c21b536069cf27802930cb6b7a7b4ccf5b454804d061c5203fda68b2ba712350af9ce132f185051e448c8b9
 DIST Glances-2.4.2.tar.gz 5497895 SHA256 31f1e4c2e129904a373f3b20d6800472375e415e01161168469ccebb320c9517 SHA512 ada7e2a9766dec54b26fa1fccac3b1abe6b9abcc16a96c6bb30d537370648732a99cff41c6c812908531a4995e118cb3d1127196184f40dee7a01a6a8a85d9b9 WHIRLPOOL 91cd5dfbe891c16bbbe5c6ae17500498c230d36a0795ba134a0384770cae04cbdf08b5236fd56157e438eaff17a7bd9cac3bc42bee7980239faf5c9fc18fc683
+DIST Glances-2.5.1.tar.gz 5807072 SHA256 d3db40ce50b7157a94195aa0076d0eadae85dc4f24557e51c3b1a4dbd972359e SHA512 ea099f5db7e73676aaedcd8b416708f2374de57afe0b8292b86f2d0e6295053f0af7bfdb51e3e6cafcb3d7f2b967b788c8d2d1ec806256d2e11b413a7e25ed98 WHIRLPOOL 64a758068436647027a602095194bffdea3cb8b8ac04107b1306f15aa69f23a2c2e9d8b2d222c18434ad5cf26f88e12dd63e4a30b17b3f8665355f0d9d8f292c
diff --git a/sys-process/glances/glances-2.5.1.ebuild b/sys-process/glances/glances-2.5.1.ebuild
new file mode 100644
index 000000000000..d3cccbb7a54e
--- /dev/null
+++ b/sys-process/glances/glances-2.5.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 eutils linux-info
+
+MYPN=Glances
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+# There is another optional extra batinfo, absent from portage
+RDEPEND="${DEPEND}
+	>=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+S="${WORKDIR}/${MYP}"
+
+# Remove duplicate entries of a prebuilt doc build and
+# ensure install of the file glances.conf in /etc/${PN}
+PATCHES=( "${FILESDIR}"/2.4.2-setup-data.patch )
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+python_install_all() {
+	# add an intended file from original data set from setup.py to DOCS
+	local DOCS=( README.rst conf/glances.conf )
+	# setup for pre-built html docs in setup.py
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Web server mode" dev-python/bottle
+	# https://bitbucket.org/gleb_zhulik/py3sensors
+	#optfeature "Hardware monitoring support" dev-python/py3sensors
+	optfeature "Monitor hard drive temperatures" app-admin/hddtemp
+	optfeature "Battery monitoring support" dev-python/batinfo
+	optfeature "RAID support" dev-python/pymdstat
+	optfeature "SNMP support" dev-python/pysnmp
+	optfeature "Autodiscover mode" dev-python/zeroconf
+	optfeature "IP plugin" dev-python/netifaces
+	optfeature "InfluxDB export module" dev-python/influxdb
+	optfeature "StatsD export module" dev-python/statsd
+	optfeature "Action script feature" dev-python/pystache
+	optfeature "Docker monitoring support" dev-python/docker-py
+	optfeature "Graphical / chart support" dev-python/matplotlib
+	optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
+	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
+}
diff --git a/sys-process/htop/files/htop-2.0.0-commlen.patch b/sys-process/htop/files/htop-2.0.0-commlen.patch
new file mode 100644
index 000000000000..f44e43ebbeb2
--- /dev/null
+++ b/sys-process/htop/files/htop-2.0.0-commlen.patch
@@ -0,0 +1,22 @@
+From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001
+From: Hisham <hisham@gobolinux.org>
+Date: Sat, 13 Feb 2016 02:18:28 -0200
+Subject: [PATCH] Fix buffer reuse.
+
+---
+ linux/LinuxProcessList.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
+index 591210e..ec643ab 100644
+--- a/linux/LinuxProcessList.c
++++ b/linux/LinuxProcessList.c
+@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess* process, const char* dirn
+ }
+ 
+ static void setCommand(Process* process, const char* command, int len) {
+-   if (process->comm && process->commLen <= len) {
++   if (process->comm && process->commLen >= len) {
+       strncpy(process->comm, command, len + 1);
+    } else {
+       free(process->comm);
diff --git a/sys-process/htop/htop-2.0.0-r1.ebuild b/sys-process/htop/htop-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..f7224ea0f5e1
--- /dev/null
+++ b/sys-process/htop/htop-2.0.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_FreeBSD kernel_linux 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"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-tinfo.patch"
+	"${FILESDIR}/${P}-commlen.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
+
+	default
+	eautoreconf
+}
+
+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+=(
+		# fails to build against recent hwloc versions
+		--disable-hwloc
+		--enable-native-affinity
+		--enable-taskstats
+		$(use_enable kernel_linux cgroup)
+		$(use_enable openvz)
+		$(use_enable unicode)
+		$(use_enable vserver)
+	)
+	econf ${myeconfargs[@]}
+}
diff --git a/sys-process/htop/htop-2.0.0.ebuild b/sys-process/htop/htop-2.0.0.ebuild
index 40725cb5add0..cef5dc5530f3 100644
--- a/sys-process/htop/htop-2.0.0.ebuild
+++ b/sys-process/htop/htop-2.0.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses:0=[unicode?]"
diff --git a/sys-process/xjobs/Manifest b/sys-process/xjobs/Manifest
index af0c065333f6..52ea6c1f55d5 100644
--- a/sys-process/xjobs/Manifest
+++ b/sys-process/xjobs/Manifest
@@ -1 +1,2 @@
 DIST xjobs-20140125.tgz 95439 SHA256 cbe582b1109c380bd80a02eb21b721dcfc5ef701446bfc9606b99246a84e737a SHA512 f95f42824a133881aa86ba07095bd4bef87bf628cae1fe73f2ce6e00bc7e327382e28d808cd13db1a781cb1d357167896cbda663382b16bb87861a2587478644 WHIRLPOOL 1b56d7a02e6cb738a47b3676943aef421a1db6502c249a07dd80268c3cb1c11bbcb5e8dfb2aabb9bb2ba3ef742c1b0584ee9526147fd35a1156b4f9ff2c04f80
+DIST xjobs-20151016.tgz 97553 SHA256 1b80abe5effe057db21897f897842dccd76e7812c1caaa80f9b8e85cca409251 SHA512 f8df8c4f3174bde08294d925678e3e1b87e096ce8eff3425613eaf325a2cc2ee0d58f52fea01c929dba35a96879a7bb7bc23b5f1a3e64b57d38dd1daaf9839bf WHIRLPOOL e4d19ffa74dc1780d0e0a1ddd7eaee8585c520dd05343674c7798ee56949c949c5c4e7113ca16851f6eee6542f9e4bd37cd88bdaba4deb53ddf896756f77ce00
diff --git a/sys-process/xjobs/xjobs-20151016.ebuild b/sys-process/xjobs/xjobs-20151016.ebuild
new file mode 100644
index 000000000000..89ba04484af7
--- /dev/null
+++ b/sys-process/xjobs/xjobs-20151016.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Reads commands line by line and executes them in parallel"
+HOMEPAGE="http://www.maier-komor.de/xjobs.html"
+SRC_URI="http://www.maier-komor.de/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/flex"
+RDEPEND=""
diff --git a/virtual/jack/jack-0.ebuild b/virtual/jack/jack-0.ebuild
new file mode 100644
index 000000000000..fd6c440d5fef
--- /dev/null
+++ b/virtual/jack/jack-0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for JACK Audio Connection Kit"
+HOMEPAGE=""
+SRC_URI=""
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+LICENSE=""
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]
+		media-sound/jack2[${MULTILIB_USEDEP}]
+	)"
diff --git a/virtual/jack/metadata.xml b/virtual/jack/metadata.xml
new file mode 100644
index 000000000000..009e0e9e4ae2
--- /dev/null
+++ b/virtual/jack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/virtual/perl6/metadata.xml b/virtual/perl6/metadata.xml
new file mode 100644
index 000000000000..15f71f0f2fa8
--- /dev/null
+++ b/virtual/perl6/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>perl@gentoo.org</email>
+	<name>perl</name>
+</maintainer>
+</pkgmetadata>
diff --git a/virtual/perl6/perl6-0.ebuild b/virtual/perl6/perl6-0.ebuild
new file mode 100644
index 000000000000..165fb100deb4
--- /dev/null
+++ b/virtual/perl6/perl6-0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Convenience virtual for perl6"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="dev-lang/rakudo"
diff --git a/virtual/python-imaging/metadata.xml b/virtual/python-imaging/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/virtual/python-imaging/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/python-imaging/python-imaging-2.ebuild b/virtual/python-imaging/python-imaging-2.ebuild
deleted file mode 100644
index 9b30f0594c64..000000000000
--- a/virtual/python-imaging/python-imaging-2.ebuild
+++ /dev/null
@@ -1,20 +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,5} pypy )
-
-inherit python-r1
-
-DESCRIPTION="Virtual for Python Imaging Library"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="jpeg tk"
-
-RDEPEND="dev-python/pillow[jpeg?,tk?,${PYTHON_USEDEP}]"
diff --git a/www-apache/mod_auth_openid/Manifest b/www-apache/mod_auth_openid/Manifest
deleted file mode 100644
index 010709f8fd8a..000000000000
--- a/www-apache/mod_auth_openid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_auth_openid-0.8.tar.gz 355531 SHA256 86812c9659e2b36b3d2cac98cdcb97d743d08ca76120159f20cc77800947445a SHA512 3994585fa26c42fde8ab76992c62c8a486316bd418bc2eac65e1390bbcd87e3b96fc1b58cb3645e749cb0cfc74811bb5035bc014f0b95bf6f037ec9f5c0ac7e2 WHIRLPOOL 3963b743735b0557503b186d8d0b1d2d35e6b6554bb155a1e595d512e93a84ea28123b1fa3ef2d493f4e8bddbe9fd141f68fdc72d31200fed5d601dd7ba20eb0
diff --git a/www-apache/mod_auth_openid/files/10_mod_auth_openid.conf b/www-apache/mod_auth_openid/files/10_mod_auth_openid.conf
deleted file mode 100644
index 2364dc36b3e9..000000000000
--- a/www-apache/mod_auth_openid/files/10_mod_auth_openid.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfDefine AUTH_OPENID>
-LoadModule authopenid_module modules/mod_auth_openid.so
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_openid/metadata.xml b/www-apache/mod_auth_openid/metadata.xml
deleted file mode 100644
index 0a9650cf0026..000000000000
--- a/www-apache/mod_auth_openid/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">bmuller/mod_auth_openid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apache/mod_auth_openid/mod_auth_openid-0.8.ebuild b/www-apache/mod_auth_openid/mod_auth_openid-0.8.ebuild
deleted file mode 100644
index 8caec457bcde..000000000000
--- a/www-apache/mod_auth_openid/mod_auth_openid-0.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit apache-module
-
-DESCRIPTION="An OpenID authentication module for the apache webserver"
-HOMEPAGE="http://findingscience.com/mod_auth_openid/"
-SRC_URI="https://github.com/bmuller/mod_auth_openid/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3
-	dev-libs/libpcre
-	>=net-libs/libopkele-2.0
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="AUTH_OPENID"
-
-need_apache2
-
-src_configure() {
-	econf --with-apxs="${APXS}" \
-		--with-sqlite3=/usr \
-		--with-apr-config=/usr/bin/apr-1-config
-}
-
-src_compile() {
-	# default src_compile fails
-	emake
-}
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index cb7fcad096c2..7211ad87e653 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -1,2 +1 @@
-DIST resin-4.0.26-src.zip 17879008 SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512 WHIRLPOOL a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
-DIST resin-gentoo-patches-4.0.26.tar.bz2 3826 SHA256 adff1fb68e38af68add2e16e3832406a105e14532ee022ad315a955d6d6f4f31 SHA512 fc23c6b82f55b76c063276169e8b6be40ab697dfa07ab8f8f560db33b9c48993526f07190b137406f952e0d1a548cc45f30b6a9ceb4983e2a9eed5de8f4ab5d3 WHIRLPOOL cf7403adcdd0b98fcab2ace7733af7e9fa57361f9e2b2fb128ee8c3a9d787c5e8437f6749889cea1aacbf1ec9b9725647e6737fe4e3d1a98d69d1965c129c2d2
+DIST resin-4.0.47-src.tar.gz 33022378 SHA256 b97ce450a1059336a4cdf05a16d072128009f7172d028a3b1c2f4eefba4d353a SHA512 c070277c970144a990c45afc86b0626d424618c0ec8122cd7e0e60745339a7f79f5d47483b5a33c24f7fb192e72a2d49823155718b8565a2c273333119279703 WHIRLPOOL 3e703a7c68c0c6cc930277e918656d11a1ff65e5f8bbfccb9dac7ea41b22a7f65b2d28efae8fdbaa181402d0416d87db56f9c974f76f2d5d075db92df8a32f0c
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild
deleted file mode 100644
index 7549272cfcec..000000000000
--- a/www-apache/mod_caucho/mod_caucho-4.0.26-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils apache-module autotools
-
-DESCRIPTION="mod_caucho connects Resin and Apache2"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	~virtual/jre-1.6.0"
-RDEPEND="~virtual/jre-1.6.0"
-
-S="${WORKDIR}/resin-${PV}"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="CAUCHO"
-APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
-
-need_apache2_4
-
-src_prepare() {
-	# Apache 2.4
-	sed -i \
-		-e 's/remote_ip/client_ip/g' \
-		-e 's/remote_addr/client_addr/g' \
-		modules/c/src/apache2/mod_caucho.c || die
-
-	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
-		epatch "${i}"
-	done
-
-	mkdir m4
-	eautoreconf
-	chmod 755 ./configure
-}
-
-src_configure() {
-	econf --with-apxs=${APXS} --with-java-home=/usr
-}
-
-src_compile() {
-	emake -C "${S}/modules/c/src/apache2/"
-}
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild
deleted file mode 100644
index aa80f16a34bf..000000000000
--- a/www-apache/mod_caucho/mod_caucho-4.0.26.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils apache-module autotools
-
-DESCRIPTION="mod_caucho connects Resin and Apache2"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	~virtual/jre-1.6.0"
-RDEPEND="~virtual/jre-1.6.0"
-
-S="${WORKDIR}/resin-${PV}"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="CAUCHO"
-APACHE2_MOD_FILE="${S}/modules/c/src/apache2/.libs/${PN}.so"
-
-need_apache2_2
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
-		epatch "${i}"
-	done
-
-	mkdir m4
-	eautoreconf
-	chmod 755 ./configure
-}
-
-src_configure() {
-	econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
-}
-
-src_compile() {
-	emake -C "${S}/modules/c/src/apache2/" || die "emake failed"
-}
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild
new file mode 100644
index 000000000000..7ec8139249ec
--- /dev/null
+++ b/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils apache-module
+
+DESCRIPTION="mod_caucho connects Resin and Apache2"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+need_apache2_4
+
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="CAUCHO"
+
+S="${WORKDIR}/resin-${PV}"
+
+# Although building this manually with apxs is bad, trying to make the
+# build scripts behave is worse. You have to:
+#
+# * Patch configure.ac and Makefile.in to respect flags.
+# * Run eautoreconf (or patch configure and chmod it too).
+# * Inherit java-pkg-2, DEPEND on virtual/jdk, and define pkg_setup just
+#   to needlessly satisfy configure or patch out large chunks of it.
+# * Define src_compile to only build the Apache module.
+# * It will still report an implicit declaration of cse_free. If you try
+#   to fix this, it will complain that the argument count doesn't match.
+
+APXS2_S="${S}/modules/c/src/apache2"
+APXS2_ARGS="-c -DAPACHE_24 -I../common ${PN}.c ../common/stream.c ../common/config.c ../common/memory.c"
+
+src_configure() {
+	:
+}
diff --git a/www-apache/mod_python/files/mod_python-3.5.0-version.patch b/www-apache/mod_python/files/mod_python-3.5.0-version.patch
new file mode 100644
index 000000000000..3c56c4d52188
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-3.5.0-version.patch
@@ -0,0 +1,121 @@
+taken from upstream
+
+https://bugs.gentoo.org/531154
+
+From 976a674b42f9647865d40fa417e7a3dc56a16e6e Mon Sep 17 00:00:00 2001
+From: Grisha Trubetskoy <grisha@modpython.org>
+Date: Thu, 19 Dec 2013 12:23:18 -0500
+Subject: [PATCH] Fixes for compile without git, correct how git revision hash
+ is generated (skip it if it's a tag or no git available or we are not working
+ with a checkin), also fix a bash-dependency (helps on Solaris), and a couple
+ of cross-platform awk fixes in configure.
+
+---
+ configure.in                |  6 +++---
+ dist/version.sh             | 15 +++++++++++++--
+ src/Makefile.in             | 14 +++++---------
+ src/include/mod_python.h    |  1 -
+ src/include/mod_python.h.in |  1 -
+ src/include/mp_version.h    |  2 --
+ 6 files changed, 21 insertions(+), 18 deletions(-)
+
+diff --git a/dist/version.sh b/dist/version.sh
+index 1060b4f..e50000d 100755
+--- a/dist/version.sh
++++ b/dist/version.sh
+@@ -5,6 +5,17 @@ MPV_PATH="`dirname $0`/../src/include/mp_version.h"
+ MAJ=`awk '/MP_VERSION_MAJOR/ {print $3}' $MPV_PATH`
+ MIN=`awk '/MP_VERSION_MINOR/ {print $3}' $MPV_PATH`
+ PCH=`awk '/MP_VERSION_PATCH/ {print $3}' $MPV_PATH`
+-GIT=`git describe --always`
+ 
+-echo $MAJ.$MIN.$PCH-$GIT
++# if git exists in path
++if type git >/dev/null 2>&1; then
++    # and we are in a checkout
++    if git rev-parse 2>/dev/null; then
++        # but not on a tag (which means this is a release)
++        if test -z "`git log 'HEAD^!' --format=%d 2>/dev/null | grep 'tag: '`"; then
++            # append git revision hash to version
++            GIT="-`git describe --always`"
++        fi
++    fi
++fi
++
++echo $MAJ.$MIN.$PCH$GIT
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c3b3fb2..081c954 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -50,7 +50,7 @@ psp_parser.c: psp_parser.l
+ 
+ dso:	mod_python.so
+ 
+-mod_python.so: $(SRCS) @SOLARIS_HACKS@ 
++mod_python.so: $(SRCS) @SOLARIS_HACKS@
+ 	@echo
+ 	@echo 'Building mod_python.so.'
+ 	@echo
+@@ -64,21 +64,17 @@ distclean: clean
+ 	rm -f Makefile .depend
+ 
+ version.c:
+-	@MP_GIT_SHA=$$(git describe --always); \
+-	echo > version.c ; \
++	@echo > version.c ; \
+ 	echo "/* THIS FILE IS AUTO-GENERATED BY Makefile */" >> version.c ; \
+ 	echo "#include \"mp_version.h\"" >> version.c ; \
+-	echo "const char * const mp_git_sha = \"$${MP_GIT_SHA}\";" >> version.c ; \
+ 	echo "const int mp_version_major = MP_VERSION_MAJOR;" >> version.c ; \
+ 	echo "const int mp_version_minor = MP_VERSION_MINOR;" >> version.c ; \
+ 	echo "const int mp_version_patch = MP_VERSION_PATCH;" >> version.c ; \
+-	echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c ; \
+-	echo "const char * const mp_version_component = \"mod_python/\" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c
+-
+-#	echo "const char * const mp_version_component = \"mod_python/\" #MP_VERSION_MAJOR \".\" #MP_VERSION_MINOR \".\" #MP_VERSION_PATCH \"-$${MP_GIT_SHA}\";" >> version.c
++	echo "const char * const mp_version_string = \"`../dist/version.sh`\";" >> version.c ; \
++	echo "const char * const mp_version_component = \"mod_python/\" \"`../dist/version.sh`\";" >> version.c
+ 
+ # this is a hack to help avoid a gcc/solaris problem
+-# python uses assert() which needs _eprintf(). See 
++# python uses assert() which needs _eprintf(). See
+ # SOLARIS_HACKS above
+ _eprintf.o:
+ 	ar -x `gcc -print-libgcc-file-name` _eprintf.o
+diff --git a/src/include/mod_python.h b/src/include/mod_python.h
+index 061146b..68a77d4 100644
+--- a/src/include/mod_python.h
++++ b/src/include/mod_python.h
+@@ -156,7 +156,6 @@ extern module AP_MODULE_DECLARE_DATA python_module;
+ #define MUTEX_DIR "/tmp"
+ 
+ /* version stuff */
+-extern const char * const mp_git_sha;
+ extern const int mp_version_major;
+ extern const int mp_version_minor;
+ extern const int mp_version_patch;
+diff --git a/src/include/mod_python.h.in b/src/include/mod_python.h.in
+index 4b6f1fb..7d536c5 100644
+--- a/src/include/mod_python.h.in
++++ b/src/include/mod_python.h.in
+@@ -156,7 +156,6 @@ extern module AP_MODULE_DECLARE_DATA python_module;
+ #define MUTEX_DIR "@MUTEX_DIR@"
+ 
+ /* version stuff */
+-extern const char * const mp_git_sha;
+ extern const int mp_version_major;
+ extern const int mp_version_minor;
+ extern const int mp_version_patch;
+diff --git a/src/include/mp_version.h b/src/include/mp_version.h
+index 4b3a494..5ed83a1 100644
+--- a/src/include/mp_version.h
++++ b/src/include/mp_version.h
+@@ -10,5 +10,3 @@
+ #define MP_VERSION_MINOR 5
+ #define MP_VERSION_PATCH 0
+ 
+-#define STR(x) #x
+-#define MP_VERSION_STRING(maj, min, p) STR(maj) "." STR(min) "." STR(p)
+-- 
+2.6.2
+
diff --git a/www-apache/mod_python/mod_python-3.5.0-r1.ebuild b/www-apache/mod_python/mod_python-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..41b02e4d0372
--- /dev/null
+++ b/www-apache/mod_python/mod_python-3.5.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 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 apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module providing an embedded Python interpreter"
+HOMEPAGE="http://modpython.org/"
+SRC_URI="http://dist.modpython.org/dist/${P}.tgz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+
+APACHE2_MOD_CONF="16_${PN}"
+APACHE2_MOD_DEFINE="PYTHON"
+need_apache2
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		app-admin/apache-tools
+		net-misc/curl
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+	epatch "${FILESDIR}"/${P}-version.patch #531154
+
+	export CFLAGS="$(apxs2 -q CFLAGS)"
+	export LDFLAGS="$(apxs2 -q LDFLAGS)"
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	cd test || die
+	PYTHONPATH="$(ls -d ${S}/dist/build/lib.*)" ${PYTHON} test.py || die
+}
+
+src_install() {
+	default
+
+	use doc && dohtml -r doc-html/*
+
+	apache-module_src_install
+}
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
index 8b165a9f45fa..31b2e461f344 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apache/mpm_itk/Manifest b/www-apache/mpm_itk/Manifest
index caeeb7133a46..d556d262e111 100644
--- a/www-apache/mpm_itk/Manifest
+++ b/www-apache/mpm_itk/Manifest
@@ -1 +1 @@
-DIST mpm-itk-2.4.7-03.tar.gz 45419 SHA256 9479fabd97dbbff5aec0fe60ae2437606dc66302a69933c9a597c015d6c937f6 SHA512 f7f517b55cf8c5d42df8029409be8d1fbd58b3d3d2117c6391e5fb8165bcd58aed42e011cf9fa69ae428c546a070ebe9be4d2e4201ec9b48559829c1295bf3bb WHIRLPOOL 73d2a5307a988775693f55d6e3f521341b43fc886100fbce0f97343775aae33941abd94d60fb0259d3adc6c795c1f2b2550b05c79163cd6101a41a1678bc75e8
+DIST mpm-itk-2.4.7-04.tar.gz 45843 SHA256 609f83e8995416c5491348e07139f26046a579db20cf8488ebf75d314668efcf SHA512 4c6f02bbe3aa4e1af2e912b6a49751dedf976901484b4f55ff67757c2f40077a330e41bcfbe1cb433a8ec8870055b0533658e85042887aa94ccf14638eade178 WHIRLPOOL a91325d7eaed4cb011207de59161c7879748afec2d34b102b88558c4d78e9c6cad8165e7d112345667891bf424cd066861f8369361045d5da2b60b9859107407
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
deleted file mode 100644
index b930c1ea041d..000000000000
--- a/www-apache/mpm_itk/mpm_itk-2.4.7_p3.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
-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_p4-r1.ebuild b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
new file mode 100644
index 000000000000..4a9c46c6ab22
--- /dev/null
+++ b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 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-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
new file mode 100644
index 000000000000..aec92c54c20d
--- /dev/null
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit depend.apache perl-module webapp
+
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="Apache gallery for mod_perl"
+SRC_URI="http://apachegallery.dk/download/${MY_P}.tar.gz"
+HOMEPAGE="http://apachegallery.dk/"
+
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="${DEPEND}
+	=dev-lang/perl-5*
+	=www-apache/libapreq2-2*[perl]
+	>=media-libs/imlib2-1.0.6-r1
+	dev-perl/URI
+	>=dev-perl/Image-Info-1.40.0
+	>=dev-perl/Image-Size-2.990.0
+	dev-perl/text-template
+	>=dev-perl/CGI-3.08
+	dev-perl/Image-Imlib2
+"
+
+need_apache2
+
+src_install() {
+	perl-module_src_install
+	webapp_src_preinst
+
+	dodoc Changes INSTALL README TODO UPGRADE || die
+
+	insinto "${MY_ICONSDIR}"/gallery
+	doins htdocs/*.png
+
+	dodir "${MY_HOSTROOTDIR}"/${PN}/templates/default
+	dodir "${MY_HOSTROOTDIR}"/${PN}/templates/new
+
+	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/default
+	doins templates/default/*
+
+	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/new
+	doins templates/new/*
+
+	insinto "${APACHE_VHOSTS_CONFDIR}"
+	doins "${FILESDIR}"/76_apache2-gallery.conf
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
deleted file mode 100644
index bea6836fa041..000000000000
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.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"
-
-inherit depend.apache perl-module webapp
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Apache gallery for mod_perl"
-SRC_URI="http://apachegallery.dk/download/${MY_P}.tar.gz"
-HOMEPAGE="http://apachegallery.dk/"
-
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="${DEPEND}
-	=dev-lang/perl-5*
-	=www-apache/libapreq2-2*[perl]
-	>=media-libs/imlib2-1.0.6-r1
-	dev-perl/URI
-	>=dev-perl/ImageInfo-1.04-r2
-	>=dev-perl/ImageSize-2.99-r1
-	dev-perl/text-template
-	>=dev-perl/CGI-3.08
-	dev-perl/Image-Imlib2
-"
-
-need_apache2
-
-src_install() {
-	perl-module_src_install
-	webapp_src_preinst
-
-	dodoc Changes INSTALL README TODO UPGRADE || die
-
-	insinto "${MY_ICONSDIR}"/gallery
-	doins htdocs/*.png
-
-	dodir "${MY_HOSTROOTDIR}"/${PN}/templates/default
-	dodir "${MY_HOSTROOTDIR}"/${PN}/templates/new
-
-	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/default
-	doins templates/default/*
-
-	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/new
-	doins templates/new/*
-
-	insinto "${APACHE_VHOSTS_CONFDIR}"
-	doins "${FILESDIR}"/76_apache2-gallery.conf
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index a339c0313810..112a8dc81778 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -13,7 +13,7 @@ inherit webapp eutils multilib user toolchain-funcs git-2
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="http://git.zx2c4.com/cgit/about"
 SRC_URI=""
-EGIT_REPO_URI="git://git.zx2c4.com/cgit"
+EGIT_REPO_URI="https://git.zx2c4.com/cgit"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-apps/davical/davical-1.0.2-r2.ebuild b/www-apps/davical/davical-1.0.2-r2.ebuild
index fc3657b72ab6..1614cad8bfc7 100644
--- a/www-apps/davical/davical-1.0.2-r2.ebuild
+++ b/www-apps/davical/davical-1.0.2-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit webapp
+inherit webapp eutils
 
 DESCRIPTION="A CalDAV and CardDAV Server"
 HOMEPAGE="http://davical.org/"
diff --git a/www-apps/davical/davical-1.1.0-r1.ebuild b/www-apps/davical/davical-1.1.0-r1.ebuild
index 3c1d90b30250..e647cf73450a 100644
--- a/www-apps/davical/davical-1.1.0-r1.ebuild
+++ b/www-apps/davical/davical-1.1.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit webapp
+inherit webapp eutils
 
 DESCRIPTION="A CalDAV and CardDAV Server"
 HOMEPAGE="http://davical.org/"
diff --git a/www-apps/davical/davical-1.1.1-r2.ebuild b/www-apps/davical/davical-1.1.1-r2.ebuild
index 7c306e4239ba..e39cacebeb32 100644
--- a/www-apps/davical/davical-1.1.1-r2.ebuild
+++ b/www-apps/davical/davical-1.1.1-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit webapp
+inherit webapp eutils
 
 DESCRIPTION="A CalDAV and CardDAV Server"
 HOMEPAGE="http://davical.org/"
diff --git a/www-apps/davical/davical-1.1.3.1-r2.ebuild b/www-apps/davical/davical-1.1.3.1-r2.ebuild
index 6bb250734f0d..28ee6ec22a79 100644
--- a/www-apps/davical/davical-1.1.3.1-r2.ebuild
+++ b/www-apps/davical/davical-1.1.3.1-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit webapp
+inherit webapp eutils
 
 DESCRIPTION="A CalDAV and CardDAV Server"
 HOMEPAGE="http://davical.org/"
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
deleted file mode 100644
index 9802eee27363..000000000000
--- a/www-apps/gallery/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gallery-2.3.2-full.tar.gz 14569436 SHA256 810ed73c456a3299ba50d9fcca6725d0654641c078c9d7c278d4875bad2af3fc SHA512 e4ee2007018ecdc6df2cb715798f57a94d2fcf5618a06812d704b45ba398cc9f52465d4ea1d830f2b99611c85d8853d7639059b3761f3b5d77ccc16d1e4ae0ad WHIRLPOOL 4591f8d69d173f01108fec5c21c7bde3f519c44177ef268866031e0c1cc021c452415b73950011e2f1cd46ee314d2741260bcd4ba80bdee56ca5b119a2452975
-DIST gallery-3.0.9.zip 2065722 SHA256 62d86c3a7252b25a17eead54a2b918bfdaac19d43f81132b73dcc735fdf20f74 SHA512 fd6f15abe69b4e80c1e3c24379e123fb2352cd7b0416e5a3aaedb857c32ff2412fc3eabba90e3227a8c3b0d1d27eedcf9a6e10c81b8dac8037f7019730b5fe89 WHIRLPOOL 75d61ab75449557a4d8a0d43ce3bcf315eed28db0fc8ec57ad2e560f0e80c3ab5df4a8a7f709abcff14baa52e85a814f1d0b7a83a21e241f1aa8d13ad7770df2
diff --git a/www-apps/gallery/files/postinstall-en.txt b/www-apps/gallery/files/postinstall-en.txt
deleted file mode 100644
index 96b52684b59e..000000000000
--- a/www-apps/gallery/files/postinstall-en.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-For new installations:

-

-1. Install the webapp using

-

-   webapp-config -h <VHOST_HOSTNAME> -d <VHOST_APPDIR> -I gallery X.Y.Z

-

-where either the VHOST_HOSTNAME or VHOST_APPDIR are optional and X.Y.Z

-is the version of gallery you just emerged.

-

-2. Create a mysql database for Gallery 3.

-

-    mysqladmin -u root -p create gallery3

-    mysql gallery3 -u root -p -e \

-        "GRANT ALL ON gallery3.* TO username@localhost IDENTIFIED BY 'password'"

-

-3. Now browse to http://<VHOST_HOSTNAME>/<VHOST_APPDIR>/installer.  Make sure

-the database name, user and password match what you created in step 2.

-

-4. Enjoy!

-

-

-The Gallery 3 user's guide can be found at

-

-    http://codex.galleryproject.org/Gallery3:User_guide:Gallery3:Installing_and_upgrading#Upgrading

diff --git a/www-apps/gallery/files/postinstall-en2.txt b/www-apps/gallery/files/postinstall-en2.txt
deleted file mode 100644
index bcc977036752..000000000000
--- a/www-apps/gallery/files/postinstall-en2.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-For new installations:

-

-1. Create a directory to share photos and make it writeable by the web server.

-

-2. Create a database for Gallery 2.

-	MySQL: 	mysqladmin -uroot create gallery2

-		mysql gallery2 -uroot -e"GRANT ALL ON gallery2.* TO

-		username@localhost IDENTIFIED BY 'password'"

-	PostgreSQL:	createdb gallery2 -E UNICODE

-		if that doesn't work, try

-		createdb gallery2 -E SQL_ASCII

-			if that doesn't work either, try

-			createdb gallery2

-

-3. Now browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install

-

-NOTE: The installer may complain that FfmpegToolkit.class has been modified.

-This is normal, as we patch it to fix a bug with newer versions of ffmpeg.

-

-For upgrades:

-

-1. Copy over your config.php and the g2data directory.

-

-2. If you are using a PHP accelerator, flush its cache.

-

-3. Browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/upgrade and follow the

-	instructions.

diff --git a/www-apps/gallery/files/postupgrade-en.txt b/www-apps/gallery/files/postupgrade-en.txt
deleted file mode 100644
index 2d41eb21f0e0..000000000000
--- a/www-apps/gallery/files/postupgrade-en.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-To upgreade:
-
-1. Upgrade the webapp using
-
-    webapp-config -h <VHOST_HOSTNAME> -d <VHOST_APPDIR> -U gallery X.Y.Z
-
-2. Direct your browser to
-
-    http://<VHOST_HOSTNAME>/<VHOST_APPDIR>/index.php/upgrader
-
-or alternatively, at a shell prompt, run
-
-    php index.php upgrade 
-
-3. Enjoy!
-
-The Gallery 3 user's guide can be found at
-
-    http://codex.galleryproject.org/Gallery3:User_guide:Gallery3:Installing_and_upgrading#Upgrading
diff --git a/www-apps/gallery/gallery-2.3.2.ebuild b/www-apps/gallery/gallery-2.3.2.ebuild
deleted file mode 100644
index a3b12868d005..000000000000
--- a/www-apps/gallery/gallery-2.3.2.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"
-
-inherit webapp eutils depend.php confutils
-
-DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
-HOMEPAGE="http://galleryproject.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="ffmpeg +gd imagemagick +mysql netpbm postgres raw sqlite unzip zip"
-
-RDEPEND="raw? ( media-gfx/dcraw )
-	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	netpbm? ( media-libs/netpbm media-gfx/jhead )
-	unzip? ( app-arch/unzip )
-	zip? ( app-arch/zip )
-	sqlite? ( dev-lang/php[pdo] dev-lang/php[sqlite] )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	dev-lang/php[session,postgres?,gd?]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}2
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	confutils_require_any gd imagemagick netpbm
-	confutils_require_any mysql postgres sqlite
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml README.html
-	rm README.html LICENSE
-	sed -i -e "/^LICENSE\>/d" -e "/^README\.html\>/d" MANIFEST
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en2.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "You are strongly encouraged to back up your database"
-	elog "and the g2data directory, as upgrading may make"
-	elog "irreversible changes to both."
-	elog
-	elog "g2data dir: cp -Rf /path/to/g2data/ /path/to/backup"
-	elog "mysql: mysqldump --opt -u username -h hostname -p database > /path/to/backup.sql"
-	elog "postgres: pg_dump -h hostname --format=t database > /path/to/backup.sql"
-	webapp_pkg_postinst
-}
diff --git a/www-apps/gallery/gallery-3.0.9.ebuild b/www-apps/gallery/gallery-3.0.9.ebuild
deleted file mode 100644
index c4bd59fa8180..000000000000
--- a/www-apps/gallery/gallery-3.0.9.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
-HOMEPAGE="http://gallery.menalto.com/"
-SRC_URI="mirror://sourceforge/gallery/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="ffmpeg +gd imagemagick mysql mysqli"
-
-# Build depend is on unzip
-DEPEND="app-arch/unzip"
-
-#PHP flags
-PHP_REQUIRED_FLAGS="ctype,filter,iconv,json,simplexml,tokenizer,unicode"
-PHP_OPTIONAL_FLAGS="gd?,mysql?,mysqli?"
-
-# No forced dependency on
-#  mysql? ( virtual/mysql )
-# which may live on another server
-RDEPEND="
-	imagemagick? ( || (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-	) )
-	ffmpeg? ( virtual/ffmpeg )
-	>=dev-lang/php-5.2.3[${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}]
-	virtual/httpd-php"
-
-REQUIRED_USE="
-	|| ( gd imagemagick )
-	|| ( mysql mysqli )"
-
-S="${WORKDIR}/${PN}3"
-
-src_install() {
-	webapp_src_preinst
-
-	rm LICENSE
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	keepdir "${MY_HTDOCSDIR}"/var
-	webapp_serverowned "${MY_HTDOCSDIR}"/var
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "\033[1;33m**************************************************\033[00m"
-	ewarn
-	ewarn "gallery3 requires short_open_tag to be enabled."
-	ewarn "You need to edit \"/etc/php/apache2-php5.?/php.ini\","
-	ewarn "set short_open_tag to \"On\" and then restart apache."
-	ewarn
-	ewarn "This ebuild does not depend on mysql or mariadb,"
-	ewarn "because the database may run on different host.  But"
-	ewarn "you will need to run a database server somewhere."
-	ewarn
-	ewarn "\033[1;33m**************************************************\033[00m"
-	ewarn
-
-	einfo
-	einfo "\033[1;32m**************************************************\033[00m"
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo "or for the post upgrade instructions, do"
-	einfo
-	einfo "    webapp-config --show-postupgrade ${PN} ${PVR}"
-	einfo
-	einfo "\033[1;32m**************************************************\033[00m"
-	einfo
-}
diff --git a/www-apps/gallery/metadata.xml b/www-apps/gallery/metadata.xml
deleted file mode 100644
index 66e8ef844e60..000000000000
--- a/www-apps/gallery/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<use>
-		<flag name="netpbm">Add <pkg>media-libs/netpbm</pkg> support</flag>
-		<flag name="unzip">Add <pkg>app-arch/unzip</pkg> support for the archive
-			upload module</flag>
-		<flag name="zip">Add <pkg>app-arch/zip</pkg> for the zip download
-			module</flag>
-	</use>
-	<longdescription>
-	Gallery is a web based software product that lets you manage your photos on
-	your own website.  With Gallery you can easily create and maintain albums of
-	photos via an intuitive interface.  Photo management includes automatic
-	thumbnail creation, image resizing, rotation, ordering, captioning,
-	searching and more.  Albums and photos can have view, edit, delete and other
-	permissions per individual authenticated user for an additional level of
-	privacy.  It's great for communities - give accounts to your friends and
-	family and let them upload and manage their own photos on your website!
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gallery</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/jekyll-gist/Manifest b/www-apps/jekyll-gist/Manifest
index 2b28063ebed9..907fc8da2adf 100644
--- a/www-apps/jekyll-gist/Manifest
+++ b/www-apps/jekyll-gist/Manifest
@@ -1 +1,2 @@
 DIST jekyll-gist-1.3.5.tar.gz 5495 SHA256 fda6aa7638c9255b197d3037aa9b236b99dff117d17c293bfb59f28776e065cb SHA512 f3028f11d594645a776c10cb9daef55d2f54592bc97fba25f1ffe4390c18e2c35330a674f40c12e34847c9dfe9844495aa419d9959b305a4100c2729e291efb2 WHIRLPOOL 9c52508ce49bd3974fe2965fa56c0bed3b1869f0b1613e220a1b10c849ecb42bbc83800ad501c0ed8a2d6a17399503e93cc9601a061169161087cf3d3d675020
+DIST jekyll-gist-1.4.0.tar.gz 7474 SHA256 cedcfc4084d643c78864d13501d50df9ad350f8023f126ce5e3efa5751b01f88 SHA512 924d2b3175378ae32277717932556ec32035aa9ad229b2c0925809b02feaf657a16d84f81c9793e0c25d06f8c05a852c427a8f2bcd264a0a1dc7d030cb8adebe WHIRLPOOL 9b8c8e7aa910394863efc54e1c2dd67bb1b960e3a29fe4eb9307fd18193bafcd5646b5cfe08a510cd6d448009227165f5acbf30313f58512dbb98fef0e5925fd
diff --git a/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild b/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild
new file mode 100644
index 000000000000..28501889a688
--- /dev/null
+++ b/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Liquid tag for displaying GitHub Gists in Jekyll sites"
+HOMEPAGE="https://github.com/jekyll/jekyll-gist"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/octokit-4.2"
+ruby_add_bdepend "test? ( dev-ruby/webmock
+	>=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+}
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 2e6a709b686e..1236a3a449c1 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1 +1,2 @@
 DIST jekyll-2.5.3.tar.gz 757248 SHA256 51316d48c3b12a6753a66655e1c7676f2c1014f0b50ccff6bf53002d5934b93d SHA512 28dc09ec9e758fbd2637df9e2adbd139af77799ace6af32d1ae4834ac9fb08e1a10f286a274a5faa589a37451fac5e8187cd219950be36c0e9b8bbdcbfd31285 WHIRLPOOL f8c1a43be364893b811e8a23e4aacf032d17e0dce01d8a253a2ed05f008141cc99181cd5c8922307d296804b961880ba29a839b3c263856d040160f80ac81771
+DIST jekyll-3.1.2.tar.gz 963278 SHA256 e1f46a75b8d38fdbfaecbda273bd5673d0f75bddf7650106f0bf84b924bb542b SHA512 602980b925acb2f5b60bff3234a8afbd93a4390b18f3678ecd5250dec957e5f252e6088ce7a98be099e24a799ace70eaa101850567feb9df72fab2db65a7cad5 WHIRLPOOL 529dbd7866c02b34812873950a3c51dd1ef1cb351018cdb3d623b9b7c8d6fdd5c9165c9db058902d313b6a83520f10042953d18586de4aab8316fcece5f32c3d
diff --git a/www-apps/jekyll/jekyll-3.1.2.ebuild b/www-apps/jekyll/jekyll-3.1.2.ebuild
new file mode 100644
index 000000000000..6d421c67c581
--- /dev/null
+++ b/www-apps/jekyll/jekyll-3.1.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.markdown README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features site"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="http://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/colorator
+	>=dev-ruby/kramdown-1.3
+	>=dev-ruby/liquid-3.0:3
+	>=dev-ruby/mercenary-0.3.3
+	>=dev-ruby/safe_yaml-1
+	>=dev-ruby/rouge-1.7
+	>=www-apps/jekyll-sass-converter-1.0
+	>=www-apps/jekyll-watch-1.1"
+
+ruby_add_bdepend "test? (
+		dev-ruby/activesupport:3.2
+		dev-ruby/launchy
+		>=dev-ruby/maruku-0.7
+		dev-ruby/mime-types:0
+		=dev-ruby/rdiscount-1.6*
+		>=dev-ruby/redcloth-4.2.1
+		>=dev-ruby/rouge-1.7
+		dev-ruby/rr
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/,+5d"\
+		-e "1igem 'test-unit'"\
+		-e "/reporters/d"\
+		-e "/profile/d"\
+		-e "/Reporters/,+4d" test/helper.rb || die
+	# Drop bundler
+	sed -i -e "/self.class.require_from_bundler/d" lib/jekyll/plugin_manager.rb || die
+	# This test fails without bundler
+	rm test/test_plugin_manager.rb || die
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index a894af495ed8..91b5266de2a4 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,4 +1,4 @@
-DIST kibana-4.1.4-linux-x64.tar.gz 11805519 SHA256 2d11c63268f49b95726bfa0f3c09cf898ea67b65da3599989d17a27095987b0d SHA512 a89290502d887002a65405e7e10de9ddefb176d262584f35ec58352a7ee9b5a88d0db2949d00eefee3752d1bccd4964f7d4f5935d5fb32c50a46e8b2e1f03a6c WHIRLPOOL 33eeda21ab98a04400d3b26bd10c9f9bbc813a8bf934897fc5dc0d354d25dd223caa60fa09613e3a0db74246d1482708620d23b18c6e740480973f77f769b99f
-DIST kibana-4.1.4-linux-x86.tar.gz 11595160 SHA256 e197ad2936488764b7167a9ea9989c26600fe3797d22c0e522244eef7eb6b809 SHA512 1651a31ee98315dea0cac83f0e80c45deabf0720e0c4b6b4e337512a1f23b8bd31e853f0b59e08cb53189c76369892ebc88dee5d796118aa659dbaa177698e13 WHIRLPOOL 4cd79f2b4bdf96d72626ad4ac992de9127095f3a96a09735a784e678fefc250f0cdbbb1776876afd9596fbe69e884133e2236f4ffe099e89fc159910048a06f4
-DIST kibana-4.4.0-linux-x64.tar.gz 30878925 SHA256 a8aeb7c2562c46e26a6841b7c359e90eaf1a7a1964a89466c73002dad022dc43 SHA512 2e9ffd1afbe36b1bb96cf293edbe95d0604b17d81b77fbd85baed031913e431b2ea5212ff832ee715c78dfad2fdcf492b7f2412b54fe81c03d4e9ca7a0a051d4 WHIRLPOOL 0437ad06d6e1fef7696e30ec2a7379bf21c3d013afce4610407c2f54b867adcd921dfa92d1e0bee4906a1a278c142988f4194eac2064b7d6fddbf491e4741f3c
-DIST kibana-4.4.0-linux-x86.tar.gz 30437829 SHA256 460909c0c1a34d7913a4aa3e9d60bf27235b1c42614116042cb3a24647ccb7f9 SHA512 805773e885603a0fab7f42091eff5fb3dcdd26ffe06990818f7f2be3fc7f8f0be026f458394ed13531f2112c5f81abc43eb14db911b4fff5fab857c5642f38d7 WHIRLPOOL d3329bc691acd92200840cc97e6d98f14ea47c745722c7dbd3ea692aa3763d3818aac68cf7c1ca586be6527dd4bc2bb9c691fd6c4121f17e08e9446c4adc1949
+DIST kibana-4.1.5-linux-x64.tar.gz 12223679 SHA256 0d20ac961c32029bd8305573c4d0e799c82829770260160e166d47eee02450ad SHA512 4fdd68f2c02bf5ba4eb1bc4182b8241bf403b741f14ea1d9927ef2aba92e37abce11b160a09f03202a99b928bd266d62b82d45acaf3ec5040c388d4d057b37ce WHIRLPOOL 5ba571474a3d45806b34fc4bddd326f7731be63154a54453a3c5df3f12b64ce2207f165a54bcd9bb5ec2c0aeb4a24175fe7f29684fe68fa17652c067ed6875ca
+DIST kibana-4.1.5-linux-x86.tar.gz 11898386 SHA256 545939f74dbfca9bff50c64e6b468aaa3d38f9911612f456bc05997f4a796275 SHA512 bf1e00aaa65ee8a289fc6e02176f06f73af808d3b1d8b2368861415036db422470a89355c16dcbabdeb3a1dd2d213cc5e3dd8a000fc1300058cc7bae6ba06265 WHIRLPOOL 41c60118c986f06ed6806b138ee48e3a0f853851c9dc6bf3e160a59d0704388d23a7a98221a05badda8dc4adbc75e99c883ea231c6d4c25d0759dc6f05f58e94
+DIST kibana-4.4.1-linux-x64.tar.gz 30646421 SHA256 fb536696b27b9807507c5d9014c90722e7b28cb2e068a80879cc9bb861316be1 SHA512 fe299260c70ce458eb1794e294da9583246cb058a0ae04f8b96614b2133dfbcf7a3ac955f5840ae045f564e0c470bb560e205e9b6a2e9ad5144c7da6c54627a3 WHIRLPOOL a73bd779d436f56ee2ae20b44d1438592014e732df97726574a9014fffa7c5f510098ee34ad69470544b1c39d7e5d3d9ed2e8766f3cb47bbcbfd9ce7a18c8e76
+DIST kibana-4.4.1-linux-x86.tar.gz 30207961 SHA256 b0b413db7f50d4cd547a0682ee4475c2fbdef8a44c4b9c3f4a89181a6fe4d733 SHA512 0c5c9bd55da347f4f308b82944f930182d707a69ae478ea89c34067a14dc32fdf2a929c45995f42ea320685f66ca0a02bb725705228b3984b5bf6c1266e4258d WHIRLPOOL db5d61a3ce19e36cc6c8e040d18dab9faffb91c86aa15ece6e7950b4c63e77614e4e839053e4e50afc228bddbc8264c482645c89d52009091698259e9fe1a2e2
diff --git a/www-apps/kibana-bin/kibana-bin-4.1.4.ebuild b/www-apps/kibana-bin/kibana-bin-4.1.5.ebuild
index 8373d2222bf4..8373d2222bf4 100644
--- a/www-apps/kibana-bin/kibana-bin-4.1.4.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-4.1.5.ebuild
diff --git a/www-apps/kibana-bin/kibana-bin-4.4.0.ebuild b/www-apps/kibana-bin/kibana-bin-4.4.1.ebuild
index b0222d11368f..b0222d11368f 100644
--- a/www-apps/kibana-bin/kibana-bin-4.4.0.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-4.4.1.ebuild
diff --git a/www-apps/metadot/metadot-6.1.6-r1.ebuild b/www-apps/metadot/metadot-6.1.6-r1.ebuild
new file mode 100644
index 000000000000..8dc917a9643c
--- /dev/null
+++ b/www-apps/metadot/metadot-6.1.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit webapp
+MY_P=${P/-/}
+S=${WORKDIR}/${PN}
+
+IUSE=""
+
+DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
+HOMEPAGE="http://www.metadot.com"
+SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
+
+KEYWORDS="~x86 ppc"
+
+RDEPEND="
+	>=dev-lang/perl-5.005
+	>=www-apache/mod_perl-2.0
+	dev-perl/DBI
+	dev-perl/DBD-mysql
+	dev-perl/Apache-DBI
+	dev-perl/XML-RSS
+	virtual/perl-Storable
+	dev-perl/perl-ldap
+	dev-perl/Log-Agent
+	dev-perl/Mail-POP3Client
+	dev-perl/IO-stringy
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	dev-perl/Unicode-String
+	dev-perl/Spreadsheet-WriteExcel
+	dev-perl/Date-Calc
+	dev-perl/AppConfig
+	dev-perl/Image-Size
+	dev-perl/Template-Toolkit
+	virtual/perl-Time-HiRes
+	dev-perl/Lingua-EN-NameParse
+	dev-perl/Number-Format
+	dev-perl/XML-Simple
+	dev-perl/Text-CSV_XS
+	dev-perl/Archive-Zip
+	dev-perl/DateManip
+"
+
+LICENSE="GPL-2"
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_HOSTROOTDIR}/${PN}
+
+	dodoc CHANGELOG README
+	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-${PVR}.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-${PVR}
+	webapp_src_install
+}
diff --git a/www-apps/metadot/metadot-6.1.6.ebuild b/www-apps/metadot/metadot-6.1.6.ebuild
deleted file mode 100644
index 9d7c2de08aa5..000000000000
--- a/www-apps/metadot/metadot-6.1.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit webapp
-MY_P=${P/-/}
-S=${WORKDIR}/${PN}
-
-IUSE=""
-
-DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
-HOMEPAGE="http://www.metadot.com"
-SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
-
-KEYWORDS="~x86 ppc"
-
-RDEPEND="
-	>=dev-lang/perl-5.005
-	>=www-apache/mod_perl-2.0
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	dev-perl/Apache-DBI
-	dev-perl/XML-RSS
-	virtual/perl-Storable
-	dev-perl/perl-ldap
-	dev-perl/Log-Agent
-	dev-perl/Mail-POP3Client
-	dev-perl/IO-stringy
-	dev-perl/MailTools
-	dev-perl/MIME-tools
-	dev-perl/Unicode-String
-	dev-perl/Spreadsheet-WriteExcel
-	dev-perl/Date-Calc
-	dev-perl/AppConfig
-	dev-perl/ImageSize
-	dev-perl/Template-Toolkit
-	virtual/perl-Time-HiRes
-	dev-perl/Lingua-EN-NameParse
-	dev-perl/Number-Format
-	dev-perl/XML-Simple
-	dev-perl/Text-CSV_XS
-	dev-perl/Archive-Zip
-	dev-perl/DateManip
-"
-
-LICENSE="GPL-2"
-
-src_install() {
-	webapp_src_preinst
-	dodir ${MY_HOSTROOTDIR}/${PN}
-
-	dodoc CHANGELOG README
-	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-${PVR}.txt
-	webapp_hook_script "${FILESDIR}"/reconfig-${PVR}
-	webapp_src_install
-}
diff --git a/www-apps/metadot/metadot-6.4.5.4-r1.ebuild b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
new file mode 100644
index 000000000000..e2a82c1f8983
--- /dev/null
+++ b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit webapp
+MY_P="Metadot${PV}"
+S=${WORKDIR}/${PN}
+
+IUSE=""
+
+DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
+HOMEPAGE="http://www.metadot.com"
+SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
+
+KEYWORDS="ppc ~x86"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/perl-5.6
+	=www-apache/mod_perl-2*
+	dev-perl/DBI
+	>=dev-perl/DBD-mysql-2.1027
+	dev-perl/Apache-DBI
+	>=dev-perl/AppConfig-1.55
+	>=dev-perl/XML-RSS-1.02
+	dev-perl/perl-ldap
+	>=dev-perl/Log-Agent-0.304
+	dev-perl/Mail-POP3Client
+	>=dev-perl/IO-stringy-2.108
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	>=dev-perl/Unicode-String-2.07
+	>=dev-perl/Spreadsheet-WriteExcel-0.41
+	>=dev-perl/Date-Calc-5.3
+	>=dev-perl/Image-Size-2.991.0
+	>=dev-perl/Template-Toolkit-2.09
+	>=virtual/perl-Time-HiRes-1.48
+	>=virtual/perl-Test-Harness-2.28
+	>=dev-perl/Test-Manifest-0.91
+	>=virtual/perl-Test-Simple-0.47
+	>=dev-perl/Lingua-EN-NameParse-1.18
+	>=dev-perl/Number-Format-1.45
+	>=dev-perl/XML-Simple-2.08
+	dev-perl/XML-Dumper
+	dev-perl/Archive-Zip
+	dev-perl/DateManip
+	dev-perl/Text-CSV_XS
+	dev-perl/HTML-Tree
+	dev-perl/HTML-Format
+	dev-perl/Data-ShowTable
+"
+
+LICENSE="GPL-2"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG README
+	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
+
+	cp "${FILESDIR}"/${PN}.conf "${D}"/${MY_HOSTROOTDIR}
+	sed -i "s|Apache::Registry|Modperl::Registry|" \
+		"${D}"/${MY_HOSTROOTDIR}/${PN}.conf
+
+	webapp_serverowned ${MY_HTDOCSDIR}
+	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-6.4_p3.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-6.4_p3
+	webapp_src_install
+}
diff --git a/www-apps/metadot/metadot-6.4.5.4.ebuild b/www-apps/metadot/metadot-6.4.5.4.ebuild
deleted file mode 100644
index 6ca41f9494cf..000000000000
--- a/www-apps/metadot/metadot-6.4.5.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit webapp
-MY_P="Metadot${PV}"
-S=${WORKDIR}/${PN}
-
-IUSE=""
-
-DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
-HOMEPAGE="http://www.metadot.com"
-SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
-
-KEYWORDS="ppc ~x86"
-
-DEPEND=""
-RDEPEND="
-	>=dev-lang/perl-5.6
-	=www-apache/mod_perl-2*
-	dev-perl/DBI
-	>=dev-perl/DBD-mysql-2.1027
-	dev-perl/Apache-DBI
-	>=dev-perl/AppConfig-1.55
-	>=dev-perl/XML-RSS-1.02
-	dev-perl/perl-ldap
-	>=dev-perl/Log-Agent-0.304
-	dev-perl/Mail-POP3Client
-	>=dev-perl/IO-stringy-2.108
-	dev-perl/MailTools
-	dev-perl/MIME-tools
-	>=dev-perl/Unicode-String-2.07
-	>=dev-perl/Spreadsheet-WriteExcel-0.41
-	>=dev-perl/Date-Calc-5.3
-	>=dev-perl/ImageSize-2.991
-	>=dev-perl/Template-Toolkit-2.09
-	>=virtual/perl-Time-HiRes-1.48
-	>=virtual/perl-Test-Harness-2.28
-	>=dev-perl/Test-Manifest-0.91
-	>=virtual/perl-Test-Simple-0.47
-	>=dev-perl/Lingua-EN-NameParse-1.18
-	>=dev-perl/Number-Format-1.45
-	>=dev-perl/XML-Simple-2.08
-	dev-perl/XML-Dumper
-	dev-perl/Archive-Zip
-	dev-perl/DateManip
-	dev-perl/Text-CSV_XS
-	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
-	dev-perl/Data-ShowTable
-"
-
-LICENSE="GPL-2"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG README
-	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
-
-	cp "${FILESDIR}"/${PN}.conf "${D}"/${MY_HOSTROOTDIR}
-	sed -i "s|Apache::Registry|Modperl::Registry|" \
-		"${D}"/${MY_HOSTROOTDIR}/${PN}.conf
-
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-6.4_p3.txt
-	webapp_hook_script "${FILESDIR}"/reconfig-6.4_p3
-	webapp_src_install
-}
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
index f88a1b3f7f75..fb066c9c4d81 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1,3 +1 @@
-DIST mythplugins-0.26.0.tar.bz2 36673620 SHA256 4e7f0493f37792c084c1b4d0b5863b4201ebce6d62ab7c6cc31ca74087d83c62 SHA512 51c10f46186e14e69c5626f2ae0955692c71aa7459fd018efaab1b99809cad533a84754d53455017102ff6f94cc9905dc303248a29d4095ba8f4f685bb022f49 WHIRLPOOL a2b995f2a94a2eb22fa0740dd840a2fe2d9d4b808af1dc43e9d83c626d93ed95134d64db2049e4b79379838ae16b1de6547b56277531e2752e6779b3cddbf25a
 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.26.0.ebuild b/www-apps/mythweb/mythweb-0.26.0.ebuild
deleted file mode 100644
index f16b5a30b482..000000000000
--- a/www-apps/mythweb/mythweb-0.26.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils webapp
-
-#BACKPORTS="4f6ac2a60b"
-# Release version
-MY_PV="${PV%_p*}"
-MY_P="mythplugins-${MY_PV}"
-
-DESCRIPTION="PHP scripts intended to manage MythTV from a web browser"
-HOMEPAGE="http://www.mythtv.org"
-LICENSE="GPL-2"
-SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
-	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="dev-lang/php[json,mysql,session,posix]
-	virtual/httpd-php
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	dev-perl/HTTP-Date
-	dev-perl/Net-UPnP"
-
-DEPEND="${RDEPEND}"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_prepare() {
-	cd "${S}"/../
-
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# Install docs
-	cd "${S}"
-	dodoc README INSTALL
-
-	# Install htdocs files
-	insinto "${MY_HTDOCSDIR}"
-	doins mythweb.php
-	doins -r classes
-	doins -r configuration
-	doins -r data
-	doins -r includes
-	doins -r js
-	doins -r modules
-	doins -r skins
-	doins -r tests
-	exeinto "${MY_HTDOCSDIR}"
-	doexe mythweb.pl
-
-	# Install our server config files
-	webapp_server_configfile apache mythweb.conf.apache mythweb.conf
-	webapp_server_configfile lighttpd mythweb.conf.lighttpd mythweb.conf
-	webapp_server_configfile nginx "${FILESDIR}"/mythweb.conf.nginx \
-		mythweb.include
-
-	# Data needs to be writable and modifiable by the web server
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-
-	# Message to display after install
-	webapp_postinst_txt en "${FILESDIR}"/0.25-postinstall-en.txt
-
-	# Script to set the correct defaults on install
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
diff --git a/www-apps/mythweb/mythweb-0.27.ebuild b/www-apps/mythweb/mythweb-0.27.ebuild
deleted file mode 100644
index affada03c0f0..000000000000
--- a/www-apps/mythweb/mythweb-0.27.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils webapp
-
-#BACKPORTS="4f6ac2a60b"
-# Release version
-MY_PV="${PV%_p*}"
-MY_P="mythweb-${MY_PV}"
-
-DESCRIPTION="PHP scripts intended to manage MythTV from a web browser"
-HOMEPAGE="http://www.mythtv.org"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/MythTV/mythweb/archive/v${MY_PV}.tar.gz -> mythweb-${MY_PV}.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="dev-lang/php[json,mysql,session,posix]
-	virtual/httpd-php
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	dev-perl/HTTP-Date
-	dev-perl/Net-UPnP"
-
-DEPEND="${RDEPEND}"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cd "${S}"/../
-
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# Install docs
-	cd "${S}"
-	dodoc README INSTALL
-
-	# Install htdocs files
-	insinto "${MY_HTDOCSDIR}"
-	doins mythweb.php
-	doins -r classes
-	doins -r configuration
-	doins -r data
-	doins -r includes
-	doins -r js
-	doins -r modules
-	doins -r skins
-	doins -r tests
-	exeinto "${MY_HTDOCSDIR}"
-	doexe mythweb.pl
-
-	# Install our server config files
-	webapp_server_configfile apache mythweb.conf.apache mythweb.conf
-	webapp_server_configfile lighttpd mythweb.conf.lighttpd mythweb.conf
-	webapp_server_configfile nginx "${FILESDIR}"/mythweb.conf.nginx \
-		mythweb.include
-
-	# Data needs to be writable and modifiable by the web server
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-
-	# Message to display after install
-	webapp_postinst_txt en "${FILESDIR}"/0.25-postinstall-en.txt
-
-	# Script to set the correct defaults on install
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 9a72b82d4eda..d6c1dd852f58 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,2 +1,3 @@
 DIST nanoc-3.7.5.gem 185856 SHA256 504309339c3e7711e6d75741b8bfa1ac1c6bcbd4a6accfc7beafbd5a45812602 SHA512 3cf6562e06d20afbc378e1d83a0545b8b6309c3c273a05538b62dd75ddbb80f4cbfc90b9225981562e561ab59a9e4e7810515da60ed12c797af4086b2531a1c7 WHIRLPOOL c1327033847a9a773e8d19795c36971ecf84d37386a7a33556b82a1563da321096b7a6596f982fa3159b6443a2c94c1ecf3ae14dd3b7f12000bb46d807ba0df4
 DIST nanoc-3.8.0.gem 189440 SHA256 382397d761ea1a97537eaee995e37ba416f7f7f093090cc812071a9eb28cea1e SHA512 ed39b6e799ea16fe19539181c0de2054af428b0ecdec5cfd592948aa14f3f0e7233a6039e57d68d9046824f55b7fc00d4f2621c4bd4b77d243e40c5c8750e93e WHIRLPOOL 33b92d6da24974c1d525d8da2433d62863ff97423ad8079c3937ac1c5c98fa310a05b179afa390d1fe3758a2e423951c880210508fdcbfc9c601e67fcbb841c5
+DIST nanoc-4.1.4.gem 173568 SHA256 a034321ec5c3fa2fe12348c068913eec1ec05d9665111c2a7501e54c90b6fd85 SHA512 90cc7e0288f80bbc92c8596e63c77a8707c0552a3fcef5984ff4fdc7197e19c68220939193b1bab1b6ace79b589e578ee52386a6cce9b654c718d718b0256244 WHIRLPOOL 45129890b998434ab7ebf446f6d5fba5b82a0fab4de66fa80b4f86cd27f3f6d43d04f1c4d9b93634d86678f2e89cdf0378ffc0b8797faca23260e50d0574aba8
diff --git a/www-apps/nanoc/nanoc-4.1.4-r1.ebuild b/www-apps/nanoc/nanoc-4.1.4-r1.ebuild
new file mode 100644
index 000000000000..d1af3969c5bd
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.1.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_TASK_TEST="test:all"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="http://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/cri-2.3:0"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	=dev-ruby/rdoc-4*
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	use doc || use test || (rm tasks/doc.rake || die)
+
+	if use test ; then
+		# Avoid dependency on coveralls.
+		sed -i -e '/coverall/I s:^:#:' tasks/test.rake || die
+	else
+		rm -f tasks/test.rake || die
+	fi
+
+	# Avoid non-optional tests for w3c_validators which we don't have
+	# packaged and which require network access.
+	rm test/extra/checking/checks/test_{css,html}.rb || die
+
+	# Skip a test that produces slightly different javascript.
+	sed -i -e '/test_filter_with_options/,/^  end/ s:^:#:' test/filters/test_uglify_js.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake test:all || die
+}
diff --git a/www-apps/nanoc/nanoc-4.1.4.ebuild b/www-apps/nanoc/nanoc-4.1.4.ebuild
new file mode 100644
index 000000000000..7d1b8b472eb2
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_TASK_TEST="test:all"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="http://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+)
+	>=dev-ruby/cri-2.3:0"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	=dev-ruby/rdoc-4*
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	use doc || use test || (rm tasks/doc.rake || die)
+
+	if use test ; then
+		# Avoid dependency on coveralls.
+		sed -i -e '/coverall/I s:^:#:' tasks/test.rake || die
+	else
+		rm -f tasks/test.rake || die
+	fi
+
+	# Avoid non-optional tests for w3c_validators which we don't have
+	# packaged and which require network access.
+	rm test/extra/checking/checks/test_{css,html}.rb || die
+
+	# Skip a test that produces slightly different javascript.
+	sed -i -e '/test_filter_with_options/,/^  end/ s:^:#:' test/filters/test_uglify_js.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake test:all || die
+}
diff --git a/www-apps/trac-accountmanager/Manifest b/www-apps/trac-accountmanager/Manifest
index e468254e7367..959aaf6dda97 100644
--- a/www-apps/trac-accountmanager/Manifest
+++ b/www-apps/trac-accountmanager/Manifest
@@ -1,3 +1,2 @@
 DIST TracAccountManager-0.4.2.tar.gz 157706 SHA256 4f527394db9316e1f826b1bd0fb8d97253516daf35c6d5f71a016df317a57d74 SHA512 b73046dd15cefbe4d7854107af1bdf372ab5c2c6e83855395383b4a894d85325d867eaa1e9013f41ffcf8907baf3ea64873ac1b6c3b333af6dfd6480ab4016b4 WHIRLPOOL 5607957625a104596975fdf0283d9ae1c85a2f5c4a309aff0a04475e7f5123c8c53e45ba0f7d69a4bbe1e7c62912490356e5c48220d51ebbc9497b160f2bfac6
-DIST trac-accountmanager-0.3_p9766.zip 91200 SHA256 c1c6a23d464f53e148aa79272e6d76513d32379778d2c76afe42fc68a9c5568f SHA512 b74a280daf6f6e9e26d691e0361881c688bdba62265962f32e194e39720b0babd7d86b719a721528d0163f9df9070a1d2c5cad40bbb418c938d9151b83cfb6d8 WHIRLPOOL 5040cf71fbc06dbcc8eaa6441c290e43c78477022ef3a781282cd725bd2606d9cdc4245f14a4c5753d5d4fdceffa3e6492d00a5a624a20358fbd1dd853603bab
-DIST trac-accountmanager-0.4_p10645.zip 145212 SHA256 51d63b3c01ef951942a53669297aa7bb46285b4ef611a250a62f4f2d98d91f7b SHA512 ed5ad707770e4a0f0abf89e6de02d1be3e7bdd0fb5baaa35dbc6a5f89706888cd81d09aca549a66035799c0ee90d0e1cba5213d5acb650c174f3861aaf4ebe6f WHIRLPOOL 9733aa9c82bc341804aca4f96fcb44a18af593084d1df5116a31e67a20b85b8daf2efb9393ff4744ee3c2aac9f8c5e1f9bd0bbc1175077441de526fb21077375
+DIST TracAccountManager-0.4.4.tar.gz 157666 SHA256 64b238e8a435156a08aeee64705b2cb60382132f022b3327d681b179680fdf4b SHA512 622e011c5cd956c3e32fe578b60d0cc060b109893a6bbd5ea12dea36373a9a47a8a226ae6a297d69a22f9d1d1deae686ccdf2258623877ee794febb99c9a99e4 WHIRLPOOL 1f38ce9672c7633920041dbd73c0a61e5358b7c70d0ab70a23baac224f4a72ca2c4056171bc3a95b5dc5e3de6e1afe0eb8b74df23537564d60332d4b682f4d8f
diff --git a/www-apps/trac-accountmanager/trac-accountmanager-0.3_p9766.ebuild b/www-apps/trac-accountmanager/trac-accountmanager-0.3_p9766.ebuild
deleted file mode 100644
index cb4f81c1e40e..000000000000
--- a/www-apps/trac-accountmanager/trac-accountmanager-0.3_p9766.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_DIR="accountmanagerplugin/trunk"
-MY_REV="${PV#*_p}"
-
-DESCRIPTION="A Trac plugin for manage user accounts"
-HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
-SRC_URI="http://trac-hacks.org/changeset/${MY_REV}/${MY_DIR}?old_path=/&filename=${MY_DIR}&format=zip
-	-> ${P}.zip"
-
-LICENSE="BEER-WARE"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools
-	app-arch/unzip"
-RDEPEND=">=www-apps/trac-0.12"
-
-S="${WORKDIR}/${MY_DIR}"
diff --git a/www-apps/trac-accountmanager/trac-accountmanager-0.4.2.ebuild b/www-apps/trac-accountmanager/trac-accountmanager-0.4.2.ebuild
deleted file mode 100644
index d98b934f4aaf..000000000000
--- a/www-apps/trac-accountmanager/trac-accountmanager-0.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="A Trac plugin for manage user accounts"
-HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
-SRC_URI="mirror://pypi/T/TracAccountManager/TracAccountManager-${PV}.tar.gz"
-
-LICENSE="BSD BEER-WARE"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=">=www-apps/trac-0.12"
-
-S="${WORKDIR}/acct_mgr-${PV}"
diff --git a/www-apps/trac-accountmanager/trac-accountmanager-0.4.4.ebuild b/www-apps/trac-accountmanager/trac-accountmanager-0.4.4.ebuild
new file mode 100644
index 000000000000..576104590422
--- /dev/null
+++ b/www-apps/trac-accountmanager/trac-accountmanager-0.4.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 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 Trac plugin for manage user accounts"
+HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
+SRC_URI="mirror://pypi/T/TracAccountManager/TracAccountManager-${PV}.tar.gz"
+
+LICENSE="BSD BEER-WARE"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-0.12"
+
+S="${WORKDIR}/acct_mgr-${PV}"
diff --git a/www-apps/trac-accountmanager/trac-accountmanager-0.4_p10645.ebuild b/www-apps/trac-accountmanager/trac-accountmanager-0.4_p10645.ebuild
deleted file mode 100644
index cb4f81c1e40e..000000000000
--- a/www-apps/trac-accountmanager/trac-accountmanager-0.4_p10645.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_DIR="accountmanagerplugin/trunk"
-MY_REV="${PV#*_p}"
-
-DESCRIPTION="A Trac plugin for manage user accounts"
-HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
-SRC_URI="http://trac-hacks.org/changeset/${MY_REV}/${MY_DIR}?old_path=/&filename=${MY_DIR}&format=zip
-	-> ${P}.zip"
-
-LICENSE="BEER-WARE"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools
-	app-arch/unzip"
-RDEPEND=">=www-apps/trac-0.12"
-
-S="${WORKDIR}/${MY_DIR}"
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index bd0b5f64722e..9b2415b04fb5 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,4 +1,3 @@
+DIST Trac-1.0.10.tar.gz 3655342 SHA256 cb439d2ef39b71673299bffe9d042bdcd3bea9d2d02eab598bc820d415953ecd SHA512 16567f9e9843a3a682f9b3f65e57ab85a7429f20ea27f09ebf72860bbf6c6667cc656a6e053e39e7b03b1eb407e330d13380f958c139c1d208d4ba8948599aa6 WHIRLPOOL 1ec5e52f4aec2e5dc0816632961bdfd2312b9da5b3be00f1b73021f1d5f9dd46bf9c51b13442bbabd2c770f49c5aed7674b5426b11c2208d1dd49b30137b8b57
 DIST Trac-1.0.4.tar.gz 3579886 SHA256 a1d564c5b612306856dd26851270b12fbba91bab1bc146b66d4cc248be1a172e SHA512 1186c3d36b7b8eae6595dcf5dfc30aed9302d46dae2019da8178a2656065fd5675683331474118f3da47f9ba75fd213ad1964bad29c7892423ab1fa7371a8131 WHIRLPOOL 2be04e6a683f88923b2f9b09fdee4b5de24779f399f32763674512f71f4f03e72b74592e0dc49e6693dc1c6c1c4ebdfb680eac72146b9fdb3735db50a5e8c9fb
-DIST Trac-1.0.5.tar.gz 3587954 SHA256 65b191f5eeb9590d2f8cd5d9e11155669947d2241d754ce55aa7e9eef65e5578 SHA512 445172bca990837492f79a11a0df18bb457e3930116a274213078d4bcd5dd44beded655b9f6ed2f93cb5b991530131a06628603879b56f2a390bf7d3822abed2 WHIRLPOOL 3fffaaead5ef61fd4655fc7f13bf9f3c00171249aa271a2d5f9312cd68df7031c51dd564bbe3b8ceed18dac0ac8045bed65c87f7c6e64963d9509ffd3c7f06ca
-DIST Trac-1.0.6.post2.tar.gz 3638718 SHA256 aefae1b4b6de37f6fb105e03d304a125cdbccbf632ba5ade15804c470f3aedcb SHA512 f8f6b086710a992d37e63bcc59f1cbc2b763cb36f8deacd9f459cccd860f0eb2f0bb41091914807ad93a607d1c3f7154a240322e61b1f89fbebd1624f57bf25b WHIRLPOOL 301926fece71c5d2fe04298fd9e4b9e260903c77dee2ecc60fd8e6c194284ed1475e41eef7a80c7387375db91e8d1239ee8e2bac0d410d1475da52d14edc4c77
 DIST Trac-1.0.9.tar.gz 3642845 SHA256 9ed3f0a2039c46132d10f35c211f9f6ee953339cc08492a41d1bf8741d6eebfa SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304 WHIRLPOOL 4005102b1109aac94728d22151c2192a38f9ab91af0227a24dff1a2e2097e67ceafa0cef0f307f1a1ddb1999c109d142bbb739107d4047dc296e6a8396a9427a
diff --git a/www-apps/trac/trac-1.0.10.ebuild b/www-apps/trac/trac-1.0.10.ebuild
new file mode 100644
index 000000000000..44e59b2dd31d
--- /dev/null
+++ b/www-apps/trac/trac-1.0.10.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	highlight? (
+		|| (
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
+			app-text/enscript
+		)
+	)
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+	distutils-r1_python_install
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/trac/trac-1.0.5.ebuild b/www-apps/trac/trac-1.0.5.ebuild
deleted file mode 100644
index 9cf7e9c2f61b..000000000000
--- a/www-apps/trac/trac-1.0.5.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
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_beta/b}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/trac/trac-1.0.6_p2.ebuild b/www-apps/trac/trac-1.0.6_p2.ebuild
deleted file mode 100644
index d9602aa483b7..000000000000
--- a/www-apps/trac/trac-1.0.6_p2.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
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 650818f18b1c..2dc47953c086 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,5 @@
+DIST chromium-48.0.2564.109.tar.xz 432310300 SHA256 2eb1e5b6dda718a5e501ba26f47015c1629adeb9f2bf2877bd9d8bf346abeb03 SHA512 2891384385a6ac1ebab218837ce609c16abcf2500e1d49396fea931bf0f709097b4a99c6ca11ae409d757c7c94b0f3af9d6848084047d981597c0bb0f73257cd WHIRLPOOL b5e4e8e185937b61e3e38c74be86bb1a7808090ab713cc284a38a307ad4eca4a6080fd81c42981834857845caaedd3edcd2541f90a9514a0b95236c271d62d0c
+DIST chromium-48.0.2564.116.tar.xz 432321192 SHA256 6a1eb9b4c853f15eeec0a55af7ac3b41835f0fc592ba6c0a500873cb12a84d0f SHA512 22c653580c1320b00e56a8b055e215b0292518af52e2d7e24b0610950ef1457a03dcec62b5417dd2e1021a2cf42b06d38b2249ee39d97aa662728f4972c54fc6 WHIRLPOOL c904185cb2e476bc253474e5ba044153bae1489a1e783bd38cd739409d46d0aa410a84553624b97e8261b1ba6ea0d6ce176703d566305634c8d8679e62c207d4
 DIST chromium-48.0.2564.82.tar.xz 432281684 SHA256 cda64bf427d01bae7d45863812edcd7fa43176238ec07c7752e42afd3e1714fd SHA512 45e50fa0a4a4ac593e95c27fc16c2699736fbdf0bb88fd84be70e17cf1b2058c8cc55cccfe5c7ab381e8d80a0816ffb1e327626992779204d85fc558a946d076 WHIRLPOOL db51d66242d8989f7db7a2c1a1e87c012b59fa6afd21b8dae745f8b9a7d5f8c5249dee95c152a9e9f4da13950b17cbc03a1d2bd23622c50e61d7f97d03181398
 DIST chromium-49.0.2623.0.tar.xz 452249352 SHA256 1637e2d16c233c75c4c4094bb83af9f8ef5add2d84a1df544ad08f53d7958357 SHA512 3f1ca7cedc121fc09823a9ecd0d8a544a0ce7561e7d9e9c5c97bfab7a0d3157ede0377ace4ae124a755844eae33d551efc07b52cb55e06ffaf54749539f55edc WHIRLPOOL 06c7f034bc007a2fe04bab8323000bcaad058a2395cf7d6affcac682466f8a81e32a5fc231ab8e8851ea4f183dae51eb0842bf352c70fea2b90d2e3d6ffb39ef
 DIST chromium-49.0.2623.28.tar.xz 452236624 SHA256 88e15a295fd584424603a3aac0f39fdb66223f2e35284ec20487bf693873efb2 SHA512 b63df71e45fb12b012d25ec2d3de66006e4597b88b814d44aa595e3762f8405f6242758729909d378fa3010634b65829d46172b07eec7639e6b65432ad5a4f63 WHIRLPOOL 62405dfd90ca731c5e8fe0d816473506fb30956493f303e55d1af8cca6604af58ac9f1a247fa774bad2db0591e7000a795d54e2e6bc4171bef16fabd92c7a0ac
diff --git a/www-client/chromium/chromium-48.0.2564.109.ebuild b/www-client/chromium/chromium-48.0.2564.109.ebuild
new file mode 100644
index 000000000000..46cec75eee75
--- /dev/null
+++ b/www-client/chromium/chromium-48.0.2564.109.ebuild
@@ -0,0 +1,690 @@
+# Copyright 1999-2016 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 gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+REQUIRED_USE="gn? ( kerberos !system-ffmpeg )"
+
+# 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-arch/bzip2:=
+	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/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/libexif:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( 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 )
+	!gn? (
+		>=app-accessibility/speech-dispatcher-0.8:=
+		app-arch/snappy:=
+		>=dev-libs/icu-55.1:=
+		>=dev-libs/libevent-1.4.13:=
+		dev-libs/libxml2:=[icu]
+		dev-libs/libxslt:=
+		dev-libs/re2:=
+		media-libs/flac:=
+		>=media-libs/harfbuzz-0.9.41:=[icu(+)]
+		>=media-libs/libjpeg-turbo-1.2.0-r1:=
+		media-libs/libpng:0=
+		>=media-libs/libwebp-0.4.0:=
+		sys-libs/zlib:=[minizip]
+	)"
+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-frameworks/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() {
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
+	epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
+	epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+	if use gn; then
+		conditional_bundled_libraries+="
+			third_party/adobe
+			third_party/ffmpeg
+			third_party/flac
+			third_party/harfbuzz-ng
+			third_party/icu
+			third_party/jinja2
+			third_party/libevent
+			third_party/libjpeg_turbo
+			third_party/libpng
+			third_party/libwebp
+			third_party/libxml
+			third_party/libxslt
+			third_party/markupsafe
+			third_party/re2
+			third_party/snappy
+			third_party/speech-dispatcher
+			third_party/usb_ids
+			third_party/xdg-utils
+			third_party/yasm
+			third_party/zlib
+		"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'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/third_party/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
+		'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/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/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/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_new' \
+		'third_party/libvpx_new/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/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_gyp=""
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf_gyp+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gyp+=" -Ddisable_nacl=1"
+	myconf_gn+=" enable_nacl=false"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_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_gyp+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf_gyp+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf_gyp+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf_gyp+="
+		$(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 gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(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)"
+
+	myconf_gn+=" use_cups=$(usex cups true false)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf_gyp+="
+		-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_gyp+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf_gyp+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf_gyp+=" -Dclang=1"
+		myconf_gn+=" is_clang=true"
+	else
+		myconf_gyp+=" -Dclang=0"
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-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_gyp+=" -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_gyp+=" -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_gyp+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf_gyp+=" -Darmv7=1"
+		else
+			myconf_gyp+=" -Darmv7=0"
+		fi
+		myconf_gyp+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gyp+=" -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_gyp+=" -Dwerror="
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -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-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# TODO: also do this for GN bundled ffmpeg build.
+	if ! use system-ffmpeg && ! use gn; then
+		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
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	if use gn; then
+		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
+		out/Release/gn gen --args="${myconf_gn}" out/Release || die
+	else
+		build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
+		egyp_chromium ${myconf_gyp} || die
+	fi
+}
+
+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"
+
+	if ! use gn; then
+		# Build mksnapshot and pax-mark it.
+		eninja -C out/Release mksnapshot || die
+		pax-mark m out/Release/mksnapshot
+	fi
+
+	# 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
+
+	if use gn; then
+		doins out/Release/icudtl.dat || die
+	fi
+
+	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/chromium-48.0.2564.116.ebuild b/www-client/chromium/chromium-48.0.2564.116.ebuild
new file mode 100644
index 000000000000..91a38643a161
--- /dev/null
+++ b/www-client/chromium/chromium-48.0.2564.116.ebuild
@@ -0,0 +1,690 @@
+# Copyright 1999-2016 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 gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+REQUIRED_USE="gn? ( kerberos !system-ffmpeg )"
+
+# 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-arch/bzip2:=
+	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/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/libexif:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( 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 )
+	!gn? (
+		>=app-accessibility/speech-dispatcher-0.8:=
+		app-arch/snappy:=
+		>=dev-libs/icu-55.1:=
+		>=dev-libs/libevent-1.4.13:=
+		dev-libs/libxml2:=[icu]
+		dev-libs/libxslt:=
+		dev-libs/re2:=
+		media-libs/flac:=
+		>=media-libs/harfbuzz-0.9.41:=[icu(+)]
+		>=media-libs/libjpeg-turbo-1.2.0-r1:=
+		media-libs/libpng:0=
+		>=media-libs/libwebp-0.4.0:=
+		sys-libs/zlib:=[minizip]
+	)"
+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-frameworks/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() {
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
+	epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
+	epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+	if use gn; then
+		conditional_bundled_libraries+="
+			third_party/adobe
+			third_party/ffmpeg
+			third_party/flac
+			third_party/harfbuzz-ng
+			third_party/icu
+			third_party/jinja2
+			third_party/libevent
+			third_party/libjpeg_turbo
+			third_party/libpng
+			third_party/libwebp
+			third_party/libxml
+			third_party/libxslt
+			third_party/markupsafe
+			third_party/re2
+			third_party/snappy
+			third_party/speech-dispatcher
+			third_party/usb_ids
+			third_party/xdg-utils
+			third_party/yasm
+			third_party/zlib
+		"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'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/third_party/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
+		'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/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/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/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_new' \
+		'third_party/libvpx_new/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/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_gyp=""
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf_gyp+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gyp+=" -Ddisable_nacl=1"
+	myconf_gn+=" enable_nacl=false"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_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_gyp+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf_gyp+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf_gyp+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf_gyp+="
+		$(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 gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(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)"
+
+	myconf_gn+=" use_cups=$(usex cups true false)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf_gyp+="
+		-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_gyp+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf_gyp+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf_gyp+=" -Dclang=1"
+		myconf_gn+=" is_clang=true"
+	else
+		myconf_gyp+=" -Dclang=0"
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-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_gyp+=" -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_gyp+=" -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_gyp+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf_gyp+=" -Darmv7=1"
+		else
+			myconf_gyp+=" -Darmv7=0"
+		fi
+		myconf_gyp+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gyp+=" -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_gyp+=" -Dwerror="
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -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-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# TODO: also do this for GN bundled ffmpeg build.
+	if ! use system-ffmpeg && ! use gn; then
+		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
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	if use gn; then
+		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
+		out/Release/gn gen --args="${myconf_gn}" out/Release || die
+	else
+		build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
+		egyp_chromium ${myconf_gyp} || die
+	fi
+}
+
+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"
+
+	if ! use gn; then
+		# Build mksnapshot and pax-mark it.
+		eninja -C out/Release mksnapshot || die
+		pax-mark m out/Release/mksnapshot
+	fi
+
+	# 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
+
+	if use gn; then
+		doins out/Release/icudtl.dat || die
+	fi
+
+	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/epiphany/Manifest b/www-client/epiphany/Manifest
index d61654335936..97bcf097f895 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,3 @@
 DIST epiphany-3.16.3.tar.xz 3082680 SHA256 d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1 SHA512 68f4dc0e299b929f244818d93a9af14f48ef2c3a93813fe5457c11d37ddb5a5e2b5ae3f93f0d41e8095590f87d8679d2cee5b6298c128475a9ad9eb6aa3c8bae WHIRLPOOL c82ff5051ac3c1ac2480b846f77893f39f52517f0aa0f7a6084e8b24e98f490264a6adecd89671d89719da835ca84f0613019e281280380bb20d980c2294afe9
-DIST epiphany-3.18.2.tar.xz 3091980 SHA256 8436170731966bb40b7d8e29dbedfa5d5ddbf78572cf5fd51fce1ac6da5da6c2 SHA512 a230f489b2d30cba0682333b1c26a53d223b5d00ac3a0255d0bdc505ee2d3ccb3fa114c290241e601e4af64b39224ee90eea1063e6ba0818f83fb914831382d8 WHIRLPOOL b9d1ec410fff4815ef0e5526bcfbb9670962fd89ea5212a9956996996d64d07ec882212276eaa1734dcc79e466e3d888130b51cd4ade61409419539d38d46fc4
 DIST epiphany-3.18.3.tar.xz 3095720 SHA256 cd4e9ce588c4c66109547d93999d9740d338c3f9dbfbc2143cf2cbb74260def9 SHA512 f519ab4f5742b3ff6b28c079e0086a37b7b7cd55d1cd3a9de0260cab28c25e0179bacf2764aa877e6e389b6a84ef3fd7d59e475c3711d0f1e1593866c177fc6a WHIRLPOOL 483f2735cd72249ef9401dda951934568de2d04ebf98e5397cd6c04945952db6aed402611f35a5e7c3e32d1ff060d363106721c2a380037b1650d37664a7db4d
+DIST epiphany-3.18.4.tar.xz 3054500 SHA256 be699d484371111abae754e669187215df73e21533f461e513b79537d7a1c1c1 SHA512 b23fe348d4ef18b4f4227352216ed377d741897dbc44221da83a0a7a1395a5aca6ca89066112f664c7724b5ad1a58c9dab1e415ab408176a33fc9cbd9bd12be7 WHIRLPOOL dae50483ed1889abcbc62b96f338711ac2f9b8cd5f13b370725df015acec2b278013b122dd5dfc1e99101868c5bc94b040812a28e878f44160ed59ec53da4a46
diff --git a/www-client/epiphany/epiphany-3.18.2.ebuild b/www-client/epiphany/epiphany-3.18.2.ebuild
deleted file mode 100644
index 9c16698c267d..000000000000
--- a/www-client/epiphany/epiphany-3.18.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="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nss test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.9.5:4
-	>=net-libs/libsoup-2.48:2.4
-	>=x11-libs/gtk+-3.13:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/adwaita-icon-theme
-
-	nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=gnome-base/gnome-common-3.6
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix unittests
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
-	epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
-	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README TODO"
-	gnome2_src_install
-}
diff --git a/www-client/epiphany/epiphany-3.18.4.ebuild b/www-client/epiphany/epiphany-3.18.4.ebuild
new file mode 100644
index 000000000000..d35f280ec046
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.18.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nss test"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
+	>=app-text/iso-codes-0.35
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.9.5:4
+	>=net-libs/libsoup-2.48:2.4
+	>=x11-libs/gtk+-3.13:3
+	>=x11-libs/libnotify-0.5.1:=
+	gnome-base/gnome-desktop:3=
+
+	dev-db/sqlite:3
+	x11-libs/libwnck:3
+	x11-libs/libX11
+
+	nss? ( dev-libs/nss )
+"
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	!www-client/epiphany-extensions
+"
+# paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	sys-apps/paxctl
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix unittests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
+	epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		$(use_enable nss) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DISPLAY
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 75dd0be62ebc..9291eca5f41b 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,234 +1,156 @@
-DIST firefox-38.5.0esr-af.xpi 483327 SHA256 ed5123547065cd65691a60d1d2916115983adbe7e5ed4a526766cd7e37cb7923 SHA512 b9c13b8b645ba5e1e661cf914ff1f8228b3d3b4a32a8dee5d4f284b83064da29bdec5e917a141388eaf4795c91ababc078a4ec8c7012168ea7c7672171201f53 WHIRLPOOL e6bcfda38ce615fd08542596ba22cfd6c13766e471cf3d49341287aed603ac62f01550c8559f3b69207bc3b20b64bbf8538bc3e24cab0c337d53d888a4fa3415
-DIST firefox-38.5.0esr-ar.xpi 516496 SHA256 a3e651f4bc9f9ec963eac9058b0230c4bffcef51b5ea70cf536449039e3b061d SHA512 2d4d4a175954754d990cfa3124b9957992ad045f7274451ab8da65436a10e5beda2231f41ee6105727d593d4f75e23e4e962865385b2ba6aef1bb40f13506a48 WHIRLPOOL 6e1a77d31aa09da2dfd71b3b804ed2c69e27332b1ae5cc3544f8a6f97b03f817da31015c895b31508bbaf0d16e48bbbb612c63b5df57af47ad3d95e632b6189b
-DIST firefox-38.5.0esr-as.xpi 509575 SHA256 6311ac7084f1f29914c8fe7285be8786ed278b75d733d62706ca36ee765bf10e SHA512 04be2a896b1719dede726af80ddf6785bf47c400d1c9d4aaf9a1f0824ab1395db9a83291320fbfeabafd7e9c500659504e36a0d09193aeb0493b79309546f502 WHIRLPOOL b6635c7d17f789fbc9c0573c18d62c467a0077d1684efb0b2ccc997eb7a0a6d379057b88c9aa87ef815b2fcc0673d1242f1039a9c800dd7a9a6ab3232fa79416
-DIST firefox-38.5.0esr-ast.xpi 397203 SHA256 b3e8f50517ada37287c3972d04dc01c60e433f30d076d31b57ca8f63412acdae SHA512 acd14eb17b50fa3452439cd43e5e568d793700ce6edd0dc1d1efc5384f3a05b3facc1d5444530fcf83e133fdcb9344c054e0ff1cf456d251802f50aaf22ee348 WHIRLPOOL 16d02ce7287fc42ceb40df362977b5ecba45a5954a23251ab66109035ce3a936502b6164ca627476f050aded4dcec29f3f336bca401abd73f09433dcb2d06562
-DIST firefox-38.5.0esr-be.xpi 441057 SHA256 b61c2aaaeabc587ce5fa977b8ba260674f8ec57a5cc0999338fa328df78cbf58 SHA512 9d2001c8bb4cabcb085f9fc3f174e763db2802548c8e002841dac8093fa97ab9d6655193fb78b41fdc3236e1e0fb68afca6f580c62afa5854dd74044fbe4166c WHIRLPOOL 3e2f562b39ce35bff385edccd58d93788da4fb178ea1c940d07343fca4a56eafb2ec9d48de00e68a959935cffd41549b8aeca2070da5502d63cc88a038f85b1e
-DIST firefox-38.5.0esr-bg.xpi 487819 SHA256 0c85c42f4e76d0df3331a2763fa65904e8c955a0abd662db1218edc4f9bef035 SHA512 2cc1965dc1a832f8043af1ae1df6d7c027e609713b1e97f057c524f14400f960bbb0962766894c746440677d6b776f70a43821b618e2568aebf8b3fafc8d4499 WHIRLPOOL f42ba7ea4fe64cabe259fc4a0d7ad88af430db8738c2c9195f4ac40d3eb3469c9b292381849d78ac68fe2ea371accd0346eba0bfa9ebe9e12ae1292bbf2cbc79
-DIST firefox-38.5.0esr-bn-BD.xpi 528690 SHA256 55bbd8db0e1966d521b2cae6c2b9d30c7e8a8bd75c9536d0edda4d140cf1f2cf SHA512 642385732bbd08d12610c68cbb00a8b10f8e6f547c86a752dea14044ba8035e306df73ff239562c514e7c27ac45a89895b6470b7ec838b02c375bdbc2bfdb401 WHIRLPOOL c6b9cd1d3a8ee465cfc953cb517de5fb363740a1fe0301d83cbb1f96fce0de48d4461c7dab5c9c3f08289cd265870ee71e2a18b20dbb7a7b871a972d634df503
-DIST firefox-38.5.0esr-bn-IN.xpi 527928 SHA256 f3ca0fc682d4e2b24120041886ce5f02cc472e9111f1985fcc55a29723744f0a SHA512 cf1237c9858e86042ed6e25e4df64ab4ac5f9c28c9507f123921b12a585a5d36bb1bac41ff7d87e38f492604ce9f0e293413702ccf97808b2592609822317aed WHIRLPOOL 6edc03867275528cb1273739745102d474c7588187d2f87c801a60d97bbe2e51b2111325163c801e57f10f36493a125a201255597ed2cbd7c0ff4306e65e2654
-DIST firefox-38.5.0esr-br.xpi 441963 SHA256 c4fc6be41c674fb5517eb1bcfd25667b1b61ab5eb8d6dc86cdc99d0472176a3c SHA512 caf4ecd3f0d0a63ea9605a49d34b5cd75cf3759d9483d32d9161a5ac0897e85746c81b808712651b0e539fc5ea7a1aab0bd02b628579b7e9b1067084178c1882 WHIRLPOOL e8dd5175ef0b30af501af2441073f9e6b6ab112d3a8ce58c76390d844a8a5c84296e4d7927dbba72aed1b07b32fbecd84ab83e8ae7f5c9ec9975531a527abff3
-DIST firefox-38.5.0esr-bs.xpi 485305 SHA256 4921943cc54ac8f66d24981de95498ed819e4555a1454c68e322edd1dff6e042 SHA512 41167dec1787e5dd1936dcf156a28cab789576104586a4d9f2a811d2a5f3635a8d46fd2c88a836f6bff826afd0960dac71f90831ac93caabd8d8c68ddc1d5e80 WHIRLPOOL f38becea1ace896558d708f9030bc65fd25dfce1f0843d5807435ca1154b8e2bf542a8a7e524a90df79496ba41ebba05a2d0c5c9b7f55f42e24ae2d8b7d0e4d8
-DIST firefox-38.5.0esr-ca.xpi 458092 SHA256 d5d77114955441415b9e30c8bb72adc8e16d7214143967530e387c1918a030da SHA512 d2c97e478ab92a2c23ffdca9f6dc71416abbc4ec1f69beaaba2e95f5c8bbec308487583533d223c4d19706589c9feb9c3745efaad14e613ac985bc8456cd8128 WHIRLPOOL f632008b3619001c490e123c1d1b142c85d540fbb9dd4616c22ddbd980aa8045cabc0763dc38142d49a78f9e23d47b2f1a37e078cca1ca1e241dff13d07d77ba
-DIST firefox-38.5.0esr-cs.xpi 446727 SHA256 7ac26985bb3c43063f105485c06f52556b1d5a84d5fff65a49fc90b58663c4a2 SHA512 64cd504346dd054b24d23e3beeebe863f1d268a62cb81248319d65a215df88f006ef3f78c644e04ac357ee6639a69aafd08bec08693a4f210d2d31b0c21ae6ca WHIRLPOOL 2fe53a4d917e5af75a1db6206a65510cbac4f45d2b3e9fedbfd52a178161abee76b83e34ae72cfd43aa1097b72bf4e4606c6fd8f0b0699733e286d0f2fbe744d
-DIST firefox-38.5.0esr-cy.xpi 444385 SHA256 aaee976fb2ad8289cfac262d2cc878b877e622277402a178ba506639d2afca13 SHA512 f1be57fc1ffccd244f8ac4367d85ae0522f231c7811bc46eef00778e940ff0350f6d66ac451f37f84e7336c6438645f249ae143a940f6fbc1d2bdd6ba6486a5a WHIRLPOOL c271929468489cf15951e13e7581ae7f108d2c1858aba7dfed8dacbbad92cb6dedf3b68ee8154f18f437e607405c9fbfef4267ee8750d82c7d19df0882bbb299
-DIST firefox-38.5.0esr-da.xpi 450763 SHA256 b1b9ecc54a460368159ecaa3542400d07fac136c27098faed661cf141fc55f19 SHA512 3bc2a6eb51fb4f5af7179a40376bcab270c84dd077ca36e820c00a41189b27d945dadf080768a704fcbf4e2f2f359a15f699da9bab931ca5026d65a9108a0f86 WHIRLPOOL cf879a03415b75464f6ee2ccf7de6bfdab688c0df801e86ef562644a8f365223411e737368f29b6bceab9cc16c5c66030a685dfada65d1681f6f39244a05fbf0
-DIST firefox-38.5.0esr-de.xpi 451630 SHA256 c6f341cf51842c2a128b840001928193287689b7beb9ad29c8dd5714d799b6e6 SHA512 0fc40bd3ae0ea16191ac11dee6b3b99867024e0dae6d9f5f84a7bd5acf724285b547adf02d2826a17a2801ca5215d454a89512c9d58b6583439788f07b696bc1 WHIRLPOOL 83a482be66732d0c8fdbc4165e95e6ab0d41dd668f62d8436674bd0ed1c3dfde870c62e02e193e3f7c2f4aea0bf8374be47ecb5048ab4d60a9591d812f7aa665
-DIST firefox-38.5.0esr-el.xpi 498370 SHA256 a1f481a0cce0ca0923f620734db4449c0d6fe74e9e85b8132947faa2ce5e7135 SHA512 c462b2363e67f8e6c79c176b4895ebb145891f454df23447d5c138216d9f99d9bba293d44057d1b1fd0cbb83dd28cd690cbdabf99aef65753fe6f02edbfd516b WHIRLPOOL d7c7e4d314aecb8b7e172eb0de32c2f0b3cc7d044ec4d4a73b3621e7ed341099db0d82e36874922a4687673ec7ab07b914f7fe3bb3f97495bb6df4a8e1793acf
-DIST firefox-38.5.0esr-en-GB.xpi 437845 SHA256 5bd5c0b66139c04e3a6c051828196f202cf0e63a7eaeb7a03658804ab96440be SHA512 aa7ba94fded966385e5dea398326a657343887b9f901cf7c8f5585cec1b215e69ac8a206e1f950ac5c5a063df8aedfe92fb7ad106a5fb985b960989b60209c74 WHIRLPOOL afd009fec01a3c8a3a33a03459c855a381fc71c2d21b469eb42c5c149cb4020d27f4a9571921c250f157a2648870c4c87045336f3cd6032280f0a204b78f0e43
-DIST firefox-38.5.0esr-en-ZA.xpi 439926 SHA256 05bca99e9e644de8c2c970f48269df7a0fe1c17168f2387b314952c0b5a5c3aa SHA512 5f40f666ad2a32658c84bd28c9a26923d415e7dcf22f8af57462464bc3345f07ecf83c9e936535c7b65a7f3b1c2589c18d34bc7c6868d3eb07c26276c3d8add7 WHIRLPOOL 01ba6f64b3f2a4b685e9ae436e028fd6bf09adb68db3a5af91ebbb1a152a45348074e2ea38f604b340a2eeb18d99d4fa995640f1c9174e7286c8fa9c41ac81ca
-DIST firefox-38.5.0esr-eo.xpi 488370 SHA256 daa0d896bdd350dd7a512fcf44739cab26e25da6c951b8d8afecf61e35da9c7a SHA512 da19ee75b202e8e9b462f4360cc47320378b534b2f1eaaa11b8531e717a0a309ce053ec6ee2df4ffbf42d2457d4c821600991dbf4a108d24d6516edc288138c6 WHIRLPOOL ac6fef38269df459f8645bda537b6ff02228935399cbd705ded607d0a4a81bff04d359bb0b693afab066ea4af69a8da0415646dce5d399b8081c8c5280bed21c
-DIST firefox-38.5.0esr-es-AR.xpi 453983 SHA256 6d460a898b51b71e2fd636cb3294fd25a597e6650b9607bdc0360cf86ab21136 SHA512 b0e8bad67335f6031e17fd06ea33ff4e4d8d924b94135c64d8fa086195e1effbc51674ad5fac7176fecbdd62ffa993db6d61f60266b3a4ef1d61ed6ff0557d2d WHIRLPOOL c070f17e3d5ab88c16d8edb5f9d9265be5e1e31c9beadd3a093221fa6fe0f8bd1bbf9fe41795ac2812c7faff425dc20b85bb9b00e9add2c905e4eac0b61606bb
-DIST firefox-38.5.0esr-es-CL.xpi 384679 SHA256 17c1d1c90b0775e33fcd1231f97fffdc794d41a676302ce5b42a5abd6d26978d SHA512 e4aa9f4f07807f9544117c90bbe88a441bb78a495aca11c7634007c83e2193b56c544984313ac320256a5c334b43c3a374eafec56536d6810d1fc95f4733630c WHIRLPOOL 2ce243f0b98968b0c2c683d6db5de9e7daea4fb3b6252c5ec5852af6ebab531fc5f112423398a996a1c3dccd96d6a49f2672412e5ede0fb513084821cf537a9f
-DIST firefox-38.5.0esr-es-ES.xpi 374073 SHA256 434aed974258fdae48e46ed8fa2432f992ccfa9d4664b48b49809cc5881c149a SHA512 f53e1a123fcbabd2bd91d02dcf0c0b63d8385e8fd8e11d784b5ec8321494ffdb6034ce2613b6fb27f78a72ab47b76827a544f1dc90f1285e0e2df521ff5359f4 WHIRLPOOL a89a11ac6a854329b06da2993a8b3145181dbc045cf0c028aafdf3296718e3609a63f980faaf4f597c7b702d0df2e6a8f8e9eab8562a59e36f9e64e048d612d3
-DIST firefox-38.5.0esr-es-MX.xpi 457050 SHA256 1f5bfd3ee120cc598125bb747272e5e32f33eabc563b4228686645c85ba60b8d SHA512 91bdd3c2070f80da9705c5d5aa1e8132b0fc1e2244de236eedb1ffb1d737b0e919587544184b39f3c4df2cd5c3857bd9906c6ada8e41e5634194bd671d34ec7b WHIRLPOOL 2150b30a6d1e92b1c4c3fc7ebc6997b36dc2b26c5cd4980656e77760c4556d15e35582e78d98b2c9b5dd280f5fc1a80a0c38311a37860b48077703b47fe6aac7
-DIST firefox-38.5.0esr-et.xpi 443229 SHA256 2dea9aacd3e26771cd778f21d21faa2a4b9893b615ef7d8e3365edf44dab0632 SHA512 2a034bf284ef545aadaa300f2701b657fc8e36b2dfc5a8b38f6594f31505319bc669e27e803d6a525b0238c4616b53e715e940318f4f43e4bcfd5f9e52874169 WHIRLPOOL 95e60a2650474abd6fc1bd81f451d79dc906708410673f4581a66f4c7fa7eddc468ea7f5d235cdcb9bff19c431e0a4595c58089320270a5d01475e9fe5514047
-DIST firefox-38.5.0esr-eu.xpi 466555 SHA256 b5a472abec6cbe241f213da9bbddd9d914fb61fe1001dbbb001c8e56635c69db SHA512 64f6c2b020a8735848c3dd7c90fc66e0ced48824101a1e6ee2e80de13b459d97646a07b3d0ec592ed20f2cbeb27d4b50d2f16b0c605fb81cfb20d984a952199a WHIRLPOOL c1fc0bd81282f30f7ce47188588a5053cc068a879932826494cc4de310ed41c3cfec85799031e39a135c0c3bd0f62130653b7de62fd6dfbdbd322a61e118a793
-DIST firefox-38.5.0esr-fa.xpi 518282 SHA256 a624a087b925992144f0ec7d122eafaf79f1b16b4acf307b397fd5c83913a4e3 SHA512 994b4ea7ad843d7161eedef6deb03ddc556b7e4536fffda60d6081c4f7767a29f64f44eb4e773568d274d82443b203999c6fd38d80a5920ba2f1b8a0e244294a WHIRLPOOL d5e54d18c5fb4c84868dd8b9abe305bef01ae1a74625f156bc2352390e441f50ed155efde534903a79b0681ff2d582852174522af2e890598694447252d9b35f
-DIST firefox-38.5.0esr-fi.xpi 444853 SHA256 3e7e618950a051ccaa9ee887a85980290c0b214cfa55ebc9e0f0f5dad79a20d2 SHA512 6da4d6f0990786e121837b586f983c09f4ac4d3a0a275214628d81e7ffbeb1742b1b9a93443c5022d4d027c15980470293bfc5eed09205b88f1fe71065c3ef88 WHIRLPOOL 75058b6ec9e77b9340773b6f9e86ae5bc1b1b8c08192e5112b8233a3b2ecb8e2870b2cd29a8226b3fd214bd4c590e544fcec5ab75530b4d7b837736b23782de2
-DIST firefox-38.5.0esr-fr.xpi 461402 SHA256 8be24b5f71615348820f2f91271f8eb79f22a1b903deedfb242409350fd5318e SHA512 84ad8164cd9d8ab67983b386b9e688e36e34f4ab7bd59e212c62c0909896e3551629ced6a6a3c74b79975a24575f4be0b06e4d34decef0d180944b69732346b5 WHIRLPOOL 29d0f4a365e592d05384e41e2e3d04e93d6f6ddca0c482f908134f3456ae2495fa0d268ee9a2c0fb93ad95d73cd40902b0c72ae7288a45341ca88595f16d3dec
-DIST firefox-38.5.0esr-fy-NL.xpi 455539 SHA256 c28993ee63371b194234fd0b45fd9fe805a473e65647618ce5831f80110755b3 SHA512 258eb7f37b0872f22cfbf68b22ef9a137679df5658c7366bea45867cbcbd6713504e9fec30b3b12221a7efbb91c4b967ca284574440d5ebf43831a1c12474fe9 WHIRLPOOL da839bd66a5da47566a9dffd1e89a2d603b432a93dc4ffccfe50137177b41761e6b0b2fb2f0d0757724ee11add88902cfdb97e3acc185e745fa46627031e1c34
-DIST firefox-38.5.0esr-ga-IE.xpi 469623 SHA256 9a278dd0c3b7312c9f0fddfbf3502fa8af6d9a0517ad9d1ee766dab0318123af SHA512 2c30d5df4ffbb18044b504d31524069dff5d3cd7291d2170c45715fed06db49a1a6287ec591f3ec8be03d3d4ab327e9eac0184d2e6a79eea9433c777c7386472 WHIRLPOOL ff9ce46c9a22bf95a70338ced8bd315b7a12bfad1e228dedf0eda44bed7e9d3368fb1acf9605868f098eb9e57c9c8e1bfdb87fa69b70e76191cfc884eee5a115
-DIST firefox-38.5.0esr-gd.xpi 454617 SHA256 ae865a16005632a83a349cac9992ca555031c846fbf65cb6a67b90d989eb80bb SHA512 4291a2165da900e4716861b41a05329ae8b0b0b285e318c34e1c45cc07115a8d4d1a4d9ed266b25b197bb0664399333c2d01b9111bcaf94ce4f74c459ebe57a2 WHIRLPOOL 37a8ef909426fbb9bd071a82c29a22081b2da7499626a7898d3b1dc169f24ea9e4382b803caaf17c89f377538158ce4aa9b2e4cbaadcb2c2cb4f3cc827e42c62
-DIST firefox-38.5.0esr-gl.xpi 448925 SHA256 97bfc8ab8d8f60905feb9b9e4f45c2907c2bac81f133de25c6c5ef8f803c104d SHA512 e237cdf67bb70f5334812780d896ef8bc608e7983977e820f28d7e1ae221878b1d277a1873c6d5b9d7aded7dbb232454b9eb6faf52fdb6f64d24553e0f7dc775 WHIRLPOOL 2e325ad69c02da3ff9406fd76dc71d42777f8dc3cc53c407518eae9b226a64fe69b1c06cda9a5f80559fd14e2aaf93ea5945f73898bf1549a7f169920a0485f4
-DIST firefox-38.5.0esr-gu-IN.xpi 477979 SHA256 c13a1ef9548495b81af1e86983d0356eaa4ae4adfc22f1c8449b788a7b64f4d6 SHA512 92ce428a5aa7b33ff5ca2598b3051e67e3b8730d27e4d7829547b885d0c796dbedaff70a899377d3df4cb136facd3e80f1d9825b0eeb7012a2907463c529c73e WHIRLPOOL 2e043bcd04ee514e0649291b95e4d9a14e3d956d11328cb85d9a6a3ea8eee5b66a20af26cee5c275dff578ac8aed1282d6f1d07ad7863f1ed2d7916a937a96f8
-DIST firefox-38.5.0esr-he.xpi 486787 SHA256 0456275c8ea0462a928b2cb6c5b39ca044e55464444232ecfbb22a3a58b05e2e SHA512 8c02962d5f3fd116b996c3de10666d9e0c90158430a36157ee65df8aba6452a89a7f3ddd8e432f0ed22ce9febace7efcbd2fc7ad336cc4dfc26bf6dcd1b2573d WHIRLPOOL 5c37378f1046f0a59148f9db247850ac56ba09d75346e29167c9f4bcad5d44f22be0974762cb686ccf983d7095a1e86562eab967cf98a085db620a60de835b7e
-DIST firefox-38.5.0esr-hi-IN.xpi 508167 SHA256 ffd9fb218182e75a8492ad0acc90dae9d2bb1213eacc2a5e25caccf430991d76 SHA512 f88bfc7bd6fbab37110bc726398b428f14e3d90eba83d46c234063fb6da35c47f0d311c47027794ab583ce8aacf04e961478b939c9f6dd1f208a2533c89f996f WHIRLPOOL ef489ab0b30bfc443ca214d23bf84e532c0896607b7eea0f839b28ef2119a1fc58c5dd49bcbaba96a33b73335cf740b4f57c38473a58ffc745dbf3d0a9e10dd2
-DIST firefox-38.5.0esr-hr.xpi 478272 SHA256 264e5ab1ebc0ab092aba6c80f12ed3f7ea9b5860493713050b51fed26f906fb3 SHA512 2f6d5fd5048ef9521634d158550fad8d25b3c2d3ca8d4a538136160322217ea86f2838ee420bc59ee2c25709178c7ec436f30d4f7af139d726d50b06f01eb8aa WHIRLPOOL 4d0bc2206ccc4def2844c615c44a930417f48cba1cd4e458c0f2bbc50710ba519b82832dfa63e44eb3783375125c5754a136c2ee9fd1b30f548c2ea1a4c49022
-DIST firefox-38.5.0esr-hu.xpi 453555 SHA256 5e4f75d43fc163a40f40990be32fa932c9421511799867a3428e981c5207c24b SHA512 d454b5d5c8d6db8e860ad2574d39aa600df9a1b1b31361f55fbd5d11bb63c0ac621dc7e31f4b0c763abd7e65f41cef4108a6874678dfd37eb8a3cf53f7395aa2 WHIRLPOOL ff03b840517de2c5cd08b79092f7090167b09ccaef01d3f1d6397b2ebf1135395b3e6e18bc077c3e81032ecb542209fc2bf7fa2e5173d274eed12a2374b121be
-DIST firefox-38.5.0esr-hy-AM.xpi 534265 SHA256 19ff2b1ac85fd0f8209499a6e1941ef212f035d85f2e09cb3d0dd8334eed44e9 SHA512 d8c79f9e884b9dfa48e2c67fd4e94379e487acf919649f22f27ba70ef108354788dbe026ab506056a4b9e18409e730449cba23c17c69520118c7aa10b440f354 WHIRLPOOL f767be98f59fbbfb645941b92965d598b7070e09401dd5ba64448bc2f775c2405267580766e71024bf1e7f66642764aaf70c944e0f062012ad07cd3f20c5df2f
-DIST firefox-38.5.0esr-id.xpi 431489 SHA256 e78a516bc8097a0aa251d35dc0678ffee498dcea5db826c990ee1f2fca3cab35 SHA512 da3f9d68b8f4988960b9639de9558b594555bff246dd514f715e634745f5b0e15a55699e6726d818835889598a984ed9c72c57466eca9e92e8bacd4eb4bee759 WHIRLPOOL b081d015b8c54d4ccc5a88a1eda56cefe67ed019e2bfc461703515f498e45127398b9cd40ee62469c038f5c334fcecd592b84a071ea0d2f979e182c48b3346a3
-DIST firefox-38.5.0esr-is.xpi 485129 SHA256 53a92cd6c5ddfde4ee1ea0e0ab45deebfe2eca8056b65594dbac00d976e30940 SHA512 915fa89f351c42b10ec3848bf183c88e3f30f9e55304e7a273cfe57a8352b38920ba4216e6ae225cd44686d2df78ebc9c9d3cc9712d7a832bb04299be98a7fb8 WHIRLPOOL a3a2709777c182237e4be218ae2c4817ec2fecf3a2672bd3b05e3dad5b492e97cc9a9f78811f38458e7985b043e8c8bcbc1a50419b75fe9404828333cd3c125a
-DIST firefox-38.5.0esr-it.xpi 368410 SHA256 de9e55c034d0f55f955f09696e0a1de691b91ecabfc5967a0c6ac1bbba2e9e14 SHA512 c5f8699dc5d33dfc628b050b125250310c041ca9b48cbae93216c71acd6752fb34919727e6d34c03b611aa76d58f44cb24866e5aff059fce88d3282a7ab0a74f WHIRLPOOL edd510450d38bf5734f6b987923c58be01ab34ded6a2830ad721a61b974e68d8ae41e16db66a8754f5fa47cbfd8bcafa7ecf7cdbd365b966a6e92934da4a2309
-DIST firefox-38.5.0esr-ja.xpi 479114 SHA256 cf8dcb232e82ed458a6d43ebdb7febda128269d70090470374bd28fc87318ef3 SHA512 234e30ed0e8401f642c48b805bacd66c8505e069911ec565d58a784b099cc53d051c07182d1b2ba520caf9a626acd2ccdbec0ab813dab648076c398174d44995 WHIRLPOOL c740d6bbb3ef4aa378734ad15ffdbb5296a2b72527ff0c6e4991abb41691b24e2505b9d8581ef2f854a8c5494b7fcc90bfdf820cd13df7e1ce4430014510a2b2
-DIST firefox-38.5.0esr-kk.xpi 503569 SHA256 abc2961c529178548008e4103e4a1ce0d189767f14c793634ac4c41a22661352 SHA512 d548ff87b83878eae6a087cc683d2d995d4736e2c234256ea15320f8b5017b3ba362574ad7ee7aecbb42102cfc7a9349392c5b7586f86e5a73837bf34ebb3579 WHIRLPOOL f9dc5eb3f30b476a0a749bb6231e9d0d7212e159f32d5e9751cc7613810abdc00889f4c8659d0a9c8295025f63fed2fbe886608d7d28675f1dde7647a2bbb6dd
-DIST firefox-38.5.0esr-kn.xpi 533465 SHA256 fe7c8d4042dea32c01db6c5d8804f3f110ba1bab4b179c54bdeaccf6f9c6fd40 SHA512 08c3849fb74d4f6b4c0234da007ba7b7b79ce4abace81426a4e4bcf4ee71d1fe2089fe0bc5deae46d8001eda2fd749bd43db28e0aa8368820743f377ba1f9fcb WHIRLPOOL 2b59167ae4ee871db52ce520bfc2a40664b7a9a9a26246c2fd112fadc17c94e109129e6907128d16f46d545daeca405f72501fc3244c11eebd7c82a0ffce88d1
-DIST firefox-38.5.0esr-ko.xpi 460854 SHA256 18aedb7263994de0fe22c99ca4134b0f5e9420a475c1822306184b20ce535a03 SHA512 6f84b79d17946b0f0f56fb1081f0ce309dd8047cd5c86bb0e622e6ea3811ba48e183bb25e79017be873e2325a49524d91f8ab69e0015c0fe891efebbe801a80e WHIRLPOOL dc8cdaa4994cb9c169c925ef16a81fd722823bf2103773245e98bae1115d202f9b5f3b7c2bb0cb22e43727b41ede2f59e827d4165061bc28689102cb407d705b
-DIST firefox-38.5.0esr-lt.xpi 486452 SHA256 a5fc129cb73ac22cb218b58714b8eaa20c4e0fa1193131baf8e32a743e53abd1 SHA512 25534b31fdd790f555b4504b2572bc5623f60ea824ed195f28f3caddce4c6389765837f1aa3900ca7c1b9a7e71881a881e58cfed242bc29a75972b2705f4c48a WHIRLPOOL a9e7af8aeecec6c254ec1d80b70afe9662d926efeba1f78ff2601a69cb63c17937f1cd418cae2cb9316e638148e4eef1e6e27001edbd41b082e7b38c3b4ae312
-DIST firefox-38.5.0esr-lv.xpi 467199 SHA256 48b911e86554fc4997fb882140aa45ca21cd0aabb5f654ff9b5bfc1c75579d29 SHA512 c795aef9516b5719969af4fee50832e37927932be01a454f5a7fb1da5dd8fac148b79a22e2679bd4ec4663dc1643d8142efe0cac07b0b24078cbfc28f99e16d5 WHIRLPOOL 6bda4f893ac1b53f10c5edd5f8f932c610c3eea8df31a5538039cfff26c2ee9e086ec663becd5991ee8966e53367f3d0ad6ed107c7da46504254accfc58666bc
-DIST firefox-38.5.0esr-mai.xpi 514666 SHA256 ccb32c83d3cf0e3ef108ed77ad126fda26cef619e7451e1f012f26c031a016dc SHA512 d68ee82aaca147544e07393b092920915e1b20100c42f16dd0d280dc3886d75683eb6c1ab1ceaaf53f24763f7ceb480e235c43d5bfb00a911b74caf0150546ce WHIRLPOOL 23c2c19c99b58dc5b668584ac9a789e5fcc02d2528f12623356c0ed32da3fe2f32816257a91a002aeaef49bef93f160a00d1cdc366f910d7228debe89cc05afa
-DIST firefox-38.5.0esr-mk.xpi 529205 SHA256 c1eb6cea142afeda64ca319fcf79138789e18a8693f751d19cddf6b835c28076 SHA512 9372e8b62450c7bce15d9aa62e3205af5bcd706196b966edcd59602fad9eea97ca711f7b4e5636a3c75d3b8aac12d30dde4d2c39bb7d790001e175f221e56d08 WHIRLPOOL c7b7450f733f56caf6aa6fa2f5453f1103dc1012ed7034dabb97eaa6cd958a887639aa4f6455fc4ec00060ea85e02d242c3913007146140bffc571f561202eb7
-DIST firefox-38.5.0esr-ml.xpi 528920 SHA256 3876cf8785af65a2d153c602c14020f4378fb19c8e8d3093806978f8b3cd9dfa SHA512 fc21e4cd76a5c0976d2b9ea34ac5c5b151c60dd4a674a9af55263b819d266e793eccffc16e6a2651f54b1b0ffa9749196fdf171a56a51bad85530a929ef0ce53 WHIRLPOOL f188fd2b6c6fb4e3b5a18c570b6d44076d430fb38a3a2910bae8257d56ae068e4b7debae254d3e4957b4ecc65542586ab8f47ad4033e542f55de19329a94028c
-DIST firefox-38.5.0esr-mr.xpi 505962 SHA256 b81fae87008c7a33fe1ca6329396209883e2dcc8bb226bab7e07979a9607c5c8 SHA512 cbc0c854c5fc4cb77f6229c09ec8a7c5c05311035196814cf20604e3fcb9294155867beeab521fe4c1361755eaaed45b583cbe7650450fd0832f474f08e4016b WHIRLPOOL 19aa07bc72985c7b6f4b79d207a323498d6ee97beaa070f54e09226ecbb3fa41c3f53a0f51703fb44c70eabd32618d0071bb3dd395bab86a6b0e70fcf0c03566
-DIST firefox-38.5.0esr-nb-NO.xpi 444177 SHA256 821b4ea3c15e85bbeeb9f29585bc4a7849687ccac06da7570463577013e1f529 SHA512 0f4f2b14b0fe5b944562fca8a47dcd952d19ac43b5c358e1218421180afd1aeac61070268aa0d9741cbd3db1440cb0f4615f186a736df76b080261132111c027 WHIRLPOOL 1fe397f2b69e69e0a04b54c683934ab4a3e437f446dffa8a7eee37895f57ce262aad909acd14e7307e0a9e8d5f7953a29ac421c58e5d5c76e1cb069564dddf69
-DIST firefox-38.5.0esr-nl.xpi 443995 SHA256 c84d9d6d9b30c0fc777a714119ddcf3050ff7891ba3452eebb356965b5274b9a SHA512 d82a12c8cd588f109f3623a83672e5da3ae349a92f0f2f865e8fc4b598100a6d281106f6ff1c41eac14dcc2d3706d885a7265133d47b05186cdf3a1562cb2ee8 WHIRLPOOL 94d4c200850e70126602d942e378f0eab10858da4a22805be0486efa9b6b8cd5f4f06e8f1478c52cc758e5975edde005a356b318936d3f43f6a5606abed6059a
-DIST firefox-38.5.0esr-nn-NO.xpi 438452 SHA256 3f2123b789f3b5ba9ef5307f22b93e09adfd75fa72d99b649c24a55f53fecfba SHA512 b6fba97eebdc812c3a335cd415044e8dc70a0de2732b6a0cb3db7b3d296b73c595767fc428a8a85eca1887732a374381a093f39f7ae0f63823d48fced3e65727 WHIRLPOOL 0811588ef439504078bc8d4a45040417aac28d12d0bf13d07fc8ae1e5ff299797f90a486b4397ad3a36ce4162978c8085bec7e5894a2aef9abd77baae63ab35d
-DIST firefox-38.5.0esr-or.xpi 527050 SHA256 8d74c81ff37fb6f1e51fc0cd66a2cda3c5b9ae572b56a125810bebe7008fefc9 SHA512 1e16eaa16fe09f18e3de287a7b5fd2b04824f9850270992cbdb1fd0d02d770f8d54f88e758de1342c4dbe22aab7d7b4e86d7ae97c6919a596339db5dff5c6634 WHIRLPOOL fc270db23e878e30b5bb223a15c017ef05a59328456831a41bdeec611e38b22c548b08830cade27e2c83431a38eb84ac4cf8ec6fee43b0da580196d2df387076
-DIST firefox-38.5.0esr-pa-IN.xpi 493722 SHA256 540e942ee1df17e77666293c7b31630edd753020a2b4e6d863a1eab37c786569 SHA512 cc54062551842e4acdede62e2b0c4c7ac3b6b61e31e8f9a6271f13c2e5f525802bd85a3f566578b104667193cd3efa9fd23c3e3de5427a9032f12f78fb0bd093 WHIRLPOOL aa213bb7b678e927fd956fe1418c0970ac1568a2e2697c245c0388b11d37054449910e66a303c13fd0a11725bc7e4c3eeddb218149456d13ad565ed4ce5685f1
-DIST firefox-38.5.0esr-pl.xpi 406567 SHA256 66526ff6e1f0704323df526077e1279bb181c1e093961fe4d289aaad6132bcfb SHA512 00e1883f322491b699f09e40a52d4076a4641eb5bd739765bc6ae4197aca9e6325587f72f627c2c5c13da911067aec7ac4625af4a2f8945746633be3cfe9d835 WHIRLPOOL f8c1e77ed695752967d4c7ebef0e63c6ff27ff286dcbbd2edb24a416cb205ddfe9f3c5925742f808c6693592e99dc3fb12cbf2c732a84d3cf934b1b7d01ecf02
-DIST firefox-38.5.0esr-pt-BR.xpi 459813 SHA256 7fa6ed68df5a7113da414fdb05b804b8cd166830e5fb3402602dd59646933322 SHA512 dbc9aa6cc13e18a7d299cd282dbc9f6a5df2baa8536a4f7ffd5e49371d6481ba315340cadd847b08d059903043ec4c378506ad445cde5bf21dbbac5e5701691e WHIRLPOOL cb3d5cfdd2d80d8ae9a14cdf7b3e82f7c3563d478529ff22d4991fb144b3683509451157841385f3329a2f618089c56fd2706ac4423e1e5f5212a89e68c74a48
-DIST firefox-38.5.0esr-pt-PT.xpi 439976 SHA256 6204744a7e016ca8049306072f2ce5e08619e16670f4bda0f2f32e96c05d964f SHA512 3741e0836be2dbe91b25afaa6e210676b22f3fd4bf8e577804e90b30e0d9741ed31747db7524c8f0c78d1f6cc95cdbb1b78e526f510f9012638a10035e745059 WHIRLPOOL 027391cf169f57616f6b08d565925ee3aabc585dd0ef92a54a4d0b3cb89825f717422d06565a45921326be1ae5aefb9831d722d5c5d3a85e8fc3b01c7181296c
-DIST firefox-38.5.0esr-rm.xpi 446288 SHA256 4324e0d1de1dcbe182e81a090c1f49e6617dc743c59098e4fa559d3192250572 SHA512 d614ecfc3afea97257254b4e0881c353d7a95f1e5ea1c4bfcc52566c825b0157a6f848f583755428530fd64d88cef6323ea50dcf79531fae19263c9265b26a64 WHIRLPOOL c2ae0bb4b1e5f0b1d2f7aaf704a2cf6af6e99558fd1392e46c00c84b99b7cd19d5b1980633131da3cdfda878b719fef4a2b7b59336a5c74cdd83309bfaa979c5
-DIST firefox-38.5.0esr-ro.xpi 494079 SHA256 f89b4b3408c28325fbec1611ff1984a161c4f9f715671c13227dd97fef0ad4ec SHA512 aa5f5a7a5dcba86af718cbbbcd3d03f710753a8923622ba1cf8505670f2b598961f79cea338c3327c153774a4c2c8ced51a2cb79ad2004152e74230f6cba5f86 WHIRLPOOL 50e3405f65fd4170f956e93635959ff795688e227b1b83965068622c96d2005e0971129056481fba724080f2861c66093df2542816add8b47142c9ef8e57a5df
-DIST firefox-38.5.0esr-ru.xpi 414419 SHA256 a9062eec7d33e57060dab292f6f364280148976da7d4d094f8c1aedb0ebde2b9 SHA512 0bcaad36a2e58b0695718d8812f0c3e81779b30ba0def5630e38b48ecabc60746a89361672176c301c2589aa84277c16cb50e67b77c1e92be43520ece18f2dfc WHIRLPOOL fcfd78f715b45408b51c3ef67f30446b4fcde6ea56e4df7482fc342d14a5e667d067c20e05c8f7ce571bab171e96fe1916015eff5d08e060c27ce930872774b3
-DIST firefox-38.5.0esr-si.xpi 537394 SHA256 705da1314284983027e6d84ff4cc26c98e8f3351a369eb2d64ca50173d6de831 SHA512 81877346039cd17bf4ce11b48cc2fd722a4297f3dc6012723bc6cc91330f1b6de46fb6a1c55a1852ea027c423e36f377b4a1a95a3a8dc1ba0eaff3970ae77284 WHIRLPOOL 7dd4db4987812af38928900cf414084bf22eb40dd0ed90a7eebcb7b7b30f419623711a9bed5dd716c92e522ba6b9e48177debe6a899bf2e3105c43fa32915a17
-DIST firefox-38.5.0esr-sk.xpi 469436 SHA256 e1859b040af0135c1ce85ee775aa92edcf6c1bf3f55ba111c35fe56f23f92ba4 SHA512 00c9b2a403772af0c694503d900883694fa4e2b7589c9a6480ca4d8f4da936f22d0bf7ebe4bb05510dd4f9d387b1d1a42ca781d54e4976e4cb5e57010d685ed6 WHIRLPOOL a2d41e9db6d9b87730ef88bf8534f897faef7fd37257a4690fd2551edfcfcc69b6ae472c076b428c190843f5ff38cef9612c40aefd9686e23d9de378ac76b5e2
-DIST firefox-38.5.0esr-sl.xpi 441594 SHA256 9d28d8d93abeafa1068962fe01a628daff5763bddb69badf41e661e688e4fc35 SHA512 05a76c911b4ab9536ca2dcb8f87a842fe352ea22d63d6779c15c0f66bf2f41c75b2337e0b650454d5b07b73d3ba9fe83ee83ed2b207d00245516ffb14a495443 WHIRLPOOL 08f029f37c8d43daef21bc6fb376a2b477b5307293e4982f61f595bf485ae3c5e2c7123b26530963e6801616ff2c9e72ab8c1043ec8aca143a4cf4c3e61c594c
-DIST firefox-38.5.0esr-son.xpi 449268 SHA256 d24724b695c356a3f172c90109775eedf57b543fcff64ba81739f644e28ab362 SHA512 f7e26f17224ff05df60eedf675d8ed7d6dc6324ae9ec96f86d34a34bed432cfb7726df3a6e47325b01f089dcd990841cfceaa369767c78091caaeaba75b71bf2 WHIRLPOOL 55bea143b9972a85a0e907a73c6b12d8b513a8a688f20a9ab590096cedaa2efa6f8aab00f6ec7348c5842557fd78a0ca9d91bc8d9e9ba6dc2dfac748fde40f72
-DIST firefox-38.5.0esr-sq.xpi 486076 SHA256 b9de1fadc0ccba4548e90a144a36a8415888aee58ded09fd073ea3cb6cb557d5 SHA512 5825c2921610cc204092239fbf603794dccf9e83180f19fae8721ab7cd6fe20068fe3c934e14acec1481ac5aba1e9e11f85586052b2dcc62e0252a96c3b794d5 WHIRLPOOL 6fbb24ae4e66c23090d3283ea2e44820c9346c42e123860899aa1cc6d9bd5479b988e35b2ac15e01bd1533f6fc122d06e5ab3c62b563075c61d774cb66cc21ea
-DIST firefox-38.5.0esr-sr.xpi 479419 SHA256 3a9d04e5b97d77523f74eb8e3269a64bf67ad2f95fd4187c1440a9a599a4770d SHA512 700b5902e112494b61c2f525f555e4f675839e2384e012f34d497b44e30357c6edc7cef7db51b4fef9e6d3d5423fefd74085c16af9e75c3fbd88da23030f399b WHIRLPOOL a967c1278a3fb5a01350b4c1d7d00901e8d726455bb24e0c687e6e9e7887df086022b282b7c6e10aeba14bf2ed03215d729ba8c6f1c6f58a884e888d07491f6e
-DIST firefox-38.5.0esr-sv-SE.xpi 452632 SHA256 dbf17ab5c837ae677f07644e3b2582a784e06d869803e6bb60d5483b35005033 SHA512 ae56af4296c632e7bfc6ec2204ba2af84783bb39d5cbd007d109e5175a5a7f550c800a6cc5c4e2426e3b31ad41c45fd3c0679110ded20d6c582c3e173c2657d6 WHIRLPOOL 0a16dc3ae72f4106f3f13771bc66bff404ba69b89780735c60b9a49528d995ba98574c7ba85cd6feba32eeca98910aeef7a167516307a5a15632e0562ab3980f
-DIST firefox-38.5.0esr-ta.xpi 506606 SHA256 6be710bf51c9ebe27a02932332b38b8a66b572130de0d0df5542563d6295fa1b SHA512 e821126ce9946ecf11dbfa280c92bd8f9bc3b2d44c571a65f0c11c5df22f74d2a4dbdb48407f064370880bc5293a037e82171ebc25dd4449dd81c3c690092fbb WHIRLPOOL 3ab783d003612700e7e386641c578b13127a8c8c9099f5cb7091cd6638f99813dc96d0a0e0722e2cb943d608ac2f9c783791d18561f086814266b434ab4f19c0
-DIST firefox-38.5.0esr-te.xpi 526253 SHA256 d62ddaf94b1555ede165b818c6cefb222ffd0311ef9f917c932b2946b902ea1e SHA512 395a5c6c4d7aba1ef032b476057a6aed071e8a0256a254aab11f47b9606eebc8b63ea57e3212f11c6b02a1970b8c0eb49d51c2614ab9fbd8ba48b758b015e0a8 WHIRLPOOL 45659e672ec7622e35abf559eb239b2e44eae7b6bf07eeac82aa1f8071ebaf540f7deeac4a322f481ad7119fa7f4c05f401456d698f43ee4f5b006c365091d05
-DIST firefox-38.5.0esr-tr.xpi 481076 SHA256 477e9129885b763b8c9105b155b308745b08365a9a1644baba7be9408714ea72 SHA512 71de2951265e6ea6c900c498208af5efcdf3c0b2ea9eeb8e1e5817ca57ca9129e8cadb7c5e2834bbc228f2fc832fbec2fd018ab77719f078e2938af67bfc407a WHIRLPOOL ac57d1de9515bbb54df7c1abdaf618ef37a8b5b5e841423cb8abadfe427eaddb7b3d05871cf69a2854e2f05c142de28268704f2d6ae5d7a2cf3ead6fffe2db06
-DIST firefox-38.5.0esr-uk.xpi 493313 SHA256 63bb631be43cb0044584d30eb28b45fa257baa2c66ea67ff71d9859a07c9fac3 SHA512 169af097ff57906e3695bfa917eb5108d81915e8ff4df8a024042b7aa6655bffa8e48415ae7a04ff48c04c9c328c6a051baeaf94574a6ab747bf626f354c8cf8 WHIRLPOOL 61005c9d9b70f75d62ef527f86ce46f6a7598a4d69a306f384d5a148857b6f354d29d871ceab28ec68acc02ecfa9aef1438ac09cb0980bc3165e7cbc67c58975
-DIST firefox-38.5.0esr-vi.xpi 467504 SHA256 8b2b644c428dd8601dbeb8c8cc35e83d122f127758873034b92b0fb25ba8425e SHA512 ebaa02afc5d257458838c1b727eb00510d6c72dc900f95c30acec426f38812b6eb0b90b7ec2196f5f41aaf0f2cb363be901322528ced28c23f2f14dbcd9d34d3 WHIRLPOOL 322cc24a74ab420206a057ecec54cdffa7e49167b94515213c46ce4c9e306ed959295cb9986712a03b3c290fe50abd4c486da653c985811b62d241167059e45f
-DIST firefox-38.5.0esr-zh-CN.xpi 488277 SHA256 213bc5ad9d0e037a51f29a96dc5bbac4c550000dafda88271d4bda0ff89ec82a SHA512 9aa1edabea803c7bde3544c5964aa0fd0eb077dd39d6d60707740fe2e0a5cfc5e66ffc39669a1776125d35624da93c8322b94aa377628de512bb3dc44c70fafd WHIRLPOOL 5e70c16d10784e1da40dbcd476d22041165f49ddfb796e793e5bc86bafc088d9ab8b9f5f199010cf704d391f4c9ec9ee56e6c93250d35858826c5459f092026c
-DIST firefox-38.5.0esr-zh-TW.xpi 467844 SHA256 7ab324275d321eb78862ddbfb0628c14fefdcd16d89b405ca7a2656f77db8338 SHA512 f05538f2fc8fc5245b1559aa8f5690ad39930ea18cd294c30679ee71d5ad7116bf21a16a67f65fa427848472fe9250b69a4b515ec318d2ae0e0b0c58144d86c3 WHIRLPOOL 0a55dc0674e92106e3a5fe21aae712a412ad4ed42d456dcd7b6af2c87705c12a4cfdb288155f179f34645c61422da440c25713a8f8d29bbd7f89a998f919f135
-DIST firefox-38.6.0esr-af.xpi 483326 SHA256 75312cd630c037ddc2e50a43597e1c0242634c40d6b8353e20c5cf6b3416f187 SHA512 9753cfcafd758dfe9b58eb2a0760e72a1dd2119a58974395ef6df61186dc6d482ab4ca410163b89d33e36e6668575cecde804b4168cf265105a47d07b4952773 WHIRLPOOL fb56a714b7fc1ebe3a85ec13c43976e59fe4e347ed58cad5425d041ef2160189e6ee40ff6a134e4523c0321a91de0df6ab5f16e58c605126072f32655747dca3
-DIST firefox-38.6.0esr-ar.xpi 516496 SHA256 1d3b3f37f4c755915bf091d0bf21db7312d5d26bfdc72362aefedcd51d616e8e SHA512 c9a44e3aa24550d13f8668951df18a9c9aaa9f4281ff352c679295360900eec39c9a44803390f53feb97cdec2de55c6250ba4f70b1da993618ed263421bae905 WHIRLPOOL 13e41841b533afef5464e4d4ea545056cf8d6683b4483af0ae48eddf2544ab3450f27553de6af7925c3c0eaf9ca475b8c6bae0c253b8ec61e3c1f4e8d3b78e21
-DIST firefox-38.6.0esr-as.xpi 509575 SHA256 fa2194dd7e6a3b7dacf813117fe96f901be71776cf41cbaaa49fa2922edc252a SHA512 68c5b1a158688d5cc6dc04623151f90784555c33924ff860f0b40e0a3e170fa77b8e58700570c6dd47757f5e1c8ea5dac3fa0696daf0f3144e33d0640975409a WHIRLPOOL 6cacb4a4442569507efe453b78fe54cc63427c62ce2a538536ee176f1dda54144fa4bdf9cbb92da24b20a94c81ed3cf2141d55c1a8dd635dde489e867c944839
-DIST firefox-38.6.0esr-ast.xpi 397203 SHA256 8982310d306ce78b1b03b23271cac18757b06ac68817517c7cef7b35e39918f6 SHA512 105c4bb8da9a6c5da5dddfe69913f53248b57125e3607fe93eb65182638c924e737599cbd489bd80df6de49ae96ea00b2f7f7ac974d5271b980e06282486870d WHIRLPOOL 0fbdce9ab08d309675006b904acb2b52e8f9657ff6a46109b28f5244a4a29939fd57e07aff0a2c1a569d7fb01cc2cfec87703b27ba99e7f89e49bb09b6e4ff1e
-DIST firefox-38.6.0esr-be.xpi 441057 SHA256 4e3bd7e6a26a636e031a9afefcca6e54ba2a2c8ad5435d3471a9d41267dc3588 SHA512 5bc767528d90653b36dae2f7fafcb99d639c3605605b035a3e330c5a659209984ba3a4fc8733253aaf5b5879b7924655e421f9571a0e2689f28f7b5c20b0c7fe WHIRLPOOL efaf3d04781404e69979abd1166c17f85622a3685b69723d70e2f85386c74895e4cc584ec897acee93c755823c93de458de578cb96dcc7d20c0d716df09012cc
-DIST firefox-38.6.0esr-bg.xpi 487819 SHA256 d25359f143a0c4dd23fcfe4804b3f01662d4e97206be8440881d39d15064c6c3 SHA512 529a978d3e1169b995d86bc3dd3e37cb6bbcd513bb001575f4cf2d0eecab2915065906c7d338c8a6f0ee90e3122c71bb16ed9157f315de23f99a6808c3c66f6e WHIRLPOOL 687d3c3cbf1a0c0a26ed9501d3d451a4e043f19b4232835c4742702ab73c23d478a7d6229e0578d6b9a03a7c9fc30debcc75fe9d73edbd14132db9e454ac6ff3
-DIST firefox-38.6.0esr-bn-BD.xpi 528690 SHA256 fa83a06b8b8ce4454a3543b13bbed40e92b8be87c3607b93d5efa41fa01f6d3d SHA512 8a2b0be36fa41c00ee2f7d11bc2e24d5dfa7e29a219585a44a20486a35ae50816b1280bc4b298eccae180501fca187cafadb7eb265cc5160d45284f6c74fd7d3 WHIRLPOOL 1c67e05d00939357d9063b2cfb8019bd0be81c4c21dbf8da16c64786f647b6f24c79e1bee386d9cc452c36c5c8c90d64f6099847bb1408aa21c47157b4ec5dc4
-DIST firefox-38.6.0esr-bn-IN.xpi 527928 SHA256 987259cc1f6dedb91988c3281c5f26c5a07325e289df8a2090e44e408f8efb66 SHA512 a8e1258a92dc3fa3539dc8a47fbc695c018e532bc92a6203fdef56e092d1d643db360750f52eb2a9ea29aee6becadd4505faca330e9824c10b54d9dfd37be94e WHIRLPOOL dffe6051868902c4e5c016be269e801a3c7701200fb9b97a2d4d38828f5afc13ab0cd290176a28ab1beef847a0caedf31bf817cdbf0f5759ef3515e97588f205
-DIST firefox-38.6.0esr-br.xpi 441962 SHA256 64ac19d617f39376ef338f13cb114199407ac77c939f6b909092c394edc3567b SHA512 4ec46ac1b3ea7f6efa88b8fccd7b4ba890d93e2d821f5b356a349891f47cd5e92c66fa52cf161306e8e4f7c5ed17cdb38dbcc2a00e391963e914e8c59ba59b8e WHIRLPOOL ca0f7bc3387b5583ce2f64d172136e67b575d6f4c8cea6ed691778fb71363d7693eb5bd25c99c2c94e3adeedf212b02324d1badbaaec949a17ef80ae9b91df73
-DIST firefox-38.6.0esr-bs.xpi 485305 SHA256 548f4326b19b535d9925e51a87d63df9e94c3fcec475d330123cf2426c8a3abd SHA512 abe447004f6c606846098789b0811678ff78dcce7f16eb961dcd544e3b5e7399398935aec27d13599a7d4e610b2bc568188644b8ef19052eb463b19700517813 WHIRLPOOL 390173a2f8de8357386c604fb9385d2987691e44e83766b2d23155b7ea8c36402fc2e88351ee11179b33ba8753bf925e3606668a0e264d764a3cfe163cb364c4
-DIST firefox-38.6.0esr-ca.xpi 458092 SHA256 c33d6a7afc0ab3381103b098c180a6f648e5373f2df06fcd495b18c486730bd1 SHA512 3eeb575cd37475d96e16dfb0ca329c4d4895c951f366dea577e7d1d2841fb8ca4b2d1fed555913422da8fbb5331e61cd620a49e3b9b3e90637363f824a746795 WHIRLPOOL 9862b1b56fd53250a53fb50c9e84199c7beaead05732e9d905a47a0c17d453a15ba01d6ab143c1b37f2646d845c3bd93006481c5178bca785d4342917c7f3d76
-DIST firefox-38.6.0esr-cs.xpi 446727 SHA256 982fcc4c7e45424b68370aa50ab98dbf1770c55baae8bffc09e25b9bb04a6031 SHA512 b02ebd2c6e0ea1f10f618cb59948e7b28493171382654528c1b652badfccc12316b08abcd2d62456b7c4b47f363fb72ba19e45cee7eeb241b3031bb5440e7b17 WHIRLPOOL b373569a9a8d3dcd35f306bae269fda6194451953c6440d11dce3d50863dae8a49bb3d677efc1e6fc9fbc08abe59a516ded1021699709f174007a55513b40368
-DIST firefox-38.6.0esr-cy.xpi 444385 SHA256 6c3ee40c1b326172a55866b1f21ede38d8b94598e85c9b6f16a6ac7f269d515a SHA512 ea6fe2bec16400b9b28b6b75e13dc18e6e1ad875927dbd7a9f83c923aa182c1ec885a0fde6a3bc9ea104a64d21fc78e9c01ec0e996bb5942d3beb2a37f03fabf WHIRLPOOL de6b09c45290858622e71757d529332cbf1ad0ae8911b0052eb44e74fbccbbb1faad5826e088c88e9a4b66aeeaf321f8b8dda09aa4e0edd2a26749dce87cb8b0
-DIST firefox-38.6.0esr-da.xpi 450763 SHA256 375b9c390e90612e7a9e847ec2b3a71527ee4ad79231b70b2ae9c67ca1fd5a19 SHA512 8a7c257e7fbe4aa0fd0bdb0ffcf8109c42ae350db4259c94da733a879505befa1a93a328e491fb0c6f661ae6de4b8e36d0bdcf91dec15d216c8de6c48bd88e36 WHIRLPOOL dcb10a5652ab22d7635e346d85a22ac2346e023bf50f676070f81d92ac46ef44b508f83760e0cc798f43af1b672c05ddd2c81a51b856bd49001c35f84068677a
-DIST firefox-38.6.0esr-de.xpi 451630 SHA256 8bdc8b5e21eb9f2c8c5a179cc60e7e23f2b3e34debd5bef69201d6cb347f3b83 SHA512 30da6352d8daaad7989bb23bd120d6af2fb8da684bb039fb629342d83030e64167ec6bf2beba84bf3dff20206a83996b6eb6e8335dc09f1fb77338d9d5a746c1 WHIRLPOOL b828d68bd1e61fdef2d30e111acac3d2602444d17b07e03bed9ecc1d291f918c9eff3f052bf0699d7c2a8dfb53db6273bd47c87fe6860858d47cb20602516c59
-DIST firefox-38.6.0esr-el.xpi 498370 SHA256 f746ebe43d8b4848fcca795e753f4daa52b83e1fbe8b5148f460d7eed993f7a4 SHA512 ce47e79321f6100956acf0a955bfe3cad2ccff84880f704311dc079394ad5af39ebfa927ba46f8b51ffd7c87ddcd08f2ee672f97293112238aa5fe67bfc7c361 WHIRLPOOL 3bec4e5d847334b3be21e332e05c7a6b85e7e5ed10cd91397ee4ca4a34a720c71a8fd14728e92dede32222d6fc711cf431cb624eb46cdbee78b24dbc64a46df2
-DIST firefox-38.6.0esr-en-GB.xpi 437845 SHA256 ac83745df0734e618b6a5b52166c9e2564c40ed16691da121ee0aeb7eefff506 SHA512 87482e6050f850c6564c0e197109c244570cb089aefd28737bd2c65c26030dc4f1e0c98d6c47aa246f9790192afaa06680b7cf18329f35065ebad490c509ade5 WHIRLPOOL 0c1d3536ac4df9c3df5dd2cfea33742349ca625dd8b50f0c2a4453b3ef0bd32b66f5db750727999f399106b40f543cec16e1321a1a6217e6818c6e0c3bb7d84e
-DIST firefox-38.6.0esr-en-ZA.xpi 439926 SHA256 288f473e35d4b682e45a2b82d2219adbddefed8bbe33d051ddd8d8de9fa9adc9 SHA512 e7d933819f5d1a0a782fa91cf8c2f7c21348a2be418a57715e9db78e2356cefa73d07b3f9cb62a432f354657e6f3cdd4a386f4841eb85d107bf5ec7f3224f39b WHIRLPOOL 3e5d5f57ae00aea276317613898b35037a4fe4f6af04de97058c8f79f6c5e0cf0ce3e84238e9af8a6ecc787604153864349f7e4e72e5066dacf9d1e793e5dffa
-DIST firefox-38.6.0esr-eo.xpi 488370 SHA256 03dd766b490847583cbf2765b4cf81ff23da75739e60918811c406af846f43c5 SHA512 98f46db5f5a40cae86bec7e004f509d2c71f151c10f2f4646539b8d7d7f8122b13a38ae4461649b64ced8e3db0aa6ff7e19f5d0474f6a964f8f27167513cd300 WHIRLPOOL 2a84facc56a7e290575cc95d532a4f75999670d4c827b281f6698a683cd9c487d194dcc61f48df341022ea1ddca5fe7c97a31f8f4945e39da0800ff982bba873
-DIST firefox-38.6.0esr-es-AR.xpi 453983 SHA256 c2599ff3ee9f099478427831f8f244252d16be7fc165f9d686cfe35b5a97cafe SHA512 46ed2163bca9201e9bc8b37d0128463e65de4db53caf0a1b23c11f00cd9577b8777968d59ac598132d093d2125857b97961ce6177ff6d5b9215b978f0c8e94f7 WHIRLPOOL 5de8a488eca9bd2a90f4fca558a40a0eb0fc5a6defbe66c9d7899de7d7297cf7fb2a9e05a1ed0f427c29cfaafde55aa9a673e3d7e5e626ba7ef30fe672ae4058
-DIST firefox-38.6.0esr-es-CL.xpi 384679 SHA256 e0cb68b939d965387e706f02fb5771fb091900ec392b135cfebdc3f1668213fc SHA512 b5e70e284f321ce575d431d3209b5c1f5218feea851beab255f7803f3f421adcdf64c3ab9baa266fbe14d0e91ad8073e5e065563256c91a4e9253c6374cef745 WHIRLPOOL bb2dd90362a5ba285771fdfb350abeffffb7b0bac7046bd2f9409ee30f2b222b57f397722b997495e2e8788947500c2ab808d229a9ce9a6566d58713af673024
-DIST firefox-38.6.0esr-es-ES.xpi 374073 SHA256 a444361e1c0a3003f0f51285429096abea71309e358b3d308266a95773d7b3d9 SHA512 f1ac712d1daa8db88cc7af1b680f4df6316aada15efe12b60abd8cd45b993e0b9b49a878f6deb7a20af85c6fdff6af6560c6e6a5eb0c7ff17ccdcf87afcb8606 WHIRLPOOL 4016b55dc5bcfc68da6b58658e53b0eae8cf4e738f2c525219f0376db212fae043117fc6579f19b0089dc69ac7086fa1c6ec3212b393b381448173f7873ebbdb
-DIST firefox-38.6.0esr-es-MX.xpi 457050 SHA256 9f78e0b078724d2f81e0a510c89388de42573086ca999c1a7b98af665761ef58 SHA512 fa9617ca15a922f5ff3e1a3b79bc43707772d9c7e04753cf162b67f9086c7981d456158902c70df4a1a03d883aa2022489e997f58a3cd01bf3e3caa90fe7c1bb WHIRLPOOL 464122fa3bfa45a1fac21424ad77bedfa899c77fc238a10c1a588202f9cff047a9ec56c4869ec55c522a778e53864b4ebd8d440702f6f3efa4d0801faf0a8d43
-DIST firefox-38.6.0esr-et.xpi 443228 SHA256 23d0b0a9da9d207775c82f3f0b4b99d1bef54e1d50e9ca8920748ddbb3bd17a8 SHA512 5fb2ccd4bf7d661007ff57df1b2ec2b65749c267456f7e9ec17f653b71e784dc6fb9fb75943cca96b1b3041220633a7dd08e002724ff628ba7ad9d3614de2acb WHIRLPOOL a190d1eb7794403f75274e2ebd80fa17332517cdd29bb00abdfce58ac01d4fbdea89bd60e12fb8addc4e456351271f5083cde9c0782283009388bd386b200bba
-DIST firefox-38.6.0esr-eu.xpi 466555 SHA256 114f0b7a0266d89545475d9e84b17ce9e44ef9430ae7e97dd8dfe746aa6924b4 SHA512 49f5f629fea56cfd53a08dc52ec0d8892e6f42ddd984181067a71f9b18738029799ac5d72500ef01b7862e551c799198093b331003b630ee8f6d7890edc2fbcc WHIRLPOOL 009d4095eff0fe702be12afd508be32849f00c02ae23996b59107b6c0466af8fe10ae25353bddeb69b8b9f66fe444a1c24c743c27a46790e0c8e7b1bbf8d2abe
-DIST firefox-38.6.0esr-fa.xpi 518282 SHA256 6a1e3e580ed74ba93e3691bb25a4a1775975d13e6cee6c911735a942f1b78e00 SHA512 8acce7fc15aa5815f6ccd9f628233ba5bc56f939b78cfdc2293a35a31a7f111b9386da5a997b9ad46f4e2df01e913604302c986382cb6eaf8293dab109677866 WHIRLPOOL f8ba2db7a8d72cbd3d609888097554c5de87b2aa51b17e2516a3eb6dc1a3534d30713e7cddf025fd6099463cde8f9c3854f07fc11042660f4057bd76a3873605
-DIST firefox-38.6.0esr-fi.xpi 444853 SHA256 c574888f1b30a6e360b4b1c1cacd84cbc2b18108fadcbd49ac4ccfd47e924b65 SHA512 48de4f540ac1c6da3fbbd037695363388e388c295860b3dc27dec8550e40977347813a4a15ae8a1e3b141d8b33a2d8282464806b13a13c0119ce82fe326b392f WHIRLPOOL d2300ff3859ffc98da14a174d674df8cf570cf3192aed7ee882b4ca543e1aaf5ff6bb73db2c8aa3436aea0f5d5d27b26d92c55c890f4cf4689e850d208f6861e
-DIST firefox-38.6.0esr-fr.xpi 461402 SHA256 da189e63a07aa2d26784e5ddcb7041fb969dc63c3f147f566290e5f55581d083 SHA512 de146d269cc91206cb1d9cad4148463264df80b2881f9e4f76cac9f800f6b1e860af48921372c9b96e033a5cc3c52e6c15e77d1342b75e83577fa8de6299ec20 WHIRLPOOL 0f7402ecc552498d13b0ce50e1e3c2cd967d78dc058497a137891fbc37eb992a1a30c44c4a04fe365c3076cb63429e731eb4942895aa7eb2d9f62a6d86a6316e
-DIST firefox-38.6.0esr-fy-NL.xpi 455538 SHA256 ec064490e4c4bdc05eca33974878cdb079ba144f9dac4fa497296d030441265c SHA512 4f64f24a9f723e9999af26d2ce4164b1b7f632dd44315759e4ffdd354ca8cc9d5b43bef8be3b588c4ce369d7ca66cb0af1a001407751a04d195b6f6b2cec2997 WHIRLPOOL c1b5ce28a86872479acd9009b2529787e029ddabfb42a1991f108da401ed3c9ba15101bab53b95218f8f9b473fbc5386d4d997f74d1fa0e712be141fb8250d81
-DIST firefox-38.6.0esr-ga-IE.xpi 469623 SHA256 c009652b9800dfa3f38e07b5d89e9bc6b2f0e8056926420afbd99ec9aa322e8d SHA512 30a998b1cd56cff0c2930fcaca655b8cec17df87b9563482436adabbfcdc019de67c21a4c841db0f112b419ac9adda59fa482009e0ecb2ae2daa1eb29eebeb44 WHIRLPOOL 8397fd0fc34e4bde7af26831a399aa03fe08f6303b8839183424b318d4c14fa4dc07b9a2b63fb08692aa51bfef693073610db14eb4d587a83760347ef20cb007
-DIST firefox-38.6.0esr-gd.xpi 454617 SHA256 04e9ce1235b1fa0d726e0925472fdad4a9ebd8b6baf80392f77e9f7f44afc665 SHA512 183c782b91582dbe8a4ac9909998f9a598e022c26ce1fbfb9c35b7062521234405eb1799f13c6d0f78162a2633eabcf6105440abfae35ebc365572d468816b94 WHIRLPOOL 42246a526903e7fcbe2048cb4baa3f0e7e3b0d3cb68ac16e346d293290bb5bda1677ab4b0779b2fbfa3a5f73811741025e8e9895c75715596df944566d1b4f0f
-DIST firefox-38.6.0esr-gl.xpi 448925 SHA256 ef4c959d24191e6abd54eb03bf7848a08f7ac4f0196e219c6074bea377e87ff4 SHA512 934dca66ea1d36ae2aa823ad07b76500bbfd4098540643a9b44fe8cae8c0bffbfc9d65b1f7841486e36eeba76556d5654144c179fd801874640e46cfd7b62f6b WHIRLPOOL 2a1a77171a9f81c4e1bbfa05287336f9bfa48c6ba9c3f1d4c22a89d06d9ab1c363791c3736d218db9b06bd87f7e394949e5bc3e1ec7945cd940fa367ac234ef5
-DIST firefox-38.6.0esr-gu-IN.xpi 477981 SHA256 e5380052b2adae2e99e592cc28d9a1ecff4dfbb74103abe4432d9688feabe452 SHA512 5620ef31dbad389b2a385e50f766bd8644d6911cbfe98b3e85d6f1e7f8b6090b63caed7362d49a8617abf7a7f9412cfe0aa3cb5af00dd3317c3216036a22072a WHIRLPOOL df6b5a8624e362de5492f196907d5e82e5f6679052e51dabbb701b6cd1e8515d116aee570969d283f5a83ff48dc81cb1e2984f37d31fa2c2383d3f167cb02b37
-DIST firefox-38.6.0esr-he.xpi 486786 SHA256 a9992a670f7c2412202b6c87e849c59d23e68f793770d06dd436ca274ffa921f SHA512 cd000b20130f27a26d58f0bfd0abe91c8cea23e2ad7581d899e1282a29dee1f5dd1ea6e42343fade4ec6b09a0db15c36eb3d1986f7cd9ba1510f64a897dbbe8a WHIRLPOOL 752b039a174d03cdd723102cc537ed57028ba31f37b9fc0634f69014462058de4e88c254263cf1cbe2f31dcc99208f315a47d8f1323ac3b6c1942e04c2018e96
-DIST firefox-38.6.0esr-hi-IN.xpi 508167 SHA256 4e68a008b7d0fd078d239bfc417ea4dcf2f505f97b39351c3b74d4147f847186 SHA512 e2e30710bb2be8a66ec6c90a44b19f3550e2611832dad13cf9ff173be9fe70cc7757503555797c146f5c1ace9107c836f2022129d83cd835ea30d66c41dc314b WHIRLPOOL 76b4d05b30919c3380e0da5a78b42a3ef5e6a837db0ac712174c893758930685a304fb51a432ad4b893def438c5ccd61329cd26182e599b4c41782c946e084b2
-DIST firefox-38.6.0esr-hr.xpi 478272 SHA256 34f86d16e2f1db465e44bafb53d23f858caa0f2e42f46b0a9270fe57c1a86fb3 SHA512 2dc02e798d00e70d2d2b272e6512a4ff08f894fcf353d43d55f9b547c4f46fff822af11656f39fe34e3c4cd2bdeea04a4cfb66ab6a80c0888b2cf2dfe47c1d64 WHIRLPOOL dfe809b4e6a2f68fe0a8c41b7a0b4bd154f3fb67e3e2bc10772c153d2f17e8e8fe03526845243695df1cd113e5b2ad984eb32727e4244c8d8d1131b2d04dfa4b
-DIST firefox-38.6.0esr-hu.xpi 453555 SHA256 c5423d6a3f9e67c6ebc5db09befee3bbccf4d9de16f52533a1fa08c22b5f2ecc SHA512 e50716a661b7f9fa982dbb28c6eeaae78623dd0e32902ad612c93d863c8b731aa999d81560806fa95158b820839bba0977b94f0d865af6495060c75f15609744 WHIRLPOOL a57a7cf532392a08d7162f026961dc6001fb5fb8e94f5ae40bab7a1e6c700110a5473e6bedd7c713b25fb805f8a984df85983e3aed888edaf982afe8de01a2e6
-DIST firefox-38.6.0esr-hy-AM.xpi 534265 SHA256 0ff3c6e8fcd716047daf002ed2b58254fccb82d22c5de1a7fe780d1eea7d771f SHA512 7cb584a9fcf83c7f34e16339085fb3db8404900d41196ed41cb2ea2bf4b79ec7e430999d283f827ebc9c85e929bb316e2f145a11d99502d0bcefc266b66de0b8 WHIRLPOOL 7dc0d4353edafa5fe9bfca2463758abd142a32b216b3d952f0492f4d0fecf4caae587770cb4b476212b38cdd160564c34a8584da1b8637a1571015a68005ef7d
-DIST firefox-38.6.0esr-id.xpi 431489 SHA256 34fc6704d13c6bad38932eaa9c57221fe7b54e5c57acf2e49a184d0c7c4660e1 SHA512 e32f171988050fdb19820c80a6f9108bcdba63b4ab16cc26ef977d6d85e2772bc187e84fa1bdfdf3b6daaee5f1a219b69c6e5ea8128708bb1811694d19c731e9 WHIRLPOOL 69fab5335992179af65ecd42e644f76be30a83a560865241624082a6dee3c145c8f31c81a7f2000120921261cdd9e6edb25bbc697c587e52098bf8d540e3b90d
-DIST firefox-38.6.0esr-is.xpi 485129 SHA256 9a13253adc716018e7fa522915c2a9aca3a4d7daf5cb12b61ec77a7df4c2f3e1 SHA512 b6f8c81dbe3327c07079c7c550b63a2f7deb8cd8ad3dbf0495c92701d95b31d05851d2bb915485bde66b9908c356f56dcf65031b2a0420eff543c064d5ff276e WHIRLPOOL ba1ca66082d544ae9aa4b8227ffd2810bbedb5814f2a5f8108c8abb7758da3816701459af26c065c6dad66165e89de713deec17e70f14a8769e6b6930a73ca35
-DIST firefox-38.6.0esr-it.xpi 368410 SHA256 3e78f0900b56104b61baab01e636256e8cd6d1241f142e2957d566b86ea79ba0 SHA512 969afe42a542d921d6ec6a08b2ee76beb104151c1c9cf0276f0f0b76c3442c6ee308ebfa9e8ea1e3ee1c214ef3a2c9324c8de94c1aa56ba95659368942d89e21 WHIRLPOOL bcd68cb07e450bae4e57caafd85112b9d60780700ce4abf2a0efc60cad2c39b034088109ac6a3819c97c587f849cc6ab8674aca10ff81ebdf2ad055acbf015d0
-DIST firefox-38.6.0esr-ja.xpi 479114 SHA256 693b4c0256e2252077bd4b3823ebf1cd2fde98d145da0ecdf8824133e445e165 SHA512 1c996b84145e99af72232ec70ed87921fb6bd0b8ac0420b1283c320b885604640394fc9c4d6d03aa3efba6c9b71c14f2dcf260658681efc12ce7dc0229ecfefe WHIRLPOOL c6ce15ff80a14c15eda964c29414e2b26c13e1b6ecbc23277be170953ce588294ccc3194721279825a6eccc91e53005f39794b7663708bf559f8a06b03b3d938
-DIST firefox-38.6.0esr-kk.xpi 503568 SHA256 c9668fad6190cc7c7d1d71c8bf01aa46c9ee565ff0f08959a8be3a4343e68f96 SHA512 f2b282d096c9b64ddf1285bfbc853d7497debd7655b32ae4c6c6ab1be37d9162d669c80c42df50d12db6b6676123779aad0e5b0eb818315e5684374b2bd59715 WHIRLPOOL 4ce29eb951b54be0ed4c4e1348e892c54832ecf9b7ca97a2b8ee6a512c2af3c2d31f5f7ec8422f965bfe963a22855b4ec52b6fd04573c652b779170fb988d4f3
-DIST firefox-38.6.0esr-kn.xpi 533463 SHA256 fe1f07f526b2a4069e69bf746e31fe435058f8eb0daf24e72e0362af00e0679a SHA512 dcb7340c6e7aea278bad68b56a45bea63e88370c7ed4178c948477482c2532babe57685d2deab7f41788687811bcde7b9feeb1daa74cfd41f019c108ba285df0 WHIRLPOOL 88a260c2d452d1e4354c332f7119a666ccaff0cac6bdbf9f2849bd772bf37eda74d15cfaf7648876ca6ae346acfaf76ff16e1fef090ea4b87e7b53e6e2a6e32c
-DIST firefox-38.6.0esr-ko.xpi 460854 SHA256 6be4f4e43fed606021d2218ec2cfe3712c63c737692b9116296a85ffe11650c5 SHA512 8cd1977f4cad826e055adc669586c323f6149b22eff8b1d45bc35543747c32a8712980b3086ca95da8672f2c46c57d4bbb3fbcf103f518054990e9cc281bbe9a WHIRLPOOL 147240ea1ab7e4d317ab0d3fd37090a5047e6f58ec2a1e5cae5bbd4e5b2310f5f668fb9fa92698526b17fae34f37b953ce932b8231c552fe923321ea19cf2c7a
-DIST firefox-38.6.0esr-lt.xpi 486451 SHA256 824b6142ec3d13f31d4ea77b9a548eb66eab4942e745a719e197fa5813578ea1 SHA512 733a90580e8b6b19607ba5cb50c55f33db70f2fd153a40a6424a8fea9a6764733a975ffc4a8202c832cf4329848501fe9252fd9d3b05ba66428aace9022a1aba WHIRLPOOL 1d78a0f7a561a254c309ac3427ec05dce71efea83a15fdfe9e2047f572898e49c9d7aafa8374012496a717752f88b26d2e2decad8d1379797a218f35985e3454
-DIST firefox-38.6.0esr-lv.xpi 467198 SHA256 28cdc44b46e3126c60091b664e9fe3c5ed8116372acd13182e46ef5a6024bfe4 SHA512 2e86d3f8fee65547db9f8e051ae81bd6588d297b6eac1baca3a3400355c3d3e23e49189d83d260c42ecee93608cb87dd2ec84d6ba6e6d0e346f59ea5b098fa41 WHIRLPOOL c212dec3d57b01d53fbbe7923958d2995cbf8244ef75b2347ea663960ba9fffc039a5dcc92ca7bcfe1c765d93373ea5a3082ce713fc6093ecf5e04f7d174f210
-DIST firefox-38.6.0esr-mai.xpi 514666 SHA256 bafb8f90a8162dd03f3d2f49aae061411e0b412ca15c85c9da82150bb034769a SHA512 112d98070ad2d5fb319978df75fa4c7a6f84049a6c8b818b66ff1a120ff57686b82cb40beae6f1454aee31930bef374c245a67374deea42b7a34ae86659fb3a7 WHIRLPOOL 883df662ac1b97eeb5ae401687c3b989d25e0c41da1819ca9107d665d353f2ac6ee9c8e369196d9595aa9f1225c8d1cc63c763625b418c520ecc1eaef9f32cd8
-DIST firefox-38.6.0esr-mk.xpi 529205 SHA256 69bb1d10e0f265342b4f4826766d0f6b13f3d777a0bafc448173f6441512a3f5 SHA512 a65a60c49b6126c66210eb52c7e8a752dfe5a4e83cc7ca62db545c44bc0e93ac1812ede3f0575805f96dccf12c936b9776129f8c98f3edf5bd4eb6285446a821 WHIRLPOOL 72e43a37c4fe6b0a24bd0034b35984f4115b8d638fc0629bafe38d5d7ac5863d9f2403777500d5054be043c826277ce5c6cc695207777fa7b6449caee9fbba3f
-DIST firefox-38.6.0esr-ml.xpi 528919 SHA256 67ad0c3738ce988fd14536da26873519bc707e554e57e02e08c36a74228328b0 SHA512 ecc3be0003962cc1041787911e14547ddc337c2938ba9d1bde003cf7fa05abd560dd8c82d9235b211b9b7a1f9804ed160b1070fd33d39f423c0d3282fa45d05c WHIRLPOOL f18c6add110caa52078a2331e949c7cec937aa0dab8d5da4474e2c96d4c94f8537c053719978d614f63fb331f5f966f0ab132d9e6530ed5b00db1a50328d1bc2
-DIST firefox-38.6.0esr-mr.xpi 505962 SHA256 f9e656e45fe64f95a2abb818ddcb8e2344ea42545c59f8f6d29909f181933120 SHA512 7c373d8bdda6f6643fb003bde4ca6da7f9434fb2b3adbfaf5955a667f346e7c0c1c600d0314a231c24bc1e127cd22e38fa62c237e207a96b86cd9ea89aeb564b WHIRLPOOL 993bed70cae4b731e36c393b7b05a2ac5a4d05ec068266956e77f12268fa1db85d9648a45d9fb9f9e95adadf5b4c8d6ce1447860a655afcfa369366fe5a81e6c
-DIST firefox-38.6.0esr-nb-NO.xpi 444177 SHA256 d2d6e1fb4c126dd0736994613682439201d7f0b4ec25a64aeedd18ba5ce89c79 SHA512 e1756fc5027eb2fd3f37c1bfadf48ec81d872c3e68d7492f6a30a32a9d7bf06c3bf8594c21d2655f7767f3e706f1baa4307a22a4ec1b37c14d6cdc3dedd90c20 WHIRLPOOL 4b058bfafa1014c216abef3b378e84aac75fcc05a49bcaecbe0f1588a2483ceed49f1897d804a2875ea7fb32458e82cabe060d0f4e2060b2b38882a3dae7c5f3
-DIST firefox-38.6.0esr-nl.xpi 443994 SHA256 963ef9ce080aa18c0c4dac7e1192368025be95d7a0e4363ea63006a0950c85ad SHA512 1a5e09434d0dafa33c5c6aacd124150e8f0e94d64664e2a4b4e689c58d768281466abd0c1550caee918ed3f79d2fc9a9a6e98cebeceb2c2df3f76957c3bf0bff WHIRLPOOL 0b9d33c4774c355669fe146d31f36e9786166625c76de14a04e8b8f2d09f4c14b6544e04d9e6bc0fe7e31ddcf1aeb4c0f988352af4dd997f1cefc9e68ed06b64
-DIST firefox-38.6.0esr-nn-NO.xpi 438452 SHA256 a05ec5d5da615d06a060df9e005d1cc4ebc2c82bca7d8836c06ba9a138f3ce5b SHA512 cfa5d381f7faf407bb27ad7fe82523c9ce024ae29e053ab33af48138fbfa34e47cc987d09abd6b7cdd6edd1e2db371a9ae3d793f95b84d3fd70467e42de3d50b WHIRLPOOL 5dbb7c8cf00d29e1af34b363c84187aa6157a1f1824a94fc3cdbb2399c5ea2bf7e89ad854d71a424709f3d8573fbc2000cb79785d1d16791b202508f339d828d
-DIST firefox-38.6.0esr-or.xpi 527049 SHA256 526b2590f5b213d4b90d2e8a3a55723f3a551dc0ad98fbc8c40898cfeb82d58b SHA512 bc46d8e1e7aed9291c632ad54026179c040d2281538b7d9743e951acf1a84efa97b05de4744e93b7a834a8c618d3f0ff3075a94adc644e888dfa427757a5ff3f WHIRLPOOL 918fc85534f043ff82e95982fb98515013ba9268cccc730aa4fc3f791be4f2c7dfd1a094286c324a90e32ac42291054ec623d336fbff6a080b870808d88aab44
-DIST firefox-38.6.0esr-pa-IN.xpi 493722 SHA256 16c2d17420c49a4f7fffdc978e9a114748ae0cfe76ee0f8db721ceef8a9bdc94 SHA512 5c2a7859264c87ff440ff104e76b57268856bae90a1c38ec2e63a5c3db21dd56529b9179335bd394ac9484b105fcf53f6c36c505a1038e45063c3f9bc71d972c WHIRLPOOL d9aae23e1f81d862959505ae0b54a30841e784524fe3e583a19f52f8c925f5ed5714f8eb9d9ef8a373f82d8865f649045ba0a5c2781e756654aead0aaaf6a8e0
-DIST firefox-38.6.0esr-pl.xpi 406566 SHA256 8d918d988341c462b0b621c7d0cd9d77ff49c14b0e2b1bf134e99e9cc4469fb1 SHA512 b7430755e3a3122a822902bba90dcb5186c8ae2b26219410f6857290afc8da2c06d758a3b8a58d8e708eec2e8499d1d43278d987bcf6342838c7e145109f11ae WHIRLPOOL 9cd8d6bd9b2f359982093089e5d186e51fd0fb38e09372987af7335dc8f19d9a16b624a1669912d035bcba6b39b0bc4fe867193839285bde44993916811be409
-DIST firefox-38.6.0esr-pt-BR.xpi 459813 SHA256 396e9bfe5192511c0ad67107dcd8e9bcda83de94d62095ca10f6af4433d59100 SHA512 a2053820711c34b6ebac5c82eddbbf74b694a7a1a3e5d47d863fa85b146c5191ea89d3a4b33a5cd7cc609f46eda27064fdeac3c4d6de3bf720feb76a47e43f52 WHIRLPOOL 9e79c57b389c400258cdfee64cb789f7e852acb1de5ad48053567850d749c63b739eb5898e11596bd5cd0f7f2b1135c5dc89a5a862f9f891f7d2d8f3a648d4a4
-DIST firefox-38.6.0esr-pt-PT.xpi 439975 SHA256 7968f2e7b2a5da76d82312230d5486f8c8b59ddef18d43d0c3e43581ebe717d8 SHA512 1dfa8c75a58a4d1cc306d3430c0a8829238a37382027f6985457acd5ed936eb16ee8972e375933fa24409d614e8a9b389c6b2b162c8fb89e9787d2b59d37d94c WHIRLPOOL 08c4a98afe291ff5cf93b2a47ccef5576175bc6456b74894337733999eca5a936d31a33f08ca162334efbd5ac6ecf52c2e99df17dec610211b92c6cdca250f1d
-DIST firefox-38.6.0esr-rm.xpi 446288 SHA256 7813fc4421fb3c08ec81e60ce955194f9f2a376662262da4a0f320db5caff342 SHA512 0eb56d59a8ec5b1ed77755a6d68b677d23d4ac67c147379f6bf903f23793fb9f1f23c07de52664dd1c3ee7dbb2be34e5b5bb99529f20e395f05d2c98b9dd4a7b WHIRLPOOL 0ac7af0b68f38c8c6de8f2183d028d955e3d0cb0e212158f18d65706492aedc1d92d88a23df648d26887377106ce227fd838a9df3edf3571acfdcdc36e533e7b
-DIST firefox-38.6.0esr-ro.xpi 494079 SHA256 7476011cb35e32f3cfa265621d830cac44d4912f5a5a3814c5c31e9cc5b899bc SHA512 bcf61c1c7ecf4d21bf7920a6a365e04a2c5261959df48af88b01975c0b0c6d1254b090e264afde172677434a44d0f5e087b87095ab4a9d82d3850d55ca27413e WHIRLPOOL 9e5b5d6359d2217ab3c3fe4517e25b713b8ab027217a8e4e76857d7107acc58201a9fde9ca85ba28d6b9d1dbd793e86931198cc1c8cf5d833209ddc9f66d5afd
-DIST firefox-38.6.0esr-ru.xpi 414418 SHA256 145b4bef6d8fa5f644d3d1726bd7fa3d5679d3dfa1c456a0e39be3bb98b64ab9 SHA512 343c6cfa77efda402f79165e4170fbb7916d9c2db9c26fd7e05ee4b32fe08ddf41d03bf4325f3d389aa8e6530114ed6647f072e3af6b8432570f5108dabb1da2 WHIRLPOOL 894c80f114c098e3e3f2e6207ea970d26b807399fb304b8f85df277726f6cf0cc6a89539a0992b3c8d735b74baa10cdba6b2e58cd62811e7d8d5d3abeb1e9810
-DIST firefox-38.6.0esr-si.xpi 537394 SHA256 1ba99487b2dba24c1a34f9cb3355492fc7002d1e15f00402788aa14bf1ea8483 SHA512 aa735d97a53a3f53f63469e30dcd91ea34c4c5a1caf54faa0c6a3c5dcd7aeb2321d3fb773d819f7c54c685666d508788e0060a853e5655a61fe9eaeb20e2b70a WHIRLPOOL 116302fe0182d8b6a7e9e9c01ce9270f396cbb5bf387828475c1a65b0b8954dece682646695369b73d6d5f430230b62c75dbfc5c8564667874db87997033df7a
-DIST firefox-38.6.0esr-sk.xpi 469436 SHA256 b3cc30232399d25c130fbbf8476ef56013589b370ec44c18e76eb61caa4a457b SHA512 7d05fefa9174de322104b6f2c8c113914bed3bf9f4f5ca1f510884e332c9fd4b3159ae22351545334586c1e7898bf0cabec5f5f2288a404f8ca6c96397327cf4 WHIRLPOOL 87a77ec14a39b75a178139297286b4f419919dafa855f5a282d5053a39cdfbec2697175cb5c1020ab48bb0e3760f4b7bb94fb36fb6c04e50b2325166336592e8
-DIST firefox-38.6.0esr-sl.xpi 441594 SHA256 77982fb211296342a39d5b16e2d538b8d4cecf7ab5a8ef7d958fb373bc32dd63 SHA512 1196020a475defc083c7a3507a515b2cc8779883b8d170bdb691822eaa0436258240229746fe23729793ccf68d81ac6377547c2183747d6aef67925d8485a56a WHIRLPOOL a1dd41c471b512c67bf0c92b03e67082f8d06b57e16d1e8b2173b008a046501a4f6c4e276d17c1fad023df668d2a57c2777e9f88a8f041670ab9b137a84d75e8
-DIST firefox-38.6.0esr-son.xpi 449267 SHA256 0c80545bab1f7119067bafcecbcef0f902393fd3451a71dfc90122a6f0b8701e SHA512 812c0e91b69e647ba554f242020ced7597c11a0da8695505f88677507d73c8e67169dba5053e9e575a261eb8bfcd15016191d830fc0ab51782fae819c1d0bcd1 WHIRLPOOL 1aa8d99ea3f4f18d10807ff52c4519497c9b70c9852dc84f57cc6a6d70f7a162a7f74f9029098670ad148248dad6321a199d3ef32e3455a4cd08087b6f85758c
-DIST firefox-38.6.0esr-sq.xpi 486076 SHA256 6f3d9fcfff460a162fc3e0cfe75a8bccfbf5eddc8d683117474c99d07f47100b SHA512 dcd4bd9aef9a6094b30ece8babe2bec877dada4ab235260650811454e9a773e2827d64c3c34f5a4b48c7776a161205346f4c091e67db47bdeefc1a5f62aae121 WHIRLPOOL 3bc920c2de13ac202643f99ef4cabfa53dc340d910f43e30efe04aa142050e16fdde6177ce34fd59df183f0f810462e3eabb9ba00c3c24a746846298e0ddf9e8
-DIST firefox-38.6.0esr-sr.xpi 479419 SHA256 825d25c1d7b7fd15919579e5930bc6d146dd9c39ba31ee544bb78da7ba1a9b5e SHA512 67dca0f68449af6a868f08e8a6809525526fa9ef6ed7851a51044a5d22e9b24f95d38191f4c34110f30968f4144f0b9a6325283599f09d2501dcd088bb471fba WHIRLPOOL 58383d8775c7484947c0406b55d7af53c7bee52b6df918bae1b6fd2388efefa2728ebee7c9590e6d5235d14ef323dc35407a63066ddb018d976abe1e0551830d
-DIST firefox-38.6.0esr-sv-SE.xpi 452633 SHA256 62c5280c5e49f47c0c6136c41196db112b220bbc238e8219b989805bcfe66dd3 SHA512 7e8134b9330df184d1a36779cd6861d42cb6ac1b51db04ba56aba5f0fb4b9becbecc56643d0af04f1b72382a671b5f6c3f9fc1014c2b08cb5fb0f481e1e1d028 WHIRLPOOL b8797b65c85814d8c62d6983d49510e107c445d1c2d822dc13e1fdbce6ace01d7eb4c43b098613c75420c1ab68ac86a8c1cceb1a71550021ac62889cc565019a
-DIST firefox-38.6.0esr-ta.xpi 506606 SHA256 57decfe700c7e047c10f39d8ef0a5d0a9f6f606fdbced530dff906cdba42bc43 SHA512 1bc88c7b98c0a2c978c4c5d7b14deae2cb156c994ae4b6a9be6d88bfccf922a3813becf5f2873f2821bf27b24c1ff3efa49a154147fdec1184078afe01085f5f WHIRLPOOL 13d061f3bd99183ff0243933638f493077eda4c1f190d1a7a830f5dd036c1d62ec7b9f7c979c949b6d9a330edd52be17ce415ba4f5bebfaf31c94acf4381e795
-DIST firefox-38.6.0esr-te.xpi 526253 SHA256 a87f56bb7ebe1c01c0dd3aca66f0542d6c769e01171e99e6667a4f226cef2635 SHA512 44e63a03d317191bbd5e129a98dba3c06a32b79a5debfd56c2bd65361646474217b3e77ede339fc785e4f65bcc152bef3d35dabc1224fb9e2b8d7a708b43553c WHIRLPOOL 97c23cd09f968e5282443608717f9c9201e4b9237fdd315112d466104eb145ee3322f0b76b6e8604bcd0538088929805d26e422f6e3414336b1ad4e311888b8b
-DIST firefox-38.6.0esr-tr.xpi 481076 SHA256 d05ea4e1f54a2356eb9062432280f85ac4733a1938eba039a01b5c7359913a24 SHA512 386db705562489fb6db438e3a37312304482ceb1c12c2949808144aada2bb57c20e969d9a98f7d80184f5dbc51aedc0c823d15a6b04f929337885a911220c707 WHIRLPOOL 301f87897b55a34ed4c10e911c1bd122b9f4a2ea072ff444c6257238d832a96e14d23ce45666f9314b2a9f601a391bf68a63df18723c20db3b4c6d2556b29d2b
-DIST firefox-38.6.0esr-uk.xpi 493313 SHA256 f81f6f044d01cb8fe1e5e56fd80524a735d08dd6b75ed88b05980aafbbaa3c5b SHA512 83ced81d6c43d7da5de60f7c36d887d0445cb5ef94cc858a2cf4368e7bcb2d0dcb4f3c18ce2dcc3bb67ca80c491d9b72586f71b08c39c95e05d376605633e892 WHIRLPOOL 305a181b1aea6138f12da120e41c51cc9bdc7ba3d9d1c575c98f7c6709dbccb24760cce5394e349641c8f78ddf74a54e5711fb8163b0d41dfc7cd058f5d8871f
-DIST firefox-38.6.0esr-vi.xpi 467504 SHA256 3c07c24f533e3eb27f3189cfa384ef815a55cb8d160e706e0506f9d676a9ca9d SHA512 ff50993a235f766eb4107328e012146e1ae7ee6e77055ac7f23a1b7d09fe9ab281044d6b309580e0611ecee0a97b8bee745af9864ec8676bf89da9a738b1b34e WHIRLPOOL be46a01c76ed994ccfa5a0d6265b164160186cd8c2f6d40e9d90194858eab678c37983a8abf0eeda765a6fa9a5ecafbeb42e291e2c9a530281395ccd41d66a23
-DIST firefox-38.6.0esr-zh-CN.xpi 488277 SHA256 b1401c37e9e44bc01e2e3627ec82dea93346681d6259e6cf14079fb973ae20ca SHA512 43115069f877087263bbaec779bc9aef72027ec228aab63def7bb2e858554d3377286c6a1ce6cb75c76ab52f5f08878b492b7eb4c26fae8b5fd9344e8e49777c WHIRLPOOL 0577d9754757c294ffdf20a02fef7a57e9d942cd4813c180763313575996121b68b00f6030be23a95ceb8bd03290247cd46823141d3ae35a9c6160d9c3fb1f38
-DIST firefox-38.6.0esr-zh-TW.xpi 467844 SHA256 e94521a7cabb0230dce0448e743c5986cff74bc4a7ef8ea7280e45e1d257237e SHA512 8c27abeefd78b4d7733016c7710a4b2986c04284747d043af486548728f1f5acb71b6136ff8c75e426dc52e37b30fccebcd1c42cce6c19abeb6bc75c8d218d41 WHIRLPOOL 17d23c0ec40bf347f0a1668f507cbb9af3c9e5024d8a9e64cd20365c3245a342b44cc3b531e0b054f7a07e61e48ac419d186086d9d0c1431e0bf2c7bb661037a
-DIST firefox-44.0-af.xpi 496123 SHA256 2d03ae5387a0b211fcae044caa7b7b84d12125abf9d21847a870f5a1f14793c7 SHA512 61d2af5dea407cb17fe6e7d8f528384ccda6356c04b89549d7ab005e5c5edca3798d40b6e51ed5da15665e5407b99096fd9cc4451ab459b5c7f51818612ef032 WHIRLPOOL 3fba0a3e3f4a848374dc81331d757bc532095cda607461afc6376cc70c3391c5d8bd0c0b9bfbd43eeb9ffef0a3dcda96cb31353b7593eefdea3f95a9708cf197
-DIST firefox-44.0-ar.xpi 531969 SHA256 08bf3646f53498eea083345ee80f656f66460ae7e9efbf7561101cf863ffd3e5 SHA512 dedaf867d02beae5896747b8e7b1c56e663d2c04da6ab22fbb9895209276104e96ef22a96153b803f56a1dd99e1bf5f4855d0373240011d9ed6f920d7d642f93 WHIRLPOOL 35adf1b23a95c1159b7e5e95574d636d4741f9d1b901733a9122db54d44732e4068cf87230af4fe336b49012ebf48a3deefdc3a64ac0623b5d6a295a265d6e19
-DIST firefox-44.0-as.xpi 522458 SHA256 54027a9d7b52c368adf77ef4746ec00f47e4a85e4ab579138a7fd686f07f892c SHA512 71611d24290486d0343856923d1c5f33a0711beae0b49da9c25c252b8586969cad3b5679bcd66821d7961472774fad439b8ba4bb5901bf2dfdbe0da1d9c3514d WHIRLPOOL e6b371cdb523310a58f6d931c0b484f3116586d63be458267b5e5dd713b7c6a16e27863b461842ae82ec8c2fd40d249eb55589d8be082fb04e2cb1c4bac3ad93
-DIST firefox-44.0-ast.xpi 420007 SHA256 be2a177e24b39b936337c778a7e94a95a96b7deb9ab47c98a9ac52351095122e SHA512 d8a3876dec85ebcf1e8b0f1d0f9b260fe39b2732b70b5b589aea63f866b38134e324a72750e2ea4a3875da7022201b32ab770f962ac3442800c62f796c6afe73 WHIRLPOOL d3d5bf2a831dc26a8b54c4e68104addd0b513ff68a79bf9d65a8c9ad7e20d814f9194fd8993b700c6cb00f551d986a9374e7ed9ab24c6105c012bfe3c9696ee4
-DIST firefox-44.0-be.xpi 464850 SHA256 7835f62ed47c44a181485f6d3475ca24d0d9717535386c892294d73fb15e798b SHA512 dcffa9664f8c37f82ac0a8b38eebcaf0a0ef1770d613f6f6aebaf371b2195949ea720e5335b0bbb2fc6c9906b897abcefd51db3e38cc45b62d90bd0ceac54c52 WHIRLPOOL 86649456ed0d5408de0c84eed6c6bb810d43a884f3be07e2dcad6c3e4b48146349434fb1634037504e826164c3e1b2cdd6a8391672d7938fbee895d2d2d9036f
-DIST firefox-44.0-bg.xpi 505504 SHA256 b1d04beea09b5b7b8fb3d95eb6e4be61ee8f05d17a12bf8ef9cb10a478c57e55 SHA512 7bdf7ef915b2df48cf84d335adccef65077a0e8fec921801bfeb426a692d5b9b73775fda885dc6d5a69ab1df46388515a4ec0e840fd6ddfd334402adc9c1d5f4 WHIRLPOOL 90a10bdb1ab2fa3635775ac8a7c7f262a7acebc3d04cdc5b5e2eb5396a391893a30a8217dbf8e2d23fda22919d98122c6363dd2012e2b5cde7781f21a375f070
-DIST firefox-44.0-bn-BD.xpi 550930 SHA256 39fb97e5782bbe7874cbb5be6a13273c4a82e78613d84e8dfe914f1debd0d865 SHA512 6be2108569b8c2f1aab587bb4002f1b5eddf154596b87909e29f956ed332827edb597af84e238ec221f0db788840d14811503d717ee956d7c981df72432b1d1d WHIRLPOOL 07dda8fb0443226a71fb65fc1d1bfbf9d9b4a5e417f8166b303580793cae9b6e42d9bb2b79bcf789c9ce2fd8547088a95ed3e6b2d4a22400dfc153637bac154b
-DIST firefox-44.0-bn-IN.xpi 542124 SHA256 56edcd91ad997d1833b4f21c47a64f54d89aba9f2a5d1766e61aecd84068e406 SHA512 fd301c79c498732bbae83611e41c3a8aa7d386fd44a39cc334a2505d81e0e3ab58f3e4bb539e7799e207329939344c9adb9b55c8a53fcad483f1a80818420127 WHIRLPOOL dcfd4e799ed56a5ca425154f186f6201cdfaaf7a1d8c2b119322c21e149cc96082705bd53bb2e72f2f43759ce1c0a7d7f53968dd96fb63b0306e7ae831d69883
-DIST firefox-44.0-br.xpi 454294 SHA256 2e2be17058da67aa6bec21809009b8e567b2da25f759778d198bb4b8088cff2d SHA512 9737f9bf3a338ce79765aeb1eecf94c79c8c2abb3e74cc8441512c676b0053d2c276953d987463ac8b1e5787170dfdb126882d5f352b8699b43f4f753566eec2 WHIRLPOOL 6f1e3c0a44b446dd40964aefe391a128de90ad7760d9bf6f7ea6037abb68fae21f24e1601da11ddbc08f4267b7c12e15daa1071f636a2a22d2d9970d92b06a4e
-DIST firefox-44.0-bs.xpi 493433 SHA256 4b951439085404024da6b343fd8967de4e8d814b5800317691bb11090d328fbb SHA512 77a2279862f31e4bfe2d328f4e131e5f9de0e68a9a3cf487330b99dcdbdb537444d2b07ed620c8f53e47ccf0f8f26d59a1b48630b21254f72133b53f9cb37d85 WHIRLPOOL af967a5669606b6db1943164cfed46738067a531dd2461deb379df8d88f38e6e0dd5b41bf35fdf791967e5039743ca90d7f15378b8d4607f4ddbe5fc41073035
-DIST firefox-44.0-ca.xpi 471462 SHA256 3704064c35a93c6ea199bee735c88ad1f8d160a8f46cd38516c226c801f6827e SHA512 ff89fbf9763179663930dd78539e1b40de9c97721be6e062572dbfec0c374cc7f5ee15241fa3229b20c83711248c4867159271c0f7b5d0c1100fd5b0b71f4a42 WHIRLPOOL 91019737301c47cbea7cea5ff81dd3df38aa2ec8fdbad6d2a03f07869e66dead2bfb6f2cf50a15eb2fb7c6c46d80771adceaa688e277339b1adddb420a5dbae8
-DIST firefox-44.0-cs.xpi 460606 SHA256 fb7c59ad096337f9ed3394ea1bc0c0156349ec03910c506e708ec254789588a3 SHA512 526babf4c84ce11039ced17ad5e19d4a19a419d9b7e2f80dd358a5d2f531dc9856f52ca1adda0cb97d9557f83f4b3cdf863e4fac2231ad3f4ab34740a7d3a9aa WHIRLPOOL 3b531743566bebf0b5fea6eca9aa3203822398f01b0a5d791e4188eec90d990c266bc175d1ab07e4ba83bee51f4ac3b829d5c317881500000656bd7ae7fc2feb
-DIST firefox-44.0-cy.xpi 456837 SHA256 e279f26bea220eeafb4f8b76b31ee782e991347e45d07c099dd06000d38d490a SHA512 56fddaa571b381f426f4fd73186925a8ba9f92750d5f92ef122c21788dd56e7d4028bb21b9afa6da74d1498bf299bfbbbaeb36a18cb071eceb9dc62f99ae9cf2 WHIRLPOOL dd13ad1c08c276c0d4ab360ee239f27a92d7887f5719c7eb903f3a94caaae9fe6771178d28837b1b58d8e7ca965eb59f98cf00927e81ae04a2c748e08214ebb5
-DIST firefox-44.0-da.xpi 463397 SHA256 3797f85f4eb97b9cd86f8af3563cbebcc0e87e95558840689f4ad69c185e43ed SHA512 b9e8cbf4de5463fcb442e0e8004e1312764649b5e878aff5f2a0185231767b948de6a82d6860d25844d687cf0926f0d76df0f205f7021053c233b4abae8a7c9a WHIRLPOOL 3d4f9f85592b6a1caa5a008480d45be32bb7ad6cf7681281b966f7ed8ac6d69c3e82199f43519f1a114c5db20ccf78616c83a3c944c4bd21c433ebdda6ced8c1
-DIST firefox-44.0-de.xpi 466176 SHA256 42bd312feb841f8cecf06eb85f9f588ff0f2f0bc7990e1949594c3a0adbe94b5 SHA512 087b7e728d3f6772e8e5161300f5032d5b0a877ccaaa684594b1a3cbd1937224f9aef892eebbed6ab104575929fcbd49f2c0ddc0056c001928f228696ea51915 WHIRLPOOL fa8fe44d7d9f718c3d051cef0858611c2006c313658fda3b2a80f4a17636a29696b639a51654fb09d665a190855ee3893b6067720020a76795a032eea41b84a8
-DIST firefox-44.0-el.xpi 511154 SHA256 edf04fb40f0436553c7535a7d908938e66b3c8a3e7def79b86b615c66572299e SHA512 58e8a7f38d376e8764af9b564c77e388bf2cbcf8b333b63e6a99a01b64788626005c97cc4cff1eebff7a0414c4a264c51562aa02ac2e6e9d98d855b00f349807 WHIRLPOOL 33739b7b5d4fe527724d039b742efb10d1193aa904281e99ff4a0b805caa47105433d171a30c897978102504e2c9b03dc12e592c1d8f7bd729becb0cdc4d8770
-DIST firefox-44.0-en-GB.xpi 452629 SHA256 5e134e1da80c612c48565a95b67f7b1950c8fd620ea16a530fb794119d9fda08 SHA512 ad456ee1acb57ba7943fe585512d501e82cf27946869f5535e3aa5078567356fcc3b99ab609b6beb0f2d5e29fce6e903fa970d33601b1b1d2a3b4a1b43b03dfb WHIRLPOOL cfe6b9b1afedfc728a2ffcaf1084c76fbde5a6df9a0beb8e57860c33884781fa09a5c64e73f4f007e7d997b026da20eb1a2e89da63636825194e8f1489fc3ee8
-DIST firefox-44.0-en-ZA.xpi 457278 SHA256 4fb855a2b9c0b46dab41f59023198a900828336fff0f3c28975882df1994cc70 SHA512 74cf1e78d90fc498eedfe15db5212cf311784fca30373525ea193d1050f05f764e657b6c6b0bf988da3c9f92863c081e97d9ecf697af0e127c19896910694a59 WHIRLPOOL d9bc0197117ff76cc93ac60829c9df3f6be99fd3da7777e496440856d3ef04108da516ffeb70e4e211c1f4796a29b241eed044c28ace6c395d14cc6f04af2937
-DIST firefox-44.0-eo.xpi 496609 SHA256 7ef64557067b7ee834bfc1c1e111c8e6682f6d766059631a0bd8fc627656da33 SHA512 3030a71b05667bcb4308100c74057fc1ae4b41b8df25ad433686d0fc48ffe70c6e1595451c65b88e93b0e4c25761bf1a7c5aed4d0f7e803bc23e05ec5c17da70 WHIRLPOOL 4f9e3c59673af09f6df2270dca427e14f90a4a3c417816cb5e2fcadb03ed352efbb446e9c80c120890a90ab6e4e5e7e3b9fa30183df516069acd619e26c5e78d
-DIST firefox-44.0-es-AR.xpi 465210 SHA256 c678d0fa10e55843deb9198d09719e686c0bbf3a5db7b49f2703bd5066574303 SHA512 8a0b9bbad8300b6c1f931e5e492ae47314844c9616f97996a0814a553e4c09c82852ccd014d37f43724873cc8ad2cfbdf097c770acd84d51923fc1d236a1226a WHIRLPOOL 837a3d26007b7bba302bba872ebf9583029ce2648ac9e454d5b2546d9e57aaf8d559d69f040e5956ab3e24ee42cdb48b7525f2617a6d7c6c4ad52eccc7da82eb
-DIST firefox-44.0-es-CL.xpi 389731 SHA256 1deeedf1776bf46505ca883a57ff96f555abc26bb07073aa8a1f8e1d2d53082b SHA512 bdf0d07ba30090a5ba44d0246b8d2e195ef942572c1ed5a18eadbcda656556787eb77a5d2abcffa5a182d9e46bbfdc30b700b9c4c4b241d63095d1a8838f120a WHIRLPOOL 063dd080102073f2948f5b60bc6ec5b439530c1fe88967b2a2eb99d54b05a75c576ee28d5e45640924923c8f082942f2a8617be9bf20508e56cc95dd76488e0d
-DIST firefox-44.0-es-ES.xpi 378684 SHA256 dc91671b42a0781fb6a7c28b416aa06780aa4ad1256f55539f465532995f440a SHA512 f620aa2d4fd8f213cf8e11ca2428f8f45662e58228f305287040ac8d285bef1d24ff071c86d819f61d77b1c79a0430b2948c1118d8e43a458bb032e10733e25f WHIRLPOOL a032e49fae546c80d4c92304cff2a7ddb0809263d2c662fb2b9b76747cbd9cb44ffe37748769983aa7cf33afad7c480305109544df10c909c966a6755e7d058a
-DIST firefox-44.0-es-MX.xpi 470416 SHA256 b126dc3f0319058bb75976ade6da3c6e15a083dfec5a60a3fcef8eecfa921886 SHA512 6842f4b1dd74a22e81b34f7385ab4ab0880eac23c5c607c9418e084645413e006edf61fefa521fd663edaaba58b5db6e4fa9e9d0fe46135a0737a9f594a644a2 WHIRLPOOL fe8896745202bfb56677ebb6024599c474c6bccac197e3c336aa519c28728c60e1deb3758c2f3d2255fe33d02d1c18e7ead48a236d98152d5a85d47181aef575
-DIST firefox-44.0-et.xpi 461957 SHA256 8b061583eddaec7dc178d221584d852af9622bcd6be1e409ae7298050593d81c SHA512 8237ce54d221b5a34d231d3142de7343cde8fcc343fae8b3c914403e255d6032ad9845854fabc43ca93e73625cfa2f47b4545b9165e3a526511540532fb96e36 WHIRLPOOL 31a046eb7f8dcd985622c3744bb8ffdd458e53d97fe71e5ee7a87e0aa6d8c0d0bd99ebfad8eaa83817871bc8c96f651ab9ff43a2156ece86c069c2d007962a0b
-DIST firefox-44.0-eu.xpi 479775 SHA256 09e09e0304db6fbfc1c43a1fb0d427fa9e0fa5beff30705e28e661e2033e38c3 SHA512 7e5096a9728a3715d106b2fd6b8b2f8198023349408f9bf3d9510d0a60b7fc199cd88b249f494691a62c2a9e3948f2f9d5fde3941e536b395e91f66e9e44a37d WHIRLPOOL 41128395a7911eaa6cfa8820719613c91860d780b90011334d31db80343a9505fb2ffe3d2a57ff35284f9dd367a413a2b4859d0d4d340587d3e814f382f4e359
-DIST firefox-44.0-fa.xpi 535474 SHA256 2e4fcbdf67620172e38630edfdec7966ffd827f5679dfda4802f252ffe693369 SHA512 18a9fbe43af6895cc66543ef0d1af5b4ab99006fa2deb94b5f6a8de7a02ee119d20fba57e956ec07a35016ea50de0ddb483e435e76e8b8042b9b2eb3347cfbb1 WHIRLPOOL a1e69e083405f339b274f6ef433466e0b115ff40bca28d4935cf80dd74fe37d75d76cdce2bc763a907345e6604397a89ef5040a0681d8222848be713e87d1953
-DIST firefox-44.0-fi.xpi 461260 SHA256 2312c6aadbb4dbf5e85e9544450ae65d31b96c99a233e5e59e5eb7145bb10c53 SHA512 73c5ea586691606024cfe27462c375cd0f8f66697b7a1fccdd4670201e5a6552321f3bb47837a9bd3048617c825641672a834be25014819efa971a0e796b82b8 WHIRLPOOL 9e5dfafffd5ac2eea880fe0a810ce81b6ab198b1afb15a5e8e0dd5ee6a73fa54c815cdbeed09edd7a592bdedaef073eaaa48efe6700d9bbfc7ff9f0e5fa33cb8
-DIST firefox-44.0-fr.xpi 475594 SHA256 d4bf2005066c089c420035d71c0d59ba9dc98adfffc9159ce51a2cf0ec560896 SHA512 8e7204de131846fc3ed74f95fe09e4c6391a1e0552f221ca20808b3b7930ce4c778cb56b5fe60619acbf665adcb2b36c370fabedb3e43cc56fc2ea58dfe21125 WHIRLPOOL 87978c74f9cc7748e816e3c196d8c458ba5f03bb7a2158b856f5bb0d16f0834c3bdf54c5b47f16225c0246415f0089134900289f307b8eb37daffca8d4419518
-DIST firefox-44.0-fy-NL.xpi 468844 SHA256 fc9a95b70a591f70a90aea0f26cdc4c1c4b1ac3f2f03abb941998f66d39e84d1 SHA512 fd69ddfbfcf14fd46e4f7ac6be85b3cf4717e9f9f6d3703dfc25c0dfd248bb94e8aaa2c386a6cdf647e2decacfb0dafeff675727e616fb390b57a59102f4a3fc WHIRLPOOL 3ad37e69537aa2cf273187447f3d3b26c38e95234c7de365e430abd8cd45f2826ae2c3ee0c06e272f8ed1665ecdd3a3e6e4bd01c04e84da600d5caddb0ced8e4
-DIST firefox-44.0-ga-IE.xpi 481200 SHA256 296cbb4521209f1fc7dbed72a7d5f5b08ce5446974f0fc443fc9cf55e4d5d70c SHA512 491e8e3264494a5d26b98ff97c3fd29e276f869773939393ac9177be5eeeed53728e678c098419fe0d44dad94038b4dc21acb4e9f31d12d4d883efe7ece7f751 WHIRLPOOL c68c725e9a6b385778710b67ec71c2a0d26cbb4dee42b02934b239b5782ac9f67acdbe99f9c3a9fbb3c4169e6119bc81a4075f28df08488d7d8bae6569edb9e4
-DIST firefox-44.0-gd.xpi 466940 SHA256 3cd36317dace91ceffd596e3d3ede3a64c5786a1e714babe00ab85ed753f4f2b SHA512 4ab5015671bc8a45903f8ce0721e955297e4ea1aca8f949accbad1b0950463b287726aaa4cca7cec7730d8d2966ed692e5eaa297de86c485dae264066b123b46 WHIRLPOOL 8c0e2adba711f371b209eaeb8f3b11a983b8adef245f591e3007b7c8e8b11dbbd8994d3a01204a25988546a23d1d11aada3511f9f556f35edecabbad40569d01
-DIST firefox-44.0-gl.xpi 461111 SHA256 f7d2add0b9d2554591df74397fc85f02e738392ffbbcce4551aad545d824fb3c SHA512 41503f19e37effd8b41cadd90133b4ababd17cc8abc90fbe692ae1e9c1ba7bf52101fbd140543cb19642901670132fc677b81500507f9015565dc41afeb89133 WHIRLPOOL 7d266af960e84108fa3401993fd652f9972e0d4d7b9146f3b1560e852025a0bd0691b42bcc5298ae853124f10e7b321e66c9977808f19e9f0ff819e863a127b2
-DIST firefox-44.0-gu-IN.xpi 498551 SHA256 195b952591f124521a2d8140b28dd316906875bb5fb906bd11130bfde6051314 SHA512 ad523aafd7ea5094b002ebbb05b6e49289803268a85745c9bd95497d6fe8c7881e370a3569d4b8ebbe496337169e5a85ea917437471aa4af65b82d9e75a6e19c WHIRLPOOL 6806106e3f18a9e575653211f096159890d1010a5c5bb7d9a27bdd3a0ff5539585f65aba9a9764122c3880cae47c12e8f73cf33525b94e902fa791895880591c
-DIST firefox-44.0-he.xpi 490166 SHA256 d25daa82b8d118b47562056e0fdd90617375c6260acd786e4640961bd86144cb SHA512 49ddcbe6220a3cfc7a176f334351f81e34cc4ee01a3984b05e627d7a7c3a650960b023d4bef0450172290a4b9ae90112e7e5f579dc943984e32e6c1cb13c112e WHIRLPOOL 0ba1c789979b11fcae26b350408a22edace8819227cecebf9d0eaaa275c296f014820db35283fdce4c6f06ec2cb71604574d82fd0ab4b4380addabdf1560753e
-DIST firefox-44.0-hi-IN.xpi 523873 SHA256 5a35a22240899b5573f2d44e848c0f959148598994db4632643a1f1e456762fa SHA512 d043a2ac0fa8f3228d8d78c278f7c832bf5b39cd26535815feadb62e7b83d2ba4bb9a1c431de4af369ab49025116aea55842a4a13de77896d195652ae96b22e3 WHIRLPOOL dd84dcd133b1375f31690ae16634a61662656c9b8db9ecaebeb344c5024a0f491fd71da30a910ae24c78fa693b1200e3c13f93e92a1f4827fe8bc2c22fff116f
-DIST firefox-44.0-hr.xpi 491273 SHA256 3f3d2a34432ec4c75cccd41126011c62e3cbc59c2a2625480cb3e471d455bcbf SHA512 adbc32d152c5abb13fe96653d2187d3b0a8d39d880be1a347e9fb49c4fe36ec2b8912f708c374f9ad77b6bbe2d731a65be3d4664ee4a5a11121027047b770556 WHIRLPOOL 7cfce2f842ee014f1000abd6ea3648570f7163fdd6249d32c624ef1f63c405602f63df896e70eb767da67d41baed32be4a977357902d1e17733888bcedaf2949
-DIST firefox-44.0-hu.xpi 466878 SHA256 7b21a1517ff931194b588cd42080a02182bba8ef5cba11a19d4a5699922d6c4d SHA512 4e18371fb0a31a557ea382af1caa2202b78987250087fd43ffb66baacf45654d2c03917d76284842a038c572c1c58115c83872fd4b37960d26e465aa7108b330 WHIRLPOOL b88b305aca31e861ee5eb3e5980d84a594d7e7265982f56c78735499ee0c3a12dc2fdf850e39abdd55e4e92e9fedccdba3357c9cf5e10552d80ae69082e00665
-DIST firefox-44.0-hy-AM.xpi 549357 SHA256 637eccd6cc0099b1a0b6a197165ba8ee85e33d5246c6f4a011801243fa14d483 SHA512 620e1426c7f5a764a30e4f8e2fa0fa5fa8066625d71695029c6692eb9c95f9812b78c6c134dde85138ff1d1a6df9f1aa0a6ab90c356d86d623d1dc82ab73db36 WHIRLPOOL b4f00726e95be2276923059c299a7bd2936b2c4f54e446f085862e32fd216142467de73692c4551dc74fdb94e6ea3820fad3fdff1a3e813919f4d2bba248ede8
-DIST firefox-44.0-id.xpi 449869 SHA256 8187f234721c3cfaf50b8640f991e633c55fa80a7714f7bf50c23db24b056f2a SHA512 d34fcb6c478110ee1a05beee54f0e620b3857c6a55ddc7be59fa2d3abbe813db7d8d614790313e7a155df89c50790b55d639f3e77f6339982785b3a9234fbdf2 WHIRLPOOL 4663ec95f2a41abfa07d1ea8e6e590956e11b4596924b2fb8f4bfc7e070c77ff4b471070a93eebdb7129b2e58f890e094b8b41153834cd6ea06851a38a0f2199
-DIST firefox-44.0-is.xpi 498239 SHA256 867f61c8a21e76fdaf46fd44e060f6ee0add54b3f976d2192bf00b69dddf3ba5 SHA512 66352f1d205330df9d91b851e1ab3478f2057509aa0354fc27b55b9a03365c9c4406faf8cd122d73218d0093f8bb619f898f8504999115e730632a24b5b7b3c6 WHIRLPOOL 517597df690ba81eb338f0a89aff75f69a6d199165cbda85a76c955342be627ec763a5adbb6a7362cd66bf22901159b4de2392c68c79d527a0e6198cd7eb0d94
-DIST firefox-44.0-it.xpi 369825 SHA256 92e7c9c874ce9913c7e2c198602c3bcbf5cbee606852d32780dd4b6fd1707b7f SHA512 76beb774738e90da540dce0b6bfaeb93e968c28f1b213d4912b9acb0d7f4f7126a06bf09b51bc0506b27dcda8519a16b04308e29a24a5781abdc77f6f221f9bf WHIRLPOOL bb8e9f37bc404cbb2e0f5e10d584a609deb15c65cc56e23fe69185e04bf1eba07ae336a61ed4e8a386552fa2efc8fd25e1a9f460aad8b9f4c7ebd631aabd24ba
-DIST firefox-44.0-ja.xpi 493749 SHA256 953227840368882f6733fb2d78efad454713bcfd8185b341624cbb7acf95d080 SHA512 9de33cd2ea7269db239cec3abcffa0754d9dd211ac70862f7c9fb903b1037b00a0ec4d3f9a092672267a7013d01df4c992fc514fba72d532a3f9d9e958b305f0 WHIRLPOOL de505fb46ae7d0a6d311e5478a048b5d54035013013868355bfab6b9cae5fca68abde41e752ea98293e5f66650229374557251e813687471ee3d8208d1d27bb9
-DIST firefox-44.0-kk.xpi 519876 SHA256 23f24aa820fffdbaa92018eccb5037dba793a75ed57d57399eef9f1b4e3e7cbb SHA512 cdaa103828f5a2ae2beff181b76748c132175e62c22d143a2b8645e1231b7bdc9a155a7a2e255f59f6e4e9532dc205c75ba1cf9e5e6134b32d1ad2543e58ffe6 WHIRLPOOL ca70443e56d76b81f6b6942902c62ac4c00f207f22f0d552f08602a61f9db3496642dd848377fca66582853894a1a6952e6afbd4f2d468bd2a81cd7bcf5b2dbf
-DIST firefox-44.0-kn.xpi 547916 SHA256 ba3cbea473b918bd29dc842f3f18850a30cecfcb9019481db0017948b80ccf4d SHA512 e3f3b1b0e9152f26b3e7a33acdafc0cefed57ee3aa5a9c717603edcab5ec0b612eecfec4db3850dec25504e7762d5181cd3a73cc84a15d7b13d6d723d625d5a4 WHIRLPOOL 6e12ea808a3eb4f7a81539e8f4d0dd0ec81debdf479bfc423ec10760b5bea543edba25852d17828817a514bb383e9a5d84d87be548dfd737c3320e6b4c691d7e
-DIST firefox-44.0-ko.xpi 480595 SHA256 c14235cab4064ee068ede2f95ce859efcca15cc350ecd69cb50fed48a5d7c105 SHA512 88d29405bee680b5e87f952fa50dc56eabc20cef142edf3c3ec0afc125970ba73e15503b47bdaf90b7f1dcc8697c0cbf8a91d0e7ea4eaba0cf718cc268c1e977 WHIRLPOOL 603dc02e9d579257f893dcc48d4504cd938d7aa5810accee2f5933cc0786de956a99a66ba541f3b679ebca065b62267ab334b74a10bedf3a68bea482533e1934
-DIST firefox-44.0-lt.xpi 500331 SHA256 01b4cfafde1912c5646694eb6b6c975e717550e85b527a341f7836ebd02e7535 SHA512 80f89d5959b79c0c4bf806387e7d912ea8a53f66f4ff2553542964a566a9105425fbca7b5c6aa8e37e7c21353c9bb4af82d39bcdd82984a3676fce034d8c58f7 WHIRLPOOL 0916f1ca9eccd0bd69bfb3189735d5494ab1c51122598d0fe51797460deb3d7c95a345b5ed8f0baa1161237b029dc5a1ef38ac163379f08e949ccc9675dee982
-DIST firefox-44.0-lv.xpi 480443 SHA256 2667d4e658a2faeb36c4aa3b5b5b13f1d3caa10abcf9a94ceb2d08307770bfe1 SHA512 a641afbd05a56a6c3ae4e4b796eac638e3d0e68dcdcee614aa58202298c20e4fb4e1367b99754faa732aaec3897576a4a2a246ecb0805ff7c610488bf528c5b1 WHIRLPOOL 4b52eeb76e003b883b2979c3ec60e099bb72a546ca77d8a1111054b50ca2a38fa4ef2696bd49f12c927976821f423404d962bface7e9f8c16985ed94d6feb392
-DIST firefox-44.0-mai.xpi 532117 SHA256 5c1a912951b00c9da71124888ba88492f433f807956d9ba21df90b6d81edfa8d SHA512 5fb142d4b1cd985e13495d3f0e78d13d4352a456636a4b5bc8451ea363b43b044392da4dfa62434ae6a711a37a1fa7ca3bdf40924bf8eea7e7c71adfc0b7a3ce WHIRLPOOL 12e25c59c2952712d37239e0fd64d33e31c87f7f0aa56c56bde7dd7aa08b60b63e002b7431f72e28a3bb869eb4a76ee3183389b7d1bcaa5684411f7ee8f6f633
-DIST firefox-44.0-mk.xpi 537870 SHA256 a6744e118506244b7e59947ee9b52975e9bef9b3f51dd5a1a91c1fc334610ec4 SHA512 c2123e97845a3f8a088747e8de682932d99d64685f7f9dc0747eb54225a78c68710496d17860f54615707fb40e4695ba82bb83b10819d8ab067b2305bb715afc WHIRLPOOL 33612046f69aeb7fe9f2456a70f33e75f33c10742bd26f709f910b81e8f9c2ed5b736e27c65f9bfbcd2a7c44b5f7c4f3b74a2729d2db0c36a8a7bd78b5dc8dd7
-DIST firefox-44.0-ml.xpi 551282 SHA256 97aa5f16c7ce66386a096df283c0ffa7c3c5b5e0b23699c80d88c04717d7a26e SHA512 1949447f7e042f2fa13bc94fc19db9b38d3568e0c3f1cced838e2cdeb888ea13d6d612ee95b93b73beafcbbb6219e5a66b24e17cafc84d916031f4fc17c037aa WHIRLPOOL 82c24a927b9e9768f82ca3b4c51f05734461fa4ada2f5fb6b24f1f8310675b42fb20be6ac22ba14f2d5934cfbce83965e21ed804f117ac7a7166597c77444d2e
-DIST firefox-44.0-mr.xpi 527782 SHA256 709844a2c3a38fe8205267f379b95c843e7b64d1a4b40c2bf176d4f2398c70c3 SHA512 f4027a4d240963b30222db9f6f86117faca62c71d2d071175317892c2129e64b43087326b3e1e270175bc7c558266ea422e6d32a45c76692fa950b13a20fea15 WHIRLPOOL 9804bd6fcd0bf4a129b70eff76f390ac0e98a4ba4d574c227c49c8a83f2ea1122090e0b6a106b62c2aad84c4ad977a63f347fe7cdd234350af6350049799168a
-DIST firefox-44.0-nb-NO.xpi 458673 SHA256 59051b45c1369f66899333c16d4dc18b1b2c40440be752053832d743d54810ee SHA512 476405d913c6f36f24a77c2cec4e97570c1956ea1830f9190c5e0333f1b835fb80c354900c5bea35a301c1116304db336b85dd3e8e6afa1b14e37f3a17e74e97 WHIRLPOOL a095b6d29c668fe099857aa5a5478e82cb908f854198363151a17d72791b48475da82f052b7a10120e9c9d5f9c130fb19704f6f89d75fae932025f19ceb37dfc
-DIST firefox-44.0-nl.xpi 456554 SHA256 35b2d2b201e963141d6079afde81bcffd1efa7879a37bc5d9431a65069aacaa0 SHA512 9fa2861ca5cb0aa244d562e30e36799e23be16e30c721bb9908dbe280609ab7e32cf223ade502ec12252f197be83d0b96725f41b8b1e2e697febaa242ccfae26 WHIRLPOOL c5241e370c91f084743b4150581a1bd4aa1910db994f07d43cfb36df29e327f81060abfc02dd1210da9ed68e7528a94e419a1e775377c89b50cc63612e8256d3
-DIST firefox-44.0-nn-NO.xpi 452666 SHA256 ccf4db814992d2bada211a886321d97346e0d2ab26e846752243c2259062ab5a SHA512 581006b0ead898d2f1a06c9f36a2add5c0f26cd0e5a3d163b5a8e975c88be9458a730c0c632b69312b1216ac91d9c6aa3f855630a5c59a7876a52b599248e908 WHIRLPOOL 7b152f37b00f0b2acab0799981e663a6482fcdb6215f54c6d87d59dd19f327acaf81d91082b14335a53437fdba27b1b17910072245320a5bffb76f9c03e1595e
-DIST firefox-44.0-or.xpi 540587 SHA256 f967f29bf4ecb73a86545a72ecc68c315d93b739060745810f82d1ad814b3cb2 SHA512 91f36ed796f26bf5bb2811735999bb555ad74b6d69e4aa50f3b41228bdd424822565b757e8283d51433dcab465ad59965577a625052ad232b815d76fc849c32a WHIRLPOOL cb84205774199b23c8384fd31eeb15daa90a63523c924acf1822b9ea19434188234784b482aa6f3e200c45d3d1ae76de7e86aa640600dc0677d8a61367719dd9
-DIST firefox-44.0-pa-IN.xpi 516425 SHA256 6e1648d2b6bc9be3c674ca0e84e96121f62dfd66b19f22232f15772408a3d65b SHA512 d384b5f88c67aca89533818fcacdef5ab021bea593017477de96ed5794b52c95f297f4d2a1b4cf0f7ef42eaf0ae9dbc216b1a1c5f5751cd894bd85e58a0c6ddf WHIRLPOOL 8c486b895af9c80d5b811502dd6d9e5cd0423b2b791652bfbbb8297c98ea9b01e9ddb8dc674fbea5d74b3f7a8d519d94c4be319d92849e9575a36d865109b33e
-DIST firefox-44.0-pl.xpi 403714 SHA256 f01c0fa237aa5ec7a303261abe7b9ad13c22db31b48e3766209fd8ff4d63f4cc SHA512 7513f696df0f6a90b37318d7e27a5be30857c603a24d7c94423e9db899649143dc3b26c06b38b0cd46a0cc72f418de7d46fcc9bf80fda09aff2383c3a59c503a WHIRLPOOL fdc67f909c94526f0dad0434d7883076bb7bfc0bdcde8d2e006bf745617ca11415ec396335ef81c42c3afad8729436db4d87fccbaabde726ba9b7545d442af45
-DIST firefox-44.0-pt-BR.xpi 473587 SHA256 dce2dfdac65e6e1dc8c2236941207a630d467dd30e71f6ca7f8973aaa2425721 SHA512 51c596355acfe0e6d533a4545cb4d2c613c6317471765b39210e2c9989dc8bbfd338f19f37c248ae209bd1af44cce0d988e0b4d38ca3926d3b088c88111dcb3c WHIRLPOOL fb22c28f27051b32692c294baedfadaf9591c261f28d4b7b8506fdaefa72bc031924f1195c00d4a1737dc22e1f70494fea7d3e7e7bfc45cc2b5d5dd92b7b476a
-DIST firefox-44.0-pt-PT.xpi 454143 SHA256 087227a30a7c06d04fcf47aab7f04e42fa554ec2c211463bb366ff17e941d339 SHA512 304295dd4f4c2ae0f490535fac848960eed9589800feb073a0d16be5b51b3279f53c11f90ffa1532abae8445b2f5b018e25391d78e943612b033c0213915611f WHIRLPOOL cbd80ff9cdf5a232c4d104772b8eb699474977ea0aee9053ea3a0716403e586a26eb5b45be83ff24e7f53eee8d591f29863352d3722d773890d509edd4fcbce3
-DIST firefox-44.0-rm.xpi 460176 SHA256 110ced11f415e15dd02cabdf4d5f2bb3f992e68a6743441bbfaa30e0334da88c SHA512 5f355994ed5d9a15a0a86ed289a8b6a9424b5c9b15572e9ffcf7cdd6bf51a22e44a22beb0b92f4afb99ec1c4980849215b4e1c3540b4f1df76039913d55a8eaf WHIRLPOOL 20a2d4a91547a810f9898ea2a593e7c417e2d700cee8fd2f483189e61144f9906c51d2f6054a554056248bb21ebb7b7ca957d5c13b723ec692b0c037d20d1ccc
-DIST firefox-44.0-ro.xpi 507825 SHA256 0f1e2de42f1116840d06145f31cfefbce833719b4ce05e31c054a915a5988356 SHA512 b82b3d6ecd3282a7101f86afc3bf9149a14b4bfd7097b87dad6d387e425cd77dca1a80f2d93d7902f5a9c49a8c42c6c936269ad423433237129d1eb298057b18 WHIRLPOOL 1cb31f912208384b6b54c32475dca12e9cd17a4c9611002ba45183ebc1e45c61f8447a30c0d2a5c0efceba083efe339888f019b8998cc5b2635e6bab53ebbdc4
-DIST firefox-44.0-ru.xpi 418291 SHA256 e14eb41bc5af7f86e74b01e9bfe6a138088216cef000d75bb4d514042baeffc1 SHA512 fe7de8a030607ddc4f0b8034918ffafd666f4543e28ac882e04b37f1f3facd6426aae17a6d56fa3eb7babe33ed3db90a38f29e6cdc2a467be27d5be6afe0e1e8 WHIRLPOOL 5770143d33cd303ab90bf73e3954c2ecf056cd2757d5ca377f542beb26a8e8b09235644ec4ad281237c1a6619f30734ca9c567b57d7ff52e5313956fe19c0f20
-DIST firefox-44.0-si.xpi 553903 SHA256 a9badff4b82754018e8585a674f96c491cdd2f15c18010b85153315d572db25f SHA512 9fbbe14a40b8c9b84c762d65da0053911421cb99332420d065966508635bd502122f614fa4b40fdd53307cb7e95d6ce72ec746e53704259e02aaee8644b0b45d WHIRLPOOL bf3266bf7f558d1d2d77542ad798e9c6d56fefed417e48edca62b3ae40db12e27ba88968f1edd8dd888b7b7427aaa8da9d59d6a90871f0d010fd5e415cfe6a59
-DIST firefox-44.0-sk.xpi 482728 SHA256 ac46e1b95d6973d35fa5ccaeba572e498be9f636a6cf253224a2b6cab6c544c7 SHA512 5a77e76e24ee69b31c898c252eb9ee1657ced43eb288551ff2d5b7634c09654e157eac5e1fbf869cc6193af3e211610634f8953c63a08f95c8e634aad7cbffd9 WHIRLPOOL 2931aba450e42baa4b9ec736b0cae8662970b70555da626c278bc63e4da54a01b5b5e26454d9ef9d7fc429f59ad628085034ee91d727074df9724043c37994e6
-DIST firefox-44.0-sl.xpi 456215 SHA256 cf3a96cbc48afc0af98ee2327cac60eaa49eed6799a6005c5a3410977efde12a SHA512 817b7bc8c6c2f926577acb3331cd1440ecc9726e768bb58f11a135b1f7abf8cf84f1aea3423dc511d27bc47e7b8e220a6f57a8829d355f6c46ef82aa6b720acb WHIRLPOOL 9de36851ea4a4adcf2790a6b72fabbe560731c009e88212ea5ef4b4f0e5df972e12acf5f182a4ceb3fc71ba1c25fcb8fc5135517c83324c560bf5971e044acb3
-DIST firefox-44.0-son.xpi 463190 SHA256 1e76a4e02ece37d331c990d143738897f3a6b0b8e03b3a0d14e368b462faefcc SHA512 64186817c5c9b4843142dfd2e975614ff016a24b285e25e59a9a569c7eb1dd3a8f3c407f268f2b792e788942e4e2295a122f46ba0463ffcfbbd8f09213188711 WHIRLPOOL 750be36d64508cc3bb561ae2ed7714592194b5f7bf9b6d5f326e5d59ab0959f26fb14d4e6ef5ac5be0a43c4a49233d5751ee142ae788bff0739f01fd47382fe4
-DIST firefox-44.0-sq.xpi 499915 SHA256 53f1757028c9c1eaf5e9f8bbd2ae1148a141eb7a869863748017be3cc5b95f62 SHA512 6dbfe308ae073d77983e8bc9c0e17de9f4276d1802df76315cd6cc35353358815c7824f22c3fc4e78c007d76ed92acf533fd187230dbc6f1a611ed2615771e0a WHIRLPOOL 70ca2ef4afe74cc634437f3d540ff2c155590e1951462c2ae40e266533822258ceb0c5d1794b69bb240ecf49582f2aaeab5be7f12730197643014827b1203288
-DIST firefox-44.0-sr.xpi 490391 SHA256 035cded41b55bb24b0f805bc18f16aae19d6f6743c049148e394cbf0e0bf44b7 SHA512 c27a07fc7b9c66b02e4eb4e6dab5e86cb8329c090e7835cdbfa1711396623f8e1edaba2411586ada5895c76e7fa025ba02e5c169c44f95f94d88443675f69f1f WHIRLPOOL 191e5781afddc661f1832df0cfec3f34b1e11d320540afdba7743c905e2aa5c3803ab3644003f33c952c1e5d7630639b03aee2a4c7dced62944b0fb725b7b23e
-DIST firefox-44.0-sv-SE.xpi 465391 SHA256 3516e268aea2f70024909a6a0edca09a804d0b639cdf8da4a25292e92dfbf9d8 SHA512 37453810bd1c400fbbce6c14856d69739c29138dd2da44d78dcdf2f56ef458be955a06d89d391a72bff3dc8a0447f0c7374ab86ce46315ceaf5732a938729a67 WHIRLPOOL 378dd473241ea4a51b972ec5d076fab09f31102763f562c9cb68bd4402ece307bfef4925eb30f48a3fbf07ab173b215a3260ab15315ca8c43a30efd8322616d4
-DIST firefox-44.0-ta.xpi 522512 SHA256 ef911260ea0011e6cecac88007e4f8590362b4238fe24a036b8ef1edbf783592 SHA512 faced2ed536946db090d1186ebdd5398c3549fb54e394a35e7b6a831f159c978822c1bfde214bb610fe8bd92d70fb07d50ca633c670f7299003ce25e178b297c WHIRLPOOL 6565793e84ec674f3adb7d9809f9101878e697a931b75245f1439402e2133b2b10b3b85db39d6470bb2a58d9e2d9633c480c4f69f112d546e85e74cccc9c1289
-DIST firefox-44.0-te.xpi 538474 SHA256 daa13ded2b57955aa47d64dd370c5eebc89932ec194b78bcb0f2f24ba49ed97d SHA512 ad4461f0a177a68cb244241161cb72eb879049212abe2532b18b1d8e5b938d494b235a7f48bcab7873d1b3db365934f880a340af252854b69249ab2e4832daca WHIRLPOOL 4e5fa1bfad71674b54ea2d6c6187e43dcb3e0788ac40d4938a16467063d8ca3aa628d70a7cfef0bf3fe3e2320357066b6b64b70751f33be3088026178f5deaf7
-DIST firefox-44.0-tr.xpi 472325 SHA256 d105d05b8ec4b2a0412f7805649bf2ae95929a91bc68ec5adc959d597dde1bf9 SHA512 9ace8eea56c1ba2f44713f5be996db7a392efc026072fd8a982bba00763a45af0a19b6521e06e5c6bc58ee3099a389dfefe57e31e37dc159fc515d12478680b1 WHIRLPOOL 27c2e963503fc299382a80d1d34d626e77a096d6770679bdba31257abcbc95f0122dea074d5ccda82c2b457fc8eb20deaa50821925f40a969c6fb0055e60ba01
-DIST firefox-44.0-uk.xpi 511048 SHA256 27a033bc8efb80c92f201daf3b667eef3c819b26fa5ddebf8b94c104f446a9d3 SHA512 7edc114c553f9ba3c75244bc21447570118c781b4c9435c7a055ad513e3cfc5fa707912f4454af066d32b3ede134a89e36d1473cf9e00c6ba327f0b1195e08d4 WHIRLPOOL 44c85068751b893b4503bf0d184a75b85abca7664259ce72822bc64f9c43623436bf10ba2b4a8c5ddccdf0eeae1ab97c577e43993bb56e4d062089b4d129c067
-DIST firefox-44.0-vi.xpi 481582 SHA256 ec827905d334ff761eb001b384c8edc7dc6cb6406d7e64e069226900828a47b8 SHA512 c930b28d2883190985c7489d5a26ca7a0e1fe994f4d4859f51a76388d802642b324f3e362d0806f4f268bf610c910581460544fd6fa05decf39e97b1a6416f73 WHIRLPOOL e74430e08ddf964a4c5bf9f570bebee6a78c6a204d3612e33180dddb088e0a34ba63f93ef917b89e5671ff068f59003e1fce8b2cc973c33113194869b23d1397
-DIST firefox-44.0-zh-CN.xpi 496299 SHA256 061a58990006a4d25be48477f9a0e06642f34a548801254e68f417f9af5b71f1 SHA512 4cf6183951fbf302f60371ba0a7c510a576b770377b0339ed1f3ab7a03dfeb08ec02ed9e28452212f78e51e55d02497285639c4e61a001d037a22ad18672b205 WHIRLPOOL 7edf4e02fa57fdcad1d6089e25a68cf9d633d2bdd431ea283f6fe03907c643d5ab4ef345dcc3e6a84362fc0cceded0aaeafabbd39468f66e7b2edbbcda5fc470
-DIST firefox-44.0-zh-TW.xpi 487760 SHA256 92da03a68277fcc445caf5a4dde39a3283bda63674d005e327f651dbc0d6dad9 SHA512 f54e293d5da8abb68f5c47e3330ed46a3529a2c5c9178f6230596b08a1464097d7a3590008f49f3e2375bef778f549a7dfcb5200753cdb3e53562c05af1ba66e WHIRLPOOL 0b9fae8bf600bdb14162f0afde882ba3db0e0ab854321c546eb1ec164660a5c47192e0d5109306f4d4ede46cf301f51a572560895294e9ef0049a552dad171ef
-DIST firefox-bin_i686-38.5.0.tar.bz2 47200274 SHA256 7cc42fd5e7f826e2bc18468f8ec16067c133100a60d46991f821949efb4a0a22 SHA512 a615ad1382ad2d9d4c05c58f4e82d359fe7ebde1088a48532e0ca47f35eb9d5bef64f32aea9716c543cd864e538e84ac8ef24b88d24487b02015f0e44df61a3c WHIRLPOOL a51dc2bdadd7bd51e1a0921419db6f3f8141a366ca3a7e34b23741c78efa122c93920c6103b983b1990a0ff3650d268a6b7c1616d474a42b60820b2c0fe8a148
-DIST firefox-bin_i686-38.6.0.tar.bz2 47222915 SHA256 b98dde023f89948ec2abb2ea2ba2ff3eaa22be940edb256c969c77791949a271 SHA512 a1a6bc8c823c3d6031586507e94559f8d794bbc17460d288e3af8f39181d6bf17103975b4de636071868c66c0b4965e03caaf3c5e02e0366e23a2c4ce79343e8 WHIRLPOOL cd6c49ed2d6fbb32967901f21f29aa2e7a0c57cc5ceeb49fc649fe6404eb3775e20b844d6a112e2af955ddeacd09e5eab112c3672434f4714de8ff28460fa212
-DIST firefox-bin_i686-44.0.tar.bz2 51145978 SHA256 d8bc60b08345db28fb33114a87d67e6384ff1da861beb2b9a610257d443811dc SHA512 f3bd5a05f6e0ce19fd7350b6ac05391037aa93149e1a35538920531f684e8481b034eefb5ad79ce9fcb7ecbb02ba07258f17153789aba3b2fea543ccefb49415 WHIRLPOOL 2d62aa64afe7c2234a89f4426d8de3c059328df0d45a034f84967dc2731db0fd01073f3ff6a11180d326d5844fc561d896e58d0e65776e9469faafa039ba41ea
-DIST firefox-bin_x86_64-38.5.0.tar.bz2 46254239 SHA256 56a6c49d23a2f149a09b4a708c20960b5a20190f054e4ffef692e64518fb969a SHA512 d2762872f0dacae849bbae9453cee7198aa9ceda7edafa4fca9e2858d2618803324bbff61dee875a5d7ab4628fa2567c3dd9614a4dc080921976a458cae302e4 WHIRLPOOL aef3c5ae91e37dac3059a5ee5af8ddfa19d392239184c771a8787d10eb3982f5f111756bd749ed385f92a21f7d5fb5d37c8d9e7c302f6de57a4e77b0c160a3e2
-DIST firefox-bin_x86_64-38.6.0.tar.bz2 46261167 SHA256 90b03a1736c493a1922cb3675251c86525a883cd726e3a7cc1a0d3b210372867 SHA512 2bc8676694a35dab4ef597f3267369af196b64b2df178bf269495dce177d954533deb1b8dc662b72f6932df045bcc1c4bfc13c073352d5f89f792d022ceac9a6 WHIRLPOOL a921e288fa3e236e75ef12dc756ad958c2004795017b7ac6f939a2b6b4774bd7c27d981283b77977b23eb1604236b05aa83e90701fb9a9b0b3427e5f00db4c7b
-DIST firefox-bin_x86_64-44.0.tar.bz2 50126803 SHA256 52fe1fb8527280d4b156d823bd4f2635c538a9b326c10bd48b7c8f3803063812 SHA512 4e02e401b5d420831911056721f29baa4444da853a8664ce9c3fcdd40cd31d2d20230c6a1fa10b9a2ef0ef18856ad94f7b36dde9077c84d749620d153a24b003 WHIRLPOOL f16bc33b8d7a8fdb97b471dda7cde031eaf3dd7df1b21c46864fae70dc9b3b1f76f13a168f2677a7acfb50eb672d9e5ed1a2a1d3864ec56fe2c1d0dea426a7d7
+DIST firefox-38.6.1esr-af.xpi 483326 SHA256 91f97c3c51218729a21e16ffe0a629aa1a10e59945190745db76d7febc3eac42 SHA512 7e998c0a1c2ac46086ca31a848d85ae072ddde09b01f67a56cad2d6b732bcdf4dba4b5dc08c70a940f38e473b037e1fd48f89d62bee493855c1da0bda5594e49 WHIRLPOOL ca0677f8c3e71a429d5137a253190640139f4e93907b65f1ad7aff89d0432161df5f4e0f1f23129ec9807aaefa25150def667dc67ab56cfb80429c9a1b07f5f1
+DIST firefox-38.6.1esr-ar.xpi 516495 SHA256 3937af045d28807a4d2941bdc26e8cd9a437f5207c71b638e86268e758a8acc5 SHA512 7714d4f5c98b9d2307b27483c8fbda14e7dbd9c8494cce7a1b674834f0088e9df825e68de526084cfad5783cb3bde925d632a8825e30ac70f9c652d1d8aa9a53 WHIRLPOOL 80d0f5b5cffe7d18ba6f129430966aba2abadca7a1f121fd542dea126ae5a3efffad8e9e8a95558fb407949b18409e691ff1143384d9da75ce7e5370d4371290
+DIST firefox-38.6.1esr-as.xpi 509574 SHA256 2d5b2360425108eed107b083a11fa0f4fcc42f66d63b3c4b98040aa7a105fb68 SHA512 cd5ca56e826ba4f3897d897b4410e53de54f5f6efb1cdc163f7a969ddd0d547a2dcdfead11db44463ad8f1233113b5eca69a0d725ba20f04874fdbd0f6fb4be2 WHIRLPOOL ddf96000a02e879bc570a06b7a0bab3c45ec85e93a6b32cfc9ac4ea9fad228fa136c06f18e543bf939c9e077630adbfd1ebc253117190ace09d0b33b0a2fbcc5
+DIST firefox-38.6.1esr-ast.xpi 397202 SHA256 3d53c59bb823c287718f2f2fd1401db97244aaa51f6df769b9696d39af2e59b7 SHA512 fa4dfcb72fe03c4181f30c7f60341b9dc236d2964c7a7af4a6a9dad1a4a82048be324b0bf8adaacfa7c8238a308c75f553a1ad1893a21302ca69bd862cf9e288 WHIRLPOOL 3e9cf9720e0ed179cd242e209087af6a8c7f50f0eb007707a44fd7957356f67569d5b3f878cccc24571f56db44f1be682084fc03770ffa2afa884d64aa6d6fd4
+DIST firefox-38.6.1esr-be.xpi 441057 SHA256 cb2bc817cb8cf69b170137c46baca6e5e893dba940dd14e24ee3e93ef3780528 SHA512 89814f4adadc99fdb0a31fb59f8a50fd637069938bb4dad144756c359829e0e385d288106a530db7da7c7f3417b741b496f55e04b8da28e87af82b5863009955 WHIRLPOOL d7ff0d3f4ba7ca36a76dd64eed5fd7ae10b97b56810a6238f1014ae133bdf5a8cb518bc1f8caa9686cceb7195f6900ea7d7ee188447fcfb1b94a63c51bdb1ba1
+DIST firefox-38.6.1esr-bg.xpi 487819 SHA256 5d825b6387dbf31d5c20650d87ff3b73643826b3143c178f6f0707cea4e0c72a SHA512 90bbd0ed306bf1350955e06a0daf5b995ad5fb469c32892431c34ae4bf0813e6614c20b4ce8a1e79fbed49bddd1cc53ab6850329e2d54e55473eee3f8334531a WHIRLPOOL 8843bc10145adee1441b5bb8d07b1b48cb9ade16e6424cc284bec65c24dde61b1b992c9be70a7123f2b8ccbf83a95bc2f7045bd92715a87310f484c16ce9e1c9
+DIST firefox-38.6.1esr-bn-BD.xpi 528690 SHA256 6438c81f0bb6c9e294a1c11f11436844964ee1867e1c4956e281e1564ee17fba SHA512 5d83cf60c4486449f82c8a9edf77bd36206db14c4a5a8f081708965187457a7d228aa5e43c7348cbcdde285246dbc9976ccb05bc824a08921b90f63681b10457 WHIRLPOOL 026cf711263f18a1ffad0f356d98366d7b3a3e39250a05346a8bd91ae39a96daa669daec570061966397c6b06b8c76c80963a43ef1bc826152a453d3b91bf710
+DIST firefox-38.6.1esr-bn-IN.xpi 527928 SHA256 ed9f2a66029b53ff1b7214275c1b22c8656919ed5cad2dbb3a0936be6c632d32 SHA512 3c5581b1bd67fa33f55c9f5133514c89ede9a23da2fe8a4c0df1030f511ebfb11a547391cf7b51098f1e65bca92c7127a0bcb7cb81f7df3eec0133dd660f3b52 WHIRLPOOL e1cbf6d1156edc41f5eb92a4a5d873eedd732786dcf8d5b1ec63834703f708946a1c8f07bb5262c2f44f85e0d85296c4b2cdae600292969982424e43a2ba940c
+DIST firefox-38.6.1esr-br.xpi 441962 SHA256 aab264c5e15554a2fb8c6590dca6507a612a1fc2c63dbb8463c1689c467a2208 SHA512 a2336b6e2afb36640026f7e91177333db63c4345f639f2d2a89a6ee644418f2eb65c13d31e84d09af8e8d77a1b5d57c89b0030eb71ad803a3d133bedab442c75 WHIRLPOOL c778c325b340472c04402fa7b56621ab2fe7aa5f2ef8c9e84eae6b6d69094732c5356543463cf1afb4eb7be820d1ca78879a7f638b0f5d8b8fe3e6bd88846bc8
+DIST firefox-38.6.1esr-bs.xpi 485305 SHA256 3bf09cc69c2250394c512e783eff5c00fbcf2696000b4b1ddbb7b73f9fdc4dca SHA512 7131bc553e97dcf2bee2f348b96d1183fa6c9183ff612e34ed048b4ad46fd590d0323c986d6c914d5a3f783e9f94a4aaff24a10cb37ebcd4b0ea5b96ba09d54c WHIRLPOOL 198a54202b5616b89a12a0bf955c0c5b368b8bfc54eac05024713682515dd5e521c33395ced464d72c7e6d142f5020c13d9e190a2933fac89325627c17288df9
+DIST firefox-38.6.1esr-ca.xpi 458092 SHA256 136c1cfa8561f73a551bebc19ce22d97203d46a6569d0bb28c26477b6f201dec SHA512 7b99cd99aa3b09870125d0f445e288dc2000b7102b1865c6afa5f32138a5c7d75438efb7384d0b2ffa938192185fbf9dbc11cade360ecc68ea3b405bafc8f0ee WHIRLPOOL 05b4be26813dfe2f3e884f7fb1e209662ff08c618673c2982b84c71a97ed8cf5fa09606f0f418d62e8e312820f7048b72fb929f58379e1e45eaf0cbd6ea3d268
+DIST firefox-38.6.1esr-cs.xpi 446726 SHA256 37656a3d2907f88d43603eda525bd7ba1f7bba2bf93e42750f86ba1b0608fb5e SHA512 aa154940042fd8aee0271bc99e64f982dc916155dbd77064f8a9d568973803ef80286cd495d94ffd33a9815f20ce4449963750120b960a22053544f2fdc1aa57 WHIRLPOOL 8a8df0cf00fd9a74a2672ad283a36b38d11b9eda016cdb4b4c990256cca0c72c81a27015222ea662ccbcaf01c4e890d2a9df44b8e47c56070944adf9499925ce
+DIST firefox-38.6.1esr-cy.xpi 444385 SHA256 8dc6fba4c340397095f492832572e8b54da5cd57532da8845a577043922ab90d SHA512 be9a817095d46b670c0afa59aeee0e959b4239b22c81a18755d906f952c5a11470784aad1303bdf9e897418788b10762828dc2d029a710218ba7fe3263e80c8e WHIRLPOOL 608c3515792a5b6a1f28074bcf4fbe17e37c6594c168fdf9afe507a12c56c150df89f1047baa5814fb2fee0b2098e0bbab4f9f9c519a975e219f223ff1e8a61f
+DIST firefox-38.6.1esr-da.xpi 450763 SHA256 0704f5f4bacf449741213825c95fbeb72482894b681aa43469287412fd939e3e SHA512 6a2d1fa831a7e7307c2bdee37bea044317b4226090ccb157cc0a8993804332681654c1e3d86e9ec8c0a8c54fd0694a6861fbdd5278cb9b44abb683999f2d1464 WHIRLPOOL 556b8d4a68073f967ca4e1c3a0566921ece5c516c4ea9c40d067a5224e156b51a1813bcbc3a63b504c3dc5953ebc39ba343ca0ecd2d4d5c22dbcb5cfce5a25d8
+DIST firefox-38.6.1esr-de.xpi 451629 SHA256 ae9d6c7500e1d05f7d63d88644573f3bb019521d174fbf662d49e28aaf6170d7 SHA512 65f3b9ad10f84929ee82b7d6060e9667730e88c1930631ff837c5370cb4a841ab3b7ea138fd696587fe37dca04318c4bbb9830b95a899fbc08988de5a80571a5 WHIRLPOOL 616902afcab9366f4ac13a5941b8f79bf7278ac56ca1073d3925102d8f643754f157b88f5f1426c2f22c043125e661c70b6ff9e452f75b74c1a2550cd81d7da5
+DIST firefox-38.6.1esr-el.xpi 498370 SHA256 84c7b297a4319dd5d0ea5653fff3de6ae5eacb38f1f45feec90f56a5db837bde SHA512 0ca1000c34e510a1b552a6c8693b76ff1a17fa632bf393afe3553fc3d1ab573dcfa2cc67c92dea76739c4a97e5cc39f8cec8089572cc60c4b27a04ed5a90c24e WHIRLPOOL 729d0607b126fde5cae0b7b06a2249340f53f462e13049df5aa6f33a24bc807fe2d4f063c86058a5f91611a565c4612463ff1865fa99f73c1fb5d05258b1cce9
+DIST firefox-38.6.1esr-en-GB.xpi 437845 SHA256 e40dbc5cac2eb0d0d399fb853166cc964011f9f49e1a48424ac527edc3594bea SHA512 4697f64da1c3f44843e02281f0a952ee6e888023eb851d068ec92b8fd1a7c7e05257e41cbe9f5be182369a9166b4ea69fb93e8cff19a8527e668f7d867934af6 WHIRLPOOL a7c80e4389bd44409f9871d0042350c59352900adc00d45993d8fd5069f89c267dcc59516613809fe00bf86b10fad6b28cc8f1f1b6d712178912b5319438e906
+DIST firefox-38.6.1esr-en-ZA.xpi 439926 SHA256 dbf3d7364d8d535cbc0c79dbf1addf8a688bf6b09035be762ebc4b64307c506e SHA512 b8472a589ed410a49e5d685a254a7e7ec90f49b812d0381c1305ee1f6a1bbcbc1de46d28a9ac77aa806dc2a2c1c41afaca7458778ba24a67e755dd5e390c251a WHIRLPOOL a9b8b5806b8fd26e5f7b52c3de9d11090829f3c02840a2a68ed61872d91ffa3e6bda2f9e106d73f32e80da41e27b41fac4a30a6f2d708de62e92b19d12123954
+DIST firefox-38.6.1esr-eo.xpi 488370 SHA256 57f7b8740e04ce686d49a4cfaf0364346c5918c12417983ad4d7e9e58f96a660 SHA512 7c4f0d6ba105b3ae8293cec0609145d0de0c7c3da33454b002acc8f16bc59d971a7c1fe36bb6af9516abafd2d21935cfc25d0e9e3c4b8ff0a4ebf1620e95a851 WHIRLPOOL 69474d991f96bfc6a71f982241293984b90171979b32f63e61ae6d8ef3f160abc97c264a5d8f6d9128166edd7d415dd0013cea5884fb931a1622d8bf6e245e0d
+DIST firefox-38.6.1esr-es-AR.xpi 453983 SHA256 28942b5f6d1485e3aa6fe2852b70c5fd671db662f02c125456f38d61a44f1e9a SHA512 5f8d4f70f74bd7bb4af014044dd2fdb3eef68e79e7d719e5bc01520c37a94081dac7b34bd8a5f527050d7547baac2f4174d8ad1197e212b0aabc6571ff718c0c WHIRLPOOL fccd5f7e0bdc78dcc90f26012127146c8a294c0bbb7c4c6f29ced5c1018924753f147e821fe20073b3ce018f890a65f834fc8ec2b48c5cfb529860ef2e95a83b
+DIST firefox-38.6.1esr-es-CL.xpi 384679 SHA256 531f656fb578e8335bd3400272a94bb0fd55418dd40399ef7bb9afb05f66342f SHA512 781f7e6d4c6f2f40efb69fe09447d6b88a01f3f59deaedda82826ad85903479c9f2b9f96661061696f675086be1d0530385eeed57892b18f16d12de4698e4053 WHIRLPOOL 06b53bbd4c6e6b12e2a5d1014974dd6d41010de0ba25424348980652153707b9b2b1931848829ba994cc82001d77ca2b3219e2665f5f53cb8be5243b7295aa27
+DIST firefox-38.6.1esr-es-ES.xpi 374073 SHA256 0cc9a3eec376216c29818cd215dfa858396a2075cba808e839cc259e092dfa48 SHA512 8417939fe3a9ae018e7416e5014cffcad6d051d1d1d5eb2d5c8a22ffc08f15acc32a6a5339c882c8aa0aa40fe50969bf3641485195aadef437308f34d5c6e8ec WHIRLPOOL 8b98add0b8d2263e3c587e06c25d78f40dc1fd69d92113d78ee8e954899229d6e3f6a792e9f984d1689691639db8961317fc61877152bbcbdeb2c1489d5b3520
+DIST firefox-38.6.1esr-es-MX.xpi 457050 SHA256 b50f5e2ac3fa83521d7f5b6fe87038588d1c3747675c7e6b6e3c7593d53c7475 SHA512 102f945eedb9952cb63e5dac866c6447abd931a397701c5aa8f765e8cd33e546cb51672103a4e8db6d70d2f06c5f9d00b150a6c42c4bf9ef74b593295d1a8cbe WHIRLPOOL ae249b3121daab51cd64eb251dd158bf66a6a72b19e317543d5f0ebf6a2c409133981a0c5b7f59dc6a2f87fa30cf18a313d33e0f2f42c7e7a9451931b0ef8424
+DIST firefox-38.6.1esr-et.xpi 443229 SHA256 d94a25ad6c66f064097c78e82ee5adc4234e42721e322adfc077363b0ebebd5a SHA512 2fa446580f2d31cdf0163465fc1ca6b12b6c634f5d049eea4e02e739b918a32c4f9b6654571dea4dd7218992369ed5d7538b5ee4b52540ece2f5e23aba73abd0 WHIRLPOOL c13ea3430c697bf3fb00fb4b3571309c1400b9fb63387f865e8d32974087e6fdd74ad4085050b142804f63568c3dbd7df2390d58726ce7f04c0fdfdfbb78853c
+DIST firefox-38.6.1esr-eu.xpi 466555 SHA256 ae32215075a3d1b27a73274e0df34b8d2600c3e2dc6d6886d1954c86074497ef SHA512 29c05ecd26a53997d03b191e00107839b085b2bccbe8790123b959b3de648b9afd93951df5bf6b4d93fc4334e3f997ab1545a73c8e20e8d854e36bb34d2e8992 WHIRLPOOL f51c5fe990916bdfd43e471d2aa2af8394889aee129e5a7de135c4bcf932ee6273f6d461a503d7bd932127c58e9a61742e51ffbf7c0b73a8c1a1caa48d77546a
+DIST firefox-38.6.1esr-fa.xpi 518282 SHA256 f7a1d03f01b6d4c9a62ba35c247935bab5ada0a644ca3072f0549df690c4d647 SHA512 1b2e111eed3fb9f50a2342d0c7cd6e543916270f56dd5a7ca97085e6102edd42b52760c4b48cb05a36a88557d5b3d39b11591ce93411749bb7ab4f2541bbaa8b WHIRLPOOL 06d6a2367840ef1be047f723fa309bfae252a8505d093b6942f882ed15e3503867538adfe5c1aac258724f9798d3b18fb3ed959dbcc60c39f1ac3b70432a1b6d
+DIST firefox-38.6.1esr-fi.xpi 444853 SHA256 94d1216d8f44caba7d10a9835c3906d1c85eb7d9d53dc59c5a47fd8945211adb SHA512 e895eaabb1be43cd75a8daa06b7573cb27e7342537bd6ab0b985f8972a1001bf7838c86aeb1d5f498831ee814cbe5ddf3a82a85d67891db397e4f7d030d9775e WHIRLPOOL 76e1785252d91add89c78ff508873a5c0a041979f14e3f3ceaa8c80bb1abd650b32a9f04db50d6cafe149fd555cc05d91c1155a4bdb1f0825f0cc31313a2a787
+DIST firefox-38.6.1esr-fr.xpi 461402 SHA256 c8829b4de0bccbf5015788aead4be109eced568610ac2b2452f7348790b58c48 SHA512 38659716fbf8eb74605ada5ae5f9e9d48b98a29e9364e2e0ccf0a8bbd9bffa82c2b50a2df940fc8a3d1a63fe63e5719448d6cfc44cddf5eb6f3535b28798bb91 WHIRLPOOL 8da7327530a5c57bb28ac20cfb558f04c906787b68f6c1985767b485b999d6aa6e6c9dd1a03a114944c27feab137486b02045deffaf70d86f4fbd04bc1eb5df5
+DIST firefox-38.6.1esr-fy-NL.xpi 455538 SHA256 6c6de4698124089e4e57ebe130f7df2d9579c1fbbeca434080b289b374705126 SHA512 50f5258a0de43e147f76a6c901c23c603496aba6fb351b59e2160bc184d0225126e1665af0b99bbce4c7f82fcb03945c9ab872785fb4279938f75284c5cc7762 WHIRLPOOL b40dfd978c1aa7e67ed1c8f0679a638239b901964756c965c63720f861c4bf6de9ced7023bdb1b0ca889e510a051f5d6fe565df24ea20eb9a5916bf9b5a7a123
+DIST firefox-38.6.1esr-ga-IE.xpi 469623 SHA256 db2ea2489a71b80b8ee759ff54fba3d44f8181349853aed2a3c94f48fc85676b SHA512 a2d74be5353807f64717afeccebda0286895f2b7d45c9400827df4884d2f2ce3eb2083128a0666bfa9b076eaeb66c62dfc82788ffbdfa7e5dc9e9728c1e3f281 WHIRLPOOL b4933cc320ed8dd0651848be3e7fef5033fe36449046e13ccb9dfa2e62ca1c1db86e419af013f84844f0763752b311ecb4fe381510b9fa022c7f4b9e2fc61d0e
+DIST firefox-38.6.1esr-gd.xpi 454616 SHA256 851314d85d257b6cb683282e8a63a83cd320ce15e15bf949685534c561009dcb SHA512 81f273e6d0732f0b5f6a54d7e99e534009bee2c9cd0452ccbe05e40d74e04659e4e79c05539b5249bd4a0df7673d0ed6219953cddad7df23cec0163366efecea WHIRLPOOL 67cc94cd57ed4a2376f041bab56b91ea63341506cdc737068c605eb55d64f1da7d15354393a589a5bcadde3f882ed575afb0aa330f378a56c803fcc70eb13efd
+DIST firefox-38.6.1esr-gl.xpi 448925 SHA256 f2cb5cbb019acab2de7b7e4f186151d92ea0c88fff29b94a48e4d80993d9dc08 SHA512 be57387d12a7860c0554a84dc7f544f507b3c08385a6f2aad966e91d1509c4d79c65044b3b982fe5a816d3b7e1ca18743dcdeb3c6362ab6a037cd5b84cc8b4ca WHIRLPOOL a50a746b3780b5de987f0769cb71596a996176a99a8365592f8118592ab9a5e617cdd552ecad1ea168577e40f1729e5d0b7a0073bbd993232a3f5d34fff843e0
+DIST firefox-38.6.1esr-gu-IN.xpi 477980 SHA256 54c7088036c89fb3f0c0a43d8b06e99a06d992563f8c8ecb3fa71ad25029e348 SHA512 ccf82a545e66de0d38e9bbfce6301436e83371ed80802e503b4471fc1564b6642d2ebd765dcfba2cc65ffc71588ffafb99aad9bfd3fb2125f1759025abd48fed WHIRLPOOL 4bf2dc70661c5a91e1f9b53ae2e96852518e825abc73154b29b3845e4f30008e114f43e38cb635d0618b9ce31f88bf64360583fa8a4174731d6b72f37f56322e
+DIST firefox-38.6.1esr-he.xpi 486785 SHA256 fb8d79576c0ed7700fe1ac0f89880e9cdee41a370ffb5aba6a5ea30d353f1dc9 SHA512 197a62f94f7773b79ec4289c8a3234e47215bcd69ec93a84ae97ed5aa0fd66c805860830df997098f76234f4efa751ec087f71f6e50553aee777223c33aeef62 WHIRLPOOL 98c97e88e728aab3295db96a19d65eddecddd3fd3bc871f643820dd4a50a8f7f3281140e123460c43e711d1653539cc8f9aab5cd7cc7ef69de7af8e15e950f02
+DIST firefox-38.6.1esr-hi-IN.xpi 508167 SHA256 9cd59047387c3fb285463d6d6f13bba45a38fe3dde2533b96b00f54e657ee9a2 SHA512 12bd0a56efc856c0dcf9461ceb90b7cf16889172ba89022bec49ff025676139e4f04c35e4bf6c8c1e0272b04133c417588823d3a5c52a416c8e8cece5a3d35cf WHIRLPOOL 727ff5b5f13fe1cb068d49cb92edc543bc5b211a878bcadf7f3e129668a91197767556ebc41a08e5b2161d8bdfb8f903176931e249c8a2fcf8b8b9a70550c6f9
+DIST firefox-38.6.1esr-hr.xpi 478271 SHA256 086e06d26a1a4f299cce29575266d382615654734170a5f6601d822cf33bc8e6 SHA512 d8c6357c27803b6f3aaadb74efc176a6cc161377dfeff0936617cf5faaf2a5eb6c0ee6d250e8379349b67b30452973363178690d513824dc554f4ae4a2d51e99 WHIRLPOOL 428ac912ef11cf8a66bbcd669dba5ff25f2e7d62a60c134359a52bd6ea8e04852f6be267de9df503f06b73b83189c57dd1011b59dd0797a9f1c70f207378017e
+DIST firefox-38.6.1esr-hu.xpi 453555 SHA256 dfa1bc4728212bc0cd43f71af102d6ab665dfcfea879e77cf77e2518e639bb46 SHA512 43d0b3ac5ddec3798e9cc4b92d3e057d57b5f3a30a7e98ab574675e1921da0e736403e7af737c4e6e2fe4e7021f1e115b539f7599f428d0cabd8afc20db76a92 WHIRLPOOL 4b485cda26f04c9fe4247269d5ba6f335ab465aa834d8003001bdd1d5b40dff1cb44748030447cc7a6ae6d64aa508736bf69dade34a11aaef16b1ac10d7cd2fc
+DIST firefox-38.6.1esr-hy-AM.xpi 534265 SHA256 b8c2e84195a5993efe15f8026fc481b3693c8abe6273eb7777b6af90d0d24bbe SHA512 97d382b9ff1bfdf02f88675fce60be2635d5b5e00feb92b38cfaec038d13e393e63f6f176bbbe1c801d5bba478f7ec849018e005c568aedb23fef0448abfebbe WHIRLPOOL 792c172c07b53a7f10d4fdbbfd262c5e0b67ed3c7377f232b40be0e366fbdf4c70c68f22fd9a67bf3fd43a8247d7f93d9fd19e1229e804ddbb29e9b545045e96
+DIST firefox-38.6.1esr-id.xpi 431489 SHA256 fbce720771e265c464a622a2f086e3111835c20897b8cf09494d6176631e348a SHA512 65b34225a9c2deb8ff950aff64eba38fb5c73e2fc1ed514397f78a654fb710e409914036cade3ac87ba0055b78ebe03e0ff1a1d21e7d0712f6a96bc5446686fb WHIRLPOOL 5304696dca9e1ace05c2b23e3c21a3e3f99bce07c6f221057d8d88931578a6c1ceb8c41153713aa5887f4ed85e3e7518e3f9bcc8da0ed5287daa416c78f4b7ed
+DIST firefox-38.6.1esr-is.xpi 485128 SHA256 a605ae15dca88ac5c33fd3ea6f38ba9a38559124db1881acad80895877b96b70 SHA512 d4385a7b2f467ee23622a8bb31d29f6ca8313178b92d4b47ae26b33efe76b9165c3ecd7bc6516720910df3856bba13a434b9ca386a16720bdb73d0b0bbf67ab4 WHIRLPOOL da26d5a8a9b42a75c52df762614fb0ba3e6331aa8ffa1f8ead42f6ddd08589b1d805170bc3fe1c32f08d429aed4fdde5ef435373c971956b47f6a9752261e609
+DIST firefox-38.6.1esr-it.xpi 368409 SHA256 3e816ca3e65cddfbe4fb2bc3955ec32a21c47481e9f71b6770017856065aff82 SHA512 2787a053fb9001b4c6f4f3c565882a70f0ce84549a6f1e52809f82f5c4cd1406f29cd1c5ad6ca953fccc2c77544a636cef09db6c4408b7ed16f052c9a0971ac5 WHIRLPOOL 502296001173b1cb08f6f66c22339391b9a67d77267b81896e0194b114d3fe87bf1b9fa0cc980b7a4319d2d2e45a26717afc3f7060084b4619dc77a446cda80d
+DIST firefox-38.6.1esr-ja.xpi 479114 SHA256 31f0819188bffa21bb8e460f9f93238cca32c882fd60e0f545e382b0de45be2d SHA512 02dd9f209d804422b3fe547cf3cf5efb5e9195058d680134ef6fd92e93a4ec43950dc0d35c6bcaa0b74137d6d19a03a0bbe304e159180fdb070211c8dee4f1be WHIRLPOOL 22ac3123070228bf5e7a1d2036b2582b5092f07cf20306051dd75c48c88885794283a67b5b56044fea95461d4b716084c84d3827be882900c048e18177836fbf
+DIST firefox-38.6.1esr-kk.xpi 503568 SHA256 4408ba162ce3dbef002a7e36f3d53399595abb196a10d9dd3f08e011e47f0f1d SHA512 18d740598c1ad27b24559a04d38953def74e2f481f00c92eb50add9dd5fe82a82bec19abc90c49f65e2aebe6bad688919d0891b99173b2fff210576819a73180 WHIRLPOOL 2339a300810cf236a3c7a8291003bd0d849d68ddb29a0aee4cf7c2e99fab84c8f00fe9faedaeb16c67ec5de3ad5c5dea8a6a8c1f9a2086e49043ec800adee1b5
+DIST firefox-38.6.1esr-kn.xpi 533464 SHA256 58c5cefe6ba8b23a64f94e16bc74b9945d1252a5da20f312af745720bd2c39be SHA512 52ed48c4806036b0afb345ee5e862e4a6694c88af46d648cf40c59ef75b60710cbacd75edf2fc4becd7322b563465e7bbd71833f327f23ea1d88c943e2b27529 WHIRLPOOL 70d38249dc4a79dabb6d0c4a5b7101bfe7317af5477193991951573a4f6fe80730bb514b35e2771328fbb496176b09db254d7faf3d8d31d85aee0dd9776e43a5
+DIST firefox-38.6.1esr-ko.xpi 460854 SHA256 7c46f9d87aa57f038ba5b5c81b06f88e9ebfa9882d44237debe45b55eed7a83f SHA512 62477aac6ab46ea19b63806f06b0463767faffc42d528370cd9b546d006a368d40e46cc76d452d91f40f6b062ede40199819f26665d6f5d1660ce8aa2bc4f4b9 WHIRLPOOL aa9c8c1dc26d4595276ff2016fcc9988ccd4e244abd3efb5d8025240456ea9025a0ee01b8be1fcdbe684bd27abca81b3a474985a1c20d100425ee7be59128601
+DIST firefox-38.6.1esr-lt.xpi 486451 SHA256 0c0959fe02ef5da26ffe65108426fb155670b14da8af112b4ce1411eedbcc6ed SHA512 0b0c36e80aa678848d6a09a9fd55020512b1f920aea2e55fc03b4a4c3242b2fa02f9d8a36bf1cb6d2e3212c0e377267183f7e0108fc24cfc78fb00cb9ada2604 WHIRLPOOL e8fa5eee4bb2fc10ad336ad3f24f2c2477d33635b9cfa905f07a03958c200f26e96c6ef899ba52606adacd2a1246a16b1d8f432565f9e8d8f9e212e92a407c04
+DIST firefox-38.6.1esr-lv.xpi 467198 SHA256 c0337ceb0203e53f46f93d96b82b3bf7f81cd48bd8e0c7883f8d86a1958da3b5 SHA512 e48633967b9d20507da3f504f30bf50442632b1dfff93ba1efdb3fe365d64d72f1aebedd93064943de2e560258ac8c2131e7d8b016e051bf8223c5a14f553bf6 WHIRLPOOL efa4b5446e068160c0d13ef7b552a39e5fc583172857911329e6eba932649216c4f5b8447c09c9dec6932fd5f84321ac350b2654459e58f2bbd98087de2a2916
+DIST firefox-38.6.1esr-mai.xpi 514666 SHA256 a14ff6b63a09b67eb75b01351e562ea3b2d28f45123eff7170d145a87c90f9b8 SHA512 5a8f2d494851366d1bf68cd8f4876dc98ae38728de561465d2d1b0cb850027830cdb56a3a01bdd9b5cb2b18f783034249cd4d1f0023c85bee6912418a0a1439a WHIRLPOOL ff86e03374786017911851246cdf56e2155dbaa626b43f336110c0b48467a3b9824297b6b6b4df89f59041096145889439ed208bde5ed9ebd94b9a02dd6f8df4
+DIST firefox-38.6.1esr-mk.xpi 529205 SHA256 187462ce7ba1931453210cdc63134bd7ff33d87f116a7655f882e673d4fd89a2 SHA512 6c24e4674e308aa0e983db261c254c583d5a091bb1cb0df9f8073fde6785213b366363d9070864a67ca526b612a75f486537e518f95c43f1db7845091f146a5e WHIRLPOOL 9e9e03d6392500d0d501a10c1ae7e6e70e5ef704f9c43f7e272b8494cf3362d25e13cb516a847b25ef856372a1a59dc901cafd6ccfeffdb357a40d9cc8e6f5b9
+DIST firefox-38.6.1esr-ml.xpi 528919 SHA256 59143a40c46c5d891f522e0d8c9ef77528f6146dbef0b125d802334e44c421ac SHA512 fec3d2644a5eb928146c1e7ec58640ecd47a94c44c53d26fa2b763d804e44fc04f0b506a38e7ba4e16ccdd1508851ecc2183287bb4d6777d54b71a8192edae8e WHIRLPOOL 22cc5cc572307ad5e800dc7f3912fb8a3d900759aa215e5ccd7a8dc06859f4d8234fe92de056ff26e2c7d590a2018e1a4a73ec8e6416450d4eefdc94eecbd528
+DIST firefox-38.6.1esr-mr.xpi 505962 SHA256 e8671bbdb3caa20fdd1c3335d2aa454fd0df5c68b7441aa4b6d355258045bfca SHA512 fb9a9c2b221efbe75ad7fa98f27683a257267dfa37fbfc0c23af459c6699cc1536f86ff5891362f55e548ab6fded11e78ac14afae0b3c2f76f0450d3f8ee9820 WHIRLPOOL 9a49d6027a8d7c134594109ce6d4aa1b12643ded7ad1844ae6357f697ece7d6d2885c320d8833bd3b86cf1b5a5039900b69c7c3b4728a9cc76f24c57c685f99a
+DIST firefox-38.6.1esr-nb-NO.xpi 444177 SHA256 21fdbb9143964f24bef0dd99583348ee563d3cc7edbbd3098abf25a168541b0a SHA512 96a450516a7910296ddfe335b670d9cb814b2f3d3bde436c4867d08a3d6b84399dcfa57153efb213a9054b98b90fee0897143a30b9c5dfce624d800022de3003 WHIRLPOOL a4cb5a90f239d0281e38bc360d0c2a5b88b1e9a8530d520a3fb0bea87492918905095e2ae099ef48539d56d20ccc748a9d6c7c95848446455b7ffead6c6723c3
+DIST firefox-38.6.1esr-nl.xpi 443994 SHA256 8c9229c5aa626a8d033d387fcfc2164208f6ad8f86d2258fa30c90f468ff6b86 SHA512 6659131468dc733575c17badf66bfb57ae7379aa9a89c0f8a4eb30f6e2d48765f199a8016b0edddc43e0ad303893e7385bbd40b65c90e09815421fbc3cedd2ee WHIRLPOOL 54aff32bbbbb1ccf05eacb8bde70168415d2dcead6b92192e86f40bafa3136c73af73d5ee91bc54b4b4dcaa9772095ea02bad3001679ae9fb725081ea44733aa
+DIST firefox-38.6.1esr-nn-NO.xpi 438452 SHA256 103a84989e908efc56fa62120aaaf9056ad6347dafc25672bc8f89bfeef160fb SHA512 54d3c5f8ee34c24394f98bb2dddb0925ee18b6c1b37acc96e5d870488cd5284ecf4aef57c21470e3f7ccab2c80d5abb77b597cbdc4faf3f8a50be13f79fdd944 WHIRLPOOL d7e783816a59cb16e1f0be02199f06db0d0882216b5714022c56cf7d0c62033949e0aeb7d1fcb17342019a9465b46c1c6ae9fa099a4940e98cb57242303d8461
+DIST firefox-38.6.1esr-or.xpi 527049 SHA256 032bc12bf506bde68d9d64bcadbc09ae5f0ddfa740ea9d4cf37fee2ee488fb88 SHA512 92cf6016947306d9b3435e22a0be1e5d658307fe1d55f73b62ffdadec9027cada2d9d820aa0ce3447334c7e9e4da32f6dacdbe2196d410b94e5a8b0103f52f5c WHIRLPOOL 97d9be7b9e9d136ad5c716b0fd31f112b9a779e707649caeedc0c1f05955472d231c4efed142b070bd6e2afc9692d87a0447725eb968876212c95eb6e2892772
+DIST firefox-38.6.1esr-pa-IN.xpi 493722 SHA256 6d74f9d8143573a7c8abf3dee1b3634c60e035ced131b3c02758078a28e77259 SHA512 c0380bf7ac9654b284aa5ee9d9fc68230b7eefbbb202c9be0e032974bff4d7ac7a5169f49ffe245884a7ef582523564baf500663d2ea95ab8921e5db1f8c582d WHIRLPOOL e03790e2e3f16c64c3e93e1b7198836071d42abf4b830dfac220cd883e11d2af9fdf5e03e9703179093e4201a856a64193e55cd38df332a18eeb0682a63e5b12
+DIST firefox-38.6.1esr-pl.xpi 406566 SHA256 f2bad2c40e75db159b54dc72a97199f9f0c8f479fab295bed8f4dc43b3b77aeb SHA512 bbe51d39d9fcb3dbf71ebc13f3456ae4a2f1ebf922a2d7c647d15de2f0cd8e92e12cdf82952beeb75de1ca484380515891fa1057d5e6834ff2c87f3e4b92fb6e WHIRLPOOL 24eaba915745711ff398e0250ab6ad7b0c7a79579be5786d73e580294bba67bbf7bcfa36eecfe973171600fc7d94b3950713f1914bd29f522fdb02aab238b02d
+DIST firefox-38.6.1esr-pt-BR.xpi 459810 SHA256 a57a326d2820c9542fdaf023fa2043f1de10f8bafcf313ab468e9b122166b352 SHA512 41224b0ce2cfcb03a0df629daf840428815e857acab52765f48e4d26cb15d5691ca7f6ba14fe7a0b6fe277473db9a518b59ada4afa7e12366b1fc31f3fa0922d WHIRLPOOL fc04d153582da223638232e93ce19f39ef96f508a728e9b91e6c2a88ec109d6771ca203817185fca5ad09e0ac1d824e43b9ff5675e4c151a506b904ab2d1877e
+DIST firefox-38.6.1esr-pt-PT.xpi 439975 SHA256 ab6a5b27d32c19a203d5f2b7dbe4fa35fbc6b44c68458bee3a4c4bdb21c377e2 SHA512 178c4dab1889dda2719bd95c38c778b1745a171bf99b55f165523cc0e63d124ff8b6165397287024689f8a942366f7d0ffd528328d2c9f077b5123220257faf7 WHIRLPOOL 3bf2c6c48b0830eabe2d27d58c04177e0d85cb3f3b78a90b9d223b836193620f24a528051ec7f8d5403a439e6a220b9f714ca304b4d13388ee5ea49cfdc538bc
+DIST firefox-38.6.1esr-rm.xpi 446286 SHA256 e4b3003ff493901d2440ac633a71ab68f6dbe5c6602fb19ebaee7b561af5620d SHA512 56b1cb4cb619aeb5b2308ed14bb7b6c0f181c51f596f5c2ba01b228404bb113e27f46444c8672717cefe1839bf6fa301a61ca012a3b1ad6083c78958e3139e9f WHIRLPOOL 2ac824918785bb36f999d1c485fad6310e7cfc9210e34f8269c62188dc5d59cf12da222ec5318ee31cbcfa48753fa8e456e6ead8107ca1ea24956b810a272de7
+DIST firefox-38.6.1esr-ro.xpi 494079 SHA256 8d099dcc828dce7d14f4ce838620e717b8e7ab442a32eeb19287ff310295f75b SHA512 09e33a7fbc29a07055ff9b42757de9367fde864bf9c66fbd73d4acb22316689fc313fd5cc4e4be4bb03eba2c3a2a1a190686c19a6ef66a329222fd2a5e2fa1ee WHIRLPOOL abdbbb7a9bef5bc377206e516a1d213a3c5bcbec673b2f41915e858711c03521bd3ef2222cafb9bea2cc9f18b50c5784d6c9ac296f18ddab4ade2ffcd2623809
+DIST firefox-38.6.1esr-ru.xpi 414419 SHA256 fb59260748ed9d01ae54454754ed1b897fa92b3970befa31d737773bb1198297 SHA512 241761cd7a4cc4a0c9ef28b78db1d1defe599d8210b0a920f3aec20f8ab40c691d377e479a5c868155ecd66bca6fcf99d891fcf183870262006f570365890152 WHIRLPOOL 17dc181a3398ab491be0c21ffa01d323e5191ff5bb7d2338d8de3cd848c38fb9a1af1e5e46bedb416db517f1969b691a3f5dbbd821edb07152325df1dddd69f4
+DIST firefox-38.6.1esr-si.xpi 537393 SHA256 7b28fb2baae26b4840ab53324646b622523b303d6cd0e98211fa649caf557294 SHA512 aaea65268425c99b5e973880d6e35907bab2524a5a80893ffdd780197a9e74867f4ba361a975263182f945eed76805eefcd2425fe74d5cb4bc0d9ad8eb36984f WHIRLPOOL 694824307cd1dd134af8136d5fcd7371a9b6a080595bc21ca8d8ed1a01665e45adb29833eec4d4c6614fdea9b6f3315359d99859226c7868c002420adc4f6337
+DIST firefox-38.6.1esr-sk.xpi 469436 SHA256 366a0dd2e0f362675e9dd7d07b8bd568b80dd85ec52f5f2f48495cd96b04e86f SHA512 75eac8eb94e33ded6d86cd2b02c383c7486bb3cd7397449f38d2fb709d5dbe055aedc9e147992aa8152d7e195758798c972e46814f92385a65831d980519fd23 WHIRLPOOL 89299f459719e2391caddadfc9aa62d449ff715870be55a03e77b96f1e414117940e516c77a03fbdc8a6a2f4fbc0563252bb2c5d0d57130b9de34c3feac3a436
+DIST firefox-38.6.1esr-sl.xpi 441594 SHA256 374a0ce9c092c43cf2d1310f2e1da6915c4fda8fae438631ba746cb5f8bef52a SHA512 dbf0434e2ac013c8cba8be9d7da15644853ee4a9cfaadec617ce1ed7134d6b998913f9da8b6b8c3997a6bfe73cbaa6b532c36dc7d854943e0eb2366fc710954f WHIRLPOOL 1c7a534f1cbb702bea8af4a9c905795d813d301b56b30f5440b86880051c181ade52c586d4416ba5d327115f7b9c95f90241f4d7ffe81aa52d0e9a6b75956943
+DIST firefox-38.6.1esr-son.xpi 449268 SHA256 e770d1aed090386d07828cf963413fb35e85475fd8a8128584cb5e57fc9181f4 SHA512 634c4b02d4aec49b7f43cabb11147924be4a0a8ef23325df85d4bc20c1c0ff0b78d9855ce4e7e5e27ef30c75e5a5b41c71e780380ad93c91a1d20280438a9092 WHIRLPOOL 85f2f67a6eeacfa26dfbfe0528cc3262d6945396244e51bba357cd79d4d551e287921cac9b3b11cc04cb1a9002ddba9877ae420f10cdc441fcc1890edb6e316b
+DIST firefox-38.6.1esr-sq.xpi 486075 SHA256 debcd2b1e1cf8c565acfa4c1234468a972675539d1c99d1a3631389ac42ed480 SHA512 de754a2055b09defe3c640527318af39c426fc4ed9c48539ab8b906c36b9a7aa3b6b6517f55c262041e20ece1ac37bd596f4f7f30f45c9ca84252ac084e18f43 WHIRLPOOL c28b6c29950a6df315a2adfc18570b53b6b7a133c07f7609b10b69e7e97368e2c8aa1121d8fe291545fd4b9e4631faa3d670f45cca94cacc19ea83eb75a6f8a9
+DIST firefox-38.6.1esr-sr.xpi 479419 SHA256 dca858f9a3dad9633ad13f52e97cf9121c34a499979a00ca4f85af1636b4739a SHA512 38c723ba9738d60f90a08f8e2913388bc890a8da141f42c76da2627036a233910239d7842820716ff1d1034790fa830b9b7c82cf7b299f576eda52ecfd046889 WHIRLPOOL 9408295be14a68915121d72c67a825252b15b994abd4db38b9dcc33ae524f977213b73a1692df7d69b75f15ce3c37fa9822c97f96f01b311cf77a432c977d14c
+DIST firefox-38.6.1esr-sv-SE.xpi 452633 SHA256 847527fdf773269ecb4431c2990877b9b22f047caab4ab0532333185fa30adea SHA512 eb3dd5c9e3adeeee9847821a44e630193b6d41eb9d807b2b77516c52220948977ab0ff871ea4039dd67b7afc3cf601907104bfc2800bcf0d027de2bb7ca448cd WHIRLPOOL de52561beca0f4949e9d3fea274be1c883178aaa65b9894d2a40a8f3647de883e42becf87889c2e88a85c3fb72c4f3f4d9d1799de8d63f92d95cb8840b8e8f1a
+DIST firefox-38.6.1esr-ta.xpi 506607 SHA256 ee5c5fed0f00a66d18cbaf4c76e1bbf435d821f3a40fc0a535323ed1a6cd47c2 SHA512 572b6aa7ea838881d94e539c7a6afa552973097a520dbcd506e054260b901a8c0257ff90b9c1876f9b3e4b7c6b0ed709667d4127af8868006445c4e22b94c643 WHIRLPOOL ea59987ac90e0154f3647ff681105d262e55f89ee9bd343759a99cbc09ca3b29323a316926ec98e71713f7da9d4b79c32cba54fcfc2e9f2b0340640f35451187
+DIST firefox-38.6.1esr-te.xpi 526250 SHA256 a1d6e88c47714eda526f932a396db6ad092ebda696dbc26bdc4996056dcc3e68 SHA512 a20f9b38205693b02484765da154f7c5e788f8950fa161b0f86592ba6bf1f811dcaf9afd97243229ccc3fca2b3abf3f270dbc08e6fcca7b69f08ad8b11dafd1f WHIRLPOOL e0f949358096783dd00d53a541e72c9a8c686de2555bd41d91829bb42e9eb7eb1f02bf4418188940252869b786f891bc65bd6444c56d5e47521523d474c3a22c
+DIST firefox-38.6.1esr-tr.xpi 481076 SHA256 97728e96773600e5d5f532bc2683fa2f2e5f2e6995af592b70778784444d4fbe SHA512 35849ce45ab4d6ea6a9b606ff0dda165236a6e6d5a58a53b8e66723a6063ef149bb4ec28d3ba44a3fce1901519d39e7fbe6cb8bf2eb51828f709ca5165bc1902 WHIRLPOOL eaee1a55daa7d7de14d4b467ddc059dcc89155a0800bd449b3cb805e693ac145fb7f5359d178e9d815000cd0ed1dd85a9b947ab17d3b255d76a5df45e3467f48
+DIST firefox-38.6.1esr-uk.xpi 493313 SHA256 5ad2299d95f27e0f6b7be9c29bc2139334f0cb04808fc141db2810251c9dc92e SHA512 72cade19db7345b424fb6fc78415815617cc49230af2b8c6ab9817897c7b43e56386fc4080dd005f6d30811bc8e5788f3f271e7961ee5e2af14b05d6f3cb0709 WHIRLPOOL 4de61d510df8f1fcd74952c01fef8f2d802c07bfe7d4af196c4e8efbd9a9844d96245f392b643b9d31ead3d6043596c7429143503a027093a0dcec4a6cc625a0
+DIST firefox-38.6.1esr-vi.xpi 467504 SHA256 773deb6abe3dd09a515dd3987953120f51ab701a4d83eee40464b8f1e4b275c5 SHA512 c9c417ce152b4b3ae8e07a26b2bee51c2e62dca9358cbac2442da26eb609a26046eb0241d64250d3c15d260c6d153c943c2dabf94ae6447f8dadf0fb9cdf90c0 WHIRLPOOL fc655a8f93782a71ea10e4986b03d0d508221053955955b0be1d5a5738dc9ee63f08e0af7d3e7adddac4b282d55b964f47b0259eda7f051a4fd43f7c083e33db
+DIST firefox-38.6.1esr-zh-CN.xpi 488276 SHA256 59bf429bf75054269dba7ca789581b6b4bfb501a8ed902690fbefcb3f3f7ae84 SHA512 9aa0b23e9f41e94cadcf5c469d32134711da4be562354bf940710e2b2da9c5b6e358d92bc957d3ed57cc59ace6da27dfb246e4ea5f7cd3a7ed3d72f345e079a1 WHIRLPOOL 054d2732db4dfdabb427bd6c4d2b7dc40a86c2669c48c78d4ea6ee936f69f3b3dec7cdf64dffde8f014374c7bc4251cd7a37526be9b8229f70bc2dab0add311c
+DIST firefox-38.6.1esr-zh-TW.xpi 467844 SHA256 740f7a7933fc624216de2c84492608941ac2aaa228b666cd55b8dbcbdc147e43 SHA512 fab6120f6515a388fdac524deeb2568ff73323692108d8987951fc29683c298612d9b24ff534b0655af12dc5b2f20a4ea9253912dbb1ff1d8bd57bdc12a692fc WHIRLPOOL b07d7b226cc81c19d6b135ff568d41443bd9e2e258824ae5f59455cc5383511e79f11babd748de162ea1566910b2d3a69d440253178be5e63b69f381c86cdca1
+DIST firefox-44.0.2-af.xpi 496124 SHA256 f80bb4cc0937f2f355d594ee1e7b771e9e3f44672161403de8228d9fd0429e01 SHA512 570d9582b89b88070e0381153880a8eebf47c33c07c9ec52c04c867830d436e59e8f88bcecf499880c7ff8934b302ae3d28b24c6f81a1d774a8581a9768dcd69 WHIRLPOOL 3e29e8faeb49f01534fb2ff15791891dffa38acfc99d4c79db7e85129931f410fcefdcec3b529d0de69b14794b2b9ed6dda42e5f405d724deb4f0064d7eaf5dd
+DIST firefox-44.0.2-ar.xpi 531970 SHA256 bc0c64baf89b969be23cf3310a288717fccf7ba186e89eeadc11829efebd5587 SHA512 bf87e11e014b378b4238108bf78686e78fcf5e49c77647c3d3f007991393f29373d858f035654350c1992168f180b80f4c7df2a454f0552369c866b67c08fa7c WHIRLPOOL 570a5de4ba28cec39e9194bbe5b211b0c7adfd6ae346c651a89762bb64409b5160f2de8cc70a540f79cda31d54c72db7421dbe188f8e97e8c1640d89a1c113f9
+DIST firefox-44.0.2-as.xpi 522459 SHA256 8ca2d9c3baffcaaffdc55eb2abc074f0d58f9f68b3dd1582faacb3f7492b1fed SHA512 908fa0c75b21b74a3763b3c76325ec144f1931d7ad438eeaa40f287c381a049c389e27ce01fe22440883e7201c496991afaad82e39ae52bb79dbeacc40f7cddf WHIRLPOOL 342f545e960b0ad32f7b9ef1df4751589f5dca97d8453d6de133bc6674f7d4c6021bd6326386c89c2c11bd7ef8f48848c9c92034b93929f96fed03b189dfc327
+DIST firefox-44.0.2-ast.xpi 420007 SHA256 7506051ecfb2a57947ccf53e0a8f8234badedd8a9668326a3e3fddb455eb4673 SHA512 333874d36a9e9843f7b0e7e2d8594e6a15dd052fad63a584ed7b833f278a3fa861fa496a192375d946792c3edb2d6f45fdfb244d3fb4a9e5e584df783a161a65 WHIRLPOOL 0f3ae131dbd1c9b4ca1ee753931962444f3f71f78182482652413b909e921e3d4620c2d6b967ece0a40118c62dc04533879cbc375c4d63142bb22ac7f4ed03ee
+DIST firefox-44.0.2-be.xpi 464851 SHA256 8788379b0978281d0e8d75e2905b67473ed80cd8c3372c3e7e3c9d723bf7b605 SHA512 939d4f4891061b9bb57d75334248bc93a31ea43df04a211d65ad8b830c273efc7070b83aae66acf0219705102f286f01b85df33fee1446b403a8fb48e0e5f5a7 WHIRLPOOL d838bd7b80264467e081e2ce93557521d9b3422c8c367ff7f38d76b4d44f25e1af6f9160d55904f79bab888945bbfef2d84a40fcae86762c6feb5fbce4b9fdfc
+DIST firefox-44.0.2-bg.xpi 505506 SHA256 5c744cbaadea198976b091c288efa4a17928a3ccf2ada2539b3134c694efe41b SHA512 9378d177e22e8dab6a1ddc6bf9c2cabe9539f2e21262ff6bd7df592bad5cc6a0fcf6ffa3b6d5ac517075a5f1fd042ece221dafbba9a616aa735cb5eb47291421 WHIRLPOOL 193d92c2832fbbbcd37825b7bbc598fb03a11439d87f4fea6fc8ef717a47bd242d01ad5eb90ba06046dc8dd9f873459d74e57cce2a899fb197bdf6891546aa41
+DIST firefox-44.0.2-bn-BD.xpi 550932 SHA256 ecc8fffc55bc95330c33bc8c73b365580a29ea743914c392612733e8144fba8f SHA512 25a8a1ae451c5ab54d2d95f8a72790f1e4cc198fc78f1268760a16006f89e354612e611aa859954f9745d9d4bb3c8b71661835c69e5e1aa6176381ed6c868f41 WHIRLPOOL 0fc9c844a656736e8ca4ee4c72a3bc6ca623b9949af5bf0ce6fa464deb7a1630dfc36b10d62d6d9b72ecc188f0428b9dc9b627bd1936a645881f7a7a6da92370
+DIST firefox-44.0.2-bn-IN.xpi 542129 SHA256 19940df3112df882b1a300f4bd7e7fa37a71e2c71d1f18c469511af5e3f211b4 SHA512 cb537a24f1bc9c9e035ccd7ba8b248f02d1f44182f391daee4cd5c39775f5a95a3b69577ee3e4c0c2517b21f566d6231308cd1cc7df660f32322a707b6f9a3b6 WHIRLPOOL 2a5eed8b136bbc1d3e4f71cba7f3f6a926918ee8ac42df378464796609a018aa3b17faa14fe9a2d680db18a9cb7bcf89e676f1fbb614409acdddffda2b7b6142
+DIST firefox-44.0.2-br.xpi 454296 SHA256 89c22568ff520a236f8ebbd8341d353af4914a999d1e3f3e9bbf15bbd5813c15 SHA512 51c1955ecbc8956114261b6e82c7f2f6a3e01746c76e4efcbe3028d1f9df64489e69f015da8e191c40e73cda6003179c13639a57536d25f5cd5dffb49c28eff8 WHIRLPOOL 076c714f8902498581cf2349921cb27d7e88c0a090c9e3eef27c2d6a7677238a81d48ae67166db8ea9f2a1b6b97c8bda905864392a66133a3817bca369b2e65b
+DIST firefox-44.0.2-bs.xpi 493434 SHA256 8b8743f5b80f13f717e81e8742cb924d77fddb7d500e96fea5e5484d641cdc34 SHA512 ea53740a099137b5c07f37ed941861208f27e6e80d9b89318f5314ac36777dd6d02536cc4bf3f406cb9ed12e0482bd244f6464a673a9f14b75a293045623de29 WHIRLPOOL 7f3f316bc82aea37d97d02cc8516595ff98286f1b163a32006b8735587628050dcac32785066c4c98e43fe528eefec76581775665fff2164b21c7af06d287831
+DIST firefox-44.0.2-ca.xpi 471463 SHA256 23bdf6db8bedc69a32e6dd5bf5a606311f9c3bf02e80d2e496f475845bf8488b SHA512 1b22b93ab01a63462e3771d8c39d190d226639cf17a3622bb0fbe12e045d8ccb29f63d56f801f13ef2be59d2279b71b53694c5717c9e785e81238a4850ba060c WHIRLPOOL a723912ce61cc7f04b7f02df0d05c45ba7c253839afde5bbd1e84dc7df0898da9d4a19754067c120e965f149b40d80ff1a8a6c3daee5f046847f352fa3226899
+DIST firefox-44.0.2-cs.xpi 460608 SHA256 0746fd83deabb832a01833689f03db0df1c691a2ad4bbe1d4ded93972c2d59d2 SHA512 125ff3355e895e49817c76cd550b72f817d5a4045d48d272da194dab56ea1c8c70854abaa8b24597c5bf494ef52534cd0da4ba0cac47a2c3d088f7650075e43c WHIRLPOOL 16d6e922a3c0e67dad76f3e5a085f62f4e2a766e523528729e34c66d615c40c7da6792c5731a3b59076dcc60cc173395a11d8cd19ce1ae6470c19f9a0025a513
+DIST firefox-44.0.2-cy.xpi 456838 SHA256 5b8e07e055ecdb040c6c46cde65dbd9745eb56b365034dcb28c20e23a44d76e3 SHA512 4fb2a3a72fa33e62168090f31427c1ef633cb31d23b74097e3a6aadfc12d43a0e57c2dbdd804a010ee0bf16c7b6fa81acddfcce098b963816cd679d91e2f7723 WHIRLPOOL 4bc434bbf003e7c8a585c7d04f7220c5d1e0098f771cc07612f856a4f9b84b75e6965ad26e7536f6cc21457c252ef988bea36f7ad8db3c1ca8f670c8f8b36f56
+DIST firefox-44.0.2-da.xpi 463398 SHA256 731c91695e99d187f7d8b03e86965b073293468b1fc808b811a67024e7ffe771 SHA512 aedf415057c71a7b3873336efe8ca331dceb1e6dd992a865c24a40bea029971c90d074b03db12944bf508511c58574d726cad6bf60c59803ea1b79bbe70d4f7a WHIRLPOOL 66b8fc4dcb1ffd48b2aee993dc07755433be4002148cef8cd59d058f8ac6e6745a15f07b3f138897e4448f3daf3f1c4694ac1b3bd1a271b7f85361acea7c8fe9
+DIST firefox-44.0.2-de.xpi 466178 SHA256 0709f207725631a3eff02bba748e443e6f53ec01a63fb1a4c67c8a00bd6a4df7 SHA512 81c46c524cfed2df963e09624c7cee5f310014c82a020bb28982e0c61c2e54a9e1d4450343c3242bfd8b0238448739e87cba97733c2b4515811dc7d61083784b WHIRLPOOL dadbd49b1c162bf79818e975cdbf036bf8823b48d8b734fdfe9d2dd836354cf44ff03684181b51afa2bd6ab0c40709b93260167c2e355277efe05e9613e4aad8
+DIST firefox-44.0.2-el.xpi 511155 SHA256 682325bdf8b134ecfb9375e169ecac6ccb40ee12e833c77326c77082607a3d3a SHA512 afa92632dfe166d237f37f33be3df01c6a63704e08c7706ac5bb2e132db0d0cf8e4cfdce806f3cc10214b3c31022b15e68ab22dfd9c1616c577dbb3006e1f85f WHIRLPOOL 34b755d279fe7e5ce807ab6b9b58ef73b6183950c15c90d612d6407bef3f1f71ce71a272d11eb8243b542359fa9e7bb213e0bd3c72e3eb2e2243c29ab29823a0
+DIST firefox-44.0.2-en-GB.xpi 452631 SHA256 4510c02be16e876ac48c60f740bc078194fb4c21ddedba1683e15b5bfe50fba2 SHA512 51ca2bec0a6a580dd32ce770d14901004f21d3748fb780aba9839792f64f8d4496184371da7f0c5ef3500a8206993d6e58091d4ac4960888744b040519348eab WHIRLPOOL 3ce321bdf36600bf0a9b3e33dc65d04a2de7a1da2e4340e3998611945bfd9ba5c6945c871fb415c052ae7203655797d04a5478c07d6ee39dc237c618177d1de1
+DIST firefox-44.0.2-en-ZA.xpi 457279 SHA256 bfe3cb660d027902a0fd89f291a4cec7bd2f2c216f4c1c536bd440176a4ee58f SHA512 1614689c71596d796c09c30b7b9ed49e8631be1b72271f05723920c550ad9a1625226a7b261cc87993a42c57e4a7f2202ccda0031b5897d202caf364b53324e2 WHIRLPOOL 12c52db2c0e63af0cd33ef6cc6bce138e188381798a74094a8b80eeaef6fa0461fc82e2dfe2107c5e6d99e2c4fa471df8195cfad901a750e5f614e3c35db2b43
+DIST firefox-44.0.2-eo.xpi 496610 SHA256 7721b31e1d73ffc2e9ea9150d19d5f09d392f454f9254e960c98c6e9deaaadcd SHA512 db82aa07a91ae315319ad08db035d1364996f3aa2c6578eb9e8666c3b060e7318ff3ce32fbb0a203c107718e15e8f90dd05e3a40569d8382112e50d5c73480b0 WHIRLPOOL 07b37e4b3d96aed040637f87b859a6683add20d45635f4316ed473c2194a89c05ad83400fd30bda0875f3a14b76fc02ddef93b220da2bbc0495add13e8e212cb
+DIST firefox-44.0.2-es-AR.xpi 465212 SHA256 a67fbc3c45cedf0c7f357136783a6c69d8d729908c7a0a0d9b5e24dbe04a2ece SHA512 10487ebf5ec5951354505b1afcc2bad609acfdd05701bee90304a3c06c7c2a08347aad4873101735a693da12c82a6c2163f28492ebb73382aac8577947f5b1d1 WHIRLPOOL e108711164d5413e6996a3b8a0c3559409fe3f2cbd3794666234c22070afb768704692ed41c991e9ce782e22d7295788a9ee8b5c024929d64da0602aa73ecc42
+DIST firefox-44.0.2-es-CL.xpi 389732 SHA256 84ccd4151bb5c7d0b1946e1690f0f26b29a61737fc8467624f1667d62e09a655 SHA512 02840b133ef0eeea695f77e955a7a54dd18a26d868910cea30155a80b5e6584f1116cf9c4a2ca84421054410d4f2a87749fa286be26d7d67d85b4a47b865a43c WHIRLPOOL 2dfdaae60bfd31f7b3fe7724a9851948d044053c3dbca60ef720e795981ceac273951b0d49c8fe397f44c0c13f9e236f7baee17d64e4abd5a32df65d6800766b
+DIST firefox-44.0.2-es-ES.xpi 378686 SHA256 a41a27f78068859fcfb14cbeaa31273062dddb5c627b8ba21d42e136e5b5d083 SHA512 6909cba88e76bbba028c25bc9197c408c94e4bb58ca25ec96f05bd6567cd9b0f5bed68e62f137f32af22036d303c14947116c011476d858ca84a4172c028870e WHIRLPOOL 4b71077adf23774a86deaf820510ff66d97526be9fab594473018d68590bdc35bafcd7445f0c404d01d2b31efccb898a23458939b0ce462546ce71a244a21515
+DIST firefox-44.0.2-es-MX.xpi 470417 SHA256 d41b3b321af8bfd63a05636aa8e90cb79a4e771adaa232544d1b2e257c9c4892 SHA512 06b575855f291f40e657fe5918eff5d158bf5fa7868fa476f87b1ab8682176ef39f64a912969b8ac33de8a134de6506d6a4f51fe5c131e5077ca6a6e6aceb68a WHIRLPOOL 001a121ab03672497e8db915b60f7356040d339267563c684258becb51eaf1cf81e70f30f870f62d2017f944b5f139b57fcc8e7063677a82e065729bec721792
+DIST firefox-44.0.2-et.xpi 461959 SHA256 9a584347e3890967acf1f2e7b8cde6d50dc922cbbd8df4b3f1780bcc9949159d SHA512 9f5b09a1a5ee666228bb8eda31a9b4a91f47affaaf53975a1143db89d061951d87443babc69d41c09325a8ea981549dc3f897e6184631f05bd04cd6fceec1092 WHIRLPOOL 6436e5ebceb8589e41133e8aefa55d32fe5a8112d23bb8cd0358158c35b3277b48538f4791a3c60fe40f65652ec0e3acb2cd3a343760b09cbf4be70bd41e3819
+DIST firefox-44.0.2-eu.xpi 479776 SHA256 6406f57634fb8b392dd0454e45a58c6e76abeb13d9ae56145e02d66174af7cf5 SHA512 39033aef6918b822ce8d9c781437cd98ea16a7d650da3bf09f09a1137845a2a4de3177ecf8f5f3899a5aad64e9196235f5f72bb6d526637499be785b560e0b2a WHIRLPOOL f0e61102b88d7f101e858c2b4a957a718c8174867dba5a69b8259bb2ab0f6f0d94196457c9c0e78c00ca4b61210f3682ba5370b33af1015c440f54942c438d6c
+DIST firefox-44.0.2-fa.xpi 535476 SHA256 49c4c10758a960dac223c29dbfb62eef71336ffa0c0a1b1691d625298cf97bfe SHA512 640a057ee2605e869ac27c66c0e971a7b94542bc9c23d35883f3d4739303bfd807af0aac0d1dde65825f5efdda620671defe1db309f757332e542bf507252140 WHIRLPOOL d99b80fcd3b379c2df72b405b9aad46ba507fcfb141fb28f86cf638a7f4801422371c0a9a0811a2e943bea3f4054b5db42b3daf1101a8a130d68d3a369480739
+DIST firefox-44.0.2-fi.xpi 461261 SHA256 b8779fd758eba162ae817b52163d26b534cf6bc860b7cae868474e101a995724 SHA512 7749e85d63f4100d175df66f40411aa49d4e3cd92eb7b23332d0128645b80a52d2a8a9cf894495fd53d9d2123784f1dbc03335375cb8d4bc7c22ef27a1069f4d WHIRLPOOL 6d631f864337f35f52ff6169e3c725d275a0f98c6c9f73cbe98c53e4bd4c1ab7992320814dd8f26e1b04fcb7327eda3847d15ba97c378e3eff2ffb8118120e9a
+DIST firefox-44.0.2-fr.xpi 475595 SHA256 04ca61dacbabb368e72b3fea3760a1faeea9d54b7afe3aacb24f290c0bf9b914 SHA512 c69e4ecde1089f3865f4b0440454d632ed54323b290d74f65362333903dbfeefecb73c1e3bac4785de2db056b9d8331d357a9c893c3d6aa46f13401ffa7b2aec WHIRLPOOL 75a7831d0fce2501d20aa54e5fd8f823e989c8f9da1abcd92833dba51681c206e2c0e3f415ba0eac5fb229749bcc6b0f5091290cd56ee5327c6e5c183fa992fc
+DIST firefox-44.0.2-fy-NL.xpi 468849 SHA256 b19bb1d3e938d31a33e98bd3c1e85a29eb409d528b8a70b0265871ee789cd22f SHA512 7d791fefbe54f817c982298240047224565aeb01316e6587e31231bf1c9bc0f8dcd937999e8994f0dd152faf9e628d679413f8cc485041b8ce2b001bc1286ec5 WHIRLPOOL 912faa3e020b5dadc8dac9797fc3efe1eb5f1b8f549955beda2fc4692b5e7398ebf604ee56aa5512211e5379a8f910416eb86b44e5327d33d9e1a2575f9a505d
+DIST firefox-44.0.2-ga-IE.xpi 481201 SHA256 4ae1edad5df17f874c3e127e9b49044f98cd77a65f8d0639ed119d9306fadd00 SHA512 64435bced08fba2079272e5a56d4f60498e1838196362baa301a27c7fdf448457558dac155663d6d8ac4b6233140234d0bb330069fcceaad4c0fab5ed74b3caa WHIRLPOOL 90def8d48e9a1128ba73ffcb403fb79c3c0bc08535374802757cf8add1fb4a25551ac03df61d89648887e0c42870c424d05064d6706dda992668aca2dac80f82
+DIST firefox-44.0.2-gd.xpi 466941 SHA256 547434963fcdcc164b668b7d00ad93fa51c58d97f6ad40b3b57a0192bf256074 SHA512 fb898385356f9a5ebb223ddfa6fc4f249f2239d55a87f621f0765b28e1a990d0f35dbdbc97f9bf608289ca2b42c6b69644f24e2c2d0640ad77ff6d498250b3ce WHIRLPOOL 9dcb78f87deb9fa9c9c0ea634686689dc63c519c188ce3ca622fb114d76cf2244340b105166fdcabcf92caf5c6f11df42db8db8d83dfe068e47d942899ae994a
+DIST firefox-44.0.2-gl.xpi 461112 SHA256 53904c0e7e50852ce0751a2cb5817493eca9496104ca8cda961e6e7544432c59 SHA512 9eedde8ecc461685a3f5c9ecbef4f078ea7d34d8e3142c92aa12d836ddeb62b9291ea62f1feec17a040c30b5a62183d7628c89403001301a9c80bafc752453dc WHIRLPOOL 1020ce9f835adb6fc8eee51670b97993fc45a0755af8fa348ba72882c4f361013350842edf121a65ff23a0e29cd106f769872ef7c524b62d56d3bedbc46b7928
+DIST firefox-44.0.2-gu-IN.xpi 498552 SHA256 d3d92f193da7e084afa2fe615cf89c7557f5da205c2dea6567c659e481cc64a0 SHA512 c9cda023f3eb6543ec2063f8c394cd5feb6793565e9ae230bd5144533980db670ce61ec5580826b0e0d0e29fa20c703d25cd5c93338b18e9058240a39131bdb6 WHIRLPOOL 72640d073080ea60a168ba8941386560d324829fc18d0f4cf95683fe7845f81075a1f52b9f89a415bfa0c74652e054a99ec47340dab22ddcb00f19ea7f7a3a68
+DIST firefox-44.0.2-he.xpi 490168 SHA256 5bf2d9de7e23d817a29ac616dcb29dee08164bff76405487f0501909e13dd076 SHA512 bce4a409f71e78e24ff080e573da4fc3aa9266584cb81fa633345e2afd02ab89879abfc315a654513bc6f2c726582228a15bc359c27fccc12daef9dc226950e8 WHIRLPOOL 0487dfe8c636de2bce503eb99e37e164b1134be69529db6c914c571466e256fa83cc0b2b8d81fbbb78c24150d7b7406e8b8798a70de5281f4085096e49d58ce5
+DIST firefox-44.0.2-hi-IN.xpi 523874 SHA256 555b81e609badb42d964a132db8340fbe76058a50f6666d7225149552da8f251 SHA512 7cf1887d3a3f4b43985f73667b70eed60cb491c0c7770abd6259fe89891b4508e4c5b555aa94f35100e1ffe07f7fe25caa807073a9b98e3fba73383a2a0a5b3f WHIRLPOOL 697bf205ef784979bb3fdd6f76e110855fc10a877620ebafd8cdaa7dd36e4016ecd2cd86ecf13e5476dfe47efdd6f231799c590da1c70385b6d785304cf486d7
+DIST firefox-44.0.2-hr.xpi 491274 SHA256 ba3ee6dfae31599f129dee59d40de832fe7a706f5b8ee07c71c3497829d93938 SHA512 95f3b1435c78adf85273d153d85fc365b34ce1775d7c78d553759535b9810d12ff880f302467ed0dd0ab3ad6e38bb95d627684319f87827fa22a639f29838551 WHIRLPOOL f96b5af13f9cdad35e5aa78facb78641ca10932924a86ba57c3554fb415ecdab8521cafc21a68d046f4b20226ceefa3d0f4c8822a12a1196a65e36d70790708c
+DIST firefox-44.0.2-hu.xpi 466878 SHA256 43a3a184917de8acf7351602fa9d8e6f3de2cd96c83e610ed957dad407b78548 SHA512 b6f8642e140515d65a0ea9ce30d19ced78396bd551f86ca120b2845586bd594bacd1eb1ef6c6d49509a04c25b82ee444a787b5e1012c8eebdefcb40a0fa8f1db WHIRLPOOL a07f57b70aafef30930993c2b23cff773fcbf15b0f1eaffaa3e85afb5a6c29f434267ecf8fa85871ef7e789401ef04a86a31a1436d78b3148ba8f86762d9a24b
+DIST firefox-44.0.2-hy-AM.xpi 549359 SHA256 3abe2cc28d1f3359e83c7ddd961c70fa6332af1a74c14926e4c152a3c204ba36 SHA512 4c3e9b90e22da2b805c9ff2665bca5e35209d281c2c4baba2ac50cbad76b4935dae8379958828843e57604a9e1d01eab6688418d670c6ec189a0ae559f84484c WHIRLPOOL ec0709d2a3b3f81fb5424654396dda48862a4e7efa63ecad19fea935fa54c0dd72510789e28e44cf8d60a964ca303a2d54aa82f113b19c0b82ca8416b95ee05c
+DIST firefox-44.0.2-id.xpi 449870 SHA256 a148c51185e82b445cf41f3172ee572ce294c3f602c5ff2263d76fadfa2898d1 SHA512 9bbcd2c99af0d9d6205478e3e980900a2acb48a727717f4217aa4723a671b96421133df6f9486189a94c8d21d616b17ccaaa8446e55a0376748ad15891275578 WHIRLPOOL 54dc6375a494f96631c526ddc510c9cd3202f6ccf31a2d0352e2f4250200702fc4c786d7510003afdf9a94f858a2743ceae870f03ce72ef3d3d57b8bfc076b1b
+DIST firefox-44.0.2-is.xpi 498245 SHA256 00de442df3cb7229956a3b7ce5b0937d7d157ee5620848554be043eec003819f SHA512 388983231e6bbc78019f78264975f3a9446335a6230ee54cdd71db2df5fc43c1cb0b2410b86dd2a1bc64d3dc60a34285c3d09f054b90dbc69584ec9d04d0d935 WHIRLPOOL 5959c17b26851eaa9c93243158dd73746dc9179d1b3eeaa5475a79728ed41e077b33175122925e4c80fa82ea2374a59caa500891fb5047dc65d980e6c0e9f574
+DIST firefox-44.0.2-it.xpi 369826 SHA256 495c54d5f2b250281dc35ac0db080518d16e1d87976b099e445116c68041855a SHA512 ee5506a1e3c01bb5c57a57d058f1d5aeece91acd33ac28355e1ca07b6e5808949a48cf129b54629d804c69c95941d54f392b0a7c1398c9ddd1f3f5dfcced0366 WHIRLPOOL fbd32d7379faacfa6cd8be1d993a0b616bbce9dc0a12c699331be587e1cbb6d68f84a3bf74ecce50232d8f442f92a00ce86d2c08122af281a909570e68f6a09e
+DIST firefox-44.0.2-ja.xpi 493750 SHA256 9fc7f986b17212a25bec75f72a4dd5d8947077327dc61e7fb1112428500237ed SHA512 58b31410501a6d787a03c747859dec66e627939678e3df3e32689549203f5c8529461d9bc01853328354cab94a630a55786df812a982430ca0b080414a1ec62d WHIRLPOOL cea4debdad00404f5710e44bdfcfd675e69d583dbda831638fd76dc0f02b9319b0f559b55fcbff8cfd3b4b81f739e07774c75eefbb61ac298fc031675e7b2a38
+DIST firefox-44.0.2-kk.xpi 519877 SHA256 e79fc6df878ef4ad55acd7faa56486e2780331b789a81e32864ebe4cb2d6333f SHA512 3cb2ec7f0ed66df38f3687973cdaa61a71ded5fec5f63aa4d396ee9fdb3e1357752fce7973f7ff562a9910ab9da3eab8e2f642731dc7b87985af08fbaec9bb8e WHIRLPOOL c40471ff5c4a7894b657e9a02dcf2db44f39ce6e958878133c38f0b6e65b21eca3d51a4c8266ffe19ae484a32ee674ea0e6e286beeb5d693b9bed98bb7b430ad
+DIST firefox-44.0.2-kn.xpi 547918 SHA256 471a33aa15d391cd46210a787f7c366e2ddf5c71bde8631d6b5ddc4facb8fda2 SHA512 354c8ae7411185fbccffc99876cc806fadd1a0027dae063f5a1cb6f3f43e8b7157654b84f6b5a32d877396faed8df38de35bad3e86a9314d4e988273f3158ead WHIRLPOOL bc174dd70f08c35a284f90cd78251e55992bbada08a1a949e299231d794c84e34aa4efd44700c9121e2494798f05247a3abedbd24262fa2a6034edc478785254
+DIST firefox-44.0.2-ko.xpi 480596 SHA256 c66172bfcac47899a9bcfc216aefb36156c4c96e7a85daff8adee4a7b8c8c40a SHA512 1f76a723970f437eaede779bad74646525997ad6d15db97136c7961627ef48f660792fc1dae800676b3acbfa1277743d1fe9569c5ecb001e1046dad45dbb6ef2 WHIRLPOOL ca9b3625b45995b0a81bb91dc411bb78f2c56b3eb95b2088005a2e91feea4e6fc60fefbbe532febc7f1d2d342c27987304b37e8dee9f6e6fc90c448a903f5b3f
+DIST firefox-44.0.2-lt.xpi 500333 SHA256 22594998956157dab0f5f75d197dc6916d3d129b7271c1fcbab62d457aa03317 SHA512 7bbd6865332d11e4b0f3b66351d75467826f395bc5038c988d2b314ad4b0c9a62253873ba461dbb836d538b3ec9c7d51583baa03dd8dd50906c1f45ad9038db4 WHIRLPOOL c641c087c96993a29ed6513d61f7d6c75e9771793130b97daf0c8441143c968999ca958c072ecbcb52d14e3b0210a0188430255e68d7529f2ffbd82906fa039e
+DIST firefox-44.0.2-lv.xpi 480445 SHA256 e624f07073e3e109cfb6f75c2dcdd37f212335777b7648d69572b5b03b86cfd1 SHA512 5b144a719fcc8a98ae84895ba3b475f600caab7338fbb5ad1d65ff99440669753364a34dac2d5b01c6f351b1b00aa267fd13737d0c7c49935e3549de01d5dfa2 WHIRLPOOL ca251cb2c81e1bab01e339955667fa35937d5fef659a783bd6cdd26fd20159f3e9fa3b4aab5e7728da2f0d548bce240bc0a5335abbaeafd8800ac11b6131dc3e
+DIST firefox-44.0.2-mai.xpi 532118 SHA256 c610849c98f75d22c953ca8f969a5a8eb216f7b9abe2b69a994437c45883780b SHA512 aa2a6f872f323b17d227f06b07f6ca1eb70d40a049ccb331a44a427830571466a94773439a4eda9d297be49c90b574feb2db4fd6479b2e9ad53d1e84e1838fd1 WHIRLPOOL 6ac014a032c2406a921460b6e1c5389077e9f7ff4512a8a15bf990ab832fe8a1a20534acf572bc86180bf02d8af0d67022628301903991ae7e6c39e0331248c9
+DIST firefox-44.0.2-mk.xpi 537872 SHA256 c20266df9f18e539cc306fa0c8510beb465fc142c4bd0a0b2981fd488c2f3e7b SHA512 ebbc42f7773cbf78ceb6022d7175da7f829908a16728f6fe068ee9a10ae38b21e2334e3ad52c6de9d9d15dc7f198712282ced32d391858837e3dbc7c2181746a WHIRLPOOL 2f870bb2cb0151359b2c9565e18083fc5a1a352129c77e76ef49fb040fa2e2986ad910fc73b8e1fca5597de7d181026e35fda9a82de79de3f188b3a8d1fb98df
+DIST firefox-44.0.2-ml.xpi 551283 SHA256 58e3cba0bd84b6196f56d5430cc802d050f89e81f7df6bbba3de78b36505a06c SHA512 ace2218180028c4cacbd54d39abf87aca8f3c780f679a6e135cfc4799ce4b6385f95a92c79465946ad580c4b345a74d8d73f5da1db967334cacbf553fd04a4fa WHIRLPOOL cec25cb56bc413717f5995b84df043e8df846cba7057f38595fa3e3d0923466b6e1ee5fa6e8ccd438b1012e1c22d5070b444bd523840778f9e951ae8298eea74
+DIST firefox-44.0.2-mr.xpi 527783 SHA256 905688e784a3687869a89a89ae6990dbf50b8a3dce01b58a675e5a130ec8d0dd SHA512 c306d16cee41c68818fa50404226df2d2641973f4e52b1c6604048d027128bfd6e758895990c78cd75b5cfe9f58091bc8d867d25a87aa43165a7d7eeb2180dc0 WHIRLPOOL efd2c0123deba48c4e3f0eb25dc5e07ff163bc827e36a88aa7a03dce015977cf8bceca4ecb70393a41797a2c67778e2f84141df10d4b9327561d637d4d703235
+DIST firefox-44.0.2-nb-NO.xpi 458674 SHA256 5f7ac91893b8dba07cf6380aaecbbf59c6cf9f6828f15905c74fe7508b00e69c SHA512 547f50e0c109b0951d04fc41ab1098e5ac9d57d0ab3569113e97dbb9a16657e8074cd42a1664017fb40165615d312365a30dc77ff1bcbe1750481f61a5f72e48 WHIRLPOOL ef68c14b0043a680d74112bf721425a5b7696d7dcfeadcd1b1f0b6be00cd72a0f21e93f26d451f5d2ff02248025c1411d4ba50b8c2bb3f4ded800c4051b8d8d4
+DIST firefox-44.0.2-nl.xpi 456555 SHA256 07af52f923566de4c75fa573e12cc642a952a9d34c68107031db3c47568ec5f3 SHA512 33d5e2bb9210289053b89b0f14b2e620e1e7c7f876f998f2f8139959c0f3ebd78bd9ddc30b4a039d884b928d3b4514f4d6f49f78b88d3cdfc7d4b814e1d823ef WHIRLPOOL 73763a0c14b6e3a7f14834293889cf5197881fbe30ac30536d7b4a7ebdc81d6170ce5118942e20ff752dc8ed794ea4b139d6f86dcdd2627bdbe9a0590b4afba1
+DIST firefox-44.0.2-nn-NO.xpi 452668 SHA256 6a452c10f93bd0317e16c40ad58a167d092c65770d62401c7680a2667f07a4c3 SHA512 254bd221cc6055654ab4eb120e160db6e00053ad60703488683c2ee417a83a0b061886b2ee432cb78cbfa58eb4fac89cc242b711e98f654b6b7879cef033f77a WHIRLPOOL 13478a069808ad0ef918cbc73ae75a062c5672aade06cb6d88c9261ce7da704fbbc0c71708846287888bcc4e5b6bb7e2c502273431d70d54a486f8420c130a17
+DIST firefox-44.0.2-or.xpi 540590 SHA256 e9c8e29ae48027f411b456e9d51490ac5340952d94ba79cf06f44b5af1426a03 SHA512 b3edc9f32289c15969f6b6fb7fb7c6d1f5be704a94d13cff0be505e91c762c989146f4de1be6a406742fae7e7e0ba43ffeccc170873d4fc68df60f59886131e0 WHIRLPOOL 9e107b7a88ece00d0deb0522272e05a637c0e8010226ec21aa5c34ff8a9ab7ca8d2093ad737cd2ef0bf6cf2ecb937480c3c14379f7cf50fb2032305790432e0d
+DIST firefox-44.0.2-pa-IN.xpi 516426 SHA256 b90d3ca3eab8f94d130869f3c722ad1e3eaa6e4e3cc40eef2bc4fdb82e77bb69 SHA512 fded8e5e1e297ab63a0897e00175c2ea738e550e8b6e1a252767c9375a831a22f4c2e15ee208770c04499297f13fffb60378a374a7ab9d872e232b421f3b5b22 WHIRLPOOL cd90cb2f84ac463bfe994301b9addcb9622a2fb35f2a7754d908e7b57213b66ad8ea7705c0d9fac65e9e43d6d14520bbf7e2ec55644e9c8dada9f523b5b696f4
+DIST firefox-44.0.2-pl.xpi 403715 SHA256 8421b880f1e5268d5cd2a1314b05e3933ea3ef568139ae9e11c2064f3e723c5a SHA512 a9644025e5bede68cf8b0bac5e03d446d99295d4a9922b042c2d16441c9cce42475f5f5559dc777976b89ffcb45cede06b0d301300cb64d828c187071235fc77 WHIRLPOOL 30568bd772294348a30472b534ea02aa5c336219b40cf6dbc3135e9eb534594599d39e4b6b48382d5dfb2ddaa43d37f91b07d34c064f74b7483330ff54a683ef
+DIST firefox-44.0.2-pt-BR.xpi 473588 SHA256 34295e1c43322c48749829f9e378fed557881a65789511eedb443eac717dd81d SHA512 96c72cd59662b0cf22c256c62fea13d6529ae460c22fc4c8fcc0be388da3e5e9ddce4df0724e4d6427b20488bbaa1b3ff2b340dc6a1739bcd8a883e0b458e6d7 WHIRLPOOL 53fd80a8b0d54dde7bfeaab20308efc166fa3552d5dcbcbac3362783c2349566bc930b12d6b7997695f563b18db7b6b81ecae8e06f2d28538300907597e7a85b
+DIST firefox-44.0.2-pt-PT.xpi 454144 SHA256 430b639c423329aaeb0a58455a92cea8f2ef3e25e1076e081672295b016194cb SHA512 a97ff41cb76098d39ad4ba0e46f30e1ed85bc1545f2197b67db517bd9032b866e58a93096ecd55a57b3ab6c2c5d7f7ba54f54d68a2888fee0b055f598e0e7e95 WHIRLPOOL f7a15ae77d5495cb0c1a45815df0c2330605abf965493806578fb4c97ecb21a0dc3ff2643feabc48963172c4f110af233b0c4cea72354e3b5cbd91c4b8d63717
+DIST firefox-44.0.2-rm.xpi 460177 SHA256 334dd7850b1de48c0c806bb5993f55ece0f45b636e781394abe89c54b7751dff SHA512 4123e7890f6cb7385a49aab192a379cd3b59f445672d408c67f8fd15b5b46d000fc6406474629d01c05424d136df202ffea2c9818981ff1ea0f186630976eed0 WHIRLPOOL 914d73d826ff7fd9c193ff2adfe0f3d2452326e6885091f82403e290b0f44e3904d9aae429fe80c205817b3c4be7edbe7966804d3568b57ac3fe353b9f1942fa
+DIST firefox-44.0.2-ro.xpi 507826 SHA256 c115c0e142cf82bc713a646e11ac345985d48f08fefbd72d2da4757062ea77d0 SHA512 f55c55fa40c8c5ef0ec46861af22de5c6102a2859f49a1be628389e801e9cd521041440c8c1913a44658f896bdcfea90c7af93631e040b0783c58ce6307677b9 WHIRLPOOL 1e4a4b656b67dc477434560e70823e9b11411020d1a0aa42087bac7acab431e282632e3110b2163353928a816de4d40e25fcf55fd78d10874c46d3bc66869d9f
+DIST firefox-44.0.2-ru.xpi 418291 SHA256 c4c8196ece406b71b642efe4142ff5fb3e244b4e575569dd354f5c89f6fee0dd SHA512 b7a0648bebb8c29c4dfe52d25cfe9c40a3b2d904a751b39c5208515a80211ef18bd6cb1c84ed500e73f89c59044d561c7d4df2dbb045b3a2aedc03993d84492e WHIRLPOOL 3c5c20625cc9a10722f3c68ffdb7c150891f8c5c657725c742efb732c63b17593fa4060e3ea42918eb9bcba04039c435e8ccc46c356a30edc922fadbdd937c61
+DIST firefox-44.0.2-si.xpi 553904 SHA256 8f48c04cbae69a254646255af72be70157f67f903cc59621f2be8b05842c4559 SHA512 84bcea09cea82f9d4aa507906dc23f79017a18043350f7f9fd07d33ecaa1a0488b7746987fccb7f89568345b0e254ac88bbd0a8fafcfd94502cbb34c5d674bff WHIRLPOOL 80489f8bad5c0b5c40d3e59a6e16393127367f0e4af709ddb951191b22a5f009892d92c00c315cee9ad325ad37ff801b86d8bbce50e2c1277c3c60fcc6752cc1
+DIST firefox-44.0.2-sk.xpi 482729 SHA256 694a66caadd8d3b7fca3d73856e8192f3f0ca0c766c5d9abe2a087f8e29acb99 SHA512 3bbd8fab3bdf3bc64170a4e45006b713324fb1304782ade4609057c70b86a5f13c10af85cb05573a1818f86c07f7adf8e577dc9af26282d805c3854ca73bb08b WHIRLPOOL 3af27ac00168732b893ed4232ae8591707fdbbe80d4eaf6925e2e31b5e794e2e710d9fd4db125ab317d6271d03b308f1f495f74c787b09579e9ad7d296f5bf17
+DIST firefox-44.0.2-sl.xpi 456216 SHA256 ad458b5c47206e4347437eb2ad1a0c8b00d5d9855cbec808f56eef44a8ce465d SHA512 25910c4bb70b6279f05543ed358804cedf822cea714a7072a2b93e6a4bf913b3ab750dd3f0077b709e77519510e3de9ed1e4b8dff71ac26184e2b140ef33a189 WHIRLPOOL 51a9ab5a8caa01be9eac3d8d9e16aed3dbed5e5aa2c460184a88e75fa0cac8f294f10bea6e11cd864d6b57c36bddf721ff207d0a4da670f10dcfaa18404fe433
+DIST firefox-44.0.2-son.xpi 463191 SHA256 7ab8b84b1cbe8101194546eb714bdc46237c420e8da1f5fcb4945ae4cf8a0f02 SHA512 0429034a0ffdcee9837dbac4861fb114f29ffb54ba63d42e9c7b5a4c33901993674da03b9e87b1015d68c4f8c1f288f1caf3d1ef93aab8b81f9c5b5c01f5b0d7 WHIRLPOOL 76761c30af441cadbc8969e70330d698e716aa08fb5349b498e70b55fa7cc319ad71e1ed538ffe8470007306cf957152ab85ce8438a6ee1d777e7c3f8e7f1cb9
+DIST firefox-44.0.2-sq.xpi 499916 SHA256 40bf8e6d4a0598bed75738814a9f2a3363aae4061d77096176f81e80b9a67e0d SHA512 cb210dd77f8336f39d756145232a3ad748f506cc7446623e4a834a767f0b4e444245e01001fef2fe28ee6928233bb9978df983c0287b5c352d76a03d7b0dc4e6 WHIRLPOOL 835b3502063d047038e3679f0d6add31e5f2d9293dfad6c429f547a78b8f9516754bc737a27a920cebcde23227d04c2ed176990ed3018a1cd84a95b648f4e415
+DIST firefox-44.0.2-sr.xpi 490393 SHA256 423fa059b7f76b35a354b6677bdaad18977aadec1b0a077a49385d86dbddff73 SHA512 a88a31812df092c2e4809483404bfc3c2934112f501ead05ef7235613a4d889f4875a041077611a7944491af16385af3c568da470fed8cd7cc4b0346d0f415a5 WHIRLPOOL 03b55747f3971b2dd846c1db05f680667425560825cce8843373b3e39ceb4f7f009729019362a804436d52843ae029240107f7bd3c540d418c0e3aea2cdb6e68
+DIST firefox-44.0.2-sv-SE.xpi 465391 SHA256 8ee4c83ce771f97b2d742345eeda9586319dff9fbb9a518b9b557f2f2d479db5 SHA512 033af1a1001069e6d5b72392f6456ad408a976d8e02a089cb877c4d51aea00db2125537814e1be60bbb32a33510734599c2f4e5c4beccdf29aa95ca7e50ac5a0 WHIRLPOOL 556ff2075f0bafc03b52f2518841022fe3738b1f6a2b2e8183963b81e75ee75d87c362dd6ee7900714e8689327bd537e0c5567a6af1ded9c6ae4f6026e6a57ef
+DIST firefox-44.0.2-ta.xpi 522514 SHA256 4af0895359af13368b298e50ea92b9a7368ae8966e153fb631012e37f2917dfb SHA512 090963b563e94b5a341d856d90979d3bc5a2a49ffe9b3637da3847239aa1bad913279c77970d06ede0e1955a743ef6b2d1ba53d0f374c53b46a57969b052a37a WHIRLPOOL a0ce62350d1073aed05a3b0c0d558cad2ded766a0f59235041fcfc13657cb8450742c04ddad16da644b6f060c8d19ee8505a5ef68bf3d582dec65eb426e09fec
+DIST firefox-44.0.2-te.xpi 538473 SHA256 5e7607c4c2f8a5a305866d944399c574c4d2a2f362cc78897220996e5333236a SHA512 50f7f775d26c9e87807f445987509e929589695f02b0273b94bbb7170b7b213be980a7713dcad9a581f72b943a400397f9499d62ce5aa5b6520dfed95ae73ef0 WHIRLPOOL 1ec0e315cb4290518456438e37d60bfe79005e717e690fda714bc4f03a1161cec5bc203bc95f3b88003b5f406867e1475f18a33342778884eeb6d3a5b77858ed
+DIST firefox-44.0.2-tr.xpi 472326 SHA256 fe97ee662baa6b52d5872488b1069b54e967d2ff4bb38dec48af83d408ee9a99 SHA512 771747fe979767a80ac857adaca02f163890ef0191148604b26d01d4064ba0c15af32431e928f2b63feb40f35d9311077f0f7c8447199512cbb37c107362fd05 WHIRLPOOL 028feef99ce62232ae39fc8dd4e531b1283c27632140634ce915225f652f278c9d2107236fd8f944c8d6c98760ea391964b6154569bf5e5b4b87af519aad0894
+DIST firefox-44.0.2-uk.xpi 511050 SHA256 367a130ac1e3e87e2fd6734b6b780bea569fc3ec4d668149a01c81072ab0b7c7 SHA512 13913be9d6dab6fadd65387d2a19e25b8ef73985503803fe84224eca9c6483516aa4523302e1e387484277242f71cdb6319543d358cceb31f39893aea25a04f3 WHIRLPOOL d1fd8ccc2a739fe154f8e950d4de2b17b681d00bf922549f953451fdb28e9e4ad39e0f167d956639abb52b3243ba152212aa27dd22ce28ef57034ab008e6f400
+DIST firefox-44.0.2-vi.xpi 481583 SHA256 f1d380e4e083da62dd3adfede3cc7a894036d6f4dcf36097b1d32f16ebe50352 SHA512 a87ef3f21aacdd247789914184b0a38184b2a09bbcea85f1097c50678ea5f5d32070e7a1c732d3b075ce1c979bd71a769f0e291bdabe62988567999f705e7b8f WHIRLPOOL 4a2284917fbd58431467b9fd2e559ce660dd1d55410a871f15ec1e6b12c06151f7b7e3b4434ccf6659ea202267a4fb3b9f6f00b15d4592b3602927745dc7ef1c
+DIST firefox-44.0.2-zh-CN.xpi 496301 SHA256 e8609ff71c038286fb3768369941bfd864343eace5c0081897387eaf2f51da0d SHA512 edfdc0bd0d7d36e0099eb3f97efbb0f185fb072f129a4ded1cd979ce6c6f66b0d0f3fd44d83b5361dfe92a094d19201ab9b17429e31c6e69a237ebcc2a071d71 WHIRLPOOL 99a0a265173e7f0e0e33c76c3c826a2f470808d9e64f9503d51d74c44b00111d403eef92dc5d18c6a35b0616b045ecaeaa3ddabf389d466dc4f60758b96b01ba
+DIST firefox-44.0.2-zh-TW.xpi 487761 SHA256 3af3a905106a7572753d7863bdaec82bbe5b3670c1abbd80d6f4893a17ddce89 SHA512 22f223cc6694d670b1f3909051244197e50a994c32a19d7ad9fe64624e559907d24527791038136250592d2410de3f7e11979a840dbb8d638172ed3e291288ee WHIRLPOOL e57ed023a1f1abaa22ed103103b081e05c1fbaa6331c3288b120971c32979341025444e0519d1170f4a532ed49076fd98ddc42793b054e8a1009f0c11f1bd3ae
+DIST firefox-bin_i686-38.6.1.tar.bz2 47227225 SHA256 2df83fb0117dc2f03d534e36e6637d2884a74af25647c18115adf6df11d5616e SHA512 8c770b8c659ae10b273525f7d636a4d694b3957de50f79ae3bd68fe1c74709d7f1e0854b905931c0874693cb06b10c17249299e5917dd56154f4fbda8ef6facb WHIRLPOOL a591b6434b52de7030c0793c32aaa7174f38b492014ad65e87b8be96a9619816d61710c26aae3100ab9fb27672de83992029ae8e4704e59f879be4e7c618100e
+DIST firefox-bin_i686-44.0.2.tar.bz2 51151474 SHA256 abe3e5d23cf557ee81e7064d6d1b2d3a8f6b6e1a5f80947fc7229f0b2b631380 SHA512 d14703d250ee07562ae1a0c6b24b9553c5106619673d20159381c00a41f06d8d0e67fdafa4ec3dc5b8c37605fc636662647a76d7233e2e4aa1135717e2ba8d64 WHIRLPOOL 7b9dad40f4d8bc1c8145dace78f98622819608a5cb6f2d249ea28eeb53807c7cb689e7cb483a56a46d4c7124d959d550e26b87977e7411ba5a04539e95dd117d
+DIST firefox-bin_x86_64-38.6.1.tar.bz2 46274297 SHA256 3e906fa245436272adafa18133319608fd923e4e656dd3ab8947bb1822d19678 SHA512 3aba82de299f83865c3881b4872a0a7ffa40ebf3b034896c0d3f264a67922ecbbdcd0230cbe8a7e8f9c95fd785633b425d2cb3f6825ac29a457162b552069591 WHIRLPOOL be47b933e231e663c51a67dd75a60ab60cc1b396db72196fec129ecd1f0dd416f534f2eecee647f84ad0a7b059321772b5c9fccacceea7bcc22891e08a257500
+DIST firefox-bin_x86_64-44.0.2.tar.bz2 50127391 SHA256 a4b439e28274feb4bf5494ba180143e6b8617428a63d11fa2fd0e650dda41908 SHA512 8da1c628413dd22ad28a1eeb8ffc31c5353e830129e35284b321b71ab116f97ec27e6b131d52c61259ece52ffb3b1aba8849d433b8ccf6cf8065233ddba411be WHIRLPOOL 21f127fcf93cac29aa6b48821ef1a8a777505f69d9e403145dd363a82ee4fcf1b1c73d578f5bdaffb282d8873788bb540afcf98d8a402cc797722b5699898424
diff --git a/www-client/firefox-bin/firefox-bin-38.5.0.ebuild b/www-client/firefox-bin/firefox-bin-38.5.0.ebuild
deleted file mode 100644
index 218bcb6ef1c1..000000000000
--- a/www-client/firefox-bin/firefox-bin-38.5.0.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MOZ_ESR=1
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Not officially supported as of yet
-# csb
-MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko lt lv mai mk ml mr nb-NO
-nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta
-te tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.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.mozilla.com/firefox"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="selinux 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
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18: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
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	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/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto /usr/share/icons/hicolor/128x128/apps
-	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# 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.js \
-		"${ED}"${MOZILLA_FIVE_HOME}/all-gentoo.js || die
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="/opt/firefox/"
-	GTK_PATH=/usr/lib/gtk-2.0/
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	# Drop requirement of curl not built with nss as it's not necessary anymore
-	#if has_version 'net-misc/curl[nss]'; then
-	#	einfo
-	#	einfo "Crashreporter won't be able to send reports"
-	#	einfo "if you have curl emerged with the nss USE-flag"
-	#	einfo
-	#fi
-
-	# 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/firefox-bin/firefox-bin-38.6.0.ebuild b/www-client/firefox-bin/firefox-bin-38.6.1.ebuild
index 1ab6a2cd0d4e..1ab6a2cd0d4e 100644
--- a/www-client/firefox-bin/firefox-bin-38.6.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-38.6.1.ebuild
diff --git a/www-client/firefox-bin/firefox-bin-44.0.ebuild b/www-client/firefox-bin/firefox-bin-44.0.2.ebuild
index f3955f984e89..f3955f984e89 100644
--- a/www-client/firefox-bin/firefox-bin-44.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-44.0.2.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 529e7d948fe4..c22c6d7e79f0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -79,245 +79,164 @@ DIST firefox-38.5.0esr-xh.xpi 450243 SHA256 9b89a96a283703284bc906a122f564f75704
 DIST firefox-38.5.0esr-zh-CN.xpi 488277 SHA256 213bc5ad9d0e037a51f29a96dc5bbac4c550000dafda88271d4bda0ff89ec82a SHA512 9aa1edabea803c7bde3544c5964aa0fd0eb077dd39d6d60707740fe2e0a5cfc5e66ffc39669a1776125d35624da93c8322b94aa377628de512bb3dc44c70fafd WHIRLPOOL 5e70c16d10784e1da40dbcd476d22041165f49ddfb796e793e5bc86bafc088d9ab8b9f5f199010cf704d391f4c9ec9ee56e6c93250d35858826c5459f092026c
 DIST firefox-38.5.0esr-zh-TW.xpi 467844 SHA256 7ab324275d321eb78862ddbfb0628c14fefdcd16d89b405ca7a2656f77db8338 SHA512 f05538f2fc8fc5245b1559aa8f5690ad39930ea18cd294c30679ee71d5ad7116bf21a16a67f65fa427848472fe9250b69a4b515ec318d2ae0e0b0c58144d86c3 WHIRLPOOL 0a55dc0674e92106e3a5fe21aae712a412ad4ed42d456dcd7b6af2c87705c12a4cfdb288155f179f34645c61422da440c25713a8f8d29bbd7f89a998f919f135
 DIST firefox-38.5.0esr.source.tar.bz2 181371970 SHA256 2a1f90cfe390ab20be88fed38cb9f61a18281cfbee47505c67e0254d339cdb20 SHA512 058b6a6c2fa9a9ec89253511db000188f1229d07b03e139750f2ee09c68896473eadb6f5042835d557c684a62b58af8a20f0818d6650e157b3fe62adb52f5e94 WHIRLPOOL 11ac4553f9c56742a7dd5fdfd16aa73ff8517296bd5ada8bd9b086494895415fce129eff655ec64d69d5bd1a60207366a91d87783aaaa000af9c6f3f7cd37185
-DIST firefox-38.6.0esr-af.xpi 483326 SHA256 75312cd630c037ddc2e50a43597e1c0242634c40d6b8353e20c5cf6b3416f187 SHA512 9753cfcafd758dfe9b58eb2a0760e72a1dd2119a58974395ef6df61186dc6d482ab4ca410163b89d33e36e6668575cecde804b4168cf265105a47d07b4952773 WHIRLPOOL fb56a714b7fc1ebe3a85ec13c43976e59fe4e347ed58cad5425d041ef2160189e6ee40ff6a134e4523c0321a91de0df6ab5f16e58c605126072f32655747dca3
-DIST firefox-38.6.0esr-ar.xpi 516496 SHA256 1d3b3f37f4c755915bf091d0bf21db7312d5d26bfdc72362aefedcd51d616e8e SHA512 c9a44e3aa24550d13f8668951df18a9c9aaa9f4281ff352c679295360900eec39c9a44803390f53feb97cdec2de55c6250ba4f70b1da993618ed263421bae905 WHIRLPOOL 13e41841b533afef5464e4d4ea545056cf8d6683b4483af0ae48eddf2544ab3450f27553de6af7925c3c0eaf9ca475b8c6bae0c253b8ec61e3c1f4e8d3b78e21
-DIST firefox-38.6.0esr-as.xpi 509575 SHA256 fa2194dd7e6a3b7dacf813117fe96f901be71776cf41cbaaa49fa2922edc252a SHA512 68c5b1a158688d5cc6dc04623151f90784555c33924ff860f0b40e0a3e170fa77b8e58700570c6dd47757f5e1c8ea5dac3fa0696daf0f3144e33d0640975409a WHIRLPOOL 6cacb4a4442569507efe453b78fe54cc63427c62ce2a538536ee176f1dda54144fa4bdf9cbb92da24b20a94c81ed3cf2141d55c1a8dd635dde489e867c944839
-DIST firefox-38.6.0esr-ast.xpi 397203 SHA256 8982310d306ce78b1b03b23271cac18757b06ac68817517c7cef7b35e39918f6 SHA512 105c4bb8da9a6c5da5dddfe69913f53248b57125e3607fe93eb65182638c924e737599cbd489bd80df6de49ae96ea00b2f7f7ac974d5271b980e06282486870d WHIRLPOOL 0fbdce9ab08d309675006b904acb2b52e8f9657ff6a46109b28f5244a4a29939fd57e07aff0a2c1a569d7fb01cc2cfec87703b27ba99e7f89e49bb09b6e4ff1e
-DIST firefox-38.6.0esr-be.xpi 441057 SHA256 4e3bd7e6a26a636e031a9afefcca6e54ba2a2c8ad5435d3471a9d41267dc3588 SHA512 5bc767528d90653b36dae2f7fafcb99d639c3605605b035a3e330c5a659209984ba3a4fc8733253aaf5b5879b7924655e421f9571a0e2689f28f7b5c20b0c7fe WHIRLPOOL efaf3d04781404e69979abd1166c17f85622a3685b69723d70e2f85386c74895e4cc584ec897acee93c755823c93de458de578cb96dcc7d20c0d716df09012cc
-DIST firefox-38.6.0esr-bg.xpi 487819 SHA256 d25359f143a0c4dd23fcfe4804b3f01662d4e97206be8440881d39d15064c6c3 SHA512 529a978d3e1169b995d86bc3dd3e37cb6bbcd513bb001575f4cf2d0eecab2915065906c7d338c8a6f0ee90e3122c71bb16ed9157f315de23f99a6808c3c66f6e WHIRLPOOL 687d3c3cbf1a0c0a26ed9501d3d451a4e043f19b4232835c4742702ab73c23d478a7d6229e0578d6b9a03a7c9fc30debcc75fe9d73edbd14132db9e454ac6ff3
-DIST firefox-38.6.0esr-bn-BD.xpi 528690 SHA256 fa83a06b8b8ce4454a3543b13bbed40e92b8be87c3607b93d5efa41fa01f6d3d SHA512 8a2b0be36fa41c00ee2f7d11bc2e24d5dfa7e29a219585a44a20486a35ae50816b1280bc4b298eccae180501fca187cafadb7eb265cc5160d45284f6c74fd7d3 WHIRLPOOL 1c67e05d00939357d9063b2cfb8019bd0be81c4c21dbf8da16c64786f647b6f24c79e1bee386d9cc452c36c5c8c90d64f6099847bb1408aa21c47157b4ec5dc4
-DIST firefox-38.6.0esr-bn-IN.xpi 527928 SHA256 987259cc1f6dedb91988c3281c5f26c5a07325e289df8a2090e44e408f8efb66 SHA512 a8e1258a92dc3fa3539dc8a47fbc695c018e532bc92a6203fdef56e092d1d643db360750f52eb2a9ea29aee6becadd4505faca330e9824c10b54d9dfd37be94e WHIRLPOOL dffe6051868902c4e5c016be269e801a3c7701200fb9b97a2d4d38828f5afc13ab0cd290176a28ab1beef847a0caedf31bf817cdbf0f5759ef3515e97588f205
-DIST firefox-38.6.0esr-br.xpi 441962 SHA256 64ac19d617f39376ef338f13cb114199407ac77c939f6b909092c394edc3567b SHA512 4ec46ac1b3ea7f6efa88b8fccd7b4ba890d93e2d821f5b356a349891f47cd5e92c66fa52cf161306e8e4f7c5ed17cdb38dbcc2a00e391963e914e8c59ba59b8e WHIRLPOOL ca0f7bc3387b5583ce2f64d172136e67b575d6f4c8cea6ed691778fb71363d7693eb5bd25c99c2c94e3adeedf212b02324d1badbaaec949a17ef80ae9b91df73
-DIST firefox-38.6.0esr-bs.xpi 485305 SHA256 548f4326b19b535d9925e51a87d63df9e94c3fcec475d330123cf2426c8a3abd SHA512 abe447004f6c606846098789b0811678ff78dcce7f16eb961dcd544e3b5e7399398935aec27d13599a7d4e610b2bc568188644b8ef19052eb463b19700517813 WHIRLPOOL 390173a2f8de8357386c604fb9385d2987691e44e83766b2d23155b7ea8c36402fc2e88351ee11179b33ba8753bf925e3606668a0e264d764a3cfe163cb364c4
-DIST firefox-38.6.0esr-ca.xpi 458092 SHA256 c33d6a7afc0ab3381103b098c180a6f648e5373f2df06fcd495b18c486730bd1 SHA512 3eeb575cd37475d96e16dfb0ca329c4d4895c951f366dea577e7d1d2841fb8ca4b2d1fed555913422da8fbb5331e61cd620a49e3b9b3e90637363f824a746795 WHIRLPOOL 9862b1b56fd53250a53fb50c9e84199c7beaead05732e9d905a47a0c17d453a15ba01d6ab143c1b37f2646d845c3bd93006481c5178bca785d4342917c7f3d76
-DIST firefox-38.6.0esr-cs.xpi 446727 SHA256 982fcc4c7e45424b68370aa50ab98dbf1770c55baae8bffc09e25b9bb04a6031 SHA512 b02ebd2c6e0ea1f10f618cb59948e7b28493171382654528c1b652badfccc12316b08abcd2d62456b7c4b47f363fb72ba19e45cee7eeb241b3031bb5440e7b17 WHIRLPOOL b373569a9a8d3dcd35f306bae269fda6194451953c6440d11dce3d50863dae8a49bb3d677efc1e6fc9fbc08abe59a516ded1021699709f174007a55513b40368
-DIST firefox-38.6.0esr-cy.xpi 444385 SHA256 6c3ee40c1b326172a55866b1f21ede38d8b94598e85c9b6f16a6ac7f269d515a SHA512 ea6fe2bec16400b9b28b6b75e13dc18e6e1ad875927dbd7a9f83c923aa182c1ec885a0fde6a3bc9ea104a64d21fc78e9c01ec0e996bb5942d3beb2a37f03fabf WHIRLPOOL de6b09c45290858622e71757d529332cbf1ad0ae8911b0052eb44e74fbccbbb1faad5826e088c88e9a4b66aeeaf321f8b8dda09aa4e0edd2a26749dce87cb8b0
-DIST firefox-38.6.0esr-da.xpi 450763 SHA256 375b9c390e90612e7a9e847ec2b3a71527ee4ad79231b70b2ae9c67ca1fd5a19 SHA512 8a7c257e7fbe4aa0fd0bdb0ffcf8109c42ae350db4259c94da733a879505befa1a93a328e491fb0c6f661ae6de4b8e36d0bdcf91dec15d216c8de6c48bd88e36 WHIRLPOOL dcb10a5652ab22d7635e346d85a22ac2346e023bf50f676070f81d92ac46ef44b508f83760e0cc798f43af1b672c05ddd2c81a51b856bd49001c35f84068677a
-DIST firefox-38.6.0esr-de.xpi 451630 SHA256 8bdc8b5e21eb9f2c8c5a179cc60e7e23f2b3e34debd5bef69201d6cb347f3b83 SHA512 30da6352d8daaad7989bb23bd120d6af2fb8da684bb039fb629342d83030e64167ec6bf2beba84bf3dff20206a83996b6eb6e8335dc09f1fb77338d9d5a746c1 WHIRLPOOL b828d68bd1e61fdef2d30e111acac3d2602444d17b07e03bed9ecc1d291f918c9eff3f052bf0699d7c2a8dfb53db6273bd47c87fe6860858d47cb20602516c59
-DIST firefox-38.6.0esr-el.xpi 498370 SHA256 f746ebe43d8b4848fcca795e753f4daa52b83e1fbe8b5148f460d7eed993f7a4 SHA512 ce47e79321f6100956acf0a955bfe3cad2ccff84880f704311dc079394ad5af39ebfa927ba46f8b51ffd7c87ddcd08f2ee672f97293112238aa5fe67bfc7c361 WHIRLPOOL 3bec4e5d847334b3be21e332e05c7a6b85e7e5ed10cd91397ee4ca4a34a720c71a8fd14728e92dede32222d6fc711cf431cb624eb46cdbee78b24dbc64a46df2
-DIST firefox-38.6.0esr-en-GB.xpi 437845 SHA256 ac83745df0734e618b6a5b52166c9e2564c40ed16691da121ee0aeb7eefff506 SHA512 87482e6050f850c6564c0e197109c244570cb089aefd28737bd2c65c26030dc4f1e0c98d6c47aa246f9790192afaa06680b7cf18329f35065ebad490c509ade5 WHIRLPOOL 0c1d3536ac4df9c3df5dd2cfea33742349ca625dd8b50f0c2a4453b3ef0bd32b66f5db750727999f399106b40f543cec16e1321a1a6217e6818c6e0c3bb7d84e
-DIST firefox-38.6.0esr-en-ZA.xpi 439926 SHA256 288f473e35d4b682e45a2b82d2219adbddefed8bbe33d051ddd8d8de9fa9adc9 SHA512 e7d933819f5d1a0a782fa91cf8c2f7c21348a2be418a57715e9db78e2356cefa73d07b3f9cb62a432f354657e6f3cdd4a386f4841eb85d107bf5ec7f3224f39b WHIRLPOOL 3e5d5f57ae00aea276317613898b35037a4fe4f6af04de97058c8f79f6c5e0cf0ce3e84238e9af8a6ecc787604153864349f7e4e72e5066dacf9d1e793e5dffa
-DIST firefox-38.6.0esr-eo.xpi 488370 SHA256 03dd766b490847583cbf2765b4cf81ff23da75739e60918811c406af846f43c5 SHA512 98f46db5f5a40cae86bec7e004f509d2c71f151c10f2f4646539b8d7d7f8122b13a38ae4461649b64ced8e3db0aa6ff7e19f5d0474f6a964f8f27167513cd300 WHIRLPOOL 2a84facc56a7e290575cc95d532a4f75999670d4c827b281f6698a683cd9c487d194dcc61f48df341022ea1ddca5fe7c97a31f8f4945e39da0800ff982bba873
-DIST firefox-38.6.0esr-es-AR.xpi 453983 SHA256 c2599ff3ee9f099478427831f8f244252d16be7fc165f9d686cfe35b5a97cafe SHA512 46ed2163bca9201e9bc8b37d0128463e65de4db53caf0a1b23c11f00cd9577b8777968d59ac598132d093d2125857b97961ce6177ff6d5b9215b978f0c8e94f7 WHIRLPOOL 5de8a488eca9bd2a90f4fca558a40a0eb0fc5a6defbe66c9d7899de7d7297cf7fb2a9e05a1ed0f427c29cfaafde55aa9a673e3d7e5e626ba7ef30fe672ae4058
-DIST firefox-38.6.0esr-es-CL.xpi 384679 SHA256 e0cb68b939d965387e706f02fb5771fb091900ec392b135cfebdc3f1668213fc SHA512 b5e70e284f321ce575d431d3209b5c1f5218feea851beab255f7803f3f421adcdf64c3ab9baa266fbe14d0e91ad8073e5e065563256c91a4e9253c6374cef745 WHIRLPOOL bb2dd90362a5ba285771fdfb350abeffffb7b0bac7046bd2f9409ee30f2b222b57f397722b997495e2e8788947500c2ab808d229a9ce9a6566d58713af673024
-DIST firefox-38.6.0esr-es-ES.xpi 374073 SHA256 a444361e1c0a3003f0f51285429096abea71309e358b3d308266a95773d7b3d9 SHA512 f1ac712d1daa8db88cc7af1b680f4df6316aada15efe12b60abd8cd45b993e0b9b49a878f6deb7a20af85c6fdff6af6560c6e6a5eb0c7ff17ccdcf87afcb8606 WHIRLPOOL 4016b55dc5bcfc68da6b58658e53b0eae8cf4e738f2c525219f0376db212fae043117fc6579f19b0089dc69ac7086fa1c6ec3212b393b381448173f7873ebbdb
-DIST firefox-38.6.0esr-es-MX.xpi 457050 SHA256 9f78e0b078724d2f81e0a510c89388de42573086ca999c1a7b98af665761ef58 SHA512 fa9617ca15a922f5ff3e1a3b79bc43707772d9c7e04753cf162b67f9086c7981d456158902c70df4a1a03d883aa2022489e997f58a3cd01bf3e3caa90fe7c1bb WHIRLPOOL 464122fa3bfa45a1fac21424ad77bedfa899c77fc238a10c1a588202f9cff047a9ec56c4869ec55c522a778e53864b4ebd8d440702f6f3efa4d0801faf0a8d43
-DIST firefox-38.6.0esr-et.xpi 443228 SHA256 23d0b0a9da9d207775c82f3f0b4b99d1bef54e1d50e9ca8920748ddbb3bd17a8 SHA512 5fb2ccd4bf7d661007ff57df1b2ec2b65749c267456f7e9ec17f653b71e784dc6fb9fb75943cca96b1b3041220633a7dd08e002724ff628ba7ad9d3614de2acb WHIRLPOOL a190d1eb7794403f75274e2ebd80fa17332517cdd29bb00abdfce58ac01d4fbdea89bd60e12fb8addc4e456351271f5083cde9c0782283009388bd386b200bba
-DIST firefox-38.6.0esr-eu.xpi 466555 SHA256 114f0b7a0266d89545475d9e84b17ce9e44ef9430ae7e97dd8dfe746aa6924b4 SHA512 49f5f629fea56cfd53a08dc52ec0d8892e6f42ddd984181067a71f9b18738029799ac5d72500ef01b7862e551c799198093b331003b630ee8f6d7890edc2fbcc WHIRLPOOL 009d4095eff0fe702be12afd508be32849f00c02ae23996b59107b6c0466af8fe10ae25353bddeb69b8b9f66fe444a1c24c743c27a46790e0c8e7b1bbf8d2abe
-DIST firefox-38.6.0esr-fa.xpi 518282 SHA256 6a1e3e580ed74ba93e3691bb25a4a1775975d13e6cee6c911735a942f1b78e00 SHA512 8acce7fc15aa5815f6ccd9f628233ba5bc56f939b78cfdc2293a35a31a7f111b9386da5a997b9ad46f4e2df01e913604302c986382cb6eaf8293dab109677866 WHIRLPOOL f8ba2db7a8d72cbd3d609888097554c5de87b2aa51b17e2516a3eb6dc1a3534d30713e7cddf025fd6099463cde8f9c3854f07fc11042660f4057bd76a3873605
-DIST firefox-38.6.0esr-fi.xpi 444853 SHA256 c574888f1b30a6e360b4b1c1cacd84cbc2b18108fadcbd49ac4ccfd47e924b65 SHA512 48de4f540ac1c6da3fbbd037695363388e388c295860b3dc27dec8550e40977347813a4a15ae8a1e3b141d8b33a2d8282464806b13a13c0119ce82fe326b392f WHIRLPOOL d2300ff3859ffc98da14a174d674df8cf570cf3192aed7ee882b4ca543e1aaf5ff6bb73db2c8aa3436aea0f5d5d27b26d92c55c890f4cf4689e850d208f6861e
-DIST firefox-38.6.0esr-fr.xpi 461402 SHA256 da189e63a07aa2d26784e5ddcb7041fb969dc63c3f147f566290e5f55581d083 SHA512 de146d269cc91206cb1d9cad4148463264df80b2881f9e4f76cac9f800f6b1e860af48921372c9b96e033a5cc3c52e6c15e77d1342b75e83577fa8de6299ec20 WHIRLPOOL 0f7402ecc552498d13b0ce50e1e3c2cd967d78dc058497a137891fbc37eb992a1a30c44c4a04fe365c3076cb63429e731eb4942895aa7eb2d9f62a6d86a6316e
-DIST firefox-38.6.0esr-fy-NL.xpi 455538 SHA256 ec064490e4c4bdc05eca33974878cdb079ba144f9dac4fa497296d030441265c SHA512 4f64f24a9f723e9999af26d2ce4164b1b7f632dd44315759e4ffdd354ca8cc9d5b43bef8be3b588c4ce369d7ca66cb0af1a001407751a04d195b6f6b2cec2997 WHIRLPOOL c1b5ce28a86872479acd9009b2529787e029ddabfb42a1991f108da401ed3c9ba15101bab53b95218f8f9b473fbc5386d4d997f74d1fa0e712be141fb8250d81
-DIST firefox-38.6.0esr-ga-IE.xpi 469623 SHA256 c009652b9800dfa3f38e07b5d89e9bc6b2f0e8056926420afbd99ec9aa322e8d SHA512 30a998b1cd56cff0c2930fcaca655b8cec17df87b9563482436adabbfcdc019de67c21a4c841db0f112b419ac9adda59fa482009e0ecb2ae2daa1eb29eebeb44 WHIRLPOOL 8397fd0fc34e4bde7af26831a399aa03fe08f6303b8839183424b318d4c14fa4dc07b9a2b63fb08692aa51bfef693073610db14eb4d587a83760347ef20cb007
-DIST firefox-38.6.0esr-gd.xpi 454617 SHA256 04e9ce1235b1fa0d726e0925472fdad4a9ebd8b6baf80392f77e9f7f44afc665 SHA512 183c782b91582dbe8a4ac9909998f9a598e022c26ce1fbfb9c35b7062521234405eb1799f13c6d0f78162a2633eabcf6105440abfae35ebc365572d468816b94 WHIRLPOOL 42246a526903e7fcbe2048cb4baa3f0e7e3b0d3cb68ac16e346d293290bb5bda1677ab4b0779b2fbfa3a5f73811741025e8e9895c75715596df944566d1b4f0f
-DIST firefox-38.6.0esr-gl.xpi 448925 SHA256 ef4c959d24191e6abd54eb03bf7848a08f7ac4f0196e219c6074bea377e87ff4 SHA512 934dca66ea1d36ae2aa823ad07b76500bbfd4098540643a9b44fe8cae8c0bffbfc9d65b1f7841486e36eeba76556d5654144c179fd801874640e46cfd7b62f6b WHIRLPOOL 2a1a77171a9f81c4e1bbfa05287336f9bfa48c6ba9c3f1d4c22a89d06d9ab1c363791c3736d218db9b06bd87f7e394949e5bc3e1ec7945cd940fa367ac234ef5
-DIST firefox-38.6.0esr-gu-IN.xpi 477981 SHA256 e5380052b2adae2e99e592cc28d9a1ecff4dfbb74103abe4432d9688feabe452 SHA512 5620ef31dbad389b2a385e50f766bd8644d6911cbfe98b3e85d6f1e7f8b6090b63caed7362d49a8617abf7a7f9412cfe0aa3cb5af00dd3317c3216036a22072a WHIRLPOOL df6b5a8624e362de5492f196907d5e82e5f6679052e51dabbb701b6cd1e8515d116aee570969d283f5a83ff48dc81cb1e2984f37d31fa2c2383d3f167cb02b37
-DIST firefox-38.6.0esr-he.xpi 486786 SHA256 a9992a670f7c2412202b6c87e849c59d23e68f793770d06dd436ca274ffa921f SHA512 cd000b20130f27a26d58f0bfd0abe91c8cea23e2ad7581d899e1282a29dee1f5dd1ea6e42343fade4ec6b09a0db15c36eb3d1986f7cd9ba1510f64a897dbbe8a WHIRLPOOL 752b039a174d03cdd723102cc537ed57028ba31f37b9fc0634f69014462058de4e88c254263cf1cbe2f31dcc99208f315a47d8f1323ac3b6c1942e04c2018e96
-DIST firefox-38.6.0esr-hi-IN.xpi 508167 SHA256 4e68a008b7d0fd078d239bfc417ea4dcf2f505f97b39351c3b74d4147f847186 SHA512 e2e30710bb2be8a66ec6c90a44b19f3550e2611832dad13cf9ff173be9fe70cc7757503555797c146f5c1ace9107c836f2022129d83cd835ea30d66c41dc314b WHIRLPOOL 76b4d05b30919c3380e0da5a78b42a3ef5e6a837db0ac712174c893758930685a304fb51a432ad4b893def438c5ccd61329cd26182e599b4c41782c946e084b2
-DIST firefox-38.6.0esr-hr.xpi 478272 SHA256 34f86d16e2f1db465e44bafb53d23f858caa0f2e42f46b0a9270fe57c1a86fb3 SHA512 2dc02e798d00e70d2d2b272e6512a4ff08f894fcf353d43d55f9b547c4f46fff822af11656f39fe34e3c4cd2bdeea04a4cfb66ab6a80c0888b2cf2dfe47c1d64 WHIRLPOOL dfe809b4e6a2f68fe0a8c41b7a0b4bd154f3fb67e3e2bc10772c153d2f17e8e8fe03526845243695df1cd113e5b2ad984eb32727e4244c8d8d1131b2d04dfa4b
-DIST firefox-38.6.0esr-hu.xpi 453555 SHA256 c5423d6a3f9e67c6ebc5db09befee3bbccf4d9de16f52533a1fa08c22b5f2ecc SHA512 e50716a661b7f9fa982dbb28c6eeaae78623dd0e32902ad612c93d863c8b731aa999d81560806fa95158b820839bba0977b94f0d865af6495060c75f15609744 WHIRLPOOL a57a7cf532392a08d7162f026961dc6001fb5fb8e94f5ae40bab7a1e6c700110a5473e6bedd7c713b25fb805f8a984df85983e3aed888edaf982afe8de01a2e6
-DIST firefox-38.6.0esr-hy-AM.xpi 534265 SHA256 0ff3c6e8fcd716047daf002ed2b58254fccb82d22c5de1a7fe780d1eea7d771f SHA512 7cb584a9fcf83c7f34e16339085fb3db8404900d41196ed41cb2ea2bf4b79ec7e430999d283f827ebc9c85e929bb316e2f145a11d99502d0bcefc266b66de0b8 WHIRLPOOL 7dc0d4353edafa5fe9bfca2463758abd142a32b216b3d952f0492f4d0fecf4caae587770cb4b476212b38cdd160564c34a8584da1b8637a1571015a68005ef7d
-DIST firefox-38.6.0esr-id.xpi 431489 SHA256 34fc6704d13c6bad38932eaa9c57221fe7b54e5c57acf2e49a184d0c7c4660e1 SHA512 e32f171988050fdb19820c80a6f9108bcdba63b4ab16cc26ef977d6d85e2772bc187e84fa1bdfdf3b6daaee5f1a219b69c6e5ea8128708bb1811694d19c731e9 WHIRLPOOL 69fab5335992179af65ecd42e644f76be30a83a560865241624082a6dee3c145c8f31c81a7f2000120921261cdd9e6edb25bbc697c587e52098bf8d540e3b90d
-DIST firefox-38.6.0esr-is.xpi 485129 SHA256 9a13253adc716018e7fa522915c2a9aca3a4d7daf5cb12b61ec77a7df4c2f3e1 SHA512 b6f8c81dbe3327c07079c7c550b63a2f7deb8cd8ad3dbf0495c92701d95b31d05851d2bb915485bde66b9908c356f56dcf65031b2a0420eff543c064d5ff276e WHIRLPOOL ba1ca66082d544ae9aa4b8227ffd2810bbedb5814f2a5f8108c8abb7758da3816701459af26c065c6dad66165e89de713deec17e70f14a8769e6b6930a73ca35
-DIST firefox-38.6.0esr-it.xpi 368410 SHA256 3e78f0900b56104b61baab01e636256e8cd6d1241f142e2957d566b86ea79ba0 SHA512 969afe42a542d921d6ec6a08b2ee76beb104151c1c9cf0276f0f0b76c3442c6ee308ebfa9e8ea1e3ee1c214ef3a2c9324c8de94c1aa56ba95659368942d89e21 WHIRLPOOL bcd68cb07e450bae4e57caafd85112b9d60780700ce4abf2a0efc60cad2c39b034088109ac6a3819c97c587f849cc6ab8674aca10ff81ebdf2ad055acbf015d0
-DIST firefox-38.6.0esr-ja.xpi 479114 SHA256 693b4c0256e2252077bd4b3823ebf1cd2fde98d145da0ecdf8824133e445e165 SHA512 1c996b84145e99af72232ec70ed87921fb6bd0b8ac0420b1283c320b885604640394fc9c4d6d03aa3efba6c9b71c14f2dcf260658681efc12ce7dc0229ecfefe WHIRLPOOL c6ce15ff80a14c15eda964c29414e2b26c13e1b6ecbc23277be170953ce588294ccc3194721279825a6eccc91e53005f39794b7663708bf559f8a06b03b3d938
-DIST firefox-38.6.0esr-kk.xpi 503568 SHA256 c9668fad6190cc7c7d1d71c8bf01aa46c9ee565ff0f08959a8be3a4343e68f96 SHA512 f2b282d096c9b64ddf1285bfbc853d7497debd7655b32ae4c6c6ab1be37d9162d669c80c42df50d12db6b6676123779aad0e5b0eb818315e5684374b2bd59715 WHIRLPOOL 4ce29eb951b54be0ed4c4e1348e892c54832ecf9b7ca97a2b8ee6a512c2af3c2d31f5f7ec8422f965bfe963a22855b4ec52b6fd04573c652b779170fb988d4f3
-DIST firefox-38.6.0esr-km.xpi 565674 SHA256 78dd06c63acdd8cff52f2c08604f612bd98f2ac9029b6da11913e9a5053e0f50 SHA512 c401de4c7635a9bde3792e0418f434b61d0627fbd46d444bc73d8461f2494ce0edf51bbdccc89d1e977c285d76da39416f5bfe5b78905541fb28beb47b7be83e WHIRLPOOL 11957ec881b7fa403a567f8a6fa4d719df9e87bca69e95f87b5c119fc6e372e25a57f6ec7e24daf225acc64913fe99d309ed8b0854033f4f44f2c0b5318ef138
-DIST firefox-38.6.0esr-kn.xpi 533463 SHA256 fe1f07f526b2a4069e69bf746e31fe435058f8eb0daf24e72e0362af00e0679a SHA512 dcb7340c6e7aea278bad68b56a45bea63e88370c7ed4178c948477482c2532babe57685d2deab7f41788687811bcde7b9feeb1daa74cfd41f019c108ba285df0 WHIRLPOOL 88a260c2d452d1e4354c332f7119a666ccaff0cac6bdbf9f2849bd772bf37eda74d15cfaf7648876ca6ae346acfaf76ff16e1fef090ea4b87e7b53e6e2a6e32c
-DIST firefox-38.6.0esr-ko.xpi 460854 SHA256 6be4f4e43fed606021d2218ec2cfe3712c63c737692b9116296a85ffe11650c5 SHA512 8cd1977f4cad826e055adc669586c323f6149b22eff8b1d45bc35543747c32a8712980b3086ca95da8672f2c46c57d4bbb3fbcf103f518054990e9cc281bbe9a WHIRLPOOL 147240ea1ab7e4d317ab0d3fd37090a5047e6f58ec2a1e5cae5bbd4e5b2310f5f668fb9fa92698526b17fae34f37b953ce932b8231c552fe923321ea19cf2c7a
-DIST firefox-38.6.0esr-lt.xpi 486451 SHA256 824b6142ec3d13f31d4ea77b9a548eb66eab4942e745a719e197fa5813578ea1 SHA512 733a90580e8b6b19607ba5cb50c55f33db70f2fd153a40a6424a8fea9a6764733a975ffc4a8202c832cf4329848501fe9252fd9d3b05ba66428aace9022a1aba WHIRLPOOL 1d78a0f7a561a254c309ac3427ec05dce71efea83a15fdfe9e2047f572898e49c9d7aafa8374012496a717752f88b26d2e2decad8d1379797a218f35985e3454
-DIST firefox-38.6.0esr-lv.xpi 467198 SHA256 28cdc44b46e3126c60091b664e9fe3c5ed8116372acd13182e46ef5a6024bfe4 SHA512 2e86d3f8fee65547db9f8e051ae81bd6588d297b6eac1baca3a3400355c3d3e23e49189d83d260c42ecee93608cb87dd2ec84d6ba6e6d0e346f59ea5b098fa41 WHIRLPOOL c212dec3d57b01d53fbbe7923958d2995cbf8244ef75b2347ea663960ba9fffc039a5dcc92ca7bcfe1c765d93373ea5a3082ce713fc6093ecf5e04f7d174f210
-DIST firefox-38.6.0esr-mai.xpi 514666 SHA256 bafb8f90a8162dd03f3d2f49aae061411e0b412ca15c85c9da82150bb034769a SHA512 112d98070ad2d5fb319978df75fa4c7a6f84049a6c8b818b66ff1a120ff57686b82cb40beae6f1454aee31930bef374c245a67374deea42b7a34ae86659fb3a7 WHIRLPOOL 883df662ac1b97eeb5ae401687c3b989d25e0c41da1819ca9107d665d353f2ac6ee9c8e369196d9595aa9f1225c8d1cc63c763625b418c520ecc1eaef9f32cd8
-DIST firefox-38.6.0esr-mk.xpi 529205 SHA256 69bb1d10e0f265342b4f4826766d0f6b13f3d777a0bafc448173f6441512a3f5 SHA512 a65a60c49b6126c66210eb52c7e8a752dfe5a4e83cc7ca62db545c44bc0e93ac1812ede3f0575805f96dccf12c936b9776129f8c98f3edf5bd4eb6285446a821 WHIRLPOOL 72e43a37c4fe6b0a24bd0034b35984f4115b8d638fc0629bafe38d5d7ac5863d9f2403777500d5054be043c826277ce5c6cc695207777fa7b6449caee9fbba3f
-DIST firefox-38.6.0esr-ml.xpi 528919 SHA256 67ad0c3738ce988fd14536da26873519bc707e554e57e02e08c36a74228328b0 SHA512 ecc3be0003962cc1041787911e14547ddc337c2938ba9d1bde003cf7fa05abd560dd8c82d9235b211b9b7a1f9804ed160b1070fd33d39f423c0d3282fa45d05c WHIRLPOOL f18c6add110caa52078a2331e949c7cec937aa0dab8d5da4474e2c96d4c94f8537c053719978d614f63fb331f5f966f0ab132d9e6530ed5b00db1a50328d1bc2
-DIST firefox-38.6.0esr-mr.xpi 505962 SHA256 f9e656e45fe64f95a2abb818ddcb8e2344ea42545c59f8f6d29909f181933120 SHA512 7c373d8bdda6f6643fb003bde4ca6da7f9434fb2b3adbfaf5955a667f346e7c0c1c600d0314a231c24bc1e127cd22e38fa62c237e207a96b86cd9ea89aeb564b WHIRLPOOL 993bed70cae4b731e36c393b7b05a2ac5a4d05ec068266956e77f12268fa1db85d9648a45d9fb9f9e95adadf5b4c8d6ce1447860a655afcfa369366fe5a81e6c
-DIST firefox-38.6.0esr-nb-NO.xpi 444177 SHA256 d2d6e1fb4c126dd0736994613682439201d7f0b4ec25a64aeedd18ba5ce89c79 SHA512 e1756fc5027eb2fd3f37c1bfadf48ec81d872c3e68d7492f6a30a32a9d7bf06c3bf8594c21d2655f7767f3e706f1baa4307a22a4ec1b37c14d6cdc3dedd90c20 WHIRLPOOL 4b058bfafa1014c216abef3b378e84aac75fcc05a49bcaecbe0f1588a2483ceed49f1897d804a2875ea7fb32458e82cabe060d0f4e2060b2b38882a3dae7c5f3
-DIST firefox-38.6.0esr-nl.xpi 443994 SHA256 963ef9ce080aa18c0c4dac7e1192368025be95d7a0e4363ea63006a0950c85ad SHA512 1a5e09434d0dafa33c5c6aacd124150e8f0e94d64664e2a4b4e689c58d768281466abd0c1550caee918ed3f79d2fc9a9a6e98cebeceb2c2df3f76957c3bf0bff WHIRLPOOL 0b9d33c4774c355669fe146d31f36e9786166625c76de14a04e8b8f2d09f4c14b6544e04d9e6bc0fe7e31ddcf1aeb4c0f988352af4dd997f1cefc9e68ed06b64
-DIST firefox-38.6.0esr-nn-NO.xpi 438452 SHA256 a05ec5d5da615d06a060df9e005d1cc4ebc2c82bca7d8836c06ba9a138f3ce5b SHA512 cfa5d381f7faf407bb27ad7fe82523c9ce024ae29e053ab33af48138fbfa34e47cc987d09abd6b7cdd6edd1e2db371a9ae3d793f95b84d3fd70467e42de3d50b WHIRLPOOL 5dbb7c8cf00d29e1af34b363c84187aa6157a1f1824a94fc3cdbb2399c5ea2bf7e89ad854d71a424709f3d8573fbc2000cb79785d1d16791b202508f339d828d
-DIST firefox-38.6.0esr-or.xpi 527049 SHA256 526b2590f5b213d4b90d2e8a3a55723f3a551dc0ad98fbc8c40898cfeb82d58b SHA512 bc46d8e1e7aed9291c632ad54026179c040d2281538b7d9743e951acf1a84efa97b05de4744e93b7a834a8c618d3f0ff3075a94adc644e888dfa427757a5ff3f WHIRLPOOL 918fc85534f043ff82e95982fb98515013ba9268cccc730aa4fc3f791be4f2c7dfd1a094286c324a90e32ac42291054ec623d336fbff6a080b870808d88aab44
-DIST firefox-38.6.0esr-pa-IN.xpi 493722 SHA256 16c2d17420c49a4f7fffdc978e9a114748ae0cfe76ee0f8db721ceef8a9bdc94 SHA512 5c2a7859264c87ff440ff104e76b57268856bae90a1c38ec2e63a5c3db21dd56529b9179335bd394ac9484b105fcf53f6c36c505a1038e45063c3f9bc71d972c WHIRLPOOL d9aae23e1f81d862959505ae0b54a30841e784524fe3e583a19f52f8c925f5ed5714f8eb9d9ef8a373f82d8865f649045ba0a5c2781e756654aead0aaaf6a8e0
-DIST firefox-38.6.0esr-pl.xpi 406566 SHA256 8d918d988341c462b0b621c7d0cd9d77ff49c14b0e2b1bf134e99e9cc4469fb1 SHA512 b7430755e3a3122a822902bba90dcb5186c8ae2b26219410f6857290afc8da2c06d758a3b8a58d8e708eec2e8499d1d43278d987bcf6342838c7e145109f11ae WHIRLPOOL 9cd8d6bd9b2f359982093089e5d186e51fd0fb38e09372987af7335dc8f19d9a16b624a1669912d035bcba6b39b0bc4fe867193839285bde44993916811be409
-DIST firefox-38.6.0esr-pt-BR.xpi 459813 SHA256 396e9bfe5192511c0ad67107dcd8e9bcda83de94d62095ca10f6af4433d59100 SHA512 a2053820711c34b6ebac5c82eddbbf74b694a7a1a3e5d47d863fa85b146c5191ea89d3a4b33a5cd7cc609f46eda27064fdeac3c4d6de3bf720feb76a47e43f52 WHIRLPOOL 9e79c57b389c400258cdfee64cb789f7e852acb1de5ad48053567850d749c63b739eb5898e11596bd5cd0f7f2b1135c5dc89a5a862f9f891f7d2d8f3a648d4a4
-DIST firefox-38.6.0esr-pt-PT.xpi 439975 SHA256 7968f2e7b2a5da76d82312230d5486f8c8b59ddef18d43d0c3e43581ebe717d8 SHA512 1dfa8c75a58a4d1cc306d3430c0a8829238a37382027f6985457acd5ed936eb16ee8972e375933fa24409d614e8a9b389c6b2b162c8fb89e9787d2b59d37d94c WHIRLPOOL 08c4a98afe291ff5cf93b2a47ccef5576175bc6456b74894337733999eca5a936d31a33f08ca162334efbd5ac6ecf52c2e99df17dec610211b92c6cdca250f1d
-DIST firefox-38.6.0esr-rm.xpi 446288 SHA256 7813fc4421fb3c08ec81e60ce955194f9f2a376662262da4a0f320db5caff342 SHA512 0eb56d59a8ec5b1ed77755a6d68b677d23d4ac67c147379f6bf903f23793fb9f1f23c07de52664dd1c3ee7dbb2be34e5b5bb99529f20e395f05d2c98b9dd4a7b WHIRLPOOL 0ac7af0b68f38c8c6de8f2183d028d955e3d0cb0e212158f18d65706492aedc1d92d88a23df648d26887377106ce227fd838a9df3edf3571acfdcdc36e533e7b
-DIST firefox-38.6.0esr-ro.xpi 494079 SHA256 7476011cb35e32f3cfa265621d830cac44d4912f5a5a3814c5c31e9cc5b899bc SHA512 bcf61c1c7ecf4d21bf7920a6a365e04a2c5261959df48af88b01975c0b0c6d1254b090e264afde172677434a44d0f5e087b87095ab4a9d82d3850d55ca27413e WHIRLPOOL 9e5b5d6359d2217ab3c3fe4517e25b713b8ab027217a8e4e76857d7107acc58201a9fde9ca85ba28d6b9d1dbd793e86931198cc1c8cf5d833209ddc9f66d5afd
-DIST firefox-38.6.0esr-ru.xpi 414418 SHA256 145b4bef6d8fa5f644d3d1726bd7fa3d5679d3dfa1c456a0e39be3bb98b64ab9 SHA512 343c6cfa77efda402f79165e4170fbb7916d9c2db9c26fd7e05ee4b32fe08ddf41d03bf4325f3d389aa8e6530114ed6647f072e3af6b8432570f5108dabb1da2 WHIRLPOOL 894c80f114c098e3e3f2e6207ea970d26b807399fb304b8f85df277726f6cf0cc6a89539a0992b3c8d735b74baa10cdba6b2e58cd62811e7d8d5d3abeb1e9810
-DIST firefox-38.6.0esr-si.xpi 537394 SHA256 1ba99487b2dba24c1a34f9cb3355492fc7002d1e15f00402788aa14bf1ea8483 SHA512 aa735d97a53a3f53f63469e30dcd91ea34c4c5a1caf54faa0c6a3c5dcd7aeb2321d3fb773d819f7c54c685666d508788e0060a853e5655a61fe9eaeb20e2b70a WHIRLPOOL 116302fe0182d8b6a7e9e9c01ce9270f396cbb5bf387828475c1a65b0b8954dece682646695369b73d6d5f430230b62c75dbfc5c8564667874db87997033df7a
-DIST firefox-38.6.0esr-sk.xpi 469436 SHA256 b3cc30232399d25c130fbbf8476ef56013589b370ec44c18e76eb61caa4a457b SHA512 7d05fefa9174de322104b6f2c8c113914bed3bf9f4f5ca1f510884e332c9fd4b3159ae22351545334586c1e7898bf0cabec5f5f2288a404f8ca6c96397327cf4 WHIRLPOOL 87a77ec14a39b75a178139297286b4f419919dafa855f5a282d5053a39cdfbec2697175cb5c1020ab48bb0e3760f4b7bb94fb36fb6c04e50b2325166336592e8
-DIST firefox-38.6.0esr-sl.xpi 441594 SHA256 77982fb211296342a39d5b16e2d538b8d4cecf7ab5a8ef7d958fb373bc32dd63 SHA512 1196020a475defc083c7a3507a515b2cc8779883b8d170bdb691822eaa0436258240229746fe23729793ccf68d81ac6377547c2183747d6aef67925d8485a56a WHIRLPOOL a1dd41c471b512c67bf0c92b03e67082f8d06b57e16d1e8b2173b008a046501a4f6c4e276d17c1fad023df668d2a57c2777e9f88a8f041670ab9b137a84d75e8
-DIST firefox-38.6.0esr-son.xpi 449267 SHA256 0c80545bab1f7119067bafcecbcef0f902393fd3451a71dfc90122a6f0b8701e SHA512 812c0e91b69e647ba554f242020ced7597c11a0da8695505f88677507d73c8e67169dba5053e9e575a261eb8bfcd15016191d830fc0ab51782fae819c1d0bcd1 WHIRLPOOL 1aa8d99ea3f4f18d10807ff52c4519497c9b70c9852dc84f57cc6a6d70f7a162a7f74f9029098670ad148248dad6321a199d3ef32e3455a4cd08087b6f85758c
-DIST firefox-38.6.0esr-sq.xpi 486076 SHA256 6f3d9fcfff460a162fc3e0cfe75a8bccfbf5eddc8d683117474c99d07f47100b SHA512 dcd4bd9aef9a6094b30ece8babe2bec877dada4ab235260650811454e9a773e2827d64c3c34f5a4b48c7776a161205346f4c091e67db47bdeefc1a5f62aae121 WHIRLPOOL 3bc920c2de13ac202643f99ef4cabfa53dc340d910f43e30efe04aa142050e16fdde6177ce34fd59df183f0f810462e3eabb9ba00c3c24a746846298e0ddf9e8
-DIST firefox-38.6.0esr-sr.xpi 479419 SHA256 825d25c1d7b7fd15919579e5930bc6d146dd9c39ba31ee544bb78da7ba1a9b5e SHA512 67dca0f68449af6a868f08e8a6809525526fa9ef6ed7851a51044a5d22e9b24f95d38191f4c34110f30968f4144f0b9a6325283599f09d2501dcd088bb471fba WHIRLPOOL 58383d8775c7484947c0406b55d7af53c7bee52b6df918bae1b6fd2388efefa2728ebee7c9590e6d5235d14ef323dc35407a63066ddb018d976abe1e0551830d
-DIST firefox-38.6.0esr-sv-SE.xpi 452633 SHA256 62c5280c5e49f47c0c6136c41196db112b220bbc238e8219b989805bcfe66dd3 SHA512 7e8134b9330df184d1a36779cd6861d42cb6ac1b51db04ba56aba5f0fb4b9becbecc56643d0af04f1b72382a671b5f6c3f9fc1014c2b08cb5fb0f481e1e1d028 WHIRLPOOL b8797b65c85814d8c62d6983d49510e107c445d1c2d822dc13e1fdbce6ace01d7eb4c43b098613c75420c1ab68ac86a8c1cceb1a71550021ac62889cc565019a
-DIST firefox-38.6.0esr-ta.xpi 506606 SHA256 57decfe700c7e047c10f39d8ef0a5d0a9f6f606fdbced530dff906cdba42bc43 SHA512 1bc88c7b98c0a2c978c4c5d7b14deae2cb156c994ae4b6a9be6d88bfccf922a3813becf5f2873f2821bf27b24c1ff3efa49a154147fdec1184078afe01085f5f WHIRLPOOL 13d061f3bd99183ff0243933638f493077eda4c1f190d1a7a830f5dd036c1d62ec7b9f7c979c949b6d9a330edd52be17ce415ba4f5bebfaf31c94acf4381e795
-DIST firefox-38.6.0esr-te.xpi 526253 SHA256 a87f56bb7ebe1c01c0dd3aca66f0542d6c769e01171e99e6667a4f226cef2635 SHA512 44e63a03d317191bbd5e129a98dba3c06a32b79a5debfd56c2bd65361646474217b3e77ede339fc785e4f65bcc152bef3d35dabc1224fb9e2b8d7a708b43553c WHIRLPOOL 97c23cd09f968e5282443608717f9c9201e4b9237fdd315112d466104eb145ee3322f0b76b6e8604bcd0538088929805d26e422f6e3414336b1ad4e311888b8b
-DIST firefox-38.6.0esr-th.xpi 534270 SHA256 c0e6584c2265cb1c2a5c55547e9ac11ae09817e26e3dea8f6b00334c3262a60a SHA512 5f0c3890a132c3ac211e280f965f7fabe8cd0b2647ff954cb180eb9aec304ece2fe77d884f7b4c3d4f4e8a078c63df03086dad520e2cedd9723080443696c26e WHIRLPOOL 3a134b4054e8bb75aa443e5bf4149dbc7b9dc1560782951ecf72419e7b51a33b0ad66f7dca8303bf9e0bd226ab2f94d9fc69837af9a2f6f371107f8b66a7a11e
-DIST firefox-38.6.0esr-tr.xpi 481076 SHA256 d05ea4e1f54a2356eb9062432280f85ac4733a1938eba039a01b5c7359913a24 SHA512 386db705562489fb6db438e3a37312304482ceb1c12c2949808144aada2bb57c20e969d9a98f7d80184f5dbc51aedc0c823d15a6b04f929337885a911220c707 WHIRLPOOL 301f87897b55a34ed4c10e911c1bd122b9f4a2ea072ff444c6257238d832a96e14d23ce45666f9314b2a9f601a391bf68a63df18723c20db3b4c6d2556b29d2b
-DIST firefox-38.6.0esr-uk.xpi 493313 SHA256 f81f6f044d01cb8fe1e5e56fd80524a735d08dd6b75ed88b05980aafbbaa3c5b SHA512 83ced81d6c43d7da5de60f7c36d887d0445cb5ef94cc858a2cf4368e7bcb2d0dcb4f3c18ce2dcc3bb67ca80c491d9b72586f71b08c39c95e05d376605633e892 WHIRLPOOL 305a181b1aea6138f12da120e41c51cc9bdc7ba3d9d1c575c98f7c6709dbccb24760cce5394e349641c8f78ddf74a54e5711fb8163b0d41dfc7cd058f5d8871f
-DIST firefox-38.6.0esr-vi.xpi 467504 SHA256 3c07c24f533e3eb27f3189cfa384ef815a55cb8d160e706e0506f9d676a9ca9d SHA512 ff50993a235f766eb4107328e012146e1ae7ee6e77055ac7f23a1b7d09fe9ab281044d6b309580e0611ecee0a97b8bee745af9864ec8676bf89da9a738b1b34e WHIRLPOOL be46a01c76ed994ccfa5a0d6265b164160186cd8c2f6d40e9d90194858eab678c37983a8abf0eeda765a6fa9a5ecafbeb42e291e2c9a530281395ccd41d66a23
-DIST firefox-38.6.0esr-xh.xpi 450242 SHA256 5d23ed0ff61a1f9b7c4153450df002b3f4e559a60ed17e93d7b0f350f6130974 SHA512 291f9a9999649c0c0e5209a78ab36889604145eb342e42e4d527cbf0304608bd18f2e75240623f132135fc8c19a85b37b7791992817c8377c15d17dc18287369 WHIRLPOOL ad1198aa84bc4c95b856310248f25d48f625e2dfd5c8768830b6ccb13dc2359ff6adc753ac71e3b411eefebac542a5a415cbd0887f2c3fbb442a0218056ca45b
-DIST firefox-38.6.0esr-zh-CN.xpi 488277 SHA256 b1401c37e9e44bc01e2e3627ec82dea93346681d6259e6cf14079fb973ae20ca SHA512 43115069f877087263bbaec779bc9aef72027ec228aab63def7bb2e858554d3377286c6a1ce6cb75c76ab52f5f08878b492b7eb4c26fae8b5fd9344e8e49777c WHIRLPOOL 0577d9754757c294ffdf20a02fef7a57e9d942cd4813c180763313575996121b68b00f6030be23a95ceb8bd03290247cd46823141d3ae35a9c6160d9c3fb1f38
-DIST firefox-38.6.0esr-zh-TW.xpi 467844 SHA256 e94521a7cabb0230dce0448e743c5986cff74bc4a7ef8ea7280e45e1d257237e SHA512 8c27abeefd78b4d7733016c7710a4b2986c04284747d043af486548728f1f5acb71b6136ff8c75e426dc52e37b30fccebcd1c42cce6c19abeb6bc75c8d218d41 WHIRLPOOL 17d23c0ec40bf347f0a1668f507cbb9af3c9e5024d8a9e64cd20365c3245a342b44cc3b531e0b054f7a07e61e48ac419d186086d9d0c1431e0bf2c7bb661037a
-DIST firefox-38.6.0esr.source.tar.bz2 181354489 SHA256 56244705572d25c5bdca111e814a6021bfe8eaefe3773646720e6e467e59e1d1 SHA512 b9cfd1b873ed77f8f9e170562f313afdf76b5d2f4fefa9f9ab9e06bfb16c0888222cf4e81331e29843181c2d2de426538bd2d91e4b8c16867132e73ad6b54c3d WHIRLPOOL 82831847e097cbf30ac61fd51530dcb2c884628faafe6fe8b8acb3e41f7f155c8364fccb920523c8df229254b73f880cf418c33c435a7753db66265863e5e7ad
-DIST firefox-42.0-patches-0.3.tar.xz 13360 SHA256 8f1b592454695a27cd8ab6a234705d73363af0a5ecc5e64c30072def05fd5fc8 SHA512 4aa1ab7b8482b2d6af35cc293443678eb3c33a6eb2577fc0553ec94b3c3a3cbd7c322d50c004ac646296491fe1f67f5d199635750b0c50cc4f0742af704a9cac WHIRLPOOL e755b9fd4da821e8d0490e138531dcc55e9c9dd6ebbbf33771fffda9fe932df79c1d26dc8ad6b6dc9e8a444ee47659f7ef90846dc076299793db4726be06b94e
-DIST firefox-43.0-af.xpi 493733 SHA256 180ca0809e10b7a2e4d75cbed04394e1965187bfb018d9dca9128ae6d773de28 SHA512 5e51836b4bbfe51e283d8fc2daf3c971fcaf0aa6a58789d062de87c21898e61283b80e7e4861265fe9b1e33b47b3d8473bb0e343007196dacea1d21038ca57d9 WHIRLPOOL b48249bfa32b6ea9d6749c4ff429c19aae29d15ec288164623eea4daba90f5ba9a7c43b8d5b2519e96ff31bbdbff805de3e373d76ee7e44e8c546bff5a09fe20
-DIST firefox-43.0-ar.xpi 531444 SHA256 052f40e5c7c6540aaa37bc7f63ec9f7ee7d8554a3da0a5655cd7802f1cd17d9c SHA512 7ac14b4df9a9a15d892dfede4496a9b1615e2fa452d48befe11a1d0aa06b12dda41634dd7dccb0c206725848fa4a73ef160f7639a7f09175ff7ff479a18a9688 WHIRLPOOL d2c5ab81bcab0258948efe6c75f9da0233b5d1fe3a1dee22863993e4d399b81be13be1ab0230c846334918d4251f31314210e25235b9bdbb19c051f741c8babe
-DIST firefox-43.0-as.xpi 520379 SHA256 734c837c556346e1cbbf823d4587acde37ea1a1a2661ab225babc817d8a879ab SHA512 58651c76664a36d3fb241fdf68f40854ae49ef0456353b292670a80826b195fc9dff269a89737593602721c0f5d8e0b3273736330015a0c9806ba791c7f7124d WHIRLPOOL b5275d94042e4a072b5991befe3e3d9665a8b23bcf9ba50b4ad3af964f4cac2fd9bc7f3bf2b02ac14b585919e337c8429053b8e52c23f93507bb5dfb38e3fcfa
-DIST firefox-43.0-ast.xpi 414848 SHA256 ede7e21f36e207e4e0b15dd508f4cd182c7e6b6d95ef3492a44ab4aa72f87c83 SHA512 f32250f32c4f675ebf5a99be4f1fb5c26203cb6b7922fa73f92973b19cb76c3f9aebcb1be12553c873d2c6a3f0a87eff2aa5cd6542f410f1ffff1edba536ae01 WHIRLPOOL 1ddd887cec728dc31d847fc0218a3345f67a3270bd10521870b7a36ef6241cc733cfeac2ef86bc694cf60318e886097d8e23dfe5243b4197a61062824e2d0694
-DIST firefox-43.0-be.xpi 462184 SHA256 b3c0f019e5d37b3591904c79de04042d97acb7d6439a7e7abf54f49afbda95ac SHA512 3fc12633f7ec53d69e3b5f4ff81cd92991de6820cb9eb7cc7cf39ce3bd82eaa64678a1e292886056c3b42fa4cb8ce51003277861d65e5d87b83fb803bd7db25b WHIRLPOOL 657f4a0a2b5449a14818a9ed4636d13a57646f9c2b4c660f73255d88bc399f0da2d9d24b89031d77b2cde72209260933451882b1ea3082fb6028c6790aa0ad7b
-DIST firefox-43.0-bg.xpi 503613 SHA256 e6a0121f1e03017938cafb3db12113e86e662efcb04bd276d1b48f5ca307ce15 SHA512 afb08e59d0fc701462e7edc9c032c8445db431c235664e1a7e258d5256916d6532a0b9e620d38ffa7b68cb3d5ba872c93cc072dba000e4999d3a48a4af01a167 WHIRLPOOL 330cd83e971fc4788b5c3bfa3ec2b45a8b6cdce1ea7490ab44c0154acf635a22b5a3a7b0369c2b2697501f163d2b59d30c73154875a43ac2727e845c204cfb6e
-DIST firefox-43.0-bn-BD.xpi 550337 SHA256 d5d40903d83ed016efa50b9e8ff4ff29e43063cc9548baab7ae8907957b1c5b7 SHA512 cf22b6d33f4f16217580df8f08616e6f6a6a56ac88b566057526cccad669d74f68d23f0863ca77dd0ef82d0c82e72128e55859b87ef1de4bd23451793d57bd6b WHIRLPOOL 56c11a71f19a5d02896760e037e6f31f71423b9144ef2d65feb4235dc1cdd4f3d608dc3085fe379cb4280091191e0e52b291fd992f05ec75322b9ea05d00b947
-DIST firefox-43.0-bn-IN.xpi 541695 SHA256 441dc10f8a8b5ded1d37b9ab41c630272c4d1a4e03d469bff7f83ccdc1192c18 SHA512 e11f373916b3dd38b31e1177041982d035932e5cc3e962ea2cb37e238f48ca85f20982c00a5e43ab838efc80def7131156bd748bf3e8d83be02e71581a749c77 WHIRLPOOL 462f675616b29c2828be766a930a9a7d6ca00e0e328bee504b545af27cfa21640d3ab6aee891b276291dfec3739f33293c2a39a8a12f68593a36a69fec5c75b9
-DIST firefox-43.0-br.xpi 452044 SHA256 8da826f3a61e1b12d700ded5c905bf9c734f66ed9989e85021d8c8de0547e81a SHA512 ad3ac22c0a55204acf81d1113eb5251f8188c6fbe7f4f948f87ce5e1c6ade45f351dfa4b0a67339311d0b0af15b9d22ba98af6b953ad2ccceba52c9ea7a3733b WHIRLPOOL fbb13aded0f7ad787ef212f9228a1fc789306ef5f46e8248f77799e87804000f06bf78efa05ee5c6163124587d5bdc682c113da041ebeda55c246e4c67850d15
-DIST firefox-43.0-bs.xpi 491001 SHA256 ea3adaf1eb8b5fdd48b836bbeebe43f1fe717f5592b18486592632cffc70b4d7 SHA512 652d359e7fba0cf57d3c659e3af4ce52bc1807353e0795d9bfa7aeeb165cba43f44aa84ec0f28afbf657ab03afd4868f3cc87ae42ca9c15e0c106e15c6b8ddca WHIRLPOOL e9ce70815658b3026631e0047b51dd8d0e35746ea7d290538d5f717d6660958cd1d532845302e07c27ff3291ca083ce79191dbb287b3d3db386c1513570d6b7a
-DIST firefox-43.0-ca.xpi 469147 SHA256 67bcce2ee0c8006ea5fc2a472e5a0796683d92e516ace6a2437f139b1d82eec8 SHA512 9ab5c8b90938c214b0e0315f80eae0d39bddaae81ebf62283b3766c5bd3bc42d06229f33ab0acf55b35f57d1b439bf9ac1e9a165b99a01553b4aaf4c637e75cc WHIRLPOOL 5328d7fc4540159ad45b76665aca9c50b3174bcc3f8bd0669978abedb1d591a54b4bec091565962132185153a77d1af0555bc47209f3cb7bd8c9c90db254ad5f
-DIST firefox-43.0-cs.xpi 458382 SHA256 2769d5894095289660ae8a1e10ac94aeb73a0562ce6fd87a743ddf2ecde2248c SHA512 d04b118c00698bb9dee661ec82b152d22fcac4778a0fc56b99512708efbc02a3e8045212d0b851dfcee6cc3cdfb46adfb258c1265967f46936e5062823978500 WHIRLPOOL 13a976132d299b92547d27cc711afe16e0d3c90f335ea6c8055775bcc4ae8f6c1b57b874bea5f558f032bf311bd9ab9ad78ac198a696cb672fbfb2c3feebefe5
-DIST firefox-43.0-cy.xpi 454623 SHA256 d4de7555bc1cf528400d16e68872171116db6b969ed14a94cf8adfe4deae7d9e SHA512 8b56994d268bbbd5d9662ad168bc2327eeeac923ef11a560fdb4fb7cd32b6835303579c72f962cfd7e583f8fb711eef02fa25b824c89bd5660c5b5d8eb9f7d06 WHIRLPOOL 9dbb04513cbf38a269f932aa103e38be6f5d716019c04492b8864135360aaf369adcca3941846993cf2b0a1bc516234c7fc49a4fc8796a625bd13c89b9b8bd75
-DIST firefox-43.0-da.xpi 462527 SHA256 d796b27050648c0344c329ef0fb5c4d378351c802a496470e665ece2e1a27691 SHA512 cacc225b856ffc9dfb7f5fcfa17d266a77c90f90f5f4c513462d25fcbedcd137a9f081fa075e04dcc5bb4d9a52e267f23f9da9f68fc6f9189b678d41d2094879 WHIRLPOOL 02be3d8bf4b0dc9eee7581ef9805bfd5a11fbc0a18f6aae910cfb35a438664f4854c8dd29dee838e8a109eed6fc82ef2083ff6624bfbdaa0f14ff5383899ded8
-DIST firefox-43.0-de.xpi 463838 SHA256 e9f7735510f34f0cab6e742dc5b41d7c72f2e1cc25ef524267703971b6b9991a SHA512 00ce200b87acadc09403215885399e4df3107da097b1e3e0808c0adf62a171e2ca361c0b3f2886105e777ce208a2f82a9dc969c8f96aee066cb96e976a983c2a WHIRLPOOL 57546cb29cfef9c7eead1c8480e327ba38e945c2d22c1ef98f56718389a53318b54855cc942c291ddab4f03c834b81f386ddfc555e111de0ac47b7812faaaec5
-DIST firefox-43.0-el.xpi 508363 SHA256 587fdcb068bdee4bf8eb8e45d2d76afa9e5f516ae1bb8cda2af39da45e3e5630 SHA512 20c91691ec6dd5919a92d36d8ccaf72d14d48220feb8afae22205630f14a0f1ab754cdbbc3f8251f1fe35c0a14383d7ec81e47ae19e28dba275767e9433e0453 WHIRLPOOL efab18973f51c3909d27cd13a0d4b2b1a35e2ccb5494d7519d66f4ecfb4ae45622c171fe630bffb6d0093620bfd19b2a9b4ec00cf87f7be2ae30e1441cb988cf
-DIST firefox-43.0-en-GB.xpi 448387 SHA256 6c0b8dd0efe578eb8fd9546440dbc481e8ad175ed4a02271610a1cc43e838922 SHA512 efaf4d614b8e38b94ea805119fd2aac6129a3c7a7cd97fa62f2ce5c95aedc9be2b8598982fe88bb52d10ada8ed116318cb7ff9502082d206b5559f06f0cf2320 WHIRLPOOL db819a7242673c5bde1425f16b8e1336f114a5b328ff199d23a13d87a4b42fac7299e2ed499d5161476e184e03bdefe9b0dcfdb6c10d410dad5cfdac400cd266
-DIST firefox-43.0-en-ZA.xpi 453304 SHA256 e01def0453ce51d40c4fc9783e54bd93948dd75ab7902d341b83d74c76e8db2c SHA512 9d18125def313dbca75c3ad97c59e0ccec3d3b4aef0e2c3be45314c0588fd9860c13272289a4c11a01d0996216d1fb7df874e9b284f0923b1ed93bcd50dbfc14 WHIRLPOOL f3a1352b65dcf591e8c39e4746383352d4e2ae8b2f488f4dbdb1e6094d9a60a63c60c2c8fe4af03a44b3a9e6e82f3c0c0dc4802ee57d1b94011477d8c7d3e084
-DIST firefox-43.0-eo.xpi 494359 SHA256 13b1949c73bbc5dc81acd56012def20650a573e24b61320deab99c3ff019e3c6 SHA512 333a934a5f3207d6be210fdc8b01516fa9d6b50e9874816586f04a31d82951a52c16971ec178f882fbd9e6cc1de28d7427e4744de7892832f246cc8ba984386c WHIRLPOOL 00ee8643227af1e2818016a99cc93077af154dfc2b392d435ec253a8c586fcd5aa38dccf5dd65282f305ec74511655c61c57d8dfa835190b33cc42f4b737f5d5
-DIST firefox-43.0-es-AR.xpi 462416 SHA256 3bbeef6354c91fefc75f7222e39f0c2a34d79b4ce8f85a7d5dc080f85cd17b2b SHA512 cc3dfdac6620f25bd2821eeb89117ea75834c9dc1084594b3ddd6e687b208f012fd22cfa9adcd16ec647ee498799fe1613614f7ec8d72dfdb222da78c6cea33c WHIRLPOOL c331f995844478e5aa5f0f7c081bb4ae8a5ea8215782f82ec6c250b8300f8424bd0bc2565f81c326f5a3a76cbfb5eaff37d167ce90963a46ab49a767748ecd23
-DIST firefox-43.0-es-CL.xpi 388433 SHA256 9b217b02c75ad153ab6608b3b07f4cc93acd517fe856d177ca77eb66fd2b0144 SHA512 9b2b1a9151a3e98cbaf390da81b6a2f653817b3b92a09c906f949876ee5a06e5338720929863af769359d1c4ea13573dbaa27200e85fde8c48160da13d4f51f5 WHIRLPOOL aede7dfadeb319d3fdab65ac4c0bfa4673ea2db38ba4e2b15e0c6ba2a769797d03e438816a61a159ed27fb7d2a3ab2f3e99233d29d1b07f504ead3b9f54920ba
-DIST firefox-43.0-es-ES.xpi 375331 SHA256 75f03fed082391c5c315e86342c72b6f118dd5389dcf9dc1dd83aa0879aa3944 SHA512 addfab6bb71264a6a54f0c10e2e5cfef3b687613c002a9b620a4b92424a3e09159f2dddbe177954ffc5c0e13de1a76d585bf7923f395a8bea9bd22f4a51029aa WHIRLPOOL 87a315535d3a6357d2d64a7f1d57daaad17b3e028725e706db3eb40edc500dce96f7560aa59b5ca43e00c9b9a22ee379314b20ccb447d5d68752acec85c1aab3
-DIST firefox-43.0-es-MX.xpi 468293 SHA256 4228035182cdcf87c0754b87c9b0806d373f9ea874bfbd9d1e43960bc3a10bd5 SHA512 8b4eeb71f995a8a6f3e34706b922746652bd0253a998012e867023dde66ec9917ed0eeb4945a11126af5bb0fd624cd0fc9d78ea46770db4ef1d21081eba1dd4e WHIRLPOOL 1c110340161b488560be63a6f955bca25f2f917c359df2bbc92d58f63df2838abaf63d52fe8d4ee75f6f315d60e432b33d2789e1af568e2ec1b527d91c5c2b0c
-DIST firefox-43.0-et.xpi 455407 SHA256 1dd00b402340a71a7b55ae2863aa1a413493a85c48ea1f7c5f8b51366c7002cd SHA512 28b4e60a2c753c8be88b248fc85437eead70bc77836a82456656317906d60a95322937af8b98d3f24ec23401dfc6fd42852b21ad73af3d5e27718b4b8149bcf4 WHIRLPOOL 70cf64d0cd325a0245ac8944a18365cbf3957637ed0589c3088fad36e5f891afbedd72bb16d41adb6d89946ac390132de350ab5d73774e72eb29983b7bc538c1
-DIST firefox-43.0-eu.xpi 477495 SHA256 09117eade214d245c30f1aeff87e8f7152e0cb7b282049da8c30509c3e81ebcd SHA512 2eab6b700306f3644ffee09e536ec64b7a50eeb6bd733da4826f8009daa8b50c03a7cc68c56d5c1884d23598b5babe1e5b943e5bb3d93c8924a97a58903bf6b3 WHIRLPOOL 0daf336ffcd746d045bcb4c091da33678801220ac30aa9bca423903bb4de10bc75aa4869843dfce4317445ec9e572e6082a1f5edf366e1380ab437dd3fe3f259
-DIST firefox-43.0-fa.xpi 529696 SHA256 da4df284787b71339f31a1741aa8176f33833e09749400482eb7bf0a28c0f575 SHA512 1edb8b1c15264ca0fd4c6b0a36b653ec243cecc01d4d4058202a246148baaf609fbaa7d65f73802210cacdd14f8af44d2cec5fd5fe92135e964e395f3d97b168 WHIRLPOOL 91df7192437000bca6e3249e011cd870c09a45971b592037864de746d4afee1c09abe1d24553a50be14111da54f153e762ba320bd155882ffa4e5ba12f4d89b6
-DIST firefox-43.0-fi.xpi 454716 SHA256 1f2c6283ad55a5f51fd936df96c5ad12576af5101aebebb59640959657105993 SHA512 f3a16976e21d2d81f75d8acef4b54ba55b123ac8ba8521b5481b37f56d3ae18732a6853d5019ec9a55e4ece9108d474ce11bc94ce864e72ae6c6ac63c3638125 WHIRLPOOL 3ba46cb5afccafe0d5fdfc9423d655ccb371749ee36e7a69dff462cb6e69eeb3334f59dcd575f0f1973b3a8babf3c0fdb07d3421b00c6360ce5a25540c9c1089
-DIST firefox-43.0-fr.xpi 473567 SHA256 0d9bdab9b3e7de4aace3cd887c202d1b5ce94578afeccd27f7abcaa0f29bee8a SHA512 bda04b379d086dbd01241776bb8cd283f84145d4662cb7aa12b3926b96c2fbdf97604c97b0f26c9288e86aace04f766873a1ef3c0dd4c6e3c4b92de5e08a87af WHIRLPOOL 3c2f0d3b30be1014d3f1aca189640cf041dd6116847d59fae00c752ca29823240aeae9ee707c08cb004ca846de39f4ea5090a63a1dc12f3094b2dcf2189628fc
-DIST firefox-43.0-fy-NL.xpi 466643 SHA256 ae5f8a371b5e7af949c10d2a85a84853b7d5a0d4bb0acb1ff0a507fa95627379 SHA512 65f7efd1cfa19ce12f1879b5d026be1a908b5c8f0c53436da209d19cca4a9e9edd1daf3ab12d884b802642a232db1026154e272650bd3b3fe77df62ab83a4951 WHIRLPOOL d123947d2270ca85d96210d7634b22b6b421ada61173c2825d58b7717f9473014f9a932807b55e7e4922a02ee834a62d0004f5e114723eae0967a5485702ae5d
-DIST firefox-43.0-ga-IE.xpi 478965 SHA256 d3a5bd8a179e94e046782b46aec9f9aa3e704b7f5dc1ed0afb29482e749db3aa SHA512 b49c9640e98f7a33714ea4d52bd1f3a97b71a220b5fb61794459cec458ce8ebf53e0748fe8dc2d2034f192272ed476a37e943b2f9f8e1def2c0d0e32f3030458 WHIRLPOOL e3c58b2c73e724f4caca0e0f8169ee04e53a98c74a76f70795c50dc7e364bb6acc121176fa081427aab92e8483e335c9fa1a3e7e07ee41d92ff7ee43fce920e5
-DIST firefox-43.0-gd.xpi 464867 SHA256 6054fe8ad1dc52a9a4e44b9d0a0041d5a1a5e4c44f00e13b51da04bdd9835a24 SHA512 0cfb57f1d0d1f135b8586701e49a296d2b5db1902a78dd2cc2d74e7ff3e5cbcf04a4af931d2a4217b5e4fb2ec513f2e08871d7df698ce2193e1017c33692c031 WHIRLPOOL f9ce372b9c33368c20c65872c1692b7522287a5a3227a4c82ecbe2a6ae1720a703586086ceed76001de6e434f3a2e43a6d887a9b9657239d5cfd079b7536bed8
-DIST firefox-43.0-gl.xpi 454572 SHA256 dc8822ad694c1e1084763e5b8ce87ada3fdf07f91fa6bba39cde3e726ae8afc0 SHA512 7887583d51e6ddc00479791c4ad7961533d2a6c362145d660f2abffd76b58acf3fba112f273da06e11499a5e4bc173844ff4914e9003ec023d93fa6212b27241 WHIRLPOOL 921f36f4756b13be6684c65646e88718673e7d1c261f59d0e028cea60300bd3252e4722322c4f0c2a348215376d8fa556ec8f79b17309908de69bcc3c2024043
-DIST firefox-43.0-gu-IN.xpi 495780 SHA256 30468dd8973c4c048a9f7c696245a2f829b89c2a79dce9047910286e1c625f5e SHA512 6a36dc17bd750d542765e8e8f86443347458e074305c67f57147111cddc8ffdd175ec0af037f6975852b2416de68593622394ba59c8b06d33bfbdb92c294aee6 WHIRLPOOL 3b5cc686b0bb9e0489b3e4e66d9ad926eb3d92feb323ef2d0da7f834f09ff88cf8358f8ad81f61101054c2aae594a098f5ae1c8f69578eaa6ab0c313158112a3
-DIST firefox-43.0-he.xpi 484108 SHA256 f3ce8f23a772b944aee103d74b371cc14c0b78deac152231340d5cad15d0379e SHA512 dd80e0abf9efaff10d71f59af7f79877452592369a0292b579f30ae355bad941db239706a509ced4e4e3fa1667033780c8ce060b6278fa53f33e5905c74fba69 WHIRLPOOL 52ac5cce5ba50bd53cd559e7226eff9df5f15c4b7e4b64aa5f390da0eb9daeb983902483c471045b1b1f144cd3ecfdf0153c60b93d97f3a08f5b83c4dcae7e8d
-DIST firefox-43.0-hi-IN.xpi 519472 SHA256 2b0ec3e6a920e1c266ce7636ae58f405c6846943a96c14fb0798767e6fa72a26 SHA512 bf969e0de595866cb3a68b48f93574b703c2cf210da70cc7bce0dfdf1f9a59b2e1400ece110842a0575a3064eea48946e052b81947a8da9e8c52910e85143ab4 WHIRLPOOL 03d703efd8160d5fd49f5804e5dca7d6b0a1faed30675c67b82394d0b3c1daa5979b37e9de64c415c922c21d516dbfc4b3c02fb92498ce845fb268d30d6f8a50
-DIST firefox-43.0-hr.xpi 489137 SHA256 f6bf0f17b16f182fcc35763c910f66aff492c10992f5a30262d9d902837b3010 SHA512 ad7ce372b38efd0e56ff5332fafa06cf8d41d1ccc0340b8ef3f187906ee6659abf11c76f22b54a79ecb36a29a143a6991bb0c50cb1530f55aaed2e6aa3a14f85 WHIRLPOOL e75026cfd538a83018f861c4d096228db02ea32949d8a7690372d7e692bb562472a56c403a2b16dafd3c36cc964bcbd61e5ef95747e16fefc30bbe714834accb
-DIST firefox-43.0-hu.xpi 464706 SHA256 7e150a90460234e7aec18adc9a22898d038165e72853cfa084b8e94e52b04f97 SHA512 5ebc94baa54bbc506c5791b85bde4d21d0305a2499bf40d3f28c13d9d355f78338a60f089a3fb582bbb0c46aa97824cd60b41a00d2d281017163fe2bcb4528bc WHIRLPOOL 20ca6bbaba1ae796c5cc5935f0e486d390cbd0988478ba06edb91af3e9d137beb38ba0a6172a474a798f22b53c7821025b3d128d685691a3f6bb38e52e987b5c
-DIST firefox-43.0-hy-AM.xpi 548745 SHA256 e8c55c8d35e30ef89101074e475887d62df5e1bd45861b47072e568087b1db98 SHA512 94f98657059ec3e86f65eb4801225c6127791e72ebb943c841b1a0fb06f78f5a3d5f15067cb26f0279b02e71bfffb708f83113111290fff950935c50d3b1730f WHIRLPOOL 09ebabbf0349004021fd896054366b98a7431efd02c3a8cd8024b6810b3d276fe7325509599ff8b46d87aaa153cfa045c24319aedee679e73559c9fbe911eb1a
-DIST firefox-43.0-id.xpi 443808 SHA256 c39dd9abfc83f3bfb07ab981a93ba87ce6ecc5a32d43c3a604d1eeb00270fae1 SHA512 31767fd2d94ff6e80709837b2aacd6a884d57b80c1e3f714c785352cbd71dbdf3bb215fbe34347170eaba39cf79b46c007945915c2fb814bf152275eb60efe71 WHIRLPOOL e57a5c3b9b9ee4714a06509ee0e88acc890c7ea21203ac58982130a3861fb12d8150b48f5051cc3094a8bff1d8fffe0be4898fa138e56d887785f20809f157cb
-DIST firefox-43.0-is.xpi 495903 SHA256 9bd135ae55b859b73d6652b256925aabad6b6a682d5fc25a2c59cdf16fa25602 SHA512 9c36ce12b984f5c958cba82f63e0d0016326836a26d67eb6d6d99c826f6578ede8ba970fbdf1fd4682e3abe1ae9a66841a7edce628a06312b697e5cf6a36dec4 WHIRLPOOL 97628ed4b7b069fa27e242f38db5f525b9b85f394cd2de8255be12dfd113bcb57fdd15e0cc67a6a6f9654b28942544d2cd17c5fcb22ba424fece81a40a09adfb
-DIST firefox-43.0-it.xpi 369328 SHA256 cc6e3904f6f47cc2e9a97e81abcbcaa77d12998875e1b2591ee6ab57c880af78 SHA512 c1436f45e9c03cab9d4549053f0de5d2376376cb00bd2c77a1377efee184adb54a7affb61ebf2d2727a393aac342ed040abac0d9d024e53bbe3f686eeff2fd44 WHIRLPOOL 8344b10cf143e33133d7544142944ef72d8c0d0566f3a77db0b5fea27d1f2937001528a2c2605f31a1511d0ac3f958db8a2890e067281cca6533d0c1f8339257
-DIST firefox-43.0-ja.xpi 491471 SHA256 5813f20c7c3f596554af2eccd33cc07e9e6d20f841dcd7170dd15d5c82c26874 SHA512 808f3126bcb5b1b2274bf2215cbcc101f7627975277ffea2c4b82785f790657482f8ad241d00d0775c933e66b622da936af32717d58375abfde7fbfb358b6223 WHIRLPOOL f90e7861cb97c36b11dcab86ebe22db148f62ea351f7ace911d9580025b06083496ed1444b2f4e6c049fb2ff0e83be3228a6a3c837507616156cbb2952a8eabd
-DIST firefox-43.0-kk.xpi 516824 SHA256 0cda2982d9d0f6bd414af2881fc96515498d10bf5236b1d9eec6c1a913240d0b SHA512 18e57836e712aedf028cbd1d7b5d33eb003f7d6e59dd90129ef50da62b8215d880e28cd50e860220ddefade98c00f3bcab590cf9cdb0006db14ee89fafae93e2 WHIRLPOOL 899a6a4504872a12820962e29cdab14841d488180c1187cfedd9451f103f3d2b788a42dc9a1b8367ffe8c7af5d191628980d56775f550914e39533937b987097
-DIST firefox-43.0-km.xpi 581655 SHA256 884e57663c7b26b1e081ffb256437579356e660f79e832ba38f44acb181fb8b2 SHA512 73c5d4ca2250a72aa45506376876d27d1152ea78cde4bc8ed4b6de8f7b75849c99e1f0cd70db214c09af9e146179be2c73c29ab4aa0e9b02924b29ef562e4c15 WHIRLPOOL 4da6fd2d263560aea79bb79aa5d1dcc661817e0766bc2eaedb45d5026638d8293948c0531916a1b94e4d4827290b7c63250ca7f4751883586135f431efb26e83
-DIST firefox-43.0-kn.xpi 548584 SHA256 4b7d44f69494731c58b1a7662c1449a4074b26af4065c7dd1760ea30c70ea136 SHA512 c4b041b2897ce3ad0299c6871aa925c795d8df3fa4a54817b5137a390542e14c802fae15e7d46c2eb8667b6857a71a49697b0b0f29df3c81fe9e3527c710713d WHIRLPOOL ca63d17d6eb29310022f0c41e85eb2633d81cbd8cd96f2254a0305f05140132d7d52b4b40790e135c939dc21d5742026a0e409106dd841e5c79807c102118255
-DIST firefox-43.0-ko.xpi 477481 SHA256 30eef1e9ccf6424d2c9f5721599dd4ac0791195b5cdc5f781454cd14811a919c SHA512 6c443214596c764644ac8be520e411093f6a1fec3b4d37dd9fa8d79bbb5c878a805f70293ead1c6daefed0ac4e8d588f99d131b249e9fd57a5c09ab9e6231ae2 WHIRLPOOL 5620b7625849c07ddcd505cceb0b85e30dbc550732c5d261744142605a37c29e7c56e1f7a23f222186fe6fb2ba930f03ed5fde3e2afeb60915242a990b18dee4
-DIST firefox-43.0-lt.xpi 498171 SHA256 476d124015e140254dbf3dc8eed5ab4e13c754d5e3642698c3af42f4d027a0ec SHA512 b37a4c282b98a4bbae962d8b5c658b5bbbfc9fc14e094084357ece6cd3d1782aa77771ac8b81dc452e4d0ef795bb70037cb699677707cb4b522a16a4a4169742 WHIRLPOOL 251324466880940519325f3f905170e2a219fb1c18c6a59ba5a39f3cb7abd09367f74f8fa0918de3abcf399721cf186df7499013e09be57fbf2acdf88cca9ec7
-DIST firefox-43.0-lv.xpi 478095 SHA256 772e85d5d01934cd8dd3ab5a56fddcddb2167f47fb7e6f5b4bacb617979a0ec6 SHA512 22829c87729e38c43af515acf733c07dd51da31e63891653d5e03bb1c77b548e82ba29b109bdf6e5d98790826fc4324a4269f5cf3adf935f05ac1e3e9ef76e85 WHIRLPOOL 60469678fb0b980851856adb8c7c500d8c4f115bb961e7ed08371ed42efdf53cb8875ff4fb476740e2d3b2cfce63cc0c444a84f0b6827bee85728540bd6a18ab
-DIST firefox-43.0-mai.xpi 527785 SHA256 935891c42c61580d95a9b6f858a46ac2d69edea0fa3a7845cb11c4729eb5e344 SHA512 7905380ff6eaae895f971a2a6ca943bb002c0a696ba4fd8829a3267404aadb9f45d653e4c8df04a64cbcb9006bb0cf67630d2bb727c14f0d6274de29469a0daf WHIRLPOOL 408d30869a01f46adf9cd347548590a8527729fb5683c7d482be05b6fcdfe781922391051247b076a7c68683b04ce1555d32bfb5371eef0c84d11af4b0ad2bb1
-DIST firefox-43.0-mk.xpi 537950 SHA256 aacd0b020ed882083879d37cb050b6f155fba47359ca03122230c6a5189c4611 SHA512 4ec972bdff91d0bee7fa110d1773c33d204ba49da65685c16c4a09b311272c0834cb8df07fdb64e0247461b69d28ca37a9b675939ea9af71062541b987893741 WHIRLPOOL a84e206f13089d3bc3915ddaf3d8479153b8b7887427428423495d0ae85137bff4e576c88f43c9e7881126f88c92322915ab21c066f82ade1c5b316d9c171efc
-DIST firefox-43.0-ml.xpi 537547 SHA256 a277d1faf91d189f19eaa01d5ffb07dbbd36dcddb5d42b3ef6e4f143a98e068c SHA512 29a25822725bd4f655ff23b12290ee6cc729a6b68dbb1f29b4863d42d74fd8f559007fb5a0ba6d4f20d015b439da1ce6c282e3eb5348ce30116add743ac25c39 WHIRLPOOL 8b0eeb9852dcc3f805638772d3928a16a74ce267a039567deaab92e07fce40a15fcf6ebdb32e11cb5d2f535a6bc3a8c4b38befd7b6027ff3fa8ef6618773183d
-DIST firefox-43.0-mr.xpi 527026 SHA256 18698ac9fb2b4f606a22e883ca7765482d2408f77fe2466c271696f72c49e3da SHA512 1712ae876936b0de2104cdba4c59476911ff4f4ca8d379fae3e96b22d3c10206977858c01d2c5ab475b0745cf3de8bd46cfefc883e1cb0e1ad09c0304c640644 WHIRLPOOL d96fc9814a57702780b69b3769bc0ae45f8038273700673129705a6724c9710eae0838e5efcd8897698dfbbcb73f92005fc3df45706b71f7243cc21675c604de
-DIST firefox-43.0-nb-NO.xpi 456064 SHA256 66b9b339aa4b4d28773745f89db1d1ace9e4fabe49c59ac9430a6bdccf6be866 SHA512 78cc98dd88cfe148a47f09f84ff791b05c5eee298c392bfe6b939d21357ff78bc5eaafef061f8a6a2ebd5276a5fe6be09f10a70db233926a9e7f8f6d2ed4833d WHIRLPOOL 82f3fcb5d793eefc8444d7d0d70d4439091cf0eef67b31298a518e13226238dc15e195f81c07b0006cfcfd9ac45359568a397e7d3bd568624ebf57096962813c
-DIST firefox-43.0-nl.xpi 454466 SHA256 8ac68a97e0aebdf63dd6691a279af5f5c107c7a497974866966fb060ba19281a SHA512 f4599043089401df12f8ecd841e92810c95317e08dc26ba78b304d17e0a5c0ca071db83ad75504c317ca132cdbdd7b37ab22a6ecfa537239b4bcb10f06cd41e8 WHIRLPOOL 6c54d65fcf002719c348b4ead36d7020ab137fb809aaa6f0f8d2b16639282e16f1823962948016062b627912d82c9a8cc673d783d4d7da7ae476e9ccd93f3a8d
-DIST firefox-43.0-nn-NO.xpi 450232 SHA256 6766906de580f7de713c5a46c91782251075c736ebfbea4a2c0ec54dbe4a06e4 SHA512 8007c9ec91793716dbb183bdbbd5d074c5e4f142f062fcc217245ddd2fc530513980e5d97bca86dcc5d52ab93ccf6f17bed3fe563ed03baaedc63c7e46a5e3ff WHIRLPOOL af7eb9c66e8c2f880e1d70f20dd32468411a33a4755c84f064ba252c77a111c29cb68121dd4c20ef806801df783b0966f0d13b63522f00b68d0e2929b6cf1182
-DIST firefox-43.0-or.xpi 536910 SHA256 b3f76ca55ac07a60a81dee0988ac99275d973c34636a5295a5a1b61227cdacc7 SHA512 4710154668816bd7b05fd678199cdd1d0d58c0e4db3c84caf39239f1a5d08fcf96a53c7099452af809b9563e2d5e48de916d1e61767241e935336c5ad92652c3 WHIRLPOOL 5eb2b658a2c5a03277c5f15e694d1d8a62ed7ab992e28283dc2cf6c09720298b61640e847eaad38a0925267c7d9656ec46e0b08de878f8026a9581b71c275edc
-DIST firefox-43.0-pa-IN.xpi 511158 SHA256 366a751f0c541549808e4f758e3d89429ed9dc1ca87948cacbc1ecd45547238d SHA512 ce512a642e9681118776e6cbc1d3bbeb884a53acdbc32606657685827e2b9fc8ea287d33562febb8cae877e8ac09e326938422a7109599829300857a04e3d400 WHIRLPOOL d09bad42d028d9267dff4569e081abaee570368ed716032d8bbb35780b979cd099799d9b45397fc7746a367be1eab2cf28e8592497ec9080212d2484ba9dea57
-DIST firefox-43.0-pl.xpi 404459 SHA256 70421961674fde783e70065664025b16398f2647e749c8fc9e8d15105c4c8560 SHA512 17728603bb62a7dbe413f1a126c0e82881be472d00c88be1dc5201d6728365f904c840387a0937265143e4823d1a73569cdec643d8a6ac04e7400390c27100c9 WHIRLPOOL 8fd16a95dde9aad7628ff039600531e84b612a10ad49bf670f0673144ba88e89e74b1b3e2435177da1b11a5bda8e716957a44e0c0b6bcc574d980420ceb71d95
-DIST firefox-43.0-pt-BR.xpi 473005 SHA256 390cae963b46fb20ce1eca25e55461559ff34f17f8cc2cd4933e81311c868e81 SHA512 d14d447b24a8114670a7f6159d648dcc563faed4b31a2d516ee1794c7cc9682f61deeef3c549ce4e04c0cb9f64e7f9b2ffdfb85ee91f5d92c2560245d7cf4c04 WHIRLPOOL fd2f6cafbd5e6894476b2936d1a680aee0fc31fbd39f69b405a376fe19c442cacd4e954291ced998eb6116519e3664e7f93b5d96edea7189fa5737c0045b9400
-DIST firefox-43.0-pt-PT.xpi 451857 SHA256 fc5f47bfb04fa48f8c69f5e2bf85dd7fb1f58f87a3fe6c2130df947cf4587e50 SHA512 cf47aee9052d8a61d5b5f2a2cc896e52cdfebf232ee158606720395db65c0cb05588210e4f72bc378c12cd4f5b517021f656637c261d3a4151a5e0466bee42a8 WHIRLPOOL 0f73ddf480264416eb0732b40bb187e8892f1ac339f787f54034ebe0ed454a01eac055bbbaf229f976812ce163f86cd4a7fa77d2202411aa71a46354b53547ff
-DIST firefox-43.0-rm.xpi 457313 SHA256 4196a0cf866253eb914723c4d5257411faf80f8abe38bdb659960e6dc5be2f29 SHA512 f04b489bd1d2318bcee3536a6043523ad17ba39f5a7438505035042dfd5e9ec133e7cd8389ae62f9f1c340bf8afbf27dca9e4c0548474c8c9acde61454ae4a39 WHIRLPOOL 83e5992702be7c4ec7aa69b8a6f82f0048be404a3aabb20eb4be580db19929afea07d438ef2db5d55e15806acdfd5af0f3e9617e8f1dee5345f1ad61bd09d3d1
-DIST firefox-43.0-ro.xpi 505832 SHA256 1d67763e94d33f2d4ed08b59a0582340f12153448f1dbcf4da8ce6ce2ebdc2a9 SHA512 fd6b27cdab709dc595a8380b061e1552106436c6ee245bada76e64dbf26c8841d2105243188171ce56458a5554ab6c8327c81327ca628ecb64f0269a0230626f WHIRLPOOL 212eeaa123cddabeeb089591c3e3c53ccf3e71bb305f4fbebb7ee8fdc4fb49d7ea31a728a8866929b18df9c54e18073a9550b9aa94b91493b2f41b0854cc6b23
-DIST firefox-43.0-ru.xpi 417904 SHA256 9cd929152d325f703607d50faaf771ab2f424f87bc19e4af2c9a75615194e366 SHA512 cc74b74efa325f5e6fcc7cc20e7d2696452ebcbc367754a404d4c056b4d8ed7813e8967fc18af9a885a6674807e1abc57c91f93371d180098f293c939564ec3a WHIRLPOOL a15f1aca59df28a38f44eb157fc51a13b5782900279fb0224d396352fc6e494e46bbe8e40aa846cefe8d27605dfa9c7b495d8c3b5d388a22ba5d7b3323df2918
-DIST firefox-43.0-si.xpi 548391 SHA256 bdbdb92280d46784bed8c7c706f501f19630647177f7ad2e2d11f38d3dd84029 SHA512 a8e3b9e37db4e46435cd490da545fb95d5bf7a1e891d5712f9d2ad97c7e770c00f1a9d7e0a50f927d56e502bb666a846d78dca242278f4af03235921c03c746a WHIRLPOOL 2018c9641d91adfe2fafad89f848df772264a827329a87a9a524f3d99d77017867918962dec5ad1cc79c588a4ff9532c341aec6b5ed3d3b51e13c51ee76cc5e8
-DIST firefox-43.0-sk.xpi 480518 SHA256 272b4f17c16e947c86fb92823bde2fb9fdd23ca76f9cd9e6b749afbff63a4827 SHA512 c6e55d982447bd395e9f4ee8d8f180ead9a8bf8d4aa3ab0cc5964da1bf4048e4ba99c8c119a26c736f9793e13047796c9af159e6c19a7d3a7d8686d6e03b5422 WHIRLPOOL 7cfd701eeb22611e5e53fe2f55f6013068ceb563f03ac31529b6a83701a035b80b344c7a274c127c9e802463965fe8e18cc39db9fe1575b940dbe49dc7b4a77b
-DIST firefox-43.0-sl.xpi 453337 SHA256 4e65ab619fa3c7dcbe96c8e045753fbf888cd8f8b43620aaf2dee721fd62ec85 SHA512 493006bded1898d06424ae8ad7b3c888e46fa506c4d9122bb14da9d7ed2b7fd3624ea1958111beacb8c5ea5891b3f73942a1bcd4dfc34459751bed03ef2a9540 WHIRLPOOL e6f3a92b7830f5d95435e7fe3b1dc7c3ab07cc8d91a2dd1bbca8169eafe14bb5928bfa863de802cad1c5f20f780119a0f833ea3d51e55312d46adf1042059398
-DIST firefox-43.0-son.xpi 462150 SHA256 7a5bd49bce76fb5345ff9a1272bcb980ebea19c7c44b5112dfdfca43bd7a7763 SHA512 10e74d588f325061af1c5542247145b4684f2167577ae10116ebfddfb7caa7f1c3cf5de69721a9eee36ed4fc5efe6e887ac4161fac4e8e0e73c1457ab741ac34 WHIRLPOOL 3bfd63f0f832e36a73eb46d8b8c3b811181ebd2abc049891fc4afc8e9f00a2e6130878f4713dbff8e5cc4ae21e551d56de4769b1628df11a72363323eed4b8d0
-DIST firefox-43.0-sq.xpi 497505 SHA256 544adce6795116edb9afa90affa7257784ee8fc48466291ab1dadfc6fa24dfb8 SHA512 788fe39d3c3f8863c552ecf12c53aa054573f7bd390d901587d0bac0a68b2c55baf46622b4b2b1b9c9a7cbba13ae7f8bc0f2b3dfd10fd6beefb0b42f22c2a92f WHIRLPOOL fc53a6212c77e60e25563e956969a1e1634292e5c7f2527d9105d5548e94558266bc32cae85c2c2e207e3fdf387fd8367841b40933cc61208d2400702d9616c2
-DIST firefox-43.0-sr.xpi 489348 SHA256 f36b0b495d0ddbd513a0e766176d9277c27fa4d75bdc03beb3b5528e67145872 SHA512 ea5edbdd586c504a80bc165350d7399641c71f8bf48ecbe3112dc1e4e774c629d48b7a97c40f43a427edd338752ac2e959f92d448b27056abf19ad95ca3c334a WHIRLPOOL 0d038ba0df1286f5d3e64efe36346010be625f95af2be2e8845164f0f1f0f2df0a9426eb8cb6eac0c4d4d39b264acb4e20bf028d5c9bcfd9437563e5611d5728
-DIST firefox-43.0-sv-SE.xpi 463026 SHA256 ce72df8bbc670b9c1919bf03d8f28a884ddff5852cbe15aec4f18efb800e7880 SHA512 a79f2ebb17389fc13097574d208e2025ba393d08ecb594deba92db62954227e83711bcfa72929ea44c56652f81e2cad87f94cf88d8e8547189a5fe31ea1e188b WHIRLPOOL e77196f0491660f03d3aaff792046480443245c0759169f9fb7aada642d143929579f6b5907f2d672a82eb0265e62426857c1383a45f0af7e25c393a2f74684e
-DIST firefox-43.0-ta.xpi 519588 SHA256 17610620319a3b5130e461bef650bd57e36b23193e8f3967630b082d76bf4013 SHA512 7ebfa17bbe2162f6f6681fbda6a41db3443b5c3a931ce1a6fe6fad6a9f741ad49e2084dda9551bf06283b13ef473b909b213a76f3be0357c72afadf0ec9af84e WHIRLPOOL dd215ad96901539e7430df727789d1377d15b5a16db6d817f0e7fe06f4387fd81da51cf0cd6bf80b709bb4fdb22f859848672b987140b397025b92f1b0b827db
-DIST firefox-43.0-te.xpi 537275 SHA256 dbae929748c411806220f676df7588e653594cb7ad451fa4bfbb265513aac204 SHA512 d39f3fff81bd2cb357cea9eab1cae203929a9b3196ef1ff8aa1d95a3562a3e45ab1a58382d7ec2865e69f77cd18079516e9b689928e1c0586fae21aca8d62156 WHIRLPOOL 8602a40eab1a0bf68c86209931fb9cc77a697d3bace33bb865a52dd06a880cfe3f8cba1b482303c09bd42cfd1e2b983be9802e14baa4c4f1c3013e55b2bb58cd
-DIST firefox-43.0-th.xpi 546507 SHA256 a251f642989c8e00dadb204767713e33a9e24f025d65218ae4cb9315ce240ac9 SHA512 ea41b9f2d113f643d5f0c00dc5ea530f284400d35f59dc7d998a9749bc71a38eb57be9d7112ec9fc2985a96e129f528c6ba4049be850c317bbdf505fd5a73062 WHIRLPOOL c4eaf342c4ed3b3bcfa968b0ac8814481582587ca216638b6fc970bf59117873c4c8e095044fa0c3dd8dd42829a8ca388fee7f263f701d645b7cdc691c09d61d
-DIST firefox-43.0-tr.xpi 492359 SHA256 d2248600b77bc5d38497c6590de89b94ae581b1734742fd7aa65d6827c7febbd SHA512 0379f705d070bf1961b04c93c10af781f43f3f5a574cede24f86966ac64ef2938e9b51997337ee6f64584606b02d3a994c184c90457a206ecf49e49c3f237616 WHIRLPOOL 60cca6a26251daf9d5db836a5f996dc4fd5eea916dac80a9a111751fbfe124b4816920b42b5be45aaeb645488021a578378dd6617d56864e87d345bd45c675b0
-DIST firefox-43.0-uk.xpi 508884 SHA256 b1d273ae648baa73e8f6bbdfe56242c89cbdc0e5b6c4fa83fc2850013c28f4a5 SHA512 44a935139d53f823a1d2ed4913d3230ef14c534ea5436fbe4997e620a9bffc42729ea73589af2bc1bb9adc931db5a0159d50c2b95bed23b14f9f8e4f4ee946f1 WHIRLPOOL e699dbc49169d9dab1c4ef5526cf8ad09e2043e6b58b5b5fe643ad167ad52cc234976d327c32ddcd639d7205df372c0c7798eaa285cffebd99d4c9a086be4a5f
-DIST firefox-43.0-vi.xpi 476612 SHA256 a92dd9fb9c66e40c86df450c3fe856e679d50905ce9126016f31afde18e74f06 SHA512 b20d46e3eb9351ba9b36a605a56eec6dda6c2f1281c4af8ba723a96fa8abed1db5c42dc8a25235f6a3e5869f2f2bfe915bd9009d1f08a55ea0ce5f92cc4c0bfa WHIRLPOOL 8c0e5f460d0079917d5746050bb804f16974199029f2940d49dc55198dbb41b6470ade15be2546975496672502cf87b1ff114891230bbbddcd89bbd471fec560
-DIST firefox-43.0-xh.xpi 458719 SHA256 f48562863c31cd8ec05cb0e79323fbd4b0c8426e75a387872e0e9f4a8483fe08 SHA512 ec79cccbba9c27e4c6ded11c45d7e3d81a058de217401c6a9f1862ae7072cc19329046cd59940638706ca159c2afae0e4ed061bbdef79230f54d60ab67b79684 WHIRLPOOL f0ffcb30152f77a90743aa58e1fef8cecf433fa0982eb9c8ed0300f2c33f7672e6fc0f2a001b874a6dbefbd0c1e48a1627900dd3f9ef28212c464bd5cc7cc135
-DIST firefox-43.0-zh-CN.xpi 493639 SHA256 73c74a35f7862f6e583d2fd9edb6fcd3e565c564977897896761e2ba153e1b54 SHA512 1298691174e95bd79dfa24602dec4d7cb5228e9544bdf404215ac4bbee1de7230b6c9989cf8305956d23136c10470a0779233124b3f3b5ffc695230bf43301d0 WHIRLPOOL a6674405f7ec161391b7876d8f1168db2719d653411dfdd17c2373560dee243914565343c3d3d48587b7b4d07dd3edc9443385a2d5fe78e2b454961c068f6e60
-DIST firefox-43.0-zh-TW.xpi 485317 SHA256 488fb84380b3729e2c78c2bb5c9d4046988f4c457727ac19c9458f92f1fe72fb SHA512 e5a32805e3e68b54b3ebe19f5b1dc9a606df232cdc7df301a57d6ba39ab6d69347c27480c2162e30cbdcf1601364c47f3811398751ab4f63f94763772212bbbd WHIRLPOOL 2273baf3e84b7f390a9c121a125902dcf1d625ebf4b96451f78642f16dd2e62b5abf4cda70a66daaec25d68e15e5bc1cd0cb460cde26f18c17008febf6198396
-DIST firefox-43.0.source.tar.xz 175414296 SHA256 a5b16741dcce9344ca71e39e0efb0e7e1336ca5160cb9b6b12f8985f402d8fea SHA512 3ca37428d1b02ba2609ec526e86ab96563b403a03efde8439cbb4acdb282b5970ccb6a14266483c839389d59e07f6b0297314890ee04a669ba2d4b10bc4cb738 WHIRLPOOL 14d8d90452bf6d0e3965f0c8050d0dd4771f1a00a6cc68f6ae9e26334e5a2c5cad9fae92d51f0f677b07aea3120e75686655cbd5c6bcf7f0b5f84d9a1ca4553f
-DIST firefox-44.0-af.xpi 496123 SHA256 2d03ae5387a0b211fcae044caa7b7b84d12125abf9d21847a870f5a1f14793c7 SHA512 61d2af5dea407cb17fe6e7d8f528384ccda6356c04b89549d7ab005e5c5edca3798d40b6e51ed5da15665e5407b99096fd9cc4451ab459b5c7f51818612ef032 WHIRLPOOL 3fba0a3e3f4a848374dc81331d757bc532095cda607461afc6376cc70c3391c5d8bd0c0b9bfbd43eeb9ffef0a3dcda96cb31353b7593eefdea3f95a9708cf197
-DIST firefox-44.0-ar.xpi 531969 SHA256 08bf3646f53498eea083345ee80f656f66460ae7e9efbf7561101cf863ffd3e5 SHA512 dedaf867d02beae5896747b8e7b1c56e663d2c04da6ab22fbb9895209276104e96ef22a96153b803f56a1dd99e1bf5f4855d0373240011d9ed6f920d7d642f93 WHIRLPOOL 35adf1b23a95c1159b7e5e95574d636d4741f9d1b901733a9122db54d44732e4068cf87230af4fe336b49012ebf48a3deefdc3a64ac0623b5d6a295a265d6e19
-DIST firefox-44.0-as.xpi 522458 SHA256 54027a9d7b52c368adf77ef4746ec00f47e4a85e4ab579138a7fd686f07f892c SHA512 71611d24290486d0343856923d1c5f33a0711beae0b49da9c25c252b8586969cad3b5679bcd66821d7961472774fad439b8ba4bb5901bf2dfdbe0da1d9c3514d WHIRLPOOL e6b371cdb523310a58f6d931c0b484f3116586d63be458267b5e5dd713b7c6a16e27863b461842ae82ec8c2fd40d249eb55589d8be082fb04e2cb1c4bac3ad93
-DIST firefox-44.0-ast.xpi 420007 SHA256 be2a177e24b39b936337c778a7e94a95a96b7deb9ab47c98a9ac52351095122e SHA512 d8a3876dec85ebcf1e8b0f1d0f9b260fe39b2732b70b5b589aea63f866b38134e324a72750e2ea4a3875da7022201b32ab770f962ac3442800c62f796c6afe73 WHIRLPOOL d3d5bf2a831dc26a8b54c4e68104addd0b513ff68a79bf9d65a8c9ad7e20d814f9194fd8993b700c6cb00f551d986a9374e7ed9ab24c6105c012bfe3c9696ee4
-DIST firefox-44.0-be.xpi 464850 SHA256 7835f62ed47c44a181485f6d3475ca24d0d9717535386c892294d73fb15e798b SHA512 dcffa9664f8c37f82ac0a8b38eebcaf0a0ef1770d613f6f6aebaf371b2195949ea720e5335b0bbb2fc6c9906b897abcefd51db3e38cc45b62d90bd0ceac54c52 WHIRLPOOL 86649456ed0d5408de0c84eed6c6bb810d43a884f3be07e2dcad6c3e4b48146349434fb1634037504e826164c3e1b2cdd6a8391672d7938fbee895d2d2d9036f
-DIST firefox-44.0-bg.xpi 505504 SHA256 b1d04beea09b5b7b8fb3d95eb6e4be61ee8f05d17a12bf8ef9cb10a478c57e55 SHA512 7bdf7ef915b2df48cf84d335adccef65077a0e8fec921801bfeb426a692d5b9b73775fda885dc6d5a69ab1df46388515a4ec0e840fd6ddfd334402adc9c1d5f4 WHIRLPOOL 90a10bdb1ab2fa3635775ac8a7c7f262a7acebc3d04cdc5b5e2eb5396a391893a30a8217dbf8e2d23fda22919d98122c6363dd2012e2b5cde7781f21a375f070
-DIST firefox-44.0-bn-BD.xpi 550930 SHA256 39fb97e5782bbe7874cbb5be6a13273c4a82e78613d84e8dfe914f1debd0d865 SHA512 6be2108569b8c2f1aab587bb4002f1b5eddf154596b87909e29f956ed332827edb597af84e238ec221f0db788840d14811503d717ee956d7c981df72432b1d1d WHIRLPOOL 07dda8fb0443226a71fb65fc1d1bfbf9d9b4a5e417f8166b303580793cae9b6e42d9bb2b79bcf789c9ce2fd8547088a95ed3e6b2d4a22400dfc153637bac154b
-DIST firefox-44.0-bn-IN.xpi 542124 SHA256 56edcd91ad997d1833b4f21c47a64f54d89aba9f2a5d1766e61aecd84068e406 SHA512 fd301c79c498732bbae83611e41c3a8aa7d386fd44a39cc334a2505d81e0e3ab58f3e4bb539e7799e207329939344c9adb9b55c8a53fcad483f1a80818420127 WHIRLPOOL dcfd4e799ed56a5ca425154f186f6201cdfaaf7a1d8c2b119322c21e149cc96082705bd53bb2e72f2f43759ce1c0a7d7f53968dd96fb63b0306e7ae831d69883
-DIST firefox-44.0-br.xpi 454294 SHA256 2e2be17058da67aa6bec21809009b8e567b2da25f759778d198bb4b8088cff2d SHA512 9737f9bf3a338ce79765aeb1eecf94c79c8c2abb3e74cc8441512c676b0053d2c276953d987463ac8b1e5787170dfdb126882d5f352b8699b43f4f753566eec2 WHIRLPOOL 6f1e3c0a44b446dd40964aefe391a128de90ad7760d9bf6f7ea6037abb68fae21f24e1601da11ddbc08f4267b7c12e15daa1071f636a2a22d2d9970d92b06a4e
-DIST firefox-44.0-bs.xpi 493433 SHA256 4b951439085404024da6b343fd8967de4e8d814b5800317691bb11090d328fbb SHA512 77a2279862f31e4bfe2d328f4e131e5f9de0e68a9a3cf487330b99dcdbdb537444d2b07ed620c8f53e47ccf0f8f26d59a1b48630b21254f72133b53f9cb37d85 WHIRLPOOL af967a5669606b6db1943164cfed46738067a531dd2461deb379df8d88f38e6e0dd5b41bf35fdf791967e5039743ca90d7f15378b8d4607f4ddbe5fc41073035
-DIST firefox-44.0-ca.xpi 471462 SHA256 3704064c35a93c6ea199bee735c88ad1f8d160a8f46cd38516c226c801f6827e SHA512 ff89fbf9763179663930dd78539e1b40de9c97721be6e062572dbfec0c374cc7f5ee15241fa3229b20c83711248c4867159271c0f7b5d0c1100fd5b0b71f4a42 WHIRLPOOL 91019737301c47cbea7cea5ff81dd3df38aa2ec8fdbad6d2a03f07869e66dead2bfb6f2cf50a15eb2fb7c6c46d80771adceaa688e277339b1adddb420a5dbae8
-DIST firefox-44.0-cs.xpi 460606 SHA256 fb7c59ad096337f9ed3394ea1bc0c0156349ec03910c506e708ec254789588a3 SHA512 526babf4c84ce11039ced17ad5e19d4a19a419d9b7e2f80dd358a5d2f531dc9856f52ca1adda0cb97d9557f83f4b3cdf863e4fac2231ad3f4ab34740a7d3a9aa WHIRLPOOL 3b531743566bebf0b5fea6eca9aa3203822398f01b0a5d791e4188eec90d990c266bc175d1ab07e4ba83bee51f4ac3b829d5c317881500000656bd7ae7fc2feb
-DIST firefox-44.0-cy.xpi 456837 SHA256 e279f26bea220eeafb4f8b76b31ee782e991347e45d07c099dd06000d38d490a SHA512 56fddaa571b381f426f4fd73186925a8ba9f92750d5f92ef122c21788dd56e7d4028bb21b9afa6da74d1498bf299bfbbbaeb36a18cb071eceb9dc62f99ae9cf2 WHIRLPOOL dd13ad1c08c276c0d4ab360ee239f27a92d7887f5719c7eb903f3a94caaae9fe6771178d28837b1b58d8e7ca965eb59f98cf00927e81ae04a2c748e08214ebb5
-DIST firefox-44.0-da.xpi 463397 SHA256 3797f85f4eb97b9cd86f8af3563cbebcc0e87e95558840689f4ad69c185e43ed SHA512 b9e8cbf4de5463fcb442e0e8004e1312764649b5e878aff5f2a0185231767b948de6a82d6860d25844d687cf0926f0d76df0f205f7021053c233b4abae8a7c9a WHIRLPOOL 3d4f9f85592b6a1caa5a008480d45be32bb7ad6cf7681281b966f7ed8ac6d69c3e82199f43519f1a114c5db20ccf78616c83a3c944c4bd21c433ebdda6ced8c1
-DIST firefox-44.0-de.xpi 466176 SHA256 42bd312feb841f8cecf06eb85f9f588ff0f2f0bc7990e1949594c3a0adbe94b5 SHA512 087b7e728d3f6772e8e5161300f5032d5b0a877ccaaa684594b1a3cbd1937224f9aef892eebbed6ab104575929fcbd49f2c0ddc0056c001928f228696ea51915 WHIRLPOOL fa8fe44d7d9f718c3d051cef0858611c2006c313658fda3b2a80f4a17636a29696b639a51654fb09d665a190855ee3893b6067720020a76795a032eea41b84a8
-DIST firefox-44.0-el.xpi 511154 SHA256 edf04fb40f0436553c7535a7d908938e66b3c8a3e7def79b86b615c66572299e SHA512 58e8a7f38d376e8764af9b564c77e388bf2cbcf8b333b63e6a99a01b64788626005c97cc4cff1eebff7a0414c4a264c51562aa02ac2e6e9d98d855b00f349807 WHIRLPOOL 33739b7b5d4fe527724d039b742efb10d1193aa904281e99ff4a0b805caa47105433d171a30c897978102504e2c9b03dc12e592c1d8f7bd729becb0cdc4d8770
-DIST firefox-44.0-en-GB.xpi 452629 SHA256 5e134e1da80c612c48565a95b67f7b1950c8fd620ea16a530fb794119d9fda08 SHA512 ad456ee1acb57ba7943fe585512d501e82cf27946869f5535e3aa5078567356fcc3b99ab609b6beb0f2d5e29fce6e903fa970d33601b1b1d2a3b4a1b43b03dfb WHIRLPOOL cfe6b9b1afedfc728a2ffcaf1084c76fbde5a6df9a0beb8e57860c33884781fa09a5c64e73f4f007e7d997b026da20eb1a2e89da63636825194e8f1489fc3ee8
-DIST firefox-44.0-en-ZA.xpi 457278 SHA256 4fb855a2b9c0b46dab41f59023198a900828336fff0f3c28975882df1994cc70 SHA512 74cf1e78d90fc498eedfe15db5212cf311784fca30373525ea193d1050f05f764e657b6c6b0bf988da3c9f92863c081e97d9ecf697af0e127c19896910694a59 WHIRLPOOL d9bc0197117ff76cc93ac60829c9df3f6be99fd3da7777e496440856d3ef04108da516ffeb70e4e211c1f4796a29b241eed044c28ace6c395d14cc6f04af2937
-DIST firefox-44.0-eo.xpi 496609 SHA256 7ef64557067b7ee834bfc1c1e111c8e6682f6d766059631a0bd8fc627656da33 SHA512 3030a71b05667bcb4308100c74057fc1ae4b41b8df25ad433686d0fc48ffe70c6e1595451c65b88e93b0e4c25761bf1a7c5aed4d0f7e803bc23e05ec5c17da70 WHIRLPOOL 4f9e3c59673af09f6df2270dca427e14f90a4a3c417816cb5e2fcadb03ed352efbb446e9c80c120890a90ab6e4e5e7e3b9fa30183df516069acd619e26c5e78d
-DIST firefox-44.0-es-AR.xpi 465210 SHA256 c678d0fa10e55843deb9198d09719e686c0bbf3a5db7b49f2703bd5066574303 SHA512 8a0b9bbad8300b6c1f931e5e492ae47314844c9616f97996a0814a553e4c09c82852ccd014d37f43724873cc8ad2cfbdf097c770acd84d51923fc1d236a1226a WHIRLPOOL 837a3d26007b7bba302bba872ebf9583029ce2648ac9e454d5b2546d9e57aaf8d559d69f040e5956ab3e24ee42cdb48b7525f2617a6d7c6c4ad52eccc7da82eb
-DIST firefox-44.0-es-CL.xpi 389731 SHA256 1deeedf1776bf46505ca883a57ff96f555abc26bb07073aa8a1f8e1d2d53082b SHA512 bdf0d07ba30090a5ba44d0246b8d2e195ef942572c1ed5a18eadbcda656556787eb77a5d2abcffa5a182d9e46bbfdc30b700b9c4c4b241d63095d1a8838f120a WHIRLPOOL 063dd080102073f2948f5b60bc6ec5b439530c1fe88967b2a2eb99d54b05a75c576ee28d5e45640924923c8f082942f2a8617be9bf20508e56cc95dd76488e0d
-DIST firefox-44.0-es-ES.xpi 378684 SHA256 dc91671b42a0781fb6a7c28b416aa06780aa4ad1256f55539f465532995f440a SHA512 f620aa2d4fd8f213cf8e11ca2428f8f45662e58228f305287040ac8d285bef1d24ff071c86d819f61d77b1c79a0430b2948c1118d8e43a458bb032e10733e25f WHIRLPOOL a032e49fae546c80d4c92304cff2a7ddb0809263d2c662fb2b9b76747cbd9cb44ffe37748769983aa7cf33afad7c480305109544df10c909c966a6755e7d058a
-DIST firefox-44.0-es-MX.xpi 470416 SHA256 b126dc3f0319058bb75976ade6da3c6e15a083dfec5a60a3fcef8eecfa921886 SHA512 6842f4b1dd74a22e81b34f7385ab4ab0880eac23c5c607c9418e084645413e006edf61fefa521fd663edaaba58b5db6e4fa9e9d0fe46135a0737a9f594a644a2 WHIRLPOOL fe8896745202bfb56677ebb6024599c474c6bccac197e3c336aa519c28728c60e1deb3758c2f3d2255fe33d02d1c18e7ead48a236d98152d5a85d47181aef575
-DIST firefox-44.0-et.xpi 461957 SHA256 8b061583eddaec7dc178d221584d852af9622bcd6be1e409ae7298050593d81c SHA512 8237ce54d221b5a34d231d3142de7343cde8fcc343fae8b3c914403e255d6032ad9845854fabc43ca93e73625cfa2f47b4545b9165e3a526511540532fb96e36 WHIRLPOOL 31a046eb7f8dcd985622c3744bb8ffdd458e53d97fe71e5ee7a87e0aa6d8c0d0bd99ebfad8eaa83817871bc8c96f651ab9ff43a2156ece86c069c2d007962a0b
-DIST firefox-44.0-eu.xpi 479775 SHA256 09e09e0304db6fbfc1c43a1fb0d427fa9e0fa5beff30705e28e661e2033e38c3 SHA512 7e5096a9728a3715d106b2fd6b8b2f8198023349408f9bf3d9510d0a60b7fc199cd88b249f494691a62c2a9e3948f2f9d5fde3941e536b395e91f66e9e44a37d WHIRLPOOL 41128395a7911eaa6cfa8820719613c91860d780b90011334d31db80343a9505fb2ffe3d2a57ff35284f9dd367a413a2b4859d0d4d340587d3e814f382f4e359
-DIST firefox-44.0-fa.xpi 535474 SHA256 2e4fcbdf67620172e38630edfdec7966ffd827f5679dfda4802f252ffe693369 SHA512 18a9fbe43af6895cc66543ef0d1af5b4ab99006fa2deb94b5f6a8de7a02ee119d20fba57e956ec07a35016ea50de0ddb483e435e76e8b8042b9b2eb3347cfbb1 WHIRLPOOL a1e69e083405f339b274f6ef433466e0b115ff40bca28d4935cf80dd74fe37d75d76cdce2bc763a907345e6604397a89ef5040a0681d8222848be713e87d1953
-DIST firefox-44.0-fi.xpi 461260 SHA256 2312c6aadbb4dbf5e85e9544450ae65d31b96c99a233e5e59e5eb7145bb10c53 SHA512 73c5ea586691606024cfe27462c375cd0f8f66697b7a1fccdd4670201e5a6552321f3bb47837a9bd3048617c825641672a834be25014819efa971a0e796b82b8 WHIRLPOOL 9e5dfafffd5ac2eea880fe0a810ce81b6ab198b1afb15a5e8e0dd5ee6a73fa54c815cdbeed09edd7a592bdedaef073eaaa48efe6700d9bbfc7ff9f0e5fa33cb8
-DIST firefox-44.0-fr.xpi 475594 SHA256 d4bf2005066c089c420035d71c0d59ba9dc98adfffc9159ce51a2cf0ec560896 SHA512 8e7204de131846fc3ed74f95fe09e4c6391a1e0552f221ca20808b3b7930ce4c778cb56b5fe60619acbf665adcb2b36c370fabedb3e43cc56fc2ea58dfe21125 WHIRLPOOL 87978c74f9cc7748e816e3c196d8c458ba5f03bb7a2158b856f5bb0d16f0834c3bdf54c5b47f16225c0246415f0089134900289f307b8eb37daffca8d4419518
-DIST firefox-44.0-fy-NL.xpi 468844 SHA256 fc9a95b70a591f70a90aea0f26cdc4c1c4b1ac3f2f03abb941998f66d39e84d1 SHA512 fd69ddfbfcf14fd46e4f7ac6be85b3cf4717e9f9f6d3703dfc25c0dfd248bb94e8aaa2c386a6cdf647e2decacfb0dafeff675727e616fb390b57a59102f4a3fc WHIRLPOOL 3ad37e69537aa2cf273187447f3d3b26c38e95234c7de365e430abd8cd45f2826ae2c3ee0c06e272f8ed1665ecdd3a3e6e4bd01c04e84da600d5caddb0ced8e4
-DIST firefox-44.0-ga-IE.xpi 481200 SHA256 296cbb4521209f1fc7dbed72a7d5f5b08ce5446974f0fc443fc9cf55e4d5d70c SHA512 491e8e3264494a5d26b98ff97c3fd29e276f869773939393ac9177be5eeeed53728e678c098419fe0d44dad94038b4dc21acb4e9f31d12d4d883efe7ece7f751 WHIRLPOOL c68c725e9a6b385778710b67ec71c2a0d26cbb4dee42b02934b239b5782ac9f67acdbe99f9c3a9fbb3c4169e6119bc81a4075f28df08488d7d8bae6569edb9e4
-DIST firefox-44.0-gd.xpi 466940 SHA256 3cd36317dace91ceffd596e3d3ede3a64c5786a1e714babe00ab85ed753f4f2b SHA512 4ab5015671bc8a45903f8ce0721e955297e4ea1aca8f949accbad1b0950463b287726aaa4cca7cec7730d8d2966ed692e5eaa297de86c485dae264066b123b46 WHIRLPOOL 8c0e2adba711f371b209eaeb8f3b11a983b8adef245f591e3007b7c8e8b11dbbd8994d3a01204a25988546a23d1d11aada3511f9f556f35edecabbad40569d01
-DIST firefox-44.0-gl.xpi 461111 SHA256 f7d2add0b9d2554591df74397fc85f02e738392ffbbcce4551aad545d824fb3c SHA512 41503f19e37effd8b41cadd90133b4ababd17cc8abc90fbe692ae1e9c1ba7bf52101fbd140543cb19642901670132fc677b81500507f9015565dc41afeb89133 WHIRLPOOL 7d266af960e84108fa3401993fd652f9972e0d4d7b9146f3b1560e852025a0bd0691b42bcc5298ae853124f10e7b321e66c9977808f19e9f0ff819e863a127b2
-DIST firefox-44.0-gu-IN.xpi 498551 SHA256 195b952591f124521a2d8140b28dd316906875bb5fb906bd11130bfde6051314 SHA512 ad523aafd7ea5094b002ebbb05b6e49289803268a85745c9bd95497d6fe8c7881e370a3569d4b8ebbe496337169e5a85ea917437471aa4af65b82d9e75a6e19c WHIRLPOOL 6806106e3f18a9e575653211f096159890d1010a5c5bb7d9a27bdd3a0ff5539585f65aba9a9764122c3880cae47c12e8f73cf33525b94e902fa791895880591c
-DIST firefox-44.0-he.xpi 490166 SHA256 d25daa82b8d118b47562056e0fdd90617375c6260acd786e4640961bd86144cb SHA512 49ddcbe6220a3cfc7a176f334351f81e34cc4ee01a3984b05e627d7a7c3a650960b023d4bef0450172290a4b9ae90112e7e5f579dc943984e32e6c1cb13c112e WHIRLPOOL 0ba1c789979b11fcae26b350408a22edace8819227cecebf9d0eaaa275c296f014820db35283fdce4c6f06ec2cb71604574d82fd0ab4b4380addabdf1560753e
-DIST firefox-44.0-hi-IN.xpi 523873 SHA256 5a35a22240899b5573f2d44e848c0f959148598994db4632643a1f1e456762fa SHA512 d043a2ac0fa8f3228d8d78c278f7c832bf5b39cd26535815feadb62e7b83d2ba4bb9a1c431de4af369ab49025116aea55842a4a13de77896d195652ae96b22e3 WHIRLPOOL dd84dcd133b1375f31690ae16634a61662656c9b8db9ecaebeb344c5024a0f491fd71da30a910ae24c78fa693b1200e3c13f93e92a1f4827fe8bc2c22fff116f
-DIST firefox-44.0-hr.xpi 491273 SHA256 3f3d2a34432ec4c75cccd41126011c62e3cbc59c2a2625480cb3e471d455bcbf SHA512 adbc32d152c5abb13fe96653d2187d3b0a8d39d880be1a347e9fb49c4fe36ec2b8912f708c374f9ad77b6bbe2d731a65be3d4664ee4a5a11121027047b770556 WHIRLPOOL 7cfce2f842ee014f1000abd6ea3648570f7163fdd6249d32c624ef1f63c405602f63df896e70eb767da67d41baed32be4a977357902d1e17733888bcedaf2949
-DIST firefox-44.0-hu.xpi 466878 SHA256 7b21a1517ff931194b588cd42080a02182bba8ef5cba11a19d4a5699922d6c4d SHA512 4e18371fb0a31a557ea382af1caa2202b78987250087fd43ffb66baacf45654d2c03917d76284842a038c572c1c58115c83872fd4b37960d26e465aa7108b330 WHIRLPOOL b88b305aca31e861ee5eb3e5980d84a594d7e7265982f56c78735499ee0c3a12dc2fdf850e39abdd55e4e92e9fedccdba3357c9cf5e10552d80ae69082e00665
-DIST firefox-44.0-hy-AM.xpi 549357 SHA256 637eccd6cc0099b1a0b6a197165ba8ee85e33d5246c6f4a011801243fa14d483 SHA512 620e1426c7f5a764a30e4f8e2fa0fa5fa8066625d71695029c6692eb9c95f9812b78c6c134dde85138ff1d1a6df9f1aa0a6ab90c356d86d623d1dc82ab73db36 WHIRLPOOL b4f00726e95be2276923059c299a7bd2936b2c4f54e446f085862e32fd216142467de73692c4551dc74fdb94e6ea3820fad3fdff1a3e813919f4d2bba248ede8
-DIST firefox-44.0-id.xpi 449869 SHA256 8187f234721c3cfaf50b8640f991e633c55fa80a7714f7bf50c23db24b056f2a SHA512 d34fcb6c478110ee1a05beee54f0e620b3857c6a55ddc7be59fa2d3abbe813db7d8d614790313e7a155df89c50790b55d639f3e77f6339982785b3a9234fbdf2 WHIRLPOOL 4663ec95f2a41abfa07d1ea8e6e590956e11b4596924b2fb8f4bfc7e070c77ff4b471070a93eebdb7129b2e58f890e094b8b41153834cd6ea06851a38a0f2199
-DIST firefox-44.0-is.xpi 498239 SHA256 867f61c8a21e76fdaf46fd44e060f6ee0add54b3f976d2192bf00b69dddf3ba5 SHA512 66352f1d205330df9d91b851e1ab3478f2057509aa0354fc27b55b9a03365c9c4406faf8cd122d73218d0093f8bb619f898f8504999115e730632a24b5b7b3c6 WHIRLPOOL 517597df690ba81eb338f0a89aff75f69a6d199165cbda85a76c955342be627ec763a5adbb6a7362cd66bf22901159b4de2392c68c79d527a0e6198cd7eb0d94
-DIST firefox-44.0-it.xpi 369825 SHA256 92e7c9c874ce9913c7e2c198602c3bcbf5cbee606852d32780dd4b6fd1707b7f SHA512 76beb774738e90da540dce0b6bfaeb93e968c28f1b213d4912b9acb0d7f4f7126a06bf09b51bc0506b27dcda8519a16b04308e29a24a5781abdc77f6f221f9bf WHIRLPOOL bb8e9f37bc404cbb2e0f5e10d584a609deb15c65cc56e23fe69185e04bf1eba07ae336a61ed4e8a386552fa2efc8fd25e1a9f460aad8b9f4c7ebd631aabd24ba
-DIST firefox-44.0-ja.xpi 493749 SHA256 953227840368882f6733fb2d78efad454713bcfd8185b341624cbb7acf95d080 SHA512 9de33cd2ea7269db239cec3abcffa0754d9dd211ac70862f7c9fb903b1037b00a0ec4d3f9a092672267a7013d01df4c992fc514fba72d532a3f9d9e958b305f0 WHIRLPOOL de505fb46ae7d0a6d311e5478a048b5d54035013013868355bfab6b9cae5fca68abde41e752ea98293e5f66650229374557251e813687471ee3d8208d1d27bb9
-DIST firefox-44.0-kk.xpi 519876 SHA256 23f24aa820fffdbaa92018eccb5037dba793a75ed57d57399eef9f1b4e3e7cbb SHA512 cdaa103828f5a2ae2beff181b76748c132175e62c22d143a2b8645e1231b7bdc9a155a7a2e255f59f6e4e9532dc205c75ba1cf9e5e6134b32d1ad2543e58ffe6 WHIRLPOOL ca70443e56d76b81f6b6942902c62ac4c00f207f22f0d552f08602a61f9db3496642dd848377fca66582853894a1a6952e6afbd4f2d468bd2a81cd7bcf5b2dbf
-DIST firefox-44.0-km.xpi 587938 SHA256 ada3358784469933b559c5cf3368b519776a57370818ea6630d3705ccbf99ac9 SHA512 14eb9ab37f1ce62ec6961acdf4bd79e189fd072c584ff94541a8440570b987d520169c08669d55f300a75aa8944fab5676e5ef9c652cca526ae65976a37d97ce WHIRLPOOL e3ea7561dd5a7f936e81f3d13ab897e9e1e935fadae6f45d8c9f224250a3c29228e5ea4af83d37e05b0c9bbeea0500782bbfad0e1d185301d1a0d5d71d539654
-DIST firefox-44.0-kn.xpi 547916 SHA256 ba3cbea473b918bd29dc842f3f18850a30cecfcb9019481db0017948b80ccf4d SHA512 e3f3b1b0e9152f26b3e7a33acdafc0cefed57ee3aa5a9c717603edcab5ec0b612eecfec4db3850dec25504e7762d5181cd3a73cc84a15d7b13d6d723d625d5a4 WHIRLPOOL 6e12ea808a3eb4f7a81539e8f4d0dd0ec81debdf479bfc423ec10760b5bea543edba25852d17828817a514bb383e9a5d84d87be548dfd737c3320e6b4c691d7e
-DIST firefox-44.0-ko.xpi 480595 SHA256 c14235cab4064ee068ede2f95ce859efcca15cc350ecd69cb50fed48a5d7c105 SHA512 88d29405bee680b5e87f952fa50dc56eabc20cef142edf3c3ec0afc125970ba73e15503b47bdaf90b7f1dcc8697c0cbf8a91d0e7ea4eaba0cf718cc268c1e977 WHIRLPOOL 603dc02e9d579257f893dcc48d4504cd938d7aa5810accee2f5933cc0786de956a99a66ba541f3b679ebca065b62267ab334b74a10bedf3a68bea482533e1934
-DIST firefox-44.0-lt.xpi 500331 SHA256 01b4cfafde1912c5646694eb6b6c975e717550e85b527a341f7836ebd02e7535 SHA512 80f89d5959b79c0c4bf806387e7d912ea8a53f66f4ff2553542964a566a9105425fbca7b5c6aa8e37e7c21353c9bb4af82d39bcdd82984a3676fce034d8c58f7 WHIRLPOOL 0916f1ca9eccd0bd69bfb3189735d5494ab1c51122598d0fe51797460deb3d7c95a345b5ed8f0baa1161237b029dc5a1ef38ac163379f08e949ccc9675dee982
-DIST firefox-44.0-lv.xpi 480443 SHA256 2667d4e658a2faeb36c4aa3b5b5b13f1d3caa10abcf9a94ceb2d08307770bfe1 SHA512 a641afbd05a56a6c3ae4e4b796eac638e3d0e68dcdcee614aa58202298c20e4fb4e1367b99754faa732aaec3897576a4a2a246ecb0805ff7c610488bf528c5b1 WHIRLPOOL 4b52eeb76e003b883b2979c3ec60e099bb72a546ca77d8a1111054b50ca2a38fa4ef2696bd49f12c927976821f423404d962bface7e9f8c16985ed94d6feb392
-DIST firefox-44.0-mai.xpi 532117 SHA256 5c1a912951b00c9da71124888ba88492f433f807956d9ba21df90b6d81edfa8d SHA512 5fb142d4b1cd985e13495d3f0e78d13d4352a456636a4b5bc8451ea363b43b044392da4dfa62434ae6a711a37a1fa7ca3bdf40924bf8eea7e7c71adfc0b7a3ce WHIRLPOOL 12e25c59c2952712d37239e0fd64d33e31c87f7f0aa56c56bde7dd7aa08b60b63e002b7431f72e28a3bb869eb4a76ee3183389b7d1bcaa5684411f7ee8f6f633
-DIST firefox-44.0-mk.xpi 537870 SHA256 a6744e118506244b7e59947ee9b52975e9bef9b3f51dd5a1a91c1fc334610ec4 SHA512 c2123e97845a3f8a088747e8de682932d99d64685f7f9dc0747eb54225a78c68710496d17860f54615707fb40e4695ba82bb83b10819d8ab067b2305bb715afc WHIRLPOOL 33612046f69aeb7fe9f2456a70f33e75f33c10742bd26f709f910b81e8f9c2ed5b736e27c65f9bfbcd2a7c44b5f7c4f3b74a2729d2db0c36a8a7bd78b5dc8dd7
-DIST firefox-44.0-ml.xpi 551282 SHA256 97aa5f16c7ce66386a096df283c0ffa7c3c5b5e0b23699c80d88c04717d7a26e SHA512 1949447f7e042f2fa13bc94fc19db9b38d3568e0c3f1cced838e2cdeb888ea13d6d612ee95b93b73beafcbbb6219e5a66b24e17cafc84d916031f4fc17c037aa WHIRLPOOL 82c24a927b9e9768f82ca3b4c51f05734461fa4ada2f5fb6b24f1f8310675b42fb20be6ac22ba14f2d5934cfbce83965e21ed804f117ac7a7166597c77444d2e
-DIST firefox-44.0-mr.xpi 527782 SHA256 709844a2c3a38fe8205267f379b95c843e7b64d1a4b40c2bf176d4f2398c70c3 SHA512 f4027a4d240963b30222db9f6f86117faca62c71d2d071175317892c2129e64b43087326b3e1e270175bc7c558266ea422e6d32a45c76692fa950b13a20fea15 WHIRLPOOL 9804bd6fcd0bf4a129b70eff76f390ac0e98a4ba4d574c227c49c8a83f2ea1122090e0b6a106b62c2aad84c4ad977a63f347fe7cdd234350af6350049799168a
-DIST firefox-44.0-nb-NO.xpi 458673 SHA256 59051b45c1369f66899333c16d4dc18b1b2c40440be752053832d743d54810ee SHA512 476405d913c6f36f24a77c2cec4e97570c1956ea1830f9190c5e0333f1b835fb80c354900c5bea35a301c1116304db336b85dd3e8e6afa1b14e37f3a17e74e97 WHIRLPOOL a095b6d29c668fe099857aa5a5478e82cb908f854198363151a17d72791b48475da82f052b7a10120e9c9d5f9c130fb19704f6f89d75fae932025f19ceb37dfc
-DIST firefox-44.0-nl.xpi 456554 SHA256 35b2d2b201e963141d6079afde81bcffd1efa7879a37bc5d9431a65069aacaa0 SHA512 9fa2861ca5cb0aa244d562e30e36799e23be16e30c721bb9908dbe280609ab7e32cf223ade502ec12252f197be83d0b96725f41b8b1e2e697febaa242ccfae26 WHIRLPOOL c5241e370c91f084743b4150581a1bd4aa1910db994f07d43cfb36df29e327f81060abfc02dd1210da9ed68e7528a94e419a1e775377c89b50cc63612e8256d3
-DIST firefox-44.0-nn-NO.xpi 452666 SHA256 ccf4db814992d2bada211a886321d97346e0d2ab26e846752243c2259062ab5a SHA512 581006b0ead898d2f1a06c9f36a2add5c0f26cd0e5a3d163b5a8e975c88be9458a730c0c632b69312b1216ac91d9c6aa3f855630a5c59a7876a52b599248e908 WHIRLPOOL 7b152f37b00f0b2acab0799981e663a6482fcdb6215f54c6d87d59dd19f327acaf81d91082b14335a53437fdba27b1b17910072245320a5bffb76f9c03e1595e
-DIST firefox-44.0-or.xpi 540587 SHA256 f967f29bf4ecb73a86545a72ecc68c315d93b739060745810f82d1ad814b3cb2 SHA512 91f36ed796f26bf5bb2811735999bb555ad74b6d69e4aa50f3b41228bdd424822565b757e8283d51433dcab465ad59965577a625052ad232b815d76fc849c32a WHIRLPOOL cb84205774199b23c8384fd31eeb15daa90a63523c924acf1822b9ea19434188234784b482aa6f3e200c45d3d1ae76de7e86aa640600dc0677d8a61367719dd9
-DIST firefox-44.0-pa-IN.xpi 516425 SHA256 6e1648d2b6bc9be3c674ca0e84e96121f62dfd66b19f22232f15772408a3d65b SHA512 d384b5f88c67aca89533818fcacdef5ab021bea593017477de96ed5794b52c95f297f4d2a1b4cf0f7ef42eaf0ae9dbc216b1a1c5f5751cd894bd85e58a0c6ddf WHIRLPOOL 8c486b895af9c80d5b811502dd6d9e5cd0423b2b791652bfbbb8297c98ea9b01e9ddb8dc674fbea5d74b3f7a8d519d94c4be319d92849e9575a36d865109b33e
+DIST firefox-38.6.1esr-af.xpi 483326 SHA256 91f97c3c51218729a21e16ffe0a629aa1a10e59945190745db76d7febc3eac42 SHA512 7e998c0a1c2ac46086ca31a848d85ae072ddde09b01f67a56cad2d6b732bcdf4dba4b5dc08c70a940f38e473b037e1fd48f89d62bee493855c1da0bda5594e49 WHIRLPOOL ca0677f8c3e71a429d5137a253190640139f4e93907b65f1ad7aff89d0432161df5f4e0f1f23129ec9807aaefa25150def667dc67ab56cfb80429c9a1b07f5f1
+DIST firefox-38.6.1esr-ar.xpi 516495 SHA256 3937af045d28807a4d2941bdc26e8cd9a437f5207c71b638e86268e758a8acc5 SHA512 7714d4f5c98b9d2307b27483c8fbda14e7dbd9c8494cce7a1b674834f0088e9df825e68de526084cfad5783cb3bde925d632a8825e30ac70f9c652d1d8aa9a53 WHIRLPOOL 80d0f5b5cffe7d18ba6f129430966aba2abadca7a1f121fd542dea126ae5a3efffad8e9e8a95558fb407949b18409e691ff1143384d9da75ce7e5370d4371290
+DIST firefox-38.6.1esr-as.xpi 509574 SHA256 2d5b2360425108eed107b083a11fa0f4fcc42f66d63b3c4b98040aa7a105fb68 SHA512 cd5ca56e826ba4f3897d897b4410e53de54f5f6efb1cdc163f7a969ddd0d547a2dcdfead11db44463ad8f1233113b5eca69a0d725ba20f04874fdbd0f6fb4be2 WHIRLPOOL ddf96000a02e879bc570a06b7a0bab3c45ec85e93a6b32cfc9ac4ea9fad228fa136c06f18e543bf939c9e077630adbfd1ebc253117190ace09d0b33b0a2fbcc5
+DIST firefox-38.6.1esr-ast.xpi 397202 SHA256 3d53c59bb823c287718f2f2fd1401db97244aaa51f6df769b9696d39af2e59b7 SHA512 fa4dfcb72fe03c4181f30c7f60341b9dc236d2964c7a7af4a6a9dad1a4a82048be324b0bf8adaacfa7c8238a308c75f553a1ad1893a21302ca69bd862cf9e288 WHIRLPOOL 3e9cf9720e0ed179cd242e209087af6a8c7f50f0eb007707a44fd7957356f67569d5b3f878cccc24571f56db44f1be682084fc03770ffa2afa884d64aa6d6fd4
+DIST firefox-38.6.1esr-be.xpi 441057 SHA256 cb2bc817cb8cf69b170137c46baca6e5e893dba940dd14e24ee3e93ef3780528 SHA512 89814f4adadc99fdb0a31fb59f8a50fd637069938bb4dad144756c359829e0e385d288106a530db7da7c7f3417b741b496f55e04b8da28e87af82b5863009955 WHIRLPOOL d7ff0d3f4ba7ca36a76dd64eed5fd7ae10b97b56810a6238f1014ae133bdf5a8cb518bc1f8caa9686cceb7195f6900ea7d7ee188447fcfb1b94a63c51bdb1ba1
+DIST firefox-38.6.1esr-bg.xpi 487819 SHA256 5d825b6387dbf31d5c20650d87ff3b73643826b3143c178f6f0707cea4e0c72a SHA512 90bbd0ed306bf1350955e06a0daf5b995ad5fb469c32892431c34ae4bf0813e6614c20b4ce8a1e79fbed49bddd1cc53ab6850329e2d54e55473eee3f8334531a WHIRLPOOL 8843bc10145adee1441b5bb8d07b1b48cb9ade16e6424cc284bec65c24dde61b1b992c9be70a7123f2b8ccbf83a95bc2f7045bd92715a87310f484c16ce9e1c9
+DIST firefox-38.6.1esr-bn-BD.xpi 528690 SHA256 6438c81f0bb6c9e294a1c11f11436844964ee1867e1c4956e281e1564ee17fba SHA512 5d83cf60c4486449f82c8a9edf77bd36206db14c4a5a8f081708965187457a7d228aa5e43c7348cbcdde285246dbc9976ccb05bc824a08921b90f63681b10457 WHIRLPOOL 026cf711263f18a1ffad0f356d98366d7b3a3e39250a05346a8bd91ae39a96daa669daec570061966397c6b06b8c76c80963a43ef1bc826152a453d3b91bf710
+DIST firefox-38.6.1esr-bn-IN.xpi 527928 SHA256 ed9f2a66029b53ff1b7214275c1b22c8656919ed5cad2dbb3a0936be6c632d32 SHA512 3c5581b1bd67fa33f55c9f5133514c89ede9a23da2fe8a4c0df1030f511ebfb11a547391cf7b51098f1e65bca92c7127a0bcb7cb81f7df3eec0133dd660f3b52 WHIRLPOOL e1cbf6d1156edc41f5eb92a4a5d873eedd732786dcf8d5b1ec63834703f708946a1c8f07bb5262c2f44f85e0d85296c4b2cdae600292969982424e43a2ba940c
+DIST firefox-38.6.1esr-br.xpi 441962 SHA256 aab264c5e15554a2fb8c6590dca6507a612a1fc2c63dbb8463c1689c467a2208 SHA512 a2336b6e2afb36640026f7e91177333db63c4345f639f2d2a89a6ee644418f2eb65c13d31e84d09af8e8d77a1b5d57c89b0030eb71ad803a3d133bedab442c75 WHIRLPOOL c778c325b340472c04402fa7b56621ab2fe7aa5f2ef8c9e84eae6b6d69094732c5356543463cf1afb4eb7be820d1ca78879a7f638b0f5d8b8fe3e6bd88846bc8
+DIST firefox-38.6.1esr-bs.xpi 485305 SHA256 3bf09cc69c2250394c512e783eff5c00fbcf2696000b4b1ddbb7b73f9fdc4dca SHA512 7131bc553e97dcf2bee2f348b96d1183fa6c9183ff612e34ed048b4ad46fd590d0323c986d6c914d5a3f783e9f94a4aaff24a10cb37ebcd4b0ea5b96ba09d54c WHIRLPOOL 198a54202b5616b89a12a0bf955c0c5b368b8bfc54eac05024713682515dd5e521c33395ced464d72c7e6d142f5020c13d9e190a2933fac89325627c17288df9
+DIST firefox-38.6.1esr-ca.xpi 458092 SHA256 136c1cfa8561f73a551bebc19ce22d97203d46a6569d0bb28c26477b6f201dec SHA512 7b99cd99aa3b09870125d0f445e288dc2000b7102b1865c6afa5f32138a5c7d75438efb7384d0b2ffa938192185fbf9dbc11cade360ecc68ea3b405bafc8f0ee WHIRLPOOL 05b4be26813dfe2f3e884f7fb1e209662ff08c618673c2982b84c71a97ed8cf5fa09606f0f418d62e8e312820f7048b72fb929f58379e1e45eaf0cbd6ea3d268
+DIST firefox-38.6.1esr-cs.xpi 446726 SHA256 37656a3d2907f88d43603eda525bd7ba1f7bba2bf93e42750f86ba1b0608fb5e SHA512 aa154940042fd8aee0271bc99e64f982dc916155dbd77064f8a9d568973803ef80286cd495d94ffd33a9815f20ce4449963750120b960a22053544f2fdc1aa57 WHIRLPOOL 8a8df0cf00fd9a74a2672ad283a36b38d11b9eda016cdb4b4c990256cca0c72c81a27015222ea662ccbcaf01c4e890d2a9df44b8e47c56070944adf9499925ce
+DIST firefox-38.6.1esr-cy.xpi 444385 SHA256 8dc6fba4c340397095f492832572e8b54da5cd57532da8845a577043922ab90d SHA512 be9a817095d46b670c0afa59aeee0e959b4239b22c81a18755d906f952c5a11470784aad1303bdf9e897418788b10762828dc2d029a710218ba7fe3263e80c8e WHIRLPOOL 608c3515792a5b6a1f28074bcf4fbe17e37c6594c168fdf9afe507a12c56c150df89f1047baa5814fb2fee0b2098e0bbab4f9f9c519a975e219f223ff1e8a61f
+DIST firefox-38.6.1esr-da.xpi 450763 SHA256 0704f5f4bacf449741213825c95fbeb72482894b681aa43469287412fd939e3e SHA512 6a2d1fa831a7e7307c2bdee37bea044317b4226090ccb157cc0a8993804332681654c1e3d86e9ec8c0a8c54fd0694a6861fbdd5278cb9b44abb683999f2d1464 WHIRLPOOL 556b8d4a68073f967ca4e1c3a0566921ece5c516c4ea9c40d067a5224e156b51a1813bcbc3a63b504c3dc5953ebc39ba343ca0ecd2d4d5c22dbcb5cfce5a25d8
+DIST firefox-38.6.1esr-de.xpi 451629 SHA256 ae9d6c7500e1d05f7d63d88644573f3bb019521d174fbf662d49e28aaf6170d7 SHA512 65f3b9ad10f84929ee82b7d6060e9667730e88c1930631ff837c5370cb4a841ab3b7ea138fd696587fe37dca04318c4bbb9830b95a899fbc08988de5a80571a5 WHIRLPOOL 616902afcab9366f4ac13a5941b8f79bf7278ac56ca1073d3925102d8f643754f157b88f5f1426c2f22c043125e661c70b6ff9e452f75b74c1a2550cd81d7da5
+DIST firefox-38.6.1esr-el.xpi 498370 SHA256 84c7b297a4319dd5d0ea5653fff3de6ae5eacb38f1f45feec90f56a5db837bde SHA512 0ca1000c34e510a1b552a6c8693b76ff1a17fa632bf393afe3553fc3d1ab573dcfa2cc67c92dea76739c4a97e5cc39f8cec8089572cc60c4b27a04ed5a90c24e WHIRLPOOL 729d0607b126fde5cae0b7b06a2249340f53f462e13049df5aa6f33a24bc807fe2d4f063c86058a5f91611a565c4612463ff1865fa99f73c1fb5d05258b1cce9
+DIST firefox-38.6.1esr-en-GB.xpi 437845 SHA256 e40dbc5cac2eb0d0d399fb853166cc964011f9f49e1a48424ac527edc3594bea SHA512 4697f64da1c3f44843e02281f0a952ee6e888023eb851d068ec92b8fd1a7c7e05257e41cbe9f5be182369a9166b4ea69fb93e8cff19a8527e668f7d867934af6 WHIRLPOOL a7c80e4389bd44409f9871d0042350c59352900adc00d45993d8fd5069f89c267dcc59516613809fe00bf86b10fad6b28cc8f1f1b6d712178912b5319438e906
+DIST firefox-38.6.1esr-en-ZA.xpi 439926 SHA256 dbf3d7364d8d535cbc0c79dbf1addf8a688bf6b09035be762ebc4b64307c506e SHA512 b8472a589ed410a49e5d685a254a7e7ec90f49b812d0381c1305ee1f6a1bbcbc1de46d28a9ac77aa806dc2a2c1c41afaca7458778ba24a67e755dd5e390c251a WHIRLPOOL a9b8b5806b8fd26e5f7b52c3de9d11090829f3c02840a2a68ed61872d91ffa3e6bda2f9e106d73f32e80da41e27b41fac4a30a6f2d708de62e92b19d12123954
+DIST firefox-38.6.1esr-eo.xpi 488370 SHA256 57f7b8740e04ce686d49a4cfaf0364346c5918c12417983ad4d7e9e58f96a660 SHA512 7c4f0d6ba105b3ae8293cec0609145d0de0c7c3da33454b002acc8f16bc59d971a7c1fe36bb6af9516abafd2d21935cfc25d0e9e3c4b8ff0a4ebf1620e95a851 WHIRLPOOL 69474d991f96bfc6a71f982241293984b90171979b32f63e61ae6d8ef3f160abc97c264a5d8f6d9128166edd7d415dd0013cea5884fb931a1622d8bf6e245e0d
+DIST firefox-38.6.1esr-es-AR.xpi 453983 SHA256 28942b5f6d1485e3aa6fe2852b70c5fd671db662f02c125456f38d61a44f1e9a SHA512 5f8d4f70f74bd7bb4af014044dd2fdb3eef68e79e7d719e5bc01520c37a94081dac7b34bd8a5f527050d7547baac2f4174d8ad1197e212b0aabc6571ff718c0c WHIRLPOOL fccd5f7e0bdc78dcc90f26012127146c8a294c0bbb7c4c6f29ced5c1018924753f147e821fe20073b3ce018f890a65f834fc8ec2b48c5cfb529860ef2e95a83b
+DIST firefox-38.6.1esr-es-CL.xpi 384679 SHA256 531f656fb578e8335bd3400272a94bb0fd55418dd40399ef7bb9afb05f66342f SHA512 781f7e6d4c6f2f40efb69fe09447d6b88a01f3f59deaedda82826ad85903479c9f2b9f96661061696f675086be1d0530385eeed57892b18f16d12de4698e4053 WHIRLPOOL 06b53bbd4c6e6b12e2a5d1014974dd6d41010de0ba25424348980652153707b9b2b1931848829ba994cc82001d77ca2b3219e2665f5f53cb8be5243b7295aa27
+DIST firefox-38.6.1esr-es-ES.xpi 374073 SHA256 0cc9a3eec376216c29818cd215dfa858396a2075cba808e839cc259e092dfa48 SHA512 8417939fe3a9ae018e7416e5014cffcad6d051d1d1d5eb2d5c8a22ffc08f15acc32a6a5339c882c8aa0aa40fe50969bf3641485195aadef437308f34d5c6e8ec WHIRLPOOL 8b98add0b8d2263e3c587e06c25d78f40dc1fd69d92113d78ee8e954899229d6e3f6a792e9f984d1689691639db8961317fc61877152bbcbdeb2c1489d5b3520
+DIST firefox-38.6.1esr-es-MX.xpi 457050 SHA256 b50f5e2ac3fa83521d7f5b6fe87038588d1c3747675c7e6b6e3c7593d53c7475 SHA512 102f945eedb9952cb63e5dac866c6447abd931a397701c5aa8f765e8cd33e546cb51672103a4e8db6d70d2f06c5f9d00b150a6c42c4bf9ef74b593295d1a8cbe WHIRLPOOL ae249b3121daab51cd64eb251dd158bf66a6a72b19e317543d5f0ebf6a2c409133981a0c5b7f59dc6a2f87fa30cf18a313d33e0f2f42c7e7a9451931b0ef8424
+DIST firefox-38.6.1esr-et.xpi 443229 SHA256 d94a25ad6c66f064097c78e82ee5adc4234e42721e322adfc077363b0ebebd5a SHA512 2fa446580f2d31cdf0163465fc1ca6b12b6c634f5d049eea4e02e739b918a32c4f9b6654571dea4dd7218992369ed5d7538b5ee4b52540ece2f5e23aba73abd0 WHIRLPOOL c13ea3430c697bf3fb00fb4b3571309c1400b9fb63387f865e8d32974087e6fdd74ad4085050b142804f63568c3dbd7df2390d58726ce7f04c0fdfdfbb78853c
+DIST firefox-38.6.1esr-eu.xpi 466555 SHA256 ae32215075a3d1b27a73274e0df34b8d2600c3e2dc6d6886d1954c86074497ef SHA512 29c05ecd26a53997d03b191e00107839b085b2bccbe8790123b959b3de648b9afd93951df5bf6b4d93fc4334e3f997ab1545a73c8e20e8d854e36bb34d2e8992 WHIRLPOOL f51c5fe990916bdfd43e471d2aa2af8394889aee129e5a7de135c4bcf932ee6273f6d461a503d7bd932127c58e9a61742e51ffbf7c0b73a8c1a1caa48d77546a
+DIST firefox-38.6.1esr-fa.xpi 518282 SHA256 f7a1d03f01b6d4c9a62ba35c247935bab5ada0a644ca3072f0549df690c4d647 SHA512 1b2e111eed3fb9f50a2342d0c7cd6e543916270f56dd5a7ca97085e6102edd42b52760c4b48cb05a36a88557d5b3d39b11591ce93411749bb7ab4f2541bbaa8b WHIRLPOOL 06d6a2367840ef1be047f723fa309bfae252a8505d093b6942f882ed15e3503867538adfe5c1aac258724f9798d3b18fb3ed959dbcc60c39f1ac3b70432a1b6d
+DIST firefox-38.6.1esr-fi.xpi 444853 SHA256 94d1216d8f44caba7d10a9835c3906d1c85eb7d9d53dc59c5a47fd8945211adb SHA512 e895eaabb1be43cd75a8daa06b7573cb27e7342537bd6ab0b985f8972a1001bf7838c86aeb1d5f498831ee814cbe5ddf3a82a85d67891db397e4f7d030d9775e WHIRLPOOL 76e1785252d91add89c78ff508873a5c0a041979f14e3f3ceaa8c80bb1abd650b32a9f04db50d6cafe149fd555cc05d91c1155a4bdb1f0825f0cc31313a2a787
+DIST firefox-38.6.1esr-fr.xpi 461402 SHA256 c8829b4de0bccbf5015788aead4be109eced568610ac2b2452f7348790b58c48 SHA512 38659716fbf8eb74605ada5ae5f9e9d48b98a29e9364e2e0ccf0a8bbd9bffa82c2b50a2df940fc8a3d1a63fe63e5719448d6cfc44cddf5eb6f3535b28798bb91 WHIRLPOOL 8da7327530a5c57bb28ac20cfb558f04c906787b68f6c1985767b485b999d6aa6e6c9dd1a03a114944c27feab137486b02045deffaf70d86f4fbd04bc1eb5df5
+DIST firefox-38.6.1esr-fy-NL.xpi 455538 SHA256 6c6de4698124089e4e57ebe130f7df2d9579c1fbbeca434080b289b374705126 SHA512 50f5258a0de43e147f76a6c901c23c603496aba6fb351b59e2160bc184d0225126e1665af0b99bbce4c7f82fcb03945c9ab872785fb4279938f75284c5cc7762 WHIRLPOOL b40dfd978c1aa7e67ed1c8f0679a638239b901964756c965c63720f861c4bf6de9ced7023bdb1b0ca889e510a051f5d6fe565df24ea20eb9a5916bf9b5a7a123
+DIST firefox-38.6.1esr-ga-IE.xpi 469623 SHA256 db2ea2489a71b80b8ee759ff54fba3d44f8181349853aed2a3c94f48fc85676b SHA512 a2d74be5353807f64717afeccebda0286895f2b7d45c9400827df4884d2f2ce3eb2083128a0666bfa9b076eaeb66c62dfc82788ffbdfa7e5dc9e9728c1e3f281 WHIRLPOOL b4933cc320ed8dd0651848be3e7fef5033fe36449046e13ccb9dfa2e62ca1c1db86e419af013f84844f0763752b311ecb4fe381510b9fa022c7f4b9e2fc61d0e
+DIST firefox-38.6.1esr-gd.xpi 454616 SHA256 851314d85d257b6cb683282e8a63a83cd320ce15e15bf949685534c561009dcb SHA512 81f273e6d0732f0b5f6a54d7e99e534009bee2c9cd0452ccbe05e40d74e04659e4e79c05539b5249bd4a0df7673d0ed6219953cddad7df23cec0163366efecea WHIRLPOOL 67cc94cd57ed4a2376f041bab56b91ea63341506cdc737068c605eb55d64f1da7d15354393a589a5bcadde3f882ed575afb0aa330f378a56c803fcc70eb13efd
+DIST firefox-38.6.1esr-gl.xpi 448925 SHA256 f2cb5cbb019acab2de7b7e4f186151d92ea0c88fff29b94a48e4d80993d9dc08 SHA512 be57387d12a7860c0554a84dc7f544f507b3c08385a6f2aad966e91d1509c4d79c65044b3b982fe5a816d3b7e1ca18743dcdeb3c6362ab6a037cd5b84cc8b4ca WHIRLPOOL a50a746b3780b5de987f0769cb71596a996176a99a8365592f8118592ab9a5e617cdd552ecad1ea168577e40f1729e5d0b7a0073bbd993232a3f5d34fff843e0
+DIST firefox-38.6.1esr-gu-IN.xpi 477980 SHA256 54c7088036c89fb3f0c0a43d8b06e99a06d992563f8c8ecb3fa71ad25029e348 SHA512 ccf82a545e66de0d38e9bbfce6301436e83371ed80802e503b4471fc1564b6642d2ebd765dcfba2cc65ffc71588ffafb99aad9bfd3fb2125f1759025abd48fed WHIRLPOOL 4bf2dc70661c5a91e1f9b53ae2e96852518e825abc73154b29b3845e4f30008e114f43e38cb635d0618b9ce31f88bf64360583fa8a4174731d6b72f37f56322e
+DIST firefox-38.6.1esr-he.xpi 486785 SHA256 fb8d79576c0ed7700fe1ac0f89880e9cdee41a370ffb5aba6a5ea30d353f1dc9 SHA512 197a62f94f7773b79ec4289c8a3234e47215bcd69ec93a84ae97ed5aa0fd66c805860830df997098f76234f4efa751ec087f71f6e50553aee777223c33aeef62 WHIRLPOOL 98c97e88e728aab3295db96a19d65eddecddd3fd3bc871f643820dd4a50a8f7f3281140e123460c43e711d1653539cc8f9aab5cd7cc7ef69de7af8e15e950f02
+DIST firefox-38.6.1esr-hi-IN.xpi 508167 SHA256 9cd59047387c3fb285463d6d6f13bba45a38fe3dde2533b96b00f54e657ee9a2 SHA512 12bd0a56efc856c0dcf9461ceb90b7cf16889172ba89022bec49ff025676139e4f04c35e4bf6c8c1e0272b04133c417588823d3a5c52a416c8e8cece5a3d35cf WHIRLPOOL 727ff5b5f13fe1cb068d49cb92edc543bc5b211a878bcadf7f3e129668a91197767556ebc41a08e5b2161d8bdfb8f903176931e249c8a2fcf8b8b9a70550c6f9
+DIST firefox-38.6.1esr-hr.xpi 478271 SHA256 086e06d26a1a4f299cce29575266d382615654734170a5f6601d822cf33bc8e6 SHA512 d8c6357c27803b6f3aaadb74efc176a6cc161377dfeff0936617cf5faaf2a5eb6c0ee6d250e8379349b67b30452973363178690d513824dc554f4ae4a2d51e99 WHIRLPOOL 428ac912ef11cf8a66bbcd669dba5ff25f2e7d62a60c134359a52bd6ea8e04852f6be267de9df503f06b73b83189c57dd1011b59dd0797a9f1c70f207378017e
+DIST firefox-38.6.1esr-hu.xpi 453555 SHA256 dfa1bc4728212bc0cd43f71af102d6ab665dfcfea879e77cf77e2518e639bb46 SHA512 43d0b3ac5ddec3798e9cc4b92d3e057d57b5f3a30a7e98ab574675e1921da0e736403e7af737c4e6e2fe4e7021f1e115b539f7599f428d0cabd8afc20db76a92 WHIRLPOOL 4b485cda26f04c9fe4247269d5ba6f335ab465aa834d8003001bdd1d5b40dff1cb44748030447cc7a6ae6d64aa508736bf69dade34a11aaef16b1ac10d7cd2fc
+DIST firefox-38.6.1esr-hy-AM.xpi 534265 SHA256 b8c2e84195a5993efe15f8026fc481b3693c8abe6273eb7777b6af90d0d24bbe SHA512 97d382b9ff1bfdf02f88675fce60be2635d5b5e00feb92b38cfaec038d13e393e63f6f176bbbe1c801d5bba478f7ec849018e005c568aedb23fef0448abfebbe WHIRLPOOL 792c172c07b53a7f10d4fdbbfd262c5e0b67ed3c7377f232b40be0e366fbdf4c70c68f22fd9a67bf3fd43a8247d7f93d9fd19e1229e804ddbb29e9b545045e96
+DIST firefox-38.6.1esr-id.xpi 431489 SHA256 fbce720771e265c464a622a2f086e3111835c20897b8cf09494d6176631e348a SHA512 65b34225a9c2deb8ff950aff64eba38fb5c73e2fc1ed514397f78a654fb710e409914036cade3ac87ba0055b78ebe03e0ff1a1d21e7d0712f6a96bc5446686fb WHIRLPOOL 5304696dca9e1ace05c2b23e3c21a3e3f99bce07c6f221057d8d88931578a6c1ceb8c41153713aa5887f4ed85e3e7518e3f9bcc8da0ed5287daa416c78f4b7ed
+DIST firefox-38.6.1esr-is.xpi 485128 SHA256 a605ae15dca88ac5c33fd3ea6f38ba9a38559124db1881acad80895877b96b70 SHA512 d4385a7b2f467ee23622a8bb31d29f6ca8313178b92d4b47ae26b33efe76b9165c3ecd7bc6516720910df3856bba13a434b9ca386a16720bdb73d0b0bbf67ab4 WHIRLPOOL da26d5a8a9b42a75c52df762614fb0ba3e6331aa8ffa1f8ead42f6ddd08589b1d805170bc3fe1c32f08d429aed4fdde5ef435373c971956b47f6a9752261e609
+DIST firefox-38.6.1esr-it.xpi 368409 SHA256 3e816ca3e65cddfbe4fb2bc3955ec32a21c47481e9f71b6770017856065aff82 SHA512 2787a053fb9001b4c6f4f3c565882a70f0ce84549a6f1e52809f82f5c4cd1406f29cd1c5ad6ca953fccc2c77544a636cef09db6c4408b7ed16f052c9a0971ac5 WHIRLPOOL 502296001173b1cb08f6f66c22339391b9a67d77267b81896e0194b114d3fe87bf1b9fa0cc980b7a4319d2d2e45a26717afc3f7060084b4619dc77a446cda80d
+DIST firefox-38.6.1esr-ja.xpi 479114 SHA256 31f0819188bffa21bb8e460f9f93238cca32c882fd60e0f545e382b0de45be2d SHA512 02dd9f209d804422b3fe547cf3cf5efb5e9195058d680134ef6fd92e93a4ec43950dc0d35c6bcaa0b74137d6d19a03a0bbe304e159180fdb070211c8dee4f1be WHIRLPOOL 22ac3123070228bf5e7a1d2036b2582b5092f07cf20306051dd75c48c88885794283a67b5b56044fea95461d4b716084c84d3827be882900c048e18177836fbf
+DIST firefox-38.6.1esr-kk.xpi 503568 SHA256 4408ba162ce3dbef002a7e36f3d53399595abb196a10d9dd3f08e011e47f0f1d SHA512 18d740598c1ad27b24559a04d38953def74e2f481f00c92eb50add9dd5fe82a82bec19abc90c49f65e2aebe6bad688919d0891b99173b2fff210576819a73180 WHIRLPOOL 2339a300810cf236a3c7a8291003bd0d849d68ddb29a0aee4cf7c2e99fab84c8f00fe9faedaeb16c67ec5de3ad5c5dea8a6a8c1f9a2086e49043ec800adee1b5
+DIST firefox-38.6.1esr-km.xpi 565674 SHA256 c996d3affd0ee0238f86438eaaae7cb9c3512d1aef1e59f170dacb3f35c49fe8 SHA512 b87be41467590572e16c9ba88ed920dbd49042d345de632356eea65c6a8fa123a242f9da1a10b91afe90b709f4dc3968c583d613f5918398a9c24c5772f34764 WHIRLPOOL 2ce277e6fce90a23893a4fc0513d0224f2505c8f749bb5408dc8e720657ed3d5ede6700cf625d012c15c714aba2c0974ac49939a2d59ba206f5fcfb542cb455a
+DIST firefox-38.6.1esr-kn.xpi 533464 SHA256 58c5cefe6ba8b23a64f94e16bc74b9945d1252a5da20f312af745720bd2c39be SHA512 52ed48c4806036b0afb345ee5e862e4a6694c88af46d648cf40c59ef75b60710cbacd75edf2fc4becd7322b563465e7bbd71833f327f23ea1d88c943e2b27529 WHIRLPOOL 70d38249dc4a79dabb6d0c4a5b7101bfe7317af5477193991951573a4f6fe80730bb514b35e2771328fbb496176b09db254d7faf3d8d31d85aee0dd9776e43a5
+DIST firefox-38.6.1esr-ko.xpi 460854 SHA256 7c46f9d87aa57f038ba5b5c81b06f88e9ebfa9882d44237debe45b55eed7a83f SHA512 62477aac6ab46ea19b63806f06b0463767faffc42d528370cd9b546d006a368d40e46cc76d452d91f40f6b062ede40199819f26665d6f5d1660ce8aa2bc4f4b9 WHIRLPOOL aa9c8c1dc26d4595276ff2016fcc9988ccd4e244abd3efb5d8025240456ea9025a0ee01b8be1fcdbe684bd27abca81b3a474985a1c20d100425ee7be59128601
+DIST firefox-38.6.1esr-lt.xpi 486451 SHA256 0c0959fe02ef5da26ffe65108426fb155670b14da8af112b4ce1411eedbcc6ed SHA512 0b0c36e80aa678848d6a09a9fd55020512b1f920aea2e55fc03b4a4c3242b2fa02f9d8a36bf1cb6d2e3212c0e377267183f7e0108fc24cfc78fb00cb9ada2604 WHIRLPOOL e8fa5eee4bb2fc10ad336ad3f24f2c2477d33635b9cfa905f07a03958c200f26e96c6ef899ba52606adacd2a1246a16b1d8f432565f9e8d8f9e212e92a407c04
+DIST firefox-38.6.1esr-lv.xpi 467198 SHA256 c0337ceb0203e53f46f93d96b82b3bf7f81cd48bd8e0c7883f8d86a1958da3b5 SHA512 e48633967b9d20507da3f504f30bf50442632b1dfff93ba1efdb3fe365d64d72f1aebedd93064943de2e560258ac8c2131e7d8b016e051bf8223c5a14f553bf6 WHIRLPOOL efa4b5446e068160c0d13ef7b552a39e5fc583172857911329e6eba932649216c4f5b8447c09c9dec6932fd5f84321ac350b2654459e58f2bbd98087de2a2916
+DIST firefox-38.6.1esr-mai.xpi 514666 SHA256 a14ff6b63a09b67eb75b01351e562ea3b2d28f45123eff7170d145a87c90f9b8 SHA512 5a8f2d494851366d1bf68cd8f4876dc98ae38728de561465d2d1b0cb850027830cdb56a3a01bdd9b5cb2b18f783034249cd4d1f0023c85bee6912418a0a1439a WHIRLPOOL ff86e03374786017911851246cdf56e2155dbaa626b43f336110c0b48467a3b9824297b6b6b4df89f59041096145889439ed208bde5ed9ebd94b9a02dd6f8df4
+DIST firefox-38.6.1esr-mk.xpi 529205 SHA256 187462ce7ba1931453210cdc63134bd7ff33d87f116a7655f882e673d4fd89a2 SHA512 6c24e4674e308aa0e983db261c254c583d5a091bb1cb0df9f8073fde6785213b366363d9070864a67ca526b612a75f486537e518f95c43f1db7845091f146a5e WHIRLPOOL 9e9e03d6392500d0d501a10c1ae7e6e70e5ef704f9c43f7e272b8494cf3362d25e13cb516a847b25ef856372a1a59dc901cafd6ccfeffdb357a40d9cc8e6f5b9
+DIST firefox-38.6.1esr-ml.xpi 528919 SHA256 59143a40c46c5d891f522e0d8c9ef77528f6146dbef0b125d802334e44c421ac SHA512 fec3d2644a5eb928146c1e7ec58640ecd47a94c44c53d26fa2b763d804e44fc04f0b506a38e7ba4e16ccdd1508851ecc2183287bb4d6777d54b71a8192edae8e WHIRLPOOL 22cc5cc572307ad5e800dc7f3912fb8a3d900759aa215e5ccd7a8dc06859f4d8234fe92de056ff26e2c7d590a2018e1a4a73ec8e6416450d4eefdc94eecbd528
+DIST firefox-38.6.1esr-mr.xpi 505962 SHA256 e8671bbdb3caa20fdd1c3335d2aa454fd0df5c68b7441aa4b6d355258045bfca SHA512 fb9a9c2b221efbe75ad7fa98f27683a257267dfa37fbfc0c23af459c6699cc1536f86ff5891362f55e548ab6fded11e78ac14afae0b3c2f76f0450d3f8ee9820 WHIRLPOOL 9a49d6027a8d7c134594109ce6d4aa1b12643ded7ad1844ae6357f697ece7d6d2885c320d8833bd3b86cf1b5a5039900b69c7c3b4728a9cc76f24c57c685f99a
+DIST firefox-38.6.1esr-nb-NO.xpi 444177 SHA256 21fdbb9143964f24bef0dd99583348ee563d3cc7edbbd3098abf25a168541b0a SHA512 96a450516a7910296ddfe335b670d9cb814b2f3d3bde436c4867d08a3d6b84399dcfa57153efb213a9054b98b90fee0897143a30b9c5dfce624d800022de3003 WHIRLPOOL a4cb5a90f239d0281e38bc360d0c2a5b88b1e9a8530d520a3fb0bea87492918905095e2ae099ef48539d56d20ccc748a9d6c7c95848446455b7ffead6c6723c3
+DIST firefox-38.6.1esr-nl.xpi 443994 SHA256 8c9229c5aa626a8d033d387fcfc2164208f6ad8f86d2258fa30c90f468ff6b86 SHA512 6659131468dc733575c17badf66bfb57ae7379aa9a89c0f8a4eb30f6e2d48765f199a8016b0edddc43e0ad303893e7385bbd40b65c90e09815421fbc3cedd2ee WHIRLPOOL 54aff32bbbbb1ccf05eacb8bde70168415d2dcead6b92192e86f40bafa3136c73af73d5ee91bc54b4b4dcaa9772095ea02bad3001679ae9fb725081ea44733aa
+DIST firefox-38.6.1esr-nn-NO.xpi 438452 SHA256 103a84989e908efc56fa62120aaaf9056ad6347dafc25672bc8f89bfeef160fb SHA512 54d3c5f8ee34c24394f98bb2dddb0925ee18b6c1b37acc96e5d870488cd5284ecf4aef57c21470e3f7ccab2c80d5abb77b597cbdc4faf3f8a50be13f79fdd944 WHIRLPOOL d7e783816a59cb16e1f0be02199f06db0d0882216b5714022c56cf7d0c62033949e0aeb7d1fcb17342019a9465b46c1c6ae9fa099a4940e98cb57242303d8461
+DIST firefox-38.6.1esr-or.xpi 527049 SHA256 032bc12bf506bde68d9d64bcadbc09ae5f0ddfa740ea9d4cf37fee2ee488fb88 SHA512 92cf6016947306d9b3435e22a0be1e5d658307fe1d55f73b62ffdadec9027cada2d9d820aa0ce3447334c7e9e4da32f6dacdbe2196d410b94e5a8b0103f52f5c WHIRLPOOL 97d9be7b9e9d136ad5c716b0fd31f112b9a779e707649caeedc0c1f05955472d231c4efed142b070bd6e2afc9692d87a0447725eb968876212c95eb6e2892772
+DIST firefox-38.6.1esr-pa-IN.xpi 493722 SHA256 6d74f9d8143573a7c8abf3dee1b3634c60e035ced131b3c02758078a28e77259 SHA512 c0380bf7ac9654b284aa5ee9d9fc68230b7eefbbb202c9be0e032974bff4d7ac7a5169f49ffe245884a7ef582523564baf500663d2ea95ab8921e5db1f8c582d WHIRLPOOL e03790e2e3f16c64c3e93e1b7198836071d42abf4b830dfac220cd883e11d2af9fdf5e03e9703179093e4201a856a64193e55cd38df332a18eeb0682a63e5b12
+DIST firefox-38.6.1esr-pl.xpi 406566 SHA256 f2bad2c40e75db159b54dc72a97199f9f0c8f479fab295bed8f4dc43b3b77aeb SHA512 bbe51d39d9fcb3dbf71ebc13f3456ae4a2f1ebf922a2d7c647d15de2f0cd8e92e12cdf82952beeb75de1ca484380515891fa1057d5e6834ff2c87f3e4b92fb6e WHIRLPOOL 24eaba915745711ff398e0250ab6ad7b0c7a79579be5786d73e580294bba67bbf7bcfa36eecfe973171600fc7d94b3950713f1914bd29f522fdb02aab238b02d
+DIST firefox-38.6.1esr-pt-BR.xpi 459810 SHA256 a57a326d2820c9542fdaf023fa2043f1de10f8bafcf313ab468e9b122166b352 SHA512 41224b0ce2cfcb03a0df629daf840428815e857acab52765f48e4d26cb15d5691ca7f6ba14fe7a0b6fe277473db9a518b59ada4afa7e12366b1fc31f3fa0922d WHIRLPOOL fc04d153582da223638232e93ce19f39ef96f508a728e9b91e6c2a88ec109d6771ca203817185fca5ad09e0ac1d824e43b9ff5675e4c151a506b904ab2d1877e
+DIST firefox-38.6.1esr-pt-PT.xpi 439975 SHA256 ab6a5b27d32c19a203d5f2b7dbe4fa35fbc6b44c68458bee3a4c4bdb21c377e2 SHA512 178c4dab1889dda2719bd95c38c778b1745a171bf99b55f165523cc0e63d124ff8b6165397287024689f8a942366f7d0ffd528328d2c9f077b5123220257faf7 WHIRLPOOL 3bf2c6c48b0830eabe2d27d58c04177e0d85cb3f3b78a90b9d223b836193620f24a528051ec7f8d5403a439e6a220b9f714ca304b4d13388ee5ea49cfdc538bc
+DIST firefox-38.6.1esr-rm.xpi 446286 SHA256 e4b3003ff493901d2440ac633a71ab68f6dbe5c6602fb19ebaee7b561af5620d SHA512 56b1cb4cb619aeb5b2308ed14bb7b6c0f181c51f596f5c2ba01b228404bb113e27f46444c8672717cefe1839bf6fa301a61ca012a3b1ad6083c78958e3139e9f WHIRLPOOL 2ac824918785bb36f999d1c485fad6310e7cfc9210e34f8269c62188dc5d59cf12da222ec5318ee31cbcfa48753fa8e456e6ead8107ca1ea24956b810a272de7
+DIST firefox-38.6.1esr-ro.xpi 494079 SHA256 8d099dcc828dce7d14f4ce838620e717b8e7ab442a32eeb19287ff310295f75b SHA512 09e33a7fbc29a07055ff9b42757de9367fde864bf9c66fbd73d4acb22316689fc313fd5cc4e4be4bb03eba2c3a2a1a190686c19a6ef66a329222fd2a5e2fa1ee WHIRLPOOL abdbbb7a9bef5bc377206e516a1d213a3c5bcbec673b2f41915e858711c03521bd3ef2222cafb9bea2cc9f18b50c5784d6c9ac296f18ddab4ade2ffcd2623809
+DIST firefox-38.6.1esr-ru.xpi 414419 SHA256 fb59260748ed9d01ae54454754ed1b897fa92b3970befa31d737773bb1198297 SHA512 241761cd7a4cc4a0c9ef28b78db1d1defe599d8210b0a920f3aec20f8ab40c691d377e479a5c868155ecd66bca6fcf99d891fcf183870262006f570365890152 WHIRLPOOL 17dc181a3398ab491be0c21ffa01d323e5191ff5bb7d2338d8de3cd848c38fb9a1af1e5e46bedb416db517f1969b691a3f5dbbd821edb07152325df1dddd69f4
+DIST firefox-38.6.1esr-si.xpi 537393 SHA256 7b28fb2baae26b4840ab53324646b622523b303d6cd0e98211fa649caf557294 SHA512 aaea65268425c99b5e973880d6e35907bab2524a5a80893ffdd780197a9e74867f4ba361a975263182f945eed76805eefcd2425fe74d5cb4bc0d9ad8eb36984f WHIRLPOOL 694824307cd1dd134af8136d5fcd7371a9b6a080595bc21ca8d8ed1a01665e45adb29833eec4d4c6614fdea9b6f3315359d99859226c7868c002420adc4f6337
+DIST firefox-38.6.1esr-sk.xpi 469436 SHA256 366a0dd2e0f362675e9dd7d07b8bd568b80dd85ec52f5f2f48495cd96b04e86f SHA512 75eac8eb94e33ded6d86cd2b02c383c7486bb3cd7397449f38d2fb709d5dbe055aedc9e147992aa8152d7e195758798c972e46814f92385a65831d980519fd23 WHIRLPOOL 89299f459719e2391caddadfc9aa62d449ff715870be55a03e77b96f1e414117940e516c77a03fbdc8a6a2f4fbc0563252bb2c5d0d57130b9de34c3feac3a436
+DIST firefox-38.6.1esr-sl.xpi 441594 SHA256 374a0ce9c092c43cf2d1310f2e1da6915c4fda8fae438631ba746cb5f8bef52a SHA512 dbf0434e2ac013c8cba8be9d7da15644853ee4a9cfaadec617ce1ed7134d6b998913f9da8b6b8c3997a6bfe73cbaa6b532c36dc7d854943e0eb2366fc710954f WHIRLPOOL 1c7a534f1cbb702bea8af4a9c905795d813d301b56b30f5440b86880051c181ade52c586d4416ba5d327115f7b9c95f90241f4d7ffe81aa52d0e9a6b75956943
+DIST firefox-38.6.1esr-son.xpi 449268 SHA256 e770d1aed090386d07828cf963413fb35e85475fd8a8128584cb5e57fc9181f4 SHA512 634c4b02d4aec49b7f43cabb11147924be4a0a8ef23325df85d4bc20c1c0ff0b78d9855ce4e7e5e27ef30c75e5a5b41c71e780380ad93c91a1d20280438a9092 WHIRLPOOL 85f2f67a6eeacfa26dfbfe0528cc3262d6945396244e51bba357cd79d4d551e287921cac9b3b11cc04cb1a9002ddba9877ae420f10cdc441fcc1890edb6e316b
+DIST firefox-38.6.1esr-sq.xpi 486075 SHA256 debcd2b1e1cf8c565acfa4c1234468a972675539d1c99d1a3631389ac42ed480 SHA512 de754a2055b09defe3c640527318af39c426fc4ed9c48539ab8b906c36b9a7aa3b6b6517f55c262041e20ece1ac37bd596f4f7f30f45c9ca84252ac084e18f43 WHIRLPOOL c28b6c29950a6df315a2adfc18570b53b6b7a133c07f7609b10b69e7e97368e2c8aa1121d8fe291545fd4b9e4631faa3d670f45cca94cacc19ea83eb75a6f8a9
+DIST firefox-38.6.1esr-sr.xpi 479419 SHA256 dca858f9a3dad9633ad13f52e97cf9121c34a499979a00ca4f85af1636b4739a SHA512 38c723ba9738d60f90a08f8e2913388bc890a8da141f42c76da2627036a233910239d7842820716ff1d1034790fa830b9b7c82cf7b299f576eda52ecfd046889 WHIRLPOOL 9408295be14a68915121d72c67a825252b15b994abd4db38b9dcc33ae524f977213b73a1692df7d69b75f15ce3c37fa9822c97f96f01b311cf77a432c977d14c
+DIST firefox-38.6.1esr-sv-SE.xpi 452633 SHA256 847527fdf773269ecb4431c2990877b9b22f047caab4ab0532333185fa30adea SHA512 eb3dd5c9e3adeeee9847821a44e630193b6d41eb9d807b2b77516c52220948977ab0ff871ea4039dd67b7afc3cf601907104bfc2800bcf0d027de2bb7ca448cd WHIRLPOOL de52561beca0f4949e9d3fea274be1c883178aaa65b9894d2a40a8f3647de883e42becf87889c2e88a85c3fb72c4f3f4d9d1799de8d63f92d95cb8840b8e8f1a
+DIST firefox-38.6.1esr-ta.xpi 506607 SHA256 ee5c5fed0f00a66d18cbaf4c76e1bbf435d821f3a40fc0a535323ed1a6cd47c2 SHA512 572b6aa7ea838881d94e539c7a6afa552973097a520dbcd506e054260b901a8c0257ff90b9c1876f9b3e4b7c6b0ed709667d4127af8868006445c4e22b94c643 WHIRLPOOL ea59987ac90e0154f3647ff681105d262e55f89ee9bd343759a99cbc09ca3b29323a316926ec98e71713f7da9d4b79c32cba54fcfc2e9f2b0340640f35451187
+DIST firefox-38.6.1esr-te.xpi 526250 SHA256 a1d6e88c47714eda526f932a396db6ad092ebda696dbc26bdc4996056dcc3e68 SHA512 a20f9b38205693b02484765da154f7c5e788f8950fa161b0f86592ba6bf1f811dcaf9afd97243229ccc3fca2b3abf3f270dbc08e6fcca7b69f08ad8b11dafd1f WHIRLPOOL e0f949358096783dd00d53a541e72c9a8c686de2555bd41d91829bb42e9eb7eb1f02bf4418188940252869b786f891bc65bd6444c56d5e47521523d474c3a22c
+DIST firefox-38.6.1esr-th.xpi 534271 SHA256 0defd0f41ef448f9751907071fc967521b08b1ef04515e6dc774851933424014 SHA512 e0cd2a64057bc69bf84d293294e19cb015d43f02eafdaf1b9b2c6ec95972433063b7a0d0c781af8987d8b2fceef7e03547851e24faa9aaf62b3af881c5f78f1d WHIRLPOOL 1b3428ef044c28fba150cb34f87cc1940c0f26a9975c364ca3822044c59a2897f3ccc17535aa631b754331d898441ab6db68df0aa8ac7d72b886e9b219695652
+DIST firefox-38.6.1esr-tr.xpi 481076 SHA256 97728e96773600e5d5f532bc2683fa2f2e5f2e6995af592b70778784444d4fbe SHA512 35849ce45ab4d6ea6a9b606ff0dda165236a6e6d5a58a53b8e66723a6063ef149bb4ec28d3ba44a3fce1901519d39e7fbe6cb8bf2eb51828f709ca5165bc1902 WHIRLPOOL eaee1a55daa7d7de14d4b467ddc059dcc89155a0800bd449b3cb805e693ac145fb7f5359d178e9d815000cd0ed1dd85a9b947ab17d3b255d76a5df45e3467f48
+DIST firefox-38.6.1esr-uk.xpi 493313 SHA256 5ad2299d95f27e0f6b7be9c29bc2139334f0cb04808fc141db2810251c9dc92e SHA512 72cade19db7345b424fb6fc78415815617cc49230af2b8c6ab9817897c7b43e56386fc4080dd005f6d30811bc8e5788f3f271e7961ee5e2af14b05d6f3cb0709 WHIRLPOOL 4de61d510df8f1fcd74952c01fef8f2d802c07bfe7d4af196c4e8efbd9a9844d96245f392b643b9d31ead3d6043596c7429143503a027093a0dcec4a6cc625a0
+DIST firefox-38.6.1esr-vi.xpi 467504 SHA256 773deb6abe3dd09a515dd3987953120f51ab701a4d83eee40464b8f1e4b275c5 SHA512 c9c417ce152b4b3ae8e07a26b2bee51c2e62dca9358cbac2442da26eb609a26046eb0241d64250d3c15d260c6d153c943c2dabf94ae6447f8dadf0fb9cdf90c0 WHIRLPOOL fc655a8f93782a71ea10e4986b03d0d508221053955955b0be1d5a5738dc9ee63f08e0af7d3e7adddac4b282d55b964f47b0259eda7f051a4fd43f7c083e33db
+DIST firefox-38.6.1esr-xh.xpi 450242 SHA256 56df68f2b0c131632d4ae7a55d6922ff4c65d0332a1ff43edcfe594e78d9a7af SHA512 14a58c32a7a9e9b3beaba1bdcb026edf8031a4dfb2ff638f9f96aa0d4891e0120f5cacac87423e0f2f68f2b98489749966a79470477f9c08466261dfa305ee1c WHIRLPOOL f70807b81f0514a671b82dc14f6b83c77e90f82760ee2d515ee49ecffe1376d998016fe30fecb4750e1994da7e9eed65aa9e178e1ca9c9dab04f54817bcc1c92
+DIST firefox-38.6.1esr-zh-CN.xpi 488276 SHA256 59bf429bf75054269dba7ca789581b6b4bfb501a8ed902690fbefcb3f3f7ae84 SHA512 9aa0b23e9f41e94cadcf5c469d32134711da4be562354bf940710e2b2da9c5b6e358d92bc957d3ed57cc59ace6da27dfb246e4ea5f7cd3a7ed3d72f345e079a1 WHIRLPOOL 054d2732db4dfdabb427bd6c4d2b7dc40a86c2669c48c78d4ea6ee936f69f3b3dec7cdf64dffde8f014374c7bc4251cd7a37526be9b8229f70bc2dab0add311c
+DIST firefox-38.6.1esr-zh-TW.xpi 467844 SHA256 740f7a7933fc624216de2c84492608941ac2aaa228b666cd55b8dbcbdc147e43 SHA512 fab6120f6515a388fdac524deeb2568ff73323692108d8987951fc29683c298612d9b24ff534b0655af12dc5b2f20a4ea9253912dbb1ff1d8bd57bdc12a692fc WHIRLPOOL b07d7b226cc81c19d6b135ff568d41443bd9e2e258824ae5f59455cc5383511e79f11babd748de162ea1566910b2d3a69d440253178be5e63b69f381c86cdca1
+DIST firefox-38.6.1esr.source.tar.bz2 181332690 SHA256 91174d0118ac7178b5902bd6e82743b4eab5d567ec6431abebf4da093ffbd0ff SHA512 e80161a8cf95ab46cf49018c1105c986a412405e3bdb7535fc7ad5e68195f8ebe799624ed482576538a785ff2a4fdad5d1cf594566180035c2bfc9a4eb9b790c WHIRLPOOL 6e2324553814c915f602c3227b8300f3adb0e952ee32e035660595735fe79ee46a3fc4a74e7e1978be0ee7e4b89fa46d0fcf1f7f73a9eb969df3b13037e64c07
 DIST firefox-44.0-patches-0.4.tar.xz 14240 SHA256 cf17d24e19c8e64501582c77e010a10bf8cc65fc1d7620f7a8dd98706195eda0 SHA512 4f597f9885366a6ccbd7cf424fd68bc7d2377eeb5de4741b21d6f51272a9f4f6a57ff2b5a848593097e79d51a7ae7e6e261aea9155f4b3d719e74ebbdf7279f1 WHIRLPOOL 097eb79a5aba97f76d50f5f51da8b089c3d85b34c6a41d6ca782a85381f024d8865062d95ff4bb2235426e3806b660344d3ddf067da0889cda66f0b24cb97912
-DIST firefox-44.0-pl.xpi 403714 SHA256 f01c0fa237aa5ec7a303261abe7b9ad13c22db31b48e3766209fd8ff4d63f4cc SHA512 7513f696df0f6a90b37318d7e27a5be30857c603a24d7c94423e9db899649143dc3b26c06b38b0cd46a0cc72f418de7d46fcc9bf80fda09aff2383c3a59c503a WHIRLPOOL fdc67f909c94526f0dad0434d7883076bb7bfc0bdcde8d2e006bf745617ca11415ec396335ef81c42c3afad8729436db4d87fccbaabde726ba9b7545d442af45
-DIST firefox-44.0-pt-BR.xpi 473587 SHA256 dce2dfdac65e6e1dc8c2236941207a630d467dd30e71f6ca7f8973aaa2425721 SHA512 51c596355acfe0e6d533a4545cb4d2c613c6317471765b39210e2c9989dc8bbfd338f19f37c248ae209bd1af44cce0d988e0b4d38ca3926d3b088c88111dcb3c WHIRLPOOL fb22c28f27051b32692c294baedfadaf9591c261f28d4b7b8506fdaefa72bc031924f1195c00d4a1737dc22e1f70494fea7d3e7e7bfc45cc2b5d5dd92b7b476a
-DIST firefox-44.0-pt-PT.xpi 454143 SHA256 087227a30a7c06d04fcf47aab7f04e42fa554ec2c211463bb366ff17e941d339 SHA512 304295dd4f4c2ae0f490535fac848960eed9589800feb073a0d16be5b51b3279f53c11f90ffa1532abae8445b2f5b018e25391d78e943612b033c0213915611f WHIRLPOOL cbd80ff9cdf5a232c4d104772b8eb699474977ea0aee9053ea3a0716403e586a26eb5b45be83ff24e7f53eee8d591f29863352d3722d773890d509edd4fcbce3
-DIST firefox-44.0-rm.xpi 460176 SHA256 110ced11f415e15dd02cabdf4d5f2bb3f992e68a6743441bbfaa30e0334da88c SHA512 5f355994ed5d9a15a0a86ed289a8b6a9424b5c9b15572e9ffcf7cdd6bf51a22e44a22beb0b92f4afb99ec1c4980849215b4e1c3540b4f1df76039913d55a8eaf WHIRLPOOL 20a2d4a91547a810f9898ea2a593e7c417e2d700cee8fd2f483189e61144f9906c51d2f6054a554056248bb21ebb7b7ca957d5c13b723ec692b0c037d20d1ccc
-DIST firefox-44.0-ro.xpi 507825 SHA256 0f1e2de42f1116840d06145f31cfefbce833719b4ce05e31c054a915a5988356 SHA512 b82b3d6ecd3282a7101f86afc3bf9149a14b4bfd7097b87dad6d387e425cd77dca1a80f2d93d7902f5a9c49a8c42c6c936269ad423433237129d1eb298057b18 WHIRLPOOL 1cb31f912208384b6b54c32475dca12e9cd17a4c9611002ba45183ebc1e45c61f8447a30c0d2a5c0efceba083efe339888f019b8998cc5b2635e6bab53ebbdc4
-DIST firefox-44.0-ru.xpi 418291 SHA256 e14eb41bc5af7f86e74b01e9bfe6a138088216cef000d75bb4d514042baeffc1 SHA512 fe7de8a030607ddc4f0b8034918ffafd666f4543e28ac882e04b37f1f3facd6426aae17a6d56fa3eb7babe33ed3db90a38f29e6cdc2a467be27d5be6afe0e1e8 WHIRLPOOL 5770143d33cd303ab90bf73e3954c2ecf056cd2757d5ca377f542beb26a8e8b09235644ec4ad281237c1a6619f30734ca9c567b57d7ff52e5313956fe19c0f20
-DIST firefox-44.0-si.xpi 553903 SHA256 a9badff4b82754018e8585a674f96c491cdd2f15c18010b85153315d572db25f SHA512 9fbbe14a40b8c9b84c762d65da0053911421cb99332420d065966508635bd502122f614fa4b40fdd53307cb7e95d6ce72ec746e53704259e02aaee8644b0b45d WHIRLPOOL bf3266bf7f558d1d2d77542ad798e9c6d56fefed417e48edca62b3ae40db12e27ba88968f1edd8dd888b7b7427aaa8da9d59d6a90871f0d010fd5e415cfe6a59
-DIST firefox-44.0-sk.xpi 482728 SHA256 ac46e1b95d6973d35fa5ccaeba572e498be9f636a6cf253224a2b6cab6c544c7 SHA512 5a77e76e24ee69b31c898c252eb9ee1657ced43eb288551ff2d5b7634c09654e157eac5e1fbf869cc6193af3e211610634f8953c63a08f95c8e634aad7cbffd9 WHIRLPOOL 2931aba450e42baa4b9ec736b0cae8662970b70555da626c278bc63e4da54a01b5b5e26454d9ef9d7fc429f59ad628085034ee91d727074df9724043c37994e6
-DIST firefox-44.0-sl.xpi 456215 SHA256 cf3a96cbc48afc0af98ee2327cac60eaa49eed6799a6005c5a3410977efde12a SHA512 817b7bc8c6c2f926577acb3331cd1440ecc9726e768bb58f11a135b1f7abf8cf84f1aea3423dc511d27bc47e7b8e220a6f57a8829d355f6c46ef82aa6b720acb WHIRLPOOL 9de36851ea4a4adcf2790a6b72fabbe560731c009e88212ea5ef4b4f0e5df972e12acf5f182a4ceb3fc71ba1c25fcb8fc5135517c83324c560bf5971e044acb3
-DIST firefox-44.0-son.xpi 463190 SHA256 1e76a4e02ece37d331c990d143738897f3a6b0b8e03b3a0d14e368b462faefcc SHA512 64186817c5c9b4843142dfd2e975614ff016a24b285e25e59a9a569c7eb1dd3a8f3c407f268f2b792e788942e4e2295a122f46ba0463ffcfbbd8f09213188711 WHIRLPOOL 750be36d64508cc3bb561ae2ed7714592194b5f7bf9b6d5f326e5d59ab0959f26fb14d4e6ef5ac5be0a43c4a49233d5751ee142ae788bff0739f01fd47382fe4
-DIST firefox-44.0-sq.xpi 499915 SHA256 53f1757028c9c1eaf5e9f8bbd2ae1148a141eb7a869863748017be3cc5b95f62 SHA512 6dbfe308ae073d77983e8bc9c0e17de9f4276d1802df76315cd6cc35353358815c7824f22c3fc4e78c007d76ed92acf533fd187230dbc6f1a611ed2615771e0a WHIRLPOOL 70ca2ef4afe74cc634437f3d540ff2c155590e1951462c2ae40e266533822258ceb0c5d1794b69bb240ecf49582f2aaeab5be7f12730197643014827b1203288
-DIST firefox-44.0-sr.xpi 490391 SHA256 035cded41b55bb24b0f805bc18f16aae19d6f6743c049148e394cbf0e0bf44b7 SHA512 c27a07fc7b9c66b02e4eb4e6dab5e86cb8329c090e7835cdbfa1711396623f8e1edaba2411586ada5895c76e7fa025ba02e5c169c44f95f94d88443675f69f1f WHIRLPOOL 191e5781afddc661f1832df0cfec3f34b1e11d320540afdba7743c905e2aa5c3803ab3644003f33c952c1e5d7630639b03aee2a4c7dced62944b0fb725b7b23e
-DIST firefox-44.0-sv-SE.xpi 465391 SHA256 3516e268aea2f70024909a6a0edca09a804d0b639cdf8da4a25292e92dfbf9d8 SHA512 37453810bd1c400fbbce6c14856d69739c29138dd2da44d78dcdf2f56ef458be955a06d89d391a72bff3dc8a0447f0c7374ab86ce46315ceaf5732a938729a67 WHIRLPOOL 378dd473241ea4a51b972ec5d076fab09f31102763f562c9cb68bd4402ece307bfef4925eb30f48a3fbf07ab173b215a3260ab15315ca8c43a30efd8322616d4
-DIST firefox-44.0-ta.xpi 522512 SHA256 ef911260ea0011e6cecac88007e4f8590362b4238fe24a036b8ef1edbf783592 SHA512 faced2ed536946db090d1186ebdd5398c3549fb54e394a35e7b6a831f159c978822c1bfde214bb610fe8bd92d70fb07d50ca633c670f7299003ce25e178b297c WHIRLPOOL 6565793e84ec674f3adb7d9809f9101878e697a931b75245f1439402e2133b2b10b3b85db39d6470bb2a58d9e2d9633c480c4f69f112d546e85e74cccc9c1289
-DIST firefox-44.0-te.xpi 538474 SHA256 daa13ded2b57955aa47d64dd370c5eebc89932ec194b78bcb0f2f24ba49ed97d SHA512 ad4461f0a177a68cb244241161cb72eb879049212abe2532b18b1d8e5b938d494b235a7f48bcab7873d1b3db365934f880a340af252854b69249ab2e4832daca WHIRLPOOL 4e5fa1bfad71674b54ea2d6c6187e43dcb3e0788ac40d4938a16467063d8ca3aa628d70a7cfef0bf3fe3e2320357066b6b64b70751f33be3088026178f5deaf7
-DIST firefox-44.0-th.xpi 547040 SHA256 9c5e3ed5017e2536d6f11742eeb3740dd513e8b4aa80a77a546f556e4ce4f39e SHA512 21db8029cda66355d9e1c255c54aa5480ef65e935bd4ea6f5f14693443a66e8e2c68b4ce1410e2bfb10cd0602361988766c86a26158e231627bbe134c8b7db9b WHIRLPOOL 806c57c2e3b02806c0088d415ee616809b1d2e65e34a6881814709c6a65a3b03b99d159e0d9e53c92a90c0c0f07c13c825977b574010563c890b04c5661deb18
-DIST firefox-44.0-tr.xpi 472325 SHA256 d105d05b8ec4b2a0412f7805649bf2ae95929a91bc68ec5adc959d597dde1bf9 SHA512 9ace8eea56c1ba2f44713f5be996db7a392efc026072fd8a982bba00763a45af0a19b6521e06e5c6bc58ee3099a389dfefe57e31e37dc159fc515d12478680b1 WHIRLPOOL 27c2e963503fc299382a80d1d34d626e77a096d6770679bdba31257abcbc95f0122dea074d5ccda82c2b457fc8eb20deaa50821925f40a969c6fb0055e60ba01
-DIST firefox-44.0-uk.xpi 511048 SHA256 27a033bc8efb80c92f201daf3b667eef3c819b26fa5ddebf8b94c104f446a9d3 SHA512 7edc114c553f9ba3c75244bc21447570118c781b4c9435c7a055ad513e3cfc5fa707912f4454af066d32b3ede134a89e36d1473cf9e00c6ba327f0b1195e08d4 WHIRLPOOL 44c85068751b893b4503bf0d184a75b85abca7664259ce72822bc64f9c43623436bf10ba2b4a8c5ddccdf0eeae1ab97c577e43993bb56e4d062089b4d129c067
-DIST firefox-44.0-vi.xpi 481582 SHA256 ec827905d334ff761eb001b384c8edc7dc6cb6406d7e64e069226900828a47b8 SHA512 c930b28d2883190985c7489d5a26ca7a0e1fe994f4d4859f51a76388d802642b324f3e362d0806f4f268bf610c910581460544fd6fa05decf39e97b1a6416f73 WHIRLPOOL e74430e08ddf964a4c5bf9f570bebee6a78c6a204d3612e33180dddb088e0a34ba63f93ef917b89e5671ff068f59003e1fce8b2cc973c33113194869b23d1397
-DIST firefox-44.0-xh.xpi 460792 SHA256 9fe12e0fa50017452f04564fcae344d8387239f895721e4e293bfeebeb06821e SHA512 1436db7a37ea2c24fe09399d8e9342fb57ba77b143913790cb7c14dcd743930c6417c196defddd33ba75b0851e9b0e820a5a619ce2563cd0f904d66b7eab99aa WHIRLPOOL 04daf4ddee224b624ae8b1804587e464cf922c88c7a7807c6360598a49296e89377d74c0a415864189346dd5be89bcbde21f4113f39e216409e73e1fda8b7eb2
-DIST firefox-44.0-zh-CN.xpi 496299 SHA256 061a58990006a4d25be48477f9a0e06642f34a548801254e68f417f9af5b71f1 SHA512 4cf6183951fbf302f60371ba0a7c510a576b770377b0339ed1f3ab7a03dfeb08ec02ed9e28452212f78e51e55d02497285639c4e61a001d037a22ad18672b205 WHIRLPOOL 7edf4e02fa57fdcad1d6089e25a68cf9d633d2bdd431ea283f6fe03907c643d5ab4ef345dcc3e6a84362fc0cceded0aaeafabbd39468f66e7b2edbbcda5fc470
-DIST firefox-44.0-zh-TW.xpi 487760 SHA256 92da03a68277fcc445caf5a4dde39a3283bda63674d005e327f651dbc0d6dad9 SHA512 f54e293d5da8abb68f5c47e3330ed46a3529a2c5c9178f6230596b08a1464097d7a3590008f49f3e2375bef778f549a7dfcb5200753cdb3e53562c05af1ba66e WHIRLPOOL 0b9fae8bf600bdb14162f0afde882ba3db0e0ab854321c546eb1ec164660a5c47192e0d5109306f4d4ede46cf301f51a572560895294e9ef0049a552dad171ef
-DIST firefox-44.0.source.tar.xz 182370528 SHA256 ea82b0f4840d320aa4fe8046ba28e686bf6dc60f707a0514a9d68c150d0c4c1d SHA512 d7a2d3ee595dbf356795ba8029e298d8a69645e11d9201307008ad3a0d15b586cbc119d2273a83843621024d20cd67c7d490228f1c4c09b467cb5dcbd288a864 WHIRLPOOL 1a0d47b62d875f700665ebc73f50daf2d33a33c3f9c4cfb5967ff0dfa516be18143d04c08f4a013ed46ba9a35d5b71b77a0f71200413ebf6c57ee57f3c841137
+DIST firefox-44.0.2-af.xpi 496124 SHA256 f80bb4cc0937f2f355d594ee1e7b771e9e3f44672161403de8228d9fd0429e01 SHA512 570d9582b89b88070e0381153880a8eebf47c33c07c9ec52c04c867830d436e59e8f88bcecf499880c7ff8934b302ae3d28b24c6f81a1d774a8581a9768dcd69 WHIRLPOOL 3e29e8faeb49f01534fb2ff15791891dffa38acfc99d4c79db7e85129931f410fcefdcec3b529d0de69b14794b2b9ed6dda42e5f405d724deb4f0064d7eaf5dd
+DIST firefox-44.0.2-ar.xpi 531970 SHA256 bc0c64baf89b969be23cf3310a288717fccf7ba186e89eeadc11829efebd5587 SHA512 bf87e11e014b378b4238108bf78686e78fcf5e49c77647c3d3f007991393f29373d858f035654350c1992168f180b80f4c7df2a454f0552369c866b67c08fa7c WHIRLPOOL 570a5de4ba28cec39e9194bbe5b211b0c7adfd6ae346c651a89762bb64409b5160f2de8cc70a540f79cda31d54c72db7421dbe188f8e97e8c1640d89a1c113f9
+DIST firefox-44.0.2-as.xpi 522459 SHA256 8ca2d9c3baffcaaffdc55eb2abc074f0d58f9f68b3dd1582faacb3f7492b1fed SHA512 908fa0c75b21b74a3763b3c76325ec144f1931d7ad438eeaa40f287c381a049c389e27ce01fe22440883e7201c496991afaad82e39ae52bb79dbeacc40f7cddf WHIRLPOOL 342f545e960b0ad32f7b9ef1df4751589f5dca97d8453d6de133bc6674f7d4c6021bd6326386c89c2c11bd7ef8f48848c9c92034b93929f96fed03b189dfc327
+DIST firefox-44.0.2-ast.xpi 420007 SHA256 7506051ecfb2a57947ccf53e0a8f8234badedd8a9668326a3e3fddb455eb4673 SHA512 333874d36a9e9843f7b0e7e2d8594e6a15dd052fad63a584ed7b833f278a3fa861fa496a192375d946792c3edb2d6f45fdfb244d3fb4a9e5e584df783a161a65 WHIRLPOOL 0f3ae131dbd1c9b4ca1ee753931962444f3f71f78182482652413b909e921e3d4620c2d6b967ece0a40118c62dc04533879cbc375c4d63142bb22ac7f4ed03ee
+DIST firefox-44.0.2-be.xpi 464851 SHA256 8788379b0978281d0e8d75e2905b67473ed80cd8c3372c3e7e3c9d723bf7b605 SHA512 939d4f4891061b9bb57d75334248bc93a31ea43df04a211d65ad8b830c273efc7070b83aae66acf0219705102f286f01b85df33fee1446b403a8fb48e0e5f5a7 WHIRLPOOL d838bd7b80264467e081e2ce93557521d9b3422c8c367ff7f38d76b4d44f25e1af6f9160d55904f79bab888945bbfef2d84a40fcae86762c6feb5fbce4b9fdfc
+DIST firefox-44.0.2-bg.xpi 505506 SHA256 5c744cbaadea198976b091c288efa4a17928a3ccf2ada2539b3134c694efe41b SHA512 9378d177e22e8dab6a1ddc6bf9c2cabe9539f2e21262ff6bd7df592bad5cc6a0fcf6ffa3b6d5ac517075a5f1fd042ece221dafbba9a616aa735cb5eb47291421 WHIRLPOOL 193d92c2832fbbbcd37825b7bbc598fb03a11439d87f4fea6fc8ef717a47bd242d01ad5eb90ba06046dc8dd9f873459d74e57cce2a899fb197bdf6891546aa41
+DIST firefox-44.0.2-bn-BD.xpi 550932 SHA256 ecc8fffc55bc95330c33bc8c73b365580a29ea743914c392612733e8144fba8f SHA512 25a8a1ae451c5ab54d2d95f8a72790f1e4cc198fc78f1268760a16006f89e354612e611aa859954f9745d9d4bb3c8b71661835c69e5e1aa6176381ed6c868f41 WHIRLPOOL 0fc9c844a656736e8ca4ee4c72a3bc6ca623b9949af5bf0ce6fa464deb7a1630dfc36b10d62d6d9b72ecc188f0428b9dc9b627bd1936a645881f7a7a6da92370
+DIST firefox-44.0.2-bn-IN.xpi 542129 SHA256 19940df3112df882b1a300f4bd7e7fa37a71e2c71d1f18c469511af5e3f211b4 SHA512 cb537a24f1bc9c9e035ccd7ba8b248f02d1f44182f391daee4cd5c39775f5a95a3b69577ee3e4c0c2517b21f566d6231308cd1cc7df660f32322a707b6f9a3b6 WHIRLPOOL 2a5eed8b136bbc1d3e4f71cba7f3f6a926918ee8ac42df378464796609a018aa3b17faa14fe9a2d680db18a9cb7bcf89e676f1fbb614409acdddffda2b7b6142
+DIST firefox-44.0.2-br.xpi 454296 SHA256 89c22568ff520a236f8ebbd8341d353af4914a999d1e3f3e9bbf15bbd5813c15 SHA512 51c1955ecbc8956114261b6e82c7f2f6a3e01746c76e4efcbe3028d1f9df64489e69f015da8e191c40e73cda6003179c13639a57536d25f5cd5dffb49c28eff8 WHIRLPOOL 076c714f8902498581cf2349921cb27d7e88c0a090c9e3eef27c2d6a7677238a81d48ae67166db8ea9f2a1b6b97c8bda905864392a66133a3817bca369b2e65b
+DIST firefox-44.0.2-bs.xpi 493434 SHA256 8b8743f5b80f13f717e81e8742cb924d77fddb7d500e96fea5e5484d641cdc34 SHA512 ea53740a099137b5c07f37ed941861208f27e6e80d9b89318f5314ac36777dd6d02536cc4bf3f406cb9ed12e0482bd244f6464a673a9f14b75a293045623de29 WHIRLPOOL 7f3f316bc82aea37d97d02cc8516595ff98286f1b163a32006b8735587628050dcac32785066c4c98e43fe528eefec76581775665fff2164b21c7af06d287831
+DIST firefox-44.0.2-ca.xpi 471463 SHA256 23bdf6db8bedc69a32e6dd5bf5a606311f9c3bf02e80d2e496f475845bf8488b SHA512 1b22b93ab01a63462e3771d8c39d190d226639cf17a3622bb0fbe12e045d8ccb29f63d56f801f13ef2be59d2279b71b53694c5717c9e785e81238a4850ba060c WHIRLPOOL a723912ce61cc7f04b7f02df0d05c45ba7c253839afde5bbd1e84dc7df0898da9d4a19754067c120e965f149b40d80ff1a8a6c3daee5f046847f352fa3226899
+DIST firefox-44.0.2-cs.xpi 460608 SHA256 0746fd83deabb832a01833689f03db0df1c691a2ad4bbe1d4ded93972c2d59d2 SHA512 125ff3355e895e49817c76cd550b72f817d5a4045d48d272da194dab56ea1c8c70854abaa8b24597c5bf494ef52534cd0da4ba0cac47a2c3d088f7650075e43c WHIRLPOOL 16d6e922a3c0e67dad76f3e5a085f62f4e2a766e523528729e34c66d615c40c7da6792c5731a3b59076dcc60cc173395a11d8cd19ce1ae6470c19f9a0025a513
+DIST firefox-44.0.2-cy.xpi 456838 SHA256 5b8e07e055ecdb040c6c46cde65dbd9745eb56b365034dcb28c20e23a44d76e3 SHA512 4fb2a3a72fa33e62168090f31427c1ef633cb31d23b74097e3a6aadfc12d43a0e57c2dbdd804a010ee0bf16c7b6fa81acddfcce098b963816cd679d91e2f7723 WHIRLPOOL 4bc434bbf003e7c8a585c7d04f7220c5d1e0098f771cc07612f856a4f9b84b75e6965ad26e7536f6cc21457c252ef988bea36f7ad8db3c1ca8f670c8f8b36f56
+DIST firefox-44.0.2-da.xpi 463398 SHA256 731c91695e99d187f7d8b03e86965b073293468b1fc808b811a67024e7ffe771 SHA512 aedf415057c71a7b3873336efe8ca331dceb1e6dd992a865c24a40bea029971c90d074b03db12944bf508511c58574d726cad6bf60c59803ea1b79bbe70d4f7a WHIRLPOOL 66b8fc4dcb1ffd48b2aee993dc07755433be4002148cef8cd59d058f8ac6e6745a15f07b3f138897e4448f3daf3f1c4694ac1b3bd1a271b7f85361acea7c8fe9
+DIST firefox-44.0.2-de.xpi 466178 SHA256 0709f207725631a3eff02bba748e443e6f53ec01a63fb1a4c67c8a00bd6a4df7 SHA512 81c46c524cfed2df963e09624c7cee5f310014c82a020bb28982e0c61c2e54a9e1d4450343c3242bfd8b0238448739e87cba97733c2b4515811dc7d61083784b WHIRLPOOL dadbd49b1c162bf79818e975cdbf036bf8823b48d8b734fdfe9d2dd836354cf44ff03684181b51afa2bd6ab0c40709b93260167c2e355277efe05e9613e4aad8
+DIST firefox-44.0.2-el.xpi 511155 SHA256 682325bdf8b134ecfb9375e169ecac6ccb40ee12e833c77326c77082607a3d3a SHA512 afa92632dfe166d237f37f33be3df01c6a63704e08c7706ac5bb2e132db0d0cf8e4cfdce806f3cc10214b3c31022b15e68ab22dfd9c1616c577dbb3006e1f85f WHIRLPOOL 34b755d279fe7e5ce807ab6b9b58ef73b6183950c15c90d612d6407bef3f1f71ce71a272d11eb8243b542359fa9e7bb213e0bd3c72e3eb2e2243c29ab29823a0
+DIST firefox-44.0.2-en-GB.xpi 452631 SHA256 4510c02be16e876ac48c60f740bc078194fb4c21ddedba1683e15b5bfe50fba2 SHA512 51ca2bec0a6a580dd32ce770d14901004f21d3748fb780aba9839792f64f8d4496184371da7f0c5ef3500a8206993d6e58091d4ac4960888744b040519348eab WHIRLPOOL 3ce321bdf36600bf0a9b3e33dc65d04a2de7a1da2e4340e3998611945bfd9ba5c6945c871fb415c052ae7203655797d04a5478c07d6ee39dc237c618177d1de1
+DIST firefox-44.0.2-en-ZA.xpi 457279 SHA256 bfe3cb660d027902a0fd89f291a4cec7bd2f2c216f4c1c536bd440176a4ee58f SHA512 1614689c71596d796c09c30b7b9ed49e8631be1b72271f05723920c550ad9a1625226a7b261cc87993a42c57e4a7f2202ccda0031b5897d202caf364b53324e2 WHIRLPOOL 12c52db2c0e63af0cd33ef6cc6bce138e188381798a74094a8b80eeaef6fa0461fc82e2dfe2107c5e6d99e2c4fa471df8195cfad901a750e5f614e3c35db2b43
+DIST firefox-44.0.2-eo.xpi 496610 SHA256 7721b31e1d73ffc2e9ea9150d19d5f09d392f454f9254e960c98c6e9deaaadcd SHA512 db82aa07a91ae315319ad08db035d1364996f3aa2c6578eb9e8666c3b060e7318ff3ce32fbb0a203c107718e15e8f90dd05e3a40569d8382112e50d5c73480b0 WHIRLPOOL 07b37e4b3d96aed040637f87b859a6683add20d45635f4316ed473c2194a89c05ad83400fd30bda0875f3a14b76fc02ddef93b220da2bbc0495add13e8e212cb
+DIST firefox-44.0.2-es-AR.xpi 465212 SHA256 a67fbc3c45cedf0c7f357136783a6c69d8d729908c7a0a0d9b5e24dbe04a2ece SHA512 10487ebf5ec5951354505b1afcc2bad609acfdd05701bee90304a3c06c7c2a08347aad4873101735a693da12c82a6c2163f28492ebb73382aac8577947f5b1d1 WHIRLPOOL e108711164d5413e6996a3b8a0c3559409fe3f2cbd3794666234c22070afb768704692ed41c991e9ce782e22d7295788a9ee8b5c024929d64da0602aa73ecc42
+DIST firefox-44.0.2-es-CL.xpi 389732 SHA256 84ccd4151bb5c7d0b1946e1690f0f26b29a61737fc8467624f1667d62e09a655 SHA512 02840b133ef0eeea695f77e955a7a54dd18a26d868910cea30155a80b5e6584f1116cf9c4a2ca84421054410d4f2a87749fa286be26d7d67d85b4a47b865a43c WHIRLPOOL 2dfdaae60bfd31f7b3fe7724a9851948d044053c3dbca60ef720e795981ceac273951b0d49c8fe397f44c0c13f9e236f7baee17d64e4abd5a32df65d6800766b
+DIST firefox-44.0.2-es-ES.xpi 378686 SHA256 a41a27f78068859fcfb14cbeaa31273062dddb5c627b8ba21d42e136e5b5d083 SHA512 6909cba88e76bbba028c25bc9197c408c94e4bb58ca25ec96f05bd6567cd9b0f5bed68e62f137f32af22036d303c14947116c011476d858ca84a4172c028870e WHIRLPOOL 4b71077adf23774a86deaf820510ff66d97526be9fab594473018d68590bdc35bafcd7445f0c404d01d2b31efccb898a23458939b0ce462546ce71a244a21515
+DIST firefox-44.0.2-es-MX.xpi 470417 SHA256 d41b3b321af8bfd63a05636aa8e90cb79a4e771adaa232544d1b2e257c9c4892 SHA512 06b575855f291f40e657fe5918eff5d158bf5fa7868fa476f87b1ab8682176ef39f64a912969b8ac33de8a134de6506d6a4f51fe5c131e5077ca6a6e6aceb68a WHIRLPOOL 001a121ab03672497e8db915b60f7356040d339267563c684258becb51eaf1cf81e70f30f870f62d2017f944b5f139b57fcc8e7063677a82e065729bec721792
+DIST firefox-44.0.2-et.xpi 461959 SHA256 9a584347e3890967acf1f2e7b8cde6d50dc922cbbd8df4b3f1780bcc9949159d SHA512 9f5b09a1a5ee666228bb8eda31a9b4a91f47affaaf53975a1143db89d061951d87443babc69d41c09325a8ea981549dc3f897e6184631f05bd04cd6fceec1092 WHIRLPOOL 6436e5ebceb8589e41133e8aefa55d32fe5a8112d23bb8cd0358158c35b3277b48538f4791a3c60fe40f65652ec0e3acb2cd3a343760b09cbf4be70bd41e3819
+DIST firefox-44.0.2-eu.xpi 479776 SHA256 6406f57634fb8b392dd0454e45a58c6e76abeb13d9ae56145e02d66174af7cf5 SHA512 39033aef6918b822ce8d9c781437cd98ea16a7d650da3bf09f09a1137845a2a4de3177ecf8f5f3899a5aad64e9196235f5f72bb6d526637499be785b560e0b2a WHIRLPOOL f0e61102b88d7f101e858c2b4a957a718c8174867dba5a69b8259bb2ab0f6f0d94196457c9c0e78c00ca4b61210f3682ba5370b33af1015c440f54942c438d6c
+DIST firefox-44.0.2-fa.xpi 535476 SHA256 49c4c10758a960dac223c29dbfb62eef71336ffa0c0a1b1691d625298cf97bfe SHA512 640a057ee2605e869ac27c66c0e971a7b94542bc9c23d35883f3d4739303bfd807af0aac0d1dde65825f5efdda620671defe1db309f757332e542bf507252140 WHIRLPOOL d99b80fcd3b379c2df72b405b9aad46ba507fcfb141fb28f86cf638a7f4801422371c0a9a0811a2e943bea3f4054b5db42b3daf1101a8a130d68d3a369480739
+DIST firefox-44.0.2-fi.xpi 461261 SHA256 b8779fd758eba162ae817b52163d26b534cf6bc860b7cae868474e101a995724 SHA512 7749e85d63f4100d175df66f40411aa49d4e3cd92eb7b23332d0128645b80a52d2a8a9cf894495fd53d9d2123784f1dbc03335375cb8d4bc7c22ef27a1069f4d WHIRLPOOL 6d631f864337f35f52ff6169e3c725d275a0f98c6c9f73cbe98c53e4bd4c1ab7992320814dd8f26e1b04fcb7327eda3847d15ba97c378e3eff2ffb8118120e9a
+DIST firefox-44.0.2-fr.xpi 475595 SHA256 04ca61dacbabb368e72b3fea3760a1faeea9d54b7afe3aacb24f290c0bf9b914 SHA512 c69e4ecde1089f3865f4b0440454d632ed54323b290d74f65362333903dbfeefecb73c1e3bac4785de2db056b9d8331d357a9c893c3d6aa46f13401ffa7b2aec WHIRLPOOL 75a7831d0fce2501d20aa54e5fd8f823e989c8f9da1abcd92833dba51681c206e2c0e3f415ba0eac5fb229749bcc6b0f5091290cd56ee5327c6e5c183fa992fc
+DIST firefox-44.0.2-fy-NL.xpi 468849 SHA256 b19bb1d3e938d31a33e98bd3c1e85a29eb409d528b8a70b0265871ee789cd22f SHA512 7d791fefbe54f817c982298240047224565aeb01316e6587e31231bf1c9bc0f8dcd937999e8994f0dd152faf9e628d679413f8cc485041b8ce2b001bc1286ec5 WHIRLPOOL 912faa3e020b5dadc8dac9797fc3efe1eb5f1b8f549955beda2fc4692b5e7398ebf604ee56aa5512211e5379a8f910416eb86b44e5327d33d9e1a2575f9a505d
+DIST firefox-44.0.2-ga-IE.xpi 481201 SHA256 4ae1edad5df17f874c3e127e9b49044f98cd77a65f8d0639ed119d9306fadd00 SHA512 64435bced08fba2079272e5a56d4f60498e1838196362baa301a27c7fdf448457558dac155663d6d8ac4b6233140234d0bb330069fcceaad4c0fab5ed74b3caa WHIRLPOOL 90def8d48e9a1128ba73ffcb403fb79c3c0bc08535374802757cf8add1fb4a25551ac03df61d89648887e0c42870c424d05064d6706dda992668aca2dac80f82
+DIST firefox-44.0.2-gd.xpi 466941 SHA256 547434963fcdcc164b668b7d00ad93fa51c58d97f6ad40b3b57a0192bf256074 SHA512 fb898385356f9a5ebb223ddfa6fc4f249f2239d55a87f621f0765b28e1a990d0f35dbdbc97f9bf608289ca2b42c6b69644f24e2c2d0640ad77ff6d498250b3ce WHIRLPOOL 9dcb78f87deb9fa9c9c0ea634686689dc63c519c188ce3ca622fb114d76cf2244340b105166fdcabcf92caf5c6f11df42db8db8d83dfe068e47d942899ae994a
+DIST firefox-44.0.2-gl.xpi 461112 SHA256 53904c0e7e50852ce0751a2cb5817493eca9496104ca8cda961e6e7544432c59 SHA512 9eedde8ecc461685a3f5c9ecbef4f078ea7d34d8e3142c92aa12d836ddeb62b9291ea62f1feec17a040c30b5a62183d7628c89403001301a9c80bafc752453dc WHIRLPOOL 1020ce9f835adb6fc8eee51670b97993fc45a0755af8fa348ba72882c4f361013350842edf121a65ff23a0e29cd106f769872ef7c524b62d56d3bedbc46b7928
+DIST firefox-44.0.2-gu-IN.xpi 498552 SHA256 d3d92f193da7e084afa2fe615cf89c7557f5da205c2dea6567c659e481cc64a0 SHA512 c9cda023f3eb6543ec2063f8c394cd5feb6793565e9ae230bd5144533980db670ce61ec5580826b0e0d0e29fa20c703d25cd5c93338b18e9058240a39131bdb6 WHIRLPOOL 72640d073080ea60a168ba8941386560d324829fc18d0f4cf95683fe7845f81075a1f52b9f89a415bfa0c74652e054a99ec47340dab22ddcb00f19ea7f7a3a68
+DIST firefox-44.0.2-he.xpi 490168 SHA256 5bf2d9de7e23d817a29ac616dcb29dee08164bff76405487f0501909e13dd076 SHA512 bce4a409f71e78e24ff080e573da4fc3aa9266584cb81fa633345e2afd02ab89879abfc315a654513bc6f2c726582228a15bc359c27fccc12daef9dc226950e8 WHIRLPOOL 0487dfe8c636de2bce503eb99e37e164b1134be69529db6c914c571466e256fa83cc0b2b8d81fbbb78c24150d7b7406e8b8798a70de5281f4085096e49d58ce5
+DIST firefox-44.0.2-hi-IN.xpi 523874 SHA256 555b81e609badb42d964a132db8340fbe76058a50f6666d7225149552da8f251 SHA512 7cf1887d3a3f4b43985f73667b70eed60cb491c0c7770abd6259fe89891b4508e4c5b555aa94f35100e1ffe07f7fe25caa807073a9b98e3fba73383a2a0a5b3f WHIRLPOOL 697bf205ef784979bb3fdd6f76e110855fc10a877620ebafd8cdaa7dd36e4016ecd2cd86ecf13e5476dfe47efdd6f231799c590da1c70385b6d785304cf486d7
+DIST firefox-44.0.2-hr.xpi 491274 SHA256 ba3ee6dfae31599f129dee59d40de832fe7a706f5b8ee07c71c3497829d93938 SHA512 95f3b1435c78adf85273d153d85fc365b34ce1775d7c78d553759535b9810d12ff880f302467ed0dd0ab3ad6e38bb95d627684319f87827fa22a639f29838551 WHIRLPOOL f96b5af13f9cdad35e5aa78facb78641ca10932924a86ba57c3554fb415ecdab8521cafc21a68d046f4b20226ceefa3d0f4c8822a12a1196a65e36d70790708c
+DIST firefox-44.0.2-hu.xpi 466878 SHA256 43a3a184917de8acf7351602fa9d8e6f3de2cd96c83e610ed957dad407b78548 SHA512 b6f8642e140515d65a0ea9ce30d19ced78396bd551f86ca120b2845586bd594bacd1eb1ef6c6d49509a04c25b82ee444a787b5e1012c8eebdefcb40a0fa8f1db WHIRLPOOL a07f57b70aafef30930993c2b23cff773fcbf15b0f1eaffaa3e85afb5a6c29f434267ecf8fa85871ef7e789401ef04a86a31a1436d78b3148ba8f86762d9a24b
+DIST firefox-44.0.2-hy-AM.xpi 549359 SHA256 3abe2cc28d1f3359e83c7ddd961c70fa6332af1a74c14926e4c152a3c204ba36 SHA512 4c3e9b90e22da2b805c9ff2665bca5e35209d281c2c4baba2ac50cbad76b4935dae8379958828843e57604a9e1d01eab6688418d670c6ec189a0ae559f84484c WHIRLPOOL ec0709d2a3b3f81fb5424654396dda48862a4e7efa63ecad19fea935fa54c0dd72510789e28e44cf8d60a964ca303a2d54aa82f113b19c0b82ca8416b95ee05c
+DIST firefox-44.0.2-id.xpi 449870 SHA256 a148c51185e82b445cf41f3172ee572ce294c3f602c5ff2263d76fadfa2898d1 SHA512 9bbcd2c99af0d9d6205478e3e980900a2acb48a727717f4217aa4723a671b96421133df6f9486189a94c8d21d616b17ccaaa8446e55a0376748ad15891275578 WHIRLPOOL 54dc6375a494f96631c526ddc510c9cd3202f6ccf31a2d0352e2f4250200702fc4c786d7510003afdf9a94f858a2743ceae870f03ce72ef3d3d57b8bfc076b1b
+DIST firefox-44.0.2-is.xpi 498245 SHA256 00de442df3cb7229956a3b7ce5b0937d7d157ee5620848554be043eec003819f SHA512 388983231e6bbc78019f78264975f3a9446335a6230ee54cdd71db2df5fc43c1cb0b2410b86dd2a1bc64d3dc60a34285c3d09f054b90dbc69584ec9d04d0d935 WHIRLPOOL 5959c17b26851eaa9c93243158dd73746dc9179d1b3eeaa5475a79728ed41e077b33175122925e4c80fa82ea2374a59caa500891fb5047dc65d980e6c0e9f574
+DIST firefox-44.0.2-it.xpi 369826 SHA256 495c54d5f2b250281dc35ac0db080518d16e1d87976b099e445116c68041855a SHA512 ee5506a1e3c01bb5c57a57d058f1d5aeece91acd33ac28355e1ca07b6e5808949a48cf129b54629d804c69c95941d54f392b0a7c1398c9ddd1f3f5dfcced0366 WHIRLPOOL fbd32d7379faacfa6cd8be1d993a0b616bbce9dc0a12c699331be587e1cbb6d68f84a3bf74ecce50232d8f442f92a00ce86d2c08122af281a909570e68f6a09e
+DIST firefox-44.0.2-ja.xpi 493750 SHA256 9fc7f986b17212a25bec75f72a4dd5d8947077327dc61e7fb1112428500237ed SHA512 58b31410501a6d787a03c747859dec66e627939678e3df3e32689549203f5c8529461d9bc01853328354cab94a630a55786df812a982430ca0b080414a1ec62d WHIRLPOOL cea4debdad00404f5710e44bdfcfd675e69d583dbda831638fd76dc0f02b9319b0f559b55fcbff8cfd3b4b81f739e07774c75eefbb61ac298fc031675e7b2a38
+DIST firefox-44.0.2-kk.xpi 519877 SHA256 e79fc6df878ef4ad55acd7faa56486e2780331b789a81e32864ebe4cb2d6333f SHA512 3cb2ec7f0ed66df38f3687973cdaa61a71ded5fec5f63aa4d396ee9fdb3e1357752fce7973f7ff562a9910ab9da3eab8e2f642731dc7b87985af08fbaec9bb8e WHIRLPOOL c40471ff5c4a7894b657e9a02dcf2db44f39ce6e958878133c38f0b6e65b21eca3d51a4c8266ffe19ae484a32ee674ea0e6e286beeb5d693b9bed98bb7b430ad
+DIST firefox-44.0.2-km.xpi 587939 SHA256 2da9abca08f869bff867e994c9fd16c4087955663dd8fa564396bd55a4215345 SHA512 162d92ff3f13da30b8f9fce75b45c7a33c8a23b758df4353e77646eee432110844b1978258048fb7eef0496512fddb87d2e4afb06732f6e2a8438046223cd060 WHIRLPOOL 10fc6f68a03c23a2ee4cb9e340e2278f2d99dc23273410b090d42bda74a3cbdead6d2accf6d22dd3c2e092b39e32cb441cad59c5977b71003ddf9b40186f4902
+DIST firefox-44.0.2-kn.xpi 547918 SHA256 471a33aa15d391cd46210a787f7c366e2ddf5c71bde8631d6b5ddc4facb8fda2 SHA512 354c8ae7411185fbccffc99876cc806fadd1a0027dae063f5a1cb6f3f43e8b7157654b84f6b5a32d877396faed8df38de35bad3e86a9314d4e988273f3158ead WHIRLPOOL bc174dd70f08c35a284f90cd78251e55992bbada08a1a949e299231d794c84e34aa4efd44700c9121e2494798f05247a3abedbd24262fa2a6034edc478785254
+DIST firefox-44.0.2-ko.xpi 480596 SHA256 c66172bfcac47899a9bcfc216aefb36156c4c96e7a85daff8adee4a7b8c8c40a SHA512 1f76a723970f437eaede779bad74646525997ad6d15db97136c7961627ef48f660792fc1dae800676b3acbfa1277743d1fe9569c5ecb001e1046dad45dbb6ef2 WHIRLPOOL ca9b3625b45995b0a81bb91dc411bb78f2c56b3eb95b2088005a2e91feea4e6fc60fefbbe532febc7f1d2d342c27987304b37e8dee9f6e6fc90c448a903f5b3f
+DIST firefox-44.0.2-lt.xpi 500333 SHA256 22594998956157dab0f5f75d197dc6916d3d129b7271c1fcbab62d457aa03317 SHA512 7bbd6865332d11e4b0f3b66351d75467826f395bc5038c988d2b314ad4b0c9a62253873ba461dbb836d538b3ec9c7d51583baa03dd8dd50906c1f45ad9038db4 WHIRLPOOL c641c087c96993a29ed6513d61f7d6c75e9771793130b97daf0c8441143c968999ca958c072ecbcb52d14e3b0210a0188430255e68d7529f2ffbd82906fa039e
+DIST firefox-44.0.2-lv.xpi 480445 SHA256 e624f07073e3e109cfb6f75c2dcdd37f212335777b7648d69572b5b03b86cfd1 SHA512 5b144a719fcc8a98ae84895ba3b475f600caab7338fbb5ad1d65ff99440669753364a34dac2d5b01c6f351b1b00aa267fd13737d0c7c49935e3549de01d5dfa2 WHIRLPOOL ca251cb2c81e1bab01e339955667fa35937d5fef659a783bd6cdd26fd20159f3e9fa3b4aab5e7728da2f0d548bce240bc0a5335abbaeafd8800ac11b6131dc3e
+DIST firefox-44.0.2-mai.xpi 532118 SHA256 c610849c98f75d22c953ca8f969a5a8eb216f7b9abe2b69a994437c45883780b SHA512 aa2a6f872f323b17d227f06b07f6ca1eb70d40a049ccb331a44a427830571466a94773439a4eda9d297be49c90b574feb2db4fd6479b2e9ad53d1e84e1838fd1 WHIRLPOOL 6ac014a032c2406a921460b6e1c5389077e9f7ff4512a8a15bf990ab832fe8a1a20534acf572bc86180bf02d8af0d67022628301903991ae7e6c39e0331248c9
+DIST firefox-44.0.2-mk.xpi 537872 SHA256 c20266df9f18e539cc306fa0c8510beb465fc142c4bd0a0b2981fd488c2f3e7b SHA512 ebbc42f7773cbf78ceb6022d7175da7f829908a16728f6fe068ee9a10ae38b21e2334e3ad52c6de9d9d15dc7f198712282ced32d391858837e3dbc7c2181746a WHIRLPOOL 2f870bb2cb0151359b2c9565e18083fc5a1a352129c77e76ef49fb040fa2e2986ad910fc73b8e1fca5597de7d181026e35fda9a82de79de3f188b3a8d1fb98df
+DIST firefox-44.0.2-ml.xpi 551283 SHA256 58e3cba0bd84b6196f56d5430cc802d050f89e81f7df6bbba3de78b36505a06c SHA512 ace2218180028c4cacbd54d39abf87aca8f3c780f679a6e135cfc4799ce4b6385f95a92c79465946ad580c4b345a74d8d73f5da1db967334cacbf553fd04a4fa WHIRLPOOL cec25cb56bc413717f5995b84df043e8df846cba7057f38595fa3e3d0923466b6e1ee5fa6e8ccd438b1012e1c22d5070b444bd523840778f9e951ae8298eea74
+DIST firefox-44.0.2-mr.xpi 527783 SHA256 905688e784a3687869a89a89ae6990dbf50b8a3dce01b58a675e5a130ec8d0dd SHA512 c306d16cee41c68818fa50404226df2d2641973f4e52b1c6604048d027128bfd6e758895990c78cd75b5cfe9f58091bc8d867d25a87aa43165a7d7eeb2180dc0 WHIRLPOOL efd2c0123deba48c4e3f0eb25dc5e07ff163bc827e36a88aa7a03dce015977cf8bceca4ecb70393a41797a2c67778e2f84141df10d4b9327561d637d4d703235
+DIST firefox-44.0.2-nb-NO.xpi 458674 SHA256 5f7ac91893b8dba07cf6380aaecbbf59c6cf9f6828f15905c74fe7508b00e69c SHA512 547f50e0c109b0951d04fc41ab1098e5ac9d57d0ab3569113e97dbb9a16657e8074cd42a1664017fb40165615d312365a30dc77ff1bcbe1750481f61a5f72e48 WHIRLPOOL ef68c14b0043a680d74112bf721425a5b7696d7dcfeadcd1b1f0b6be00cd72a0f21e93f26d451f5d2ff02248025c1411d4ba50b8c2bb3f4ded800c4051b8d8d4
+DIST firefox-44.0.2-nl.xpi 456555 SHA256 07af52f923566de4c75fa573e12cc642a952a9d34c68107031db3c47568ec5f3 SHA512 33d5e2bb9210289053b89b0f14b2e620e1e7c7f876f998f2f8139959c0f3ebd78bd9ddc30b4a039d884b928d3b4514f4d6f49f78b88d3cdfc7d4b814e1d823ef WHIRLPOOL 73763a0c14b6e3a7f14834293889cf5197881fbe30ac30536d7b4a7ebdc81d6170ce5118942e20ff752dc8ed794ea4b139d6f86dcdd2627bdbe9a0590b4afba1
+DIST firefox-44.0.2-nn-NO.xpi 452668 SHA256 6a452c10f93bd0317e16c40ad58a167d092c65770d62401c7680a2667f07a4c3 SHA512 254bd221cc6055654ab4eb120e160db6e00053ad60703488683c2ee417a83a0b061886b2ee432cb78cbfa58eb4fac89cc242b711e98f654b6b7879cef033f77a WHIRLPOOL 13478a069808ad0ef918cbc73ae75a062c5672aade06cb6d88c9261ce7da704fbbc0c71708846287888bcc4e5b6bb7e2c502273431d70d54a486f8420c130a17
+DIST firefox-44.0.2-or.xpi 540590 SHA256 e9c8e29ae48027f411b456e9d51490ac5340952d94ba79cf06f44b5af1426a03 SHA512 b3edc9f32289c15969f6b6fb7fb7c6d1f5be704a94d13cff0be505e91c762c989146f4de1be6a406742fae7e7e0ba43ffeccc170873d4fc68df60f59886131e0 WHIRLPOOL 9e107b7a88ece00d0deb0522272e05a637c0e8010226ec21aa5c34ff8a9ab7ca8d2093ad737cd2ef0bf6cf2ecb937480c3c14379f7cf50fb2032305790432e0d
+DIST firefox-44.0.2-pa-IN.xpi 516426 SHA256 b90d3ca3eab8f94d130869f3c722ad1e3eaa6e4e3cc40eef2bc4fdb82e77bb69 SHA512 fded8e5e1e297ab63a0897e00175c2ea738e550e8b6e1a252767c9375a831a22f4c2e15ee208770c04499297f13fffb60378a374a7ab9d872e232b421f3b5b22 WHIRLPOOL cd90cb2f84ac463bfe994301b9addcb9622a2fb35f2a7754d908e7b57213b66ad8ea7705c0d9fac65e9e43d6d14520bbf7e2ec55644e9c8dada9f523b5b696f4
+DIST firefox-44.0.2-pl.xpi 403715 SHA256 8421b880f1e5268d5cd2a1314b05e3933ea3ef568139ae9e11c2064f3e723c5a SHA512 a9644025e5bede68cf8b0bac5e03d446d99295d4a9922b042c2d16441c9cce42475f5f5559dc777976b89ffcb45cede06b0d301300cb64d828c187071235fc77 WHIRLPOOL 30568bd772294348a30472b534ea02aa5c336219b40cf6dbc3135e9eb534594599d39e4b6b48382d5dfb2ddaa43d37f91b07d34c064f74b7483330ff54a683ef
+DIST firefox-44.0.2-pt-BR.xpi 473588 SHA256 34295e1c43322c48749829f9e378fed557881a65789511eedb443eac717dd81d SHA512 96c72cd59662b0cf22c256c62fea13d6529ae460c22fc4c8fcc0be388da3e5e9ddce4df0724e4d6427b20488bbaa1b3ff2b340dc6a1739bcd8a883e0b458e6d7 WHIRLPOOL 53fd80a8b0d54dde7bfeaab20308efc166fa3552d5dcbcbac3362783c2349566bc930b12d6b7997695f563b18db7b6b81ecae8e06f2d28538300907597e7a85b
+DIST firefox-44.0.2-pt-PT.xpi 454144 SHA256 430b639c423329aaeb0a58455a92cea8f2ef3e25e1076e081672295b016194cb SHA512 a97ff41cb76098d39ad4ba0e46f30e1ed85bc1545f2197b67db517bd9032b866e58a93096ecd55a57b3ab6c2c5d7f7ba54f54d68a2888fee0b055f598e0e7e95 WHIRLPOOL f7a15ae77d5495cb0c1a45815df0c2330605abf965493806578fb4c97ecb21a0dc3ff2643feabc48963172c4f110af233b0c4cea72354e3b5cbd91c4b8d63717
+DIST firefox-44.0.2-rm.xpi 460177 SHA256 334dd7850b1de48c0c806bb5993f55ece0f45b636e781394abe89c54b7751dff SHA512 4123e7890f6cb7385a49aab192a379cd3b59f445672d408c67f8fd15b5b46d000fc6406474629d01c05424d136df202ffea2c9818981ff1ea0f186630976eed0 WHIRLPOOL 914d73d826ff7fd9c193ff2adfe0f3d2452326e6885091f82403e290b0f44e3904d9aae429fe80c205817b3c4be7edbe7966804d3568b57ac3fe353b9f1942fa
+DIST firefox-44.0.2-ro.xpi 507826 SHA256 c115c0e142cf82bc713a646e11ac345985d48f08fefbd72d2da4757062ea77d0 SHA512 f55c55fa40c8c5ef0ec46861af22de5c6102a2859f49a1be628389e801e9cd521041440c8c1913a44658f896bdcfea90c7af93631e040b0783c58ce6307677b9 WHIRLPOOL 1e4a4b656b67dc477434560e70823e9b11411020d1a0aa42087bac7acab431e282632e3110b2163353928a816de4d40e25fcf55fd78d10874c46d3bc66869d9f
+DIST firefox-44.0.2-ru.xpi 418291 SHA256 c4c8196ece406b71b642efe4142ff5fb3e244b4e575569dd354f5c89f6fee0dd SHA512 b7a0648bebb8c29c4dfe52d25cfe9c40a3b2d904a751b39c5208515a80211ef18bd6cb1c84ed500e73f89c59044d561c7d4df2dbb045b3a2aedc03993d84492e WHIRLPOOL 3c5c20625cc9a10722f3c68ffdb7c150891f8c5c657725c742efb732c63b17593fa4060e3ea42918eb9bcba04039c435e8ccc46c356a30edc922fadbdd937c61
+DIST firefox-44.0.2-si.xpi 553904 SHA256 8f48c04cbae69a254646255af72be70157f67f903cc59621f2be8b05842c4559 SHA512 84bcea09cea82f9d4aa507906dc23f79017a18043350f7f9fd07d33ecaa1a0488b7746987fccb7f89568345b0e254ac88bbd0a8fafcfd94502cbb34c5d674bff WHIRLPOOL 80489f8bad5c0b5c40d3e59a6e16393127367f0e4af709ddb951191b22a5f009892d92c00c315cee9ad325ad37ff801b86d8bbce50e2c1277c3c60fcc6752cc1
+DIST firefox-44.0.2-sk.xpi 482729 SHA256 694a66caadd8d3b7fca3d73856e8192f3f0ca0c766c5d9abe2a087f8e29acb99 SHA512 3bbd8fab3bdf3bc64170a4e45006b713324fb1304782ade4609057c70b86a5f13c10af85cb05573a1818f86c07f7adf8e577dc9af26282d805c3854ca73bb08b WHIRLPOOL 3af27ac00168732b893ed4232ae8591707fdbbe80d4eaf6925e2e31b5e794e2e710d9fd4db125ab317d6271d03b308f1f495f74c787b09579e9ad7d296f5bf17
+DIST firefox-44.0.2-sl.xpi 456216 SHA256 ad458b5c47206e4347437eb2ad1a0c8b00d5d9855cbec808f56eef44a8ce465d SHA512 25910c4bb70b6279f05543ed358804cedf822cea714a7072a2b93e6a4bf913b3ab750dd3f0077b709e77519510e3de9ed1e4b8dff71ac26184e2b140ef33a189 WHIRLPOOL 51a9ab5a8caa01be9eac3d8d9e16aed3dbed5e5aa2c460184a88e75fa0cac8f294f10bea6e11cd864d6b57c36bddf721ff207d0a4da670f10dcfaa18404fe433
+DIST firefox-44.0.2-son.xpi 463191 SHA256 7ab8b84b1cbe8101194546eb714bdc46237c420e8da1f5fcb4945ae4cf8a0f02 SHA512 0429034a0ffdcee9837dbac4861fb114f29ffb54ba63d42e9c7b5a4c33901993674da03b9e87b1015d68c4f8c1f288f1caf3d1ef93aab8b81f9c5b5c01f5b0d7 WHIRLPOOL 76761c30af441cadbc8969e70330d698e716aa08fb5349b498e70b55fa7cc319ad71e1ed538ffe8470007306cf957152ab85ce8438a6ee1d777e7c3f8e7f1cb9
+DIST firefox-44.0.2-sq.xpi 499916 SHA256 40bf8e6d4a0598bed75738814a9f2a3363aae4061d77096176f81e80b9a67e0d SHA512 cb210dd77f8336f39d756145232a3ad748f506cc7446623e4a834a767f0b4e444245e01001fef2fe28ee6928233bb9978df983c0287b5c352d76a03d7b0dc4e6 WHIRLPOOL 835b3502063d047038e3679f0d6add31e5f2d9293dfad6c429f547a78b8f9516754bc737a27a920cebcde23227d04c2ed176990ed3018a1cd84a95b648f4e415
+DIST firefox-44.0.2-sr.xpi 490393 SHA256 423fa059b7f76b35a354b6677bdaad18977aadec1b0a077a49385d86dbddff73 SHA512 a88a31812df092c2e4809483404bfc3c2934112f501ead05ef7235613a4d889f4875a041077611a7944491af16385af3c568da470fed8cd7cc4b0346d0f415a5 WHIRLPOOL 03b55747f3971b2dd846c1db05f680667425560825cce8843373b3e39ceb4f7f009729019362a804436d52843ae029240107f7bd3c540d418c0e3aea2cdb6e68
+DIST firefox-44.0.2-sv-SE.xpi 465391 SHA256 8ee4c83ce771f97b2d742345eeda9586319dff9fbb9a518b9b557f2f2d479db5 SHA512 033af1a1001069e6d5b72392f6456ad408a976d8e02a089cb877c4d51aea00db2125537814e1be60bbb32a33510734599c2f4e5c4beccdf29aa95ca7e50ac5a0 WHIRLPOOL 556ff2075f0bafc03b52f2518841022fe3738b1f6a2b2e8183963b81e75ee75d87c362dd6ee7900714e8689327bd537e0c5567a6af1ded9c6ae4f6026e6a57ef
+DIST firefox-44.0.2-ta.xpi 522514 SHA256 4af0895359af13368b298e50ea92b9a7368ae8966e153fb631012e37f2917dfb SHA512 090963b563e94b5a341d856d90979d3bc5a2a49ffe9b3637da3847239aa1bad913279c77970d06ede0e1955a743ef6b2d1ba53d0f374c53b46a57969b052a37a WHIRLPOOL a0ce62350d1073aed05a3b0c0d558cad2ded766a0f59235041fcfc13657cb8450742c04ddad16da644b6f060c8d19ee8505a5ef68bf3d582dec65eb426e09fec
+DIST firefox-44.0.2-te.xpi 538473 SHA256 5e7607c4c2f8a5a305866d944399c574c4d2a2f362cc78897220996e5333236a SHA512 50f7f775d26c9e87807f445987509e929589695f02b0273b94bbb7170b7b213be980a7713dcad9a581f72b943a400397f9499d62ce5aa5b6520dfed95ae73ef0 WHIRLPOOL 1ec0e315cb4290518456438e37d60bfe79005e717e690fda714bc4f03a1161cec5bc203bc95f3b88003b5f406867e1475f18a33342778884eeb6d3a5b77858ed
+DIST firefox-44.0.2-th.xpi 547043 SHA256 9485e0929ab39dde7de36531a17b2dfb063d783c3c7041639d2a75340ef3041f SHA512 3f8156632fb9a578cd2cc7386a0cadd84fab82dceaa38fa804abb7b9daf6cc321ee903113f14bda2e13a126a539ff29054d7498ee382e0752f1016e50fc3620f WHIRLPOOL a4cda86e5629ff8b0aa3a45d23ba03747c8d7d5a9bd70dcfee7c3b941037fa3424cffad25ad7055f64b2252c7a5c444903c1be0eaa7de9c6ac2f1f6383aa7c07
+DIST firefox-44.0.2-tr.xpi 472326 SHA256 fe97ee662baa6b52d5872488b1069b54e967d2ff4bb38dec48af83d408ee9a99 SHA512 771747fe979767a80ac857adaca02f163890ef0191148604b26d01d4064ba0c15af32431e928f2b63feb40f35d9311077f0f7c8447199512cbb37c107362fd05 WHIRLPOOL 028feef99ce62232ae39fc8dd4e531b1283c27632140634ce915225f652f278c9d2107236fd8f944c8d6c98760ea391964b6154569bf5e5b4b87af519aad0894
+DIST firefox-44.0.2-uk.xpi 511050 SHA256 367a130ac1e3e87e2fd6734b6b780bea569fc3ec4d668149a01c81072ab0b7c7 SHA512 13913be9d6dab6fadd65387d2a19e25b8ef73985503803fe84224eca9c6483516aa4523302e1e387484277242f71cdb6319543d358cceb31f39893aea25a04f3 WHIRLPOOL d1fd8ccc2a739fe154f8e950d4de2b17b681d00bf922549f953451fdb28e9e4ad39e0f167d956639abb52b3243ba152212aa27dd22ce28ef57034ab008e6f400
+DIST firefox-44.0.2-vi.xpi 481583 SHA256 f1d380e4e083da62dd3adfede3cc7a894036d6f4dcf36097b1d32f16ebe50352 SHA512 a87ef3f21aacdd247789914184b0a38184b2a09bbcea85f1097c50678ea5f5d32070e7a1c732d3b075ce1c979bd71a769f0e291bdabe62988567999f705e7b8f WHIRLPOOL 4a2284917fbd58431467b9fd2e559ce660dd1d55410a871f15ec1e6b12c06151f7b7e3b4434ccf6659ea202267a4fb3b9f6f00b15d4592b3602927745dc7ef1c
+DIST firefox-44.0.2-xh.xpi 460794 SHA256 08ba2553fe4042c123eeffa05721ae7a26b4d30bb79219d3ead1620bed918d4d SHA512 89b6f77e5f3e013028ef9c92e88a806743c261589ef791af807c3bb955ecc931660061bc2e2dd397c05b53ec358d56794c83f25f97bc7673e30f7f3d05838f58 WHIRLPOOL 68faf4ba7c117fece40214a4a5a20dfb0a31ee16b5a00aeb64564a44b8ce2e4c6a49acd187848c0a79ab8bea0f8d064d17be1f2fac1572c44dd1882f3ae333ee
+DIST firefox-44.0.2-zh-CN.xpi 496301 SHA256 e8609ff71c038286fb3768369941bfd864343eace5c0081897387eaf2f51da0d SHA512 edfdc0bd0d7d36e0099eb3f97efbb0f185fb072f129a4ded1cd979ce6c6f66b0d0f3fd44d83b5361dfe92a094d19201ab9b17429e31c6e69a237ebcc2a071d71 WHIRLPOOL 99a0a265173e7f0e0e33c76c3c826a2f470808d9e64f9503d51d74c44b00111d403eef92dc5d18c6a35b0616b045ecaeaa3ddabf389d466dc4f60758b96b01ba
+DIST firefox-44.0.2-zh-TW.xpi 487761 SHA256 3af3a905106a7572753d7863bdaec82bbe5b3670c1abbd80d6f4893a17ddce89 SHA512 22f223cc6694d670b1f3909051244197e50a994c32a19d7ad9fe64624e559907d24527791038136250592d2410de3f7e11979a840dbb8d638172ed3e291288ee WHIRLPOOL e57ed023a1f1abaa22ed103103b081e05c1fbaa6331c3288b120971c32979341025444e0519d1170f4a532ed49076fd98ddc42793b054e8a1009f0c11f1bd3ae
+DIST firefox-44.0.2.source.tar.xz 182355632 SHA256 0bb28841a9268c50cbb239f759f16f55b3a624f679c68965158beaa0a83a2d9e SHA512 03bcb796577a416d3267f3dbadf4cdbaf6f4ee0b2e4fde3b0f6d47ccbaeaadcc7e2eb997b569e5b14aa38e2e7c0ef0a19749b9a448a89d0d335f7510ba06dd1a WHIRLPOOL 76a1e4f25e6dc154195099da7d2ab5066ccffbb24a7763b3305d9220c8a6a5bbfab6ca1f2ffdfe77a809de14f90d92ac0da0193ea1b83243b06b78e8f6849f46
diff --git a/www-client/firefox/firefox-38.6.0.ebuild b/www-client/firefox/firefox-38.6.1.ebuild
index a795236dc850..a795236dc850 100644
--- a/www-client/firefox/firefox-38.6.0.ebuild
+++ b/www-client/firefox/firefox-38.6.1.ebuild
diff --git a/www-client/firefox/firefox-43.0.ebuild b/www-client/firefox/firefox-43.0.ebuild
deleted file mode 100644
index d0229f53ce60..000000000000
--- a/www-client/firefox/firefox-43.0.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# No official support as of fetch time
-# csb
-MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
-gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-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
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-42.0-patches-0.3"
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.42 multilib pax-utils fdo-mime autotools virtualx mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist egl hardened +hwaccel +minimal pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
-	>=dev-libs/nss-3.20.1
-	>=dev-libs/nspr-4.10.10-r1
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	pgo? (
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="8a3042764de7"
-	SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
-	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-else
-	S="${WORKDIR}/firefox-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-#elif [[ ${PV} =~ beta ]]; then
-#	S="${WORKDIR}/mozilla-beta"
-#	SRC_URI="${SRC_URI}
-#		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-#else
-#	SRC_URI="${SRC_URI}
-#		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-#	if [[ ${MOZ_ESR} == 1 ]]; then
-#		S="${WORKDIR}/mozilla-esr${PV%%.*}"
-#	else
-#		S="${WORKDIR}/mozilla-release"
-#	fi
-#fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="8002_jemalloc_configure_unbashify.patch
-			8011_bug1194520-freetype261_until_moz43.patch" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	eautoreconf
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf
-
-	# Need to update jemalloc's configure
-	cd "${S}"/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# We want rpath support to prevent unneeded hacks on different libc variants
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	emake -f client.mk configure
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -z "${cards}"; then
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-		addpredict "${cards}"
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		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:-${EPREFIX%/}/bin/bash}" \
-		emake -f client.mk realbuild
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || for plugin in \
-	gmp-gmpopenh264 ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png"
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	if use jit; then
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-	else
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-	fi
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
-			|| die "Failed to remove sdk and headers"
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
-					|| die "sparc sed failed"; }
-}
-
-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/firefox/firefox-44.0.2.ebuild b/www-client/firefox/firefox-44.0.2.ebuild
new file mode 100644
index 000000000000..8aa3b8a12fbd
--- /dev/null
+++ b/www-client/firefox/firefox-44.0.2.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+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
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-44.0-patches-0.4"
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.44 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist hardened +hwaccel pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=dev-libs/nss-3.21
+	>=dev-libs/nspr-4.10.10-r1
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	pgo? (
+		>=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	CHANGESET="8a3042764de7"
+	SRC_URI="${SRC_URI}
+		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
+	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+else
+	S="${WORKDIR}/firefox-${MOZ_PV}"
+	SRC_URI="${SRC_URI}
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+
+	# Need to update jemalloc's configure
+	cd "${S}"/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# We want rpath support to prevent unneeded hacks on different libc variants
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	# EGL use flag removed for now, as build failures ensue with firefox-44
+	#use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	emake -f client.mk configure
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		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:-${EPREFIX%/}/bin/bash}" \
+		emake -f client.mk realbuild
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened, with jit useflag.
+	if use jit; then
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+	else
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+					|| die "sparc sed failed"; }
+}
+
+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/firefox/firefox-44.0.ebuild b/www-client/firefox/firefox-44.0.ebuild
deleted file mode 100644
index 8c5198c11175..000000000000
--- a/www-client/firefox/firefox-44.0.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# No official support as of fetch time
-# csb
-MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
-gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-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
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-44.0-patches-0.4"
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.44 multilib pax-utils fdo-mime autotools virtualx mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist hardened +hwaccel pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
-	>=dev-libs/nss-3.20.1
-	>=dev-libs/nspr-4.10.10-r1
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	pgo? (
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="8a3042764de7"
-	SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
-	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-else
-	S="${WORKDIR}/firefox-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	eautoreconf
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf
-
-	# Need to update jemalloc's configure
-	cd "${S}"/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# We want rpath support to prevent unneeded hacks on different libc variants
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	# EGL use flag removed for now, as build failures ensue with firefox-44
-	#use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	emake -f client.mk configure
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -z "${cards}"; then
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-		addpredict "${cards}"
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		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:-${EPREFIX%/}/bin/bash}" \
-		emake -f client.mk realbuild
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || for plugin in \
-	gmp-gmpopenh264 ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png"
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened, with jit useflag.
-	if use jit; then
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-	else
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
-					|| die "sparc sed failed"; }
-}
-
-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/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 51f12f3dcf12..1ad10b3da343 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_49.0.2623.47-1_amd64.deb 48458988 SHA256 61d874cacab549e7113fbd1e011d7d7d993a36393223233a9b4b223b4299aa68 SHA512 8f3802a1d754520ec2f082809fd2937ea640e4bfabc80a7ed2a3692bb507e1ebe013d526be10dec52144828dd9619b2eed74b6aabb826280da280458c2c23c3b WHIRLPOOL 88b599128200eaf5d23e407779f98db5ac1e331d617571c9064f1ba5fb7d87dc1f28380f03d7fbe6744be5cc4366d54259fcdf66dd86f96b041eb1ea0f453bac
+DIST google-chrome-beta_49.0.2623.56-1_amd64.deb 48428634 SHA256 bcc08228c1da66a133cc8eb961ef3ff6dbfc1200783b1248824ab8b96f1c2fc9 SHA512 af5c7130c53b8f295d6af733613d9f2680cf9d644ba40410c6f9d6ee7f15a4c4357d4204eb3cbd54823bee1f7fd1e7a494638f966e70fc13c0104da780908600 WHIRLPOOL e6f9a318612403ca570a8bc7406f7d82614be99b6cb39693831ea548c091a919eb2bc2a44bd19f2427b819c4b1856de2209b140cd2eeee96f6e6324acb74efb2
diff --git a/www-client/google-chrome-beta/google-chrome-beta-49.0.2623.47_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-49.0.2623.56_p1.ebuild
index d57602ec7c32..d57602ec7c32 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-49.0.2623.47_p1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-49.0.2623.56_p1.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index c3a410a78417..6681e170d996 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_50.0.2638.0-1_amd64.deb 48485834 SHA256 013a1fd1ab35db0b9e27965cf838e80a642ceb87f95fd1c75144071bc969b941 SHA512 688883ee5b4459b6c532c7dab630fbd6781a0604de23ae293ba9fbc1656c2bbcbf20a9dabafd6f66117ad2d516232a69a7e986e0d7eb0c24d52f08388f979bd4 WHIRLPOOL 943e52d51f6c6856f2d531b6fa6e0aa25a0ed67d5f95ffefa48d96417bcb2ed386a1d63e27ad3e6aa6fef2176a3456398dce8614113d2e077f3e86296f941db2
+DIST google-chrome-unstable_50.0.2652.0-1_amd64.deb 48494116 SHA256 a9c2c9870fd91b2bb398cdc92c3f594e6d620d1f2baa0722c524362337abcd1e SHA512 fe1f4f19f516f9ba874b34cff9e122dbe60233d3220a99e3d669d062413cf396133cb5f9a2a6692a620226618e386d7c2db70c6dc46d83bdb77a3c5abe89b0e0 WHIRLPOOL d5f3e414556c4ed803f16e3b41d74389b91509e9e1165686caffa6bb9378be872949726ab6913d803e25421e1fe580e6f5f55a7ae8dd387063710bafb91926fa
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-50.0.2638.0_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-50.0.2652.0_p1.ebuild
index d57602ec7c32..d57602ec7c32 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-50.0.2638.0_p1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-50.0.2652.0_p1.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index c98e644b27fe..c04a39ddda37 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-stable_48.0.2564.109-1_amd64.deb 48067952 SHA256 ba3fd26b9aafc5b747c979cf3abd5775e671b9088d5779d4a45c0a5b87f51aa6 SHA512 65af159affe7e3856d920ba0f1a2b1dbc2ec95cd310b1645ccfb5079cc83f1c639ddf02139a17247051e578262d6b2ca194e59807a5f5a8eb844d0d2c3714552 WHIRLPOOL c50ea6fdefd634f2ce6b26ae7f1ce52888fa364d16a5fab58960b8ba9c52f64d2365112d15c34726e9d9a980c6ebcb7692d0560b8bff4da8c998c7eaf1d147d9
-DIST google-chrome-stable_48.0.2564.109-1_i386.deb 47625502 SHA256 e4d8652972d468c07f517617b13e15ad7d8e5d3f3d01bf0ac4862a6652ec3087 SHA512 ae8b870bb2bd2337aecbfc091bfb8f3f39bae31d088a45c2a599c552c838ce8aa9fb1631639f588033a8935a2fa6c31b2746492267f20f5c0b8c4d824fd411e6 WHIRLPOOL ba5dffb0822996179cc671e7261eee251d2979d0122fa9f468c5f12d94f6e69e62ed71b39cb0cfeaa7f2ad6c6190d43c3358a2c70e4bc90b742d6cdeb5d0a3eb
+DIST google-chrome-stable_48.0.2564.116-1_amd64.deb 47906916 SHA256 201e3b32c9c3d647f9bc071b5fe9faa45e0f2ab52127380052f2338c5465d70c SHA512 10394ea44886f17fc5d2ed9b878e6e707a184ca818107fc76147705bd957002a701e34df42e70a471668d0f630e7a1b8d5373d5b057eb8715968e0fc781c617c WHIRLPOOL 834d46c00ce3dcae3ab6f3930a269d3a41bd2237203a137b04e02998f02d933e26899715482abb7266d8f2ba5a4112d876682c5a941748bfb484c4eaab091bbe
+DIST google-chrome-stable_48.0.2564.116-1_i386.deb 47539368 SHA256 7401ad3698a28bf2b45e350fd2b941c44cb51dbb3f87b0e7dd1a2da72c42f594 SHA512 7059b444fe6435f7c2d654db18b9f19a49559c8e37b252b3d1a8ae1ad13f897219173922d8208696e0d06e1e9bf751ff339b492805f3619f593b030f0bf1f235 WHIRLPOOL 3fa70010b4799b2e13dfdfb9d46a8f27feed030d2cfb5e434307826431011fcc9b562393fdb088dfcf458de6ef9cf7dff4266b59989f11412062aa711182027d
diff --git a/www-client/google-chrome/google-chrome-48.0.2564.109_p1.ebuild b/www-client/google-chrome/google-chrome-48.0.2564.116_p1.ebuild
index 6516144706cb..6516144706cb 100644
--- a/www-client/google-chrome/google-chrome-48.0.2564.109_p1.ebuild
+++ b/www-client/google-chrome/google-chrome-48.0.2564.116_p1.ebuild
diff --git a/www-client/httrack/httrack-3.48.21-r2.ebuild b/www-client/httrack/httrack-3.48.21-r2.ebuild
index 0a53cb88aa8d..d3375e59e4fe 100644
--- a/www-client/httrack/httrack-3.48.21-r2.ebuild
+++ b/www-client/httrack/httrack-3.48.21-r2.ebuild
@@ -29,8 +29,8 @@ src_prepare() {
 
 src_configure() {
 	econf $(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
+		--docdir=${EPREFIX}/usr/share/doc/${PF} \
+		--htmldir=${EPREFIX}/usr/share/doc/${PF}/html
 }
 
 src_install() {
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index e50b3537d6c5..2b0efb89bee9 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -2,3 +2,5 @@ DIST opera-developer_36.0.2120.0_amd64.deb 46346306 SHA256 2e572f3b8a3571c9f4c79
 DIST opera-developer_36.0.2120.0_i386.deb 46568196 SHA256 7d7561c4d46746203f456c560aa74cd385b500b44f8779712ad265797d9187ad SHA512 b09f5045f4b053734b1773d879bbef273545bb0662bbc01ffa609274f06363ba6037f374c6af0f5547680db986f3e318b63cde734a4f5b6a034c80a3e834953b WHIRLPOOL c1febbc4210328e514ecf945e1bbab988834ecdd68a79cc43f037e8f3b8f429e96bcb611aac3680de0286ba43d0717aa391d4cbcbc6706dca87ffa1c8e8103e6
 DIST opera-developer_36.0.2129.0_amd64.deb 46667976 SHA256 b549b232a0565fcc4f2a0f338f50f57545efbeaa8c40c8cfd64aff47955f8c46 SHA512 9f0b8a21fbd7ff8b8c0db65d5b2a98704ef458893cbf584411db26b6fda1fd8286d1fba287d7826105dcae582566c9e8a074e639c308dd5b3684c0c8c94542d6 WHIRLPOOL c0d8e8793bfe86ce82f2b76114c8d37b6edef3a2a6cae52f41af191e9eaf79901ba16d52c59bccc3a4a3069f05e2f6e218899c4d1713328ba82a59d50ee3fe0e
 DIST opera-developer_36.0.2129.0_i386.deb 48143050 SHA256 529d5bf6732c44fc5d23845f07d7b8e0a6922145f0389cb1858db8636cfead2e SHA512 7e3a7ee1d31f014f10a34d1ff728ad65bf52a66e5f201b38eac3a95dd499650b7e6fc911b0e507cec34562d7e6e0ea0e0298ca2bd5cfad256acb258e985c1776 WHIRLPOOL 8e3cfbfb2f2e9473ed864ca41f5cd05775b25f23d849b2ef94a6a2396b0a8efef3714d696e88e01b95d9f67ef81bf38827aa8146c850c67fd23e2ddb8ae1f78e
+DIST opera-developer_37.0.2142.0_amd64.deb 47534832 SHA256 bad16537194760f3be744163c2d88d5f228eae142865b704766de4b6c3d8f4f6 SHA512 6be695ad20b0d0bd0a2f567b4853c15d63523195136040e276ce07fd18a08cb369e63793c70fa735e332ae1d9c916f80502be18f3c1f4bc8fe343e1394b69281 WHIRLPOOL 9f797f0a3abae394d8ed1785d9a8c752521e5b63fecc73d580f6bb6837c3a15e951fb191480e2e1d2a74ee789de16299cbd9d8afeb7c3a80ebcfbee0923e6cab
+DIST opera-developer_37.0.2142.0_i386.deb 49027934 SHA256 db74f4b3159e5e8ed604b9d253f68dde1a430b303e520f8b3c11dc238dbc8737 SHA512 8174eddfa5d50151055fcbd39b2136bcdebfd0b043109b312d17470ffbd1d83bae6bf7cd857137ceaa0e415bd9330138c7e367d43da9f8a5f7caae9f45f1dba9 WHIRLPOOL 84f05191d55509f734a38adbf2b7850ec6b5c8f05ad5d15a1220d6d367a093de426d35f8f522562f5673274eae581164e811ca38b31a7e76a36d59ff2757b6e4
diff --git a/www-client/opera-developer/opera-developer-37.0.2142.0.ebuild b/www-client/opera-developer/opera-developer-37.0.2142.0.ebuild
new file mode 100644
index 000000000000..bfeded8ebfc9
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-37.0.2142.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
+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/Manifest b/www-client/opera/Manifest
index 6a5fa8bbfea5..bb7a0c27c041 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,5 +2,5 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_34.0.2036.50_amd64.deb 44627688 SHA256 ca32b729d044cb85d657c6ac7e613a4e60f22c1b62ffbe2fb9aa3dde6c4ed041 SHA512 6183e07fb60aaedfa39929f2821f22b880497f61f625297198c205746c7308987a090d2a30452e38dffd8119620f41109c2d019cc0665d245b601cdb21942a5d WHIRLPOOL 967f4c287578c704e1ff4e2a5b743b869ed7618694d0d0ca2ba64800b259e9a30a374ebd72498ed85285b961fe9ccda7f26c62011129dd18a76542c66419beec
-DIST opera-stable_35.0.2066.37_amd64.deb 45350606 SHA256 3afa543f51d5f7fe4e8fbff93518c4afe0a0a8fab5e43210fbc0f6d42739d148 SHA512 6d4ff41316879bc4607b1a4c24ff537a215fdfae672724f3d3ae5e8928e6c03a51250aa56c29258c17080b197687a6f9f169deda16ea5d3777e821bc5f474416 WHIRLPOOL 78aa059e8efbfa6f0680287a34af3450dab5a707fe4c31308e198dfa92e7baedaaa478ee7d5bd080b385e379f52b431a8512c9c6456e3dc0d66ff0140cb3e624
+DIST opera-stable_35.0.2066.68_amd64.deb 45320262 SHA256 20805cc8832e1dfa961ae9f8917cb8099e62a5ea829224053927b24e2e2ceeb4 SHA512 673ccdbac2a8cbf98f5efbfb9e44be66ab886aedee1358e84f9c3b91dc23a5f724cb46b494585a85c672b74942b138697ce47786fed13018472b9a59eb2923e3 WHIRLPOOL 0af64f4313576db6d731d801702b63e54e37dd58dace8a351ede5062c787411a1124704e10101724d07999032fcd8c1548e8c37034b204ba9e590c9db69a940f
+DIST opera-stable_35.0.2066.82_amd64.deb 45190134 SHA256 5748675db2490b6d267b622db33f51a0b7d4f30af810642d562a68ba27600dff SHA512 68caa06089745c8069df87c00823b0e64931da681438c6c6ff75553467d3763d95c93ffe8c3bd857dd32f19ea91d5116d0eb7b58ec1a7216c8f59bd883c4a3e0 WHIRLPOOL 5c5202cdd8630f2b00504d5ab1a5ef323adcd6b8f6dc0c5793a7676877154402e742fbb0b2d48a10dbd18a939fde75a23437fa2a464efbf2558ea6b63f471562
diff --git a/www-client/opera/opera-34.0.2036.50.ebuild b/www-client/opera/opera-35.0.2066.68.ebuild
index ec547a8df4ce..ec547a8df4ce 100644
--- a/www-client/opera/opera-34.0.2036.50.ebuild
+++ b/www-client/opera/opera-35.0.2066.68.ebuild
diff --git a/www-client/opera/opera-35.0.2066.37.ebuild b/www-client/opera/opera-35.0.2066.82.ebuild
index ec547a8df4ce..ec547a8df4ce 100644
--- a/www-client/opera/opera-35.0.2066.37.ebuild
+++ b/www-client/opera/opera-35.0.2066.82.ebuild
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index a4ce5bcbc626..9a2e212e1f1b 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1 +1,2 @@
 DIST pybugz-0.11.1.tar.gz 23787 SHA256 05b2cef8a655ab34d9279e6341d16a803af07958e72320125cb30a3fd6bc8eec SHA512 bc2277a8e900765bf1799e5de65de5df8184bf50b6ca7c78478a9f43ceb78aa66bcb53c3fd89f7b194b13fa14ad162291d559554a8cb073c071104e2b0978c61 WHIRLPOOL cb8f9a36cac6ae7a42e43d6d9489e2593c8ae76153b769bf04f269967e6477e37b1633d30969c4d7c6d0bcd816aff7bd189a1754c06769e3ea0f761eda3c16db
+DIST pybugz-0.12.1.tar.gz 25606 SHA256 aade267d2ee6b02d6872e019ef4ddf8f96e1d81668faa2506e96875fa2981bc7 SHA512 bb76baf8105f4b56b106c3e63f5aebb322659141edf9c5e5af747db5824abffb7b127703ecb7111f9480d05bdb2f11b3fef2cd5f99078d9dda00e841b4ce7394 WHIRLPOOL 0b345efb5f6ce40e5c5910f576e544b2fc65c73beec3843fae21504455c23f3cd5aac41801a2eb733def50485455345e78e8c94287a1943747f608cc63a27e3d
diff --git a/www-client/pybugz/pybugz-0.12.1.ebuild b/www-client/pybugz/pybugz-0.12.1.ebuild
new file mode 100644
index 000000000000..3445cef687df
--- /dev/null
+++ b/www-client/pybugz/pybugz-0.12.1.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=( python3_3 python3_4 python3_5 )
+PYTHON_REQ_USE="readline(+)"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://github.com/williamh/pybugz.git
+		https://github.com/williamh/pybugz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	inherit vcs-snapshot
+fi
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
+HOMEPAGE="https://www.github.com/williamh/pybugz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zsh-completion"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp contrib/bash-completion bugz
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh-completion _pybugz
+	fi
+}
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 7c995dcf583f..8d6f076a8061 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,4 +1,2 @@
-DIST QupZilla-1.8.6.tar.xz 3205912 SHA256 aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5 SHA512 36f1c79b7932b76f3ecbc4d1ea1bb207fe7e0477a98d583e13ab7df1703a5529e2d599c42b8f0a6792692c09e257abfdec398a1537a9002c1fd98d2128f4b627 WHIRLPOOL e60f66749654bd135fa2552ed2d75095c00108be6992b5d0e1609d7b458690218e601af317b3219f6e106e19870e46207109659e8aa9182117532bda7481f8e3
 DIST QupZilla-1.8.9.tar.xz 3004644 SHA256 620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac SHA512 64ee064aa55f4aa1c56ca3a925dbec66612d522eec570a96448d940d52239cb74dfb08b89610008b3ee669cfb4b287393020b8070162697e991aa8c04c57c448 WHIRLPOOL 4f5864c35d008b64292afbfb615cbb33a9e327446d637cbcd1bf41d0e4ffa7a3cf6a529d1eda14cba6bf28664aa40ee743f812b165698ba997a90cb2285cbc0d
-DIST qupzilla-plugins-2015.01.27.tar.gz 335585 SHA256 466d2cc4a0b904705e2d23b6c05be6d36c74065f81b24aa9b82be0e377960e55 SHA512 0354b96530eca72d27838acfcd6605c0a14095f741587b89d1d4292e57bebe54d17e49464dc0a41af99873031c69ef09120c07053452568caf16dca222f1371b WHIRLPOOL a849f120f7f7a9e4dae6fa9abb2d3a66295a4778101887e99248f1ebd46e9231481f99f1d8fd9478e12f5cedbc5be055948ebe026d504d6b5d2d362ee222ba49
 DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256 afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512 5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522 WHIRLPOOL 10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb
diff --git a/www-client/qupzilla/qupzilla-1.8.6.ebuild b/www-client/qupzilla/qupzilla-1.8.6.ebuild
deleted file mode 100644
index f125b456a427..000000000000
--- a/www-client/qupzilla/qupzilla-1.8.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
-MY_PN="QupZilla"
-MY_P=${MY_PN}-${PV}
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
-PLUGINS_HASH='1f8122da27362ae14a6e3c029830b51e9bac03be'
-PLUGINS_VERSION='2015.01.27' # if there are no updates, we can use the older archive
-
-inherit eutils l10n multilib qmake-utils vcs-snapshot
-
-DESCRIPTION="Qt WebKit web browser"
-HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
-	https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )
-	kde? ( qt4 )"
-
-RDEPEND="dev-libs/openssl:0
-	x11-libs/libX11
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kde? ( kde-base/kdelibs:4
-		kde-apps/kwalletd:4 )
-	qt4? ( >=dev-qt/qtcore-4.8:4
-		>=dev-qt/qtgui-4.8:4
-		>=dev-qt/qtscript-4.8:4
-		>=dev-qt/qtsql-4.8:4[sqlite]
-		>=dev-qt/qtwebkit-4.8:4
-		dbus? ( >=dev-qt/qtdbus-4.8:4 ) )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtwebkit:5
-		dbus? ( dev-qt/qtdbus:5 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS=( AUTHORS CHANGELOG FAQ README.md )
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
-	epatch_user
-
-	# remove outdated prebuilt localizations
-	rm -rf bin/locale || die
-
-	# remove empty locale
-	rm translations/empty.ts || die
-
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
-
-	l10n_find_plocales_changes "translations" "" ".ts"
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
-		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		USE_QTWEBKIT_2_2=true \
-		DISABLE_DBUS=$(usex dbus '' 'true') \
-		KDE_INTEGRATION=$(usex kde 'true' '') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
-
-	if use qt4 ; then
-		eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	else
-		eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	if has_version www-plugins/adobe-flash; then
-		ewarn "For using adobe flash plugin you may need to run"
-		ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
-	fi
-}
diff --git a/www-client/qupzilla/qupzilla-1.8.9.ebuild b/www-client/qupzilla/qupzilla-1.8.9.ebuild
index 44bafc0a5221..301c37b64ad1 100644
--- a/www-client/qupzilla/qupzilla-1.8.9.ebuild
+++ b/www-client/qupzilla/qupzilla-1.8.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc64 x86"
 IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5"
 REQUIRED_USE="^^ ( qt4 qt5 )
 	kde? ( qt4 )"
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 1759c3bc9b72..5678842e1ca5 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,4 +1,4 @@
-DIST google-chrome-beta_49.0.2623.47-1_amd64.deb 48458988 SHA256 61d874cacab549e7113fbd1e011d7d7d993a36393223233a9b4b223b4299aa68 SHA512 8f3802a1d754520ec2f082809fd2937ea640e4bfabc80a7ed2a3692bb507e1ebe013d526be10dec52144828dd9619b2eed74b6aabb826280da280458c2c23c3b WHIRLPOOL 88b599128200eaf5d23e407779f98db5ac1e331d617571c9064f1ba5fb7d87dc1f28380f03d7fbe6744be5cc4366d54259fcdf66dd86f96b041eb1ea0f453bac
-DIST google-chrome-stable_48.0.2564.109-1_amd64.deb 48067952 SHA256 ba3fd26b9aafc5b747c979cf3abd5775e671b9088d5779d4a45c0a5b87f51aa6 SHA512 65af159affe7e3856d920ba0f1a2b1dbc2ec95cd310b1645ccfb5079cc83f1c639ddf02139a17247051e578262d6b2ca194e59807a5f5a8eb844d0d2c3714552 WHIRLPOOL c50ea6fdefd634f2ce6b26ae7f1ce52888fa364d16a5fab58960b8ba9c52f64d2365112d15c34726e9d9a980c6ebcb7692d0560b8bff4da8c998c7eaf1d147d9
-DIST google-chrome-stable_48.0.2564.109-1_i386.deb 47625502 SHA256 e4d8652972d468c07f517617b13e15ad7d8e5d3f3d01bf0ac4862a6652ec3087 SHA512 ae8b870bb2bd2337aecbfc091bfb8f3f39bae31d088a45c2a599c552c838ce8aa9fb1631639f588033a8935a2fa6c31b2746492267f20f5c0b8c4d824fd411e6 WHIRLPOOL ba5dffb0822996179cc671e7261eee251d2979d0122fa9f468c5f12d94f6e69e62ed71b39cb0cfeaa7f2ad6c6190d43c3358a2c70e4bc90b742d6cdeb5d0a3eb
-DIST google-chrome-unstable_50.0.2638.0-1_amd64.deb 48485834 SHA256 013a1fd1ab35db0b9e27965cf838e80a642ceb87f95fd1c75144071bc969b941 SHA512 688883ee5b4459b6c532c7dab630fbd6781a0604de23ae293ba9fbc1656c2bbcbf20a9dabafd6f66117ad2d516232a69a7e986e0d7eb0c24d52f08388f979bd4 WHIRLPOOL 943e52d51f6c6856f2d531b6fa6e0aa25a0ed67d5f95ffefa48d96417bcb2ed386a1d63e27ad3e6aa6fef2176a3456398dce8614113d2e077f3e86296f941db2
+DIST google-chrome-beta_49.0.2623.56-1_amd64.deb 48428634 SHA256 bcc08228c1da66a133cc8eb961ef3ff6dbfc1200783b1248824ab8b96f1c2fc9 SHA512 af5c7130c53b8f295d6af733613d9f2680cf9d644ba40410c6f9d6ee7f15a4c4357d4204eb3cbd54823bee1f7fd1e7a494638f966e70fc13c0104da780908600 WHIRLPOOL e6f9a318612403ca570a8bc7406f7d82614be99b6cb39693831ea548c091a919eb2bc2a44bd19f2427b819c4b1856de2209b140cd2eeee96f6e6324acb74efb2
+DIST google-chrome-stable_48.0.2564.116-1_amd64.deb 47906916 SHA256 201e3b32c9c3d647f9bc071b5fe9faa45e0f2ab52127380052f2338c5465d70c SHA512 10394ea44886f17fc5d2ed9b878e6e707a184ca818107fc76147705bd957002a701e34df42e70a471668d0f630e7a1b8d5373d5b057eb8715968e0fc781c617c WHIRLPOOL 834d46c00ce3dcae3ab6f3930a269d3a41bd2237203a137b04e02998f02d933e26899715482abb7266d8f2ba5a4112d876682c5a941748bfb484c4eaab091bbe
+DIST google-chrome-stable_48.0.2564.116-1_i386.deb 47539368 SHA256 7401ad3698a28bf2b45e350fd2b941c44cb51dbb3f87b0e7dd1a2da72c42f594 SHA512 7059b444fe6435f7c2d654db18b9f19a49559c8e37b252b3d1a8ae1ad13f897219173922d8208696e0d06e1e9bf751ff339b492805f3619f593b030f0bf1f235 WHIRLPOOL 3fa70010b4799b2e13dfdfb9d46a8f27feed030d2cfb5e434307826431011fcc9b562393fdb088dfcf458de6ef9cf7dff4266b59989f11412062aa711182027d
+DIST google-chrome-unstable_50.0.2652.0-1_amd64.deb 48494116 SHA256 a9c2c9870fd91b2bb398cdc92c3f594e6d620d1f2baa0722c524362337abcd1e SHA512 fe1f4f19f516f9ba874b34cff9e122dbe60233d3220a99e3d669d062413cf396133cb5f9a2a6692a620226618e386d7c2db70c6dc46d83bdb77a3c5abe89b0e0 WHIRLPOOL d5f3e414556c4ed803f16e3b41d74389b91509e9e1165686caffa6bb9378be872949726ab6913d803e25421e1fe580e6f5f55a7ae8dd387063710bafb91926fa
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.109_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.116_p1.ebuild
index e859db625286..e859db625286 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.109_p1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.116_p1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.47_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.56_beta1.ebuild
index 1dbafa6a762d..1dbafa6a762d 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.47_beta1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.56_beta1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-50.0.2638.0_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-50.0.2652.0_alpha1.ebuild
index 1dbafa6a762d..1dbafa6a762d 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-50.0.2638.0_alpha1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-50.0.2652.0_alpha1.ebuild
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
new file mode 100644
index 000000000000..875d4fa0758d
--- /dev/null
+++ b/www-servers/adsf/Manifest
@@ -0,0 +1 @@
+DIST adsf-1.2.0.tar.gz 162753 SHA256 ba564c1da4a60c848dcb47fb3e003cbad0d2c6cf393c189f334b35e59937b681 SHA512 e195d36fee5900cfad08521cb511e0941078d46edab5c621d0ea0808fc9045e95ed634d171e8049dd649313b0c2b9e86f00a9f026943593292da57125e6320cb WHIRLPOOL e0bab5114801a30a33618c8cf310ec4d7808123179a35e31b414ff63ad6cfb23f7986f50dd5cf46208e938fbab5cb65b664553f030e6da5fd149dfb6b51ac0f0
diff --git a/www-servers/adsf/adsf-1.2.0.ebuild b/www-servers/adsf/adsf-1.2.0.ebuild
new file mode 100644
index 000000000000..72344edeb5e1
--- /dev/null
+++ b/www-servers/adsf/adsf-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
+HOMEPAGE="http://nanoc.stoneship.org/"
+SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
diff --git a/www-servers/adsf/metadata.xml b/www-servers/adsf/metadata.xml
new file mode 100644
index 000000000000..bd70e455b425
--- /dev/null
+++ b/www-servers/adsf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 1541bd9bfe93..84fb7b78a7ea 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,2 +1,3 @@
 DIST lighttpd-1.4.35.tar.bz2 665955 SHA256 4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7 SHA512 13f8562fb735964fe7ef1b127a15c43907f34be70b6bd2dd4ba61b59275d7c2a8d9a7947ff1a4d7cc5fd7efd309fc66b7de6d954b59424f814ea2eb98fd876b9 WHIRLPOOL edbeb94ae29475be398e9281135fc43f915be68c5836ae3da302f7c94c3af19eeca601cedc9bfe59d552f45c6248a945b2de725613de395087e4e195efe9a62e
 DIST lighttpd-1.4.37.tar.xz 574020 SHA256 804e6f60567ca1da2b3927f92b7e9332b93aca9560f282ca135b86b7558979bd SHA512 60870149c78a44ae1cf29bd2ba8737ba18019178f9fd3868523255121d85cdc923c2315b572a2a0fcecc3d6451a501ad030189b78bfc7f25807a05b0300063b3 WHIRLPOOL 08c3d79fa5a65eea999d257a9c8e10ed75d0043a00160f6b69c868c6ef4c1fbf81cf90dd037506e24ecbfd4a9cba15801b4bb0f16af0a400afa885f863ec64ae
+DIST lighttpd-1.4.39.tar.xz 579180 SHA256 7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b SHA512 69bf56afe2bec381566defdc20961554e405e5e7f77b0067e1a29a04e65167b9283cf08655b8dae1c2b6fdddde31245253b5506a532a83f363dce066811b61b3 WHIRLPOOL 5f0fe57afd11a555d5aac76c6abb8b78e34d7f56b0b2921a318297efde420b4762048045274a51e4e030279cbd6d14ee0a344d2c91c18755a0a9d5f83f4bafb8
diff --git a/www-servers/lighttpd/lighttpd-1.4.39.ebuild b/www-servers/lighttpd/lighttpd-1.4.39.ebuild
new file mode 100644
index 000000000000..2c3832ebbd2a
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.39.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit base autotools eutils readme.gentoo user systemd
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl !libressl )"
+
+CDEPEND="
+	bzip2?    ( app-arch/bzip2 )
+	fam?      ( virtual/fam )
+	gdbm?     ( sys-libs/gdbm )
+	ldap?     ( >=net-nds/openldap-2.1.26 )
+	libev?    ( >=dev-libs/libev-4.01 )
+	lua?      ( >=dev-lang/lua-5.1:= )
+	memcache? ( dev-libs/libmemcache )
+	mysql?    ( >=virtual/mysql-4.0 )
+	pcre?     ( >=dev-libs/libpcre-3.1 )
+	php?      ( dev-lang/php:*[cgi] )
+	rrdtool?  ( net-analyzer/rrdtool )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	webdav? (
+		dev-libs/libxml2
+		>=dev-db/sqlite-3
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? (	>=sys-libs/zlib-1.1 )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+		dev-libs/fcgi
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+	# enable stat() caching
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+	local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+	# text docs
+	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+	# non-essential modules
+	rm -f \
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+
+	# allow users to keep some based on USE flags
+	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+	use webdav  || rm -f ${libdir}/mod_webdav.*
+	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}"
+		ewarn "and mod_ssi."
+	fi
+	if use mmap; then
+		ewarn "You have enabled the mmap option. This option may allow"
+		ewarn "local users to trigger SIGBUG crashes. Use this option"
+		ewarn "with EXTRA care."
+	fi
+	enewgroup lighttpd
+	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+	base_src_prepare
+	#dev-python/docutils installs rst2html.py not rst2html
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with bzip2) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with kerberos kerberos5) \
+		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua) \
+		$(use_with memcache) \
+		$(use_with mysql) \
+		$(use_with pcre) \
+		$(use_with ssl openssl) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+	use fam && has_version app-admin/fam && \
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+	# configs
+	insinto /etc/lighttpd
+	doins "${FILESDIR}"/conf/lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+	use ipv6 && readme.gentoo_create_doc
+
+	use doc && dohtml -r doc/*
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+
+	use minimal && remove_non_essential
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst () {
+	use ipv6 && readme.gentoo_print_elog
+
+	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+
+	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
+	fi
+}
diff --git a/www-servers/nginx/files/nginx.logrotate-r1 b/www-servers/nginx/files/nginx.logrotate-r1
index a78ed7a1a79c..23665e5f204a 100644
--- a/www-servers/nginx/files/nginx.logrotate-r1
+++ b/www-servers/nginx/files/nginx.logrotate-r1
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,6 +7,6 @@
 	delaycompress
 	sharedscripts
 	postrotate
-		test -r /run/nginx.pid && kill -USR1 `cat /run/nginx.pid`
+		nginx -s reopen
 	endscript
 }
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 10026eed2f2a..b4d633012157 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,2 +1 @@
-DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
 DIST resin-4.0.46-src.zip 40400255 SHA256 e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f WHIRLPOOL a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
diff --git a/www-servers/resin/files/4.0.44/VarType.java.patch b/www-servers/resin/files/4.0.44/VarType.java.patch
deleted file mode 100644
index 05f03f214cb2..000000000000
--- a/www-servers/resin/files/4.0.44/VarType.java.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- modules/kernel/src/com/caucho/config/reflect/VarType.java.orig	2015-08-12 21:05:11.892000000 +0000
-+++ modules/kernel/src/com/caucho/config/reflect/VarType.java	2015-08-12 21:06:04.475000000 +0000
-@@ -33,6 +33,7 @@
- import java.lang.reflect.GenericDeclaration;
- import java.lang.reflect.Type;
- import java.lang.reflect.TypeVariable;
-+import java.lang.reflect.AnnotatedType;
- import java.util.Set;
- 
- import com.caucho.inject.Module;
-@@ -188,7 +189,23 @@
-     
-     return sb.toString();
-   }
--  
-+
-+  public AnnotatedType[] getAnnotatedBounds() {
-+      return null;
-+  }
-+
-+  public Annotation[] getDeclaredAnnotations() {
-+      return null;
-+  }
-+
-+  public Annotation[] getAnnotations() {
-+      return null;
-+  }
-+
-+  public <T extends Annotation> T getAnnotation(Class<T> klass) {
-+      return null;
-+  }
-+
-   static class GenericDeclarationImpl implements GenericDeclaration {
-     @Override
-     public TypeVariable<?>[] getTypeParameters()
diff --git a/www-servers/resin/files/4.0.44/build.xml.patch b/www-servers/resin/files/4.0.44/build.xml.patch
deleted file mode 100644
index dc3a413fc0bf..000000000000
--- a/www-servers/resin/files/4.0.44/build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- build.xml.orig	2015-08-12 23:14:20.302000000 +0000
-+++ build.xml	2015-08-12 23:14:47.909000000 +0000
-@@ -12,7 +12,7 @@
-   <property name="eclipse.home" value="${user.home}/eclipse"/>
- 
-   <target name="compile"
--          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper">
-+          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae">
-   </target>
- 
-   <!--
-@@ -27,10 +27,6 @@
-     </antcall>
-   </target>
-   -->
--  <target name="resin-eclipselink" depends="eclipselink">
--    <copy file="modules/eclipselink/dist/resin-eclipselink.jar"
--          todir="${resin.lib}"/>
--  </target>
- 
-   <target name="richfaces" depends="init">
-     <antcall target="artifact" inheritRefs="true">
-@@ -92,13 +88,6 @@
-     </antcall>
-   </target>
- 
--  <target name="eclipselink" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="eclipselink"/>
--      <param name="module.jar" value="resin-eclipselink.jar"/>
--    </antcall>
--  </target>
--
-   <!-- gae APIs for quercus testing -->
-   <target name="gae" depends="init">
-     <antcall target="module" inheritRefs="true">
-@@ -437,13 +426,6 @@
-     </antcall>
-   </target>
- 
--  <target name="jasper" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="jasper"/>
--      <param name="module.jar" value="resin-jasper.jar"/>
--    </antcall>
--  </target>
--
-   <target name="version">
-     <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl"
-           tofile="${resin.modules}/kernel/src/com/caucho/Version.java"
-@@ -903,7 +885,7 @@
-     <delete dir="${dist}/${dist.name}"/>
-   </target>
- 
--  <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
-+  <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
- 
-   <target name="configure" depends="init">
-      <copy tofile="modules/c/src/resin/Makefile.in"
diff --git a/www-servers/resin/files/4.0.44/resin-compile.patch b/www-servers/resin/files/4.0.44/resin-compile.patch
deleted file mode 100644
index fa6dd390f3fa..000000000000
--- a/www-servers/resin/files/4.0.44/resin-compile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- modules/quercus/src/com/caucho/quercus/lib/xml/XMLWriter.java.orig	2015-08-12 22:15:36.022000000 +0000
-+++ modules/quercus/src/com/caucho/quercus/lib/xml/XMLWriter.java	2015-08-12 22:16:45.761000000 +0000
-@@ -29,6 +29,7 @@
- 
- package com.caucho.quercus.lib.xml;
- 
-+import com.caucho.quercus.annotation.Optional;
- import com.caucho.quercus.annotation.*;
- import com.caucho.quercus.env.*;
- import com.caucho.util.L10N;
---- modules/quercus/src/com/caucho/quercus/lib/xml/XMLWriterModule.java.orig	2015-08-12 22:24:52.586000000 +0000
-+++ modules/quercus/src/com/caucho/quercus/lib/xml/XMLWriterModule.java	2015-08-12 22:25:10.385000000 +0000
-@@ -29,6 +29,7 @@
- 
- package com.caucho.quercus.lib.xml;
- 
-+import com.caucho.quercus.annotation.Optional;
- import com.caucho.quercus.annotation.*;
- import com.caucho.quercus.env.*;
- import com.caucho.util.L10N;
---- modules/resin/src/com/caucho/security/x509/X509Parser.java.orig	2015-08-12 22:38:56.323000000 +0000
-+++ modules/resin/src/com/caucho/security/x509/X509Parser.java	2015-08-12 22:39:17.249000000 +0000
-@@ -29,6 +29,7 @@
- 
- package com.caucho.security.x509;
- 
-+import com.caucho.util.Base64;
- import com.caucho.util.*;
- import com.caucho.vfs.*;
- import java.io.*;
---- modules/resin/src/com/caucho/server/admin/ManagementAuthenticator.java.orig	2015-08-12 22:39:56.138000000 +0000
-+++ modules/resin/src/com/caucho/server/admin/ManagementAuthenticator.java	2015-08-12 22:40:29.323000000 +0000
-@@ -33,6 +33,7 @@
- import com.caucho.security.AbstractAuthenticator;
- import com.caucho.security.PasswordUser;
- import com.caucho.util.*;
-+import com.caucho.util.Base64;
- 
- import java.security.Principal;
- import java.util.*;
---- modules/resin/src/com/caucho/ejb/session/AbstractSessionManager.java.orig	2015-08-12 22:42:36.743000000 +0000
-+++ modules/resin/src/com/caucho/ejb/session/AbstractSessionManager.java	2015-08-12 22:42:53.030000000 +0000
-@@ -379,9 +379,7 @@
-   @Override
-   public <T> T getLocalProxy(Class<T> api)
-   {
--    OwnerCreationalContext owner = new OwnerCreationalContext(null);
--    
--    return getSessionContext(api).createProxy(owner);
-+      return null;
-   }
-   
-   protected <T> AbstractSessionContext<X,T>
diff --git a/www-servers/resin/files/4.0.44/resin.conf b/www-servers/resin/files/4.0.44/resin.conf
deleted file mode 100644
index a48840b5e9f2..000000000000
--- a/www-servers/resin/files/4.0.44/resin.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-
-# You can override this value with whatever JDK you want.
-# For a list of valid values for GENTOO_VM see output of
-#   java-config -L
-#GENTOO_VM=sun-jdk-1.5
-
-# Verbose starting and stopping? (yes/no, defaults to no)
-#VERBOSE="yes"
-
-# Select which server will be started, this is an advanced feature, please refer
-# to Resin documentation.
-SERVER_ID=""
diff --git a/www-servers/resin/files/4.0.44/resin.init b/www-servers/resin/files/4.0.44/resin.init
deleted file mode 100644
index 6103369d40e3..000000000000
--- a/www-servers/resin/files/4.0.44/resin.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-runResin() {
-	JAVA_HOME=$(java-config -O)
-	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
-	export JAVA_HOME
-
-	local extraArgs=
-	if [ "${VERBOSE}" = "yes" ]; then
-		extraArgs="-verbose"
-	fi
-
-	local msg="${1}"
-	shift
-
-	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
-
-	ebegin "${msg}"
-	su - resin -c "${cmdline}"
-	eend $?
-}
-
-start()	{
-	runResin "Starting Resin" "start"
-}
-
-stop()	{
-	runResin "Stopping Resin" "shutdown"
-}
diff --git a/www-servers/resin/resin-4.0.44-r4.ebuild b/www-servers/resin/resin-4.0.44-r4.ebuild
deleted file mode 100644
index dd2b2575fca9..000000000000
--- a/www-servers/resin/resin-4.0.44-r4.ebuild
+++ /dev/null
@@ -1,191 +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.1
-	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.1
-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.1 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 e3193d227658..d2754a6056ec 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d
 DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
+DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81 WHIRLPOOL 79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8
diff --git a/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch
new file mode 100644
index 000000000000..481591fb6ff5
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.68-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml	2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml	2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+       </fileset>
+     </copy>
+     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+         <include name="*" />
+         <exclude name="jspxml*" />
+       </fileset>
+     </copy>
++-->
+ 
+   </target>
+ 
+@@ -721,26 +723,32 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+ 
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+ 
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
++-->
+ 
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+@@ -1051,14 +1061,15 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!--
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+-
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+-
++-->
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1681,7 +1692,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+     description="Create the Tomcat javadoc" >
+     <fail unless="java.7.home"
+           message="The java.7.home property must be set for javadoc build"/>
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2699,7 +2714,7 @@
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadzip-2">
+       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.68-r1.ebuild b/www-servers/tomcat/tomcat-7.0.68-r1.ebuild
new file mode 100644
index 000000000000..b98587f6ce56
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.68-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2016 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 ~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/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() {
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	java-pkg_clean
+
+	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},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.32-r1.ebuild b/www-servers/tomcat/tomcat-8.0.32-r1.ebuild
new file mode 100644
index 000000000000..ac0869f61f8c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.32-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 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/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=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 servlet-api
+	rm -rv java/javax/{el,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},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="-r2"
+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 ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	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="$(pwgen -s -B 15 1)"
+	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.32.ebuild b/www-servers/tomcat/tomcat-8.0.32.ebuild
deleted file mode 100644
index c6d846333b54..000000000000
--- a/www-servers/tomcat/tomcat-8.0.32.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 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}
-	app-admin/pwgen
-	>=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="-r2"
-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 ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	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="$(pwgen -s -B 15 1)"
-	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-9.0.0_alpha3-r1.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild
new file mode 100644
index 000000000000..2b5821693538
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 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_PV="${PV/_alpha/.M}"
+MY_P="apache-${PN}-${MY_PV}-src"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+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.5"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.8"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.8
+	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 servlet-api
+	rm -rv java/javax/{el,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},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="-r2"
+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 ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	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="$(pwgen -s -B 15 1)"
+	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-9.0.0_alpha3.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild
deleted file mode 100644
index 881e9a90419f..000000000000
--- a/www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild
+++ /dev/null
@@ -1,156 +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_PV="${PV/_alpha/.M}"
-MY_P="apache-${PN}-${MY_PV}-src"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-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.5"
-SAPI_SLOT="4.0"
-
-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.8"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=virtual/jdk-1.8
-	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="-r2"
-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 ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	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="$(pwgen -s -B 15 1)"
-	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/xsp/files/systemd/readme.txt b/www-servers/xsp/files/systemd/readme.txt
deleted file mode 100644
index 8b137891791f..000000000000
--- a/www-servers/xsp/files/systemd/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
index 735a0b642a8e..364710758bfe 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
@@ -78,7 +78,6 @@ src_install() {
 	insinto /etc/xsp4
 	doins "${FILESDIR}"/systemd/mono.webapp
 	insinto /etc/xsp4/conf.d
-	doins "${FILESDIR}"/systemd/readme.txt
 	# mono-xsp4.service was original name from 
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770458;filename=mono-xsp4.service;att=1;msg=5
 	# I think that using the same commands as in debian 
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 01f176b177c3..9996f4f97800 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,2 +1,2 @@
-DIST xrandr-1.4.1.tar.bz2 171963 SHA256 67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50 SHA512 da36a3e332c13f4c793be83528b4b9d77bfa2457a9159958ecfe92a460f2c645d353ec0bdd9d8c34ee77241931b030757cf3dead8b0049e1341ff79add0c247c WHIRLPOOL 459d1b405e64a50cbb4abeeee1dd8b7b9834bde89f4422075af55d018bf0bbd645abd911f96a044773e93fc19558d5e5d755dfa8e5d609900f3698334d0f9cdd
 DIST xrandr-1.4.3.tar.bz2 169850 SHA256 7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b SHA512 eea2637484e744af305366606ec8fba77f54bb66bf45bd131367abb0f5ff90b858d85fbe4c17ee48f7b2f32f277d5f08b18e9cd61f147757828d415a3db9b9bc WHIRLPOOL 0088c7729bb002ab427249fa7cee0855ea38ff4b0927411e92f5544837b0c3f7d2f48573a7020d3d2263796a535b1d6312439450feafb15264379de314fd0f04
+DIST xrandr-1.5.0.tar.bz2 182515 SHA256 c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd SHA512 11d8fb1b98fbe215555d5bb875d82f80a7fd6a61c93ebf175c226f4f747570e8d18980add54a4b88d20dc637155074b2a558b34f035d66a465f324281d65f9e4 WHIRLPOOL a873db930fac01a5d54ac351203da5ad27abca95aa61dcc750200cabbdd89aa5eb37649937190d1558b0d0afe6afcf1258338203d12e4643f5c4d3388675976a
diff --git a/x11-apps/xrandr/xrandr-1.4.1.ebuild b/x11-apps/xrandr/xrandr-1.4.1.ebuild
deleted file mode 100644
index 3961c9f350b9..000000000000
--- a/x11-apps/xrandr/xrandr-1.4.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="primitive command line interface to RandR extension"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrandr-1.4
-	x11-libs/libXrender
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	xorg-2_src_install
-	rm -f "${ED}"/usr/bin/xkeystone || die
-}
diff --git a/x11-apps/xrandr/xrandr-1.5.0.ebuild b/x11-apps/xrandr/xrandr-1.5.0.ebuild
new file mode 100644
index 000000000000..d97b1be8f8e0
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-1.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrandr-1.4
+	x11-libs/libXrender
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	xorg-2_src_install
+	rm -f "${ED}"/usr/bin/xkeystone || die
+}
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 2afe778b0ce6..dc9cd7977692 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -25,6 +25,7 @@ DIST NVIDIA-Linux-x86-340.96.run 38720587 SHA256 c40e2778cd1ab036a76e1896fe2f77c
 DIST NVIDIA-Linux-x86-346.96.run 40751579 SHA256 8a299ddce7d34389206599a306a41d30754bb9bddda1be1a7fd85012f9aedf39 SHA512 9d413dd0559a4035a842527371cb1a27030c9eaeff510e529d2a205ea3eddc6e5666989418a6172aead4f5b2a924cf4cbf05269cb435dc2516af37eb35ba5d4d WHIRLPOOL 055127105804f2a6dc5067b20e771b4c12ad9dad62f4e874719385c7115e8394a8618eed3d6b330c8b5d90cbd3ae7fd09998e2a0017e35b4adca0f626110f238
 DIST NVIDIA-Linux-x86-352.63.run 42983438 SHA256 484442dd5163c3249e86736b1e297cb4b500f60eeeaa2ac6f570335fa1e8b96f SHA512 499e9949d0221e40c8050a589e5d174d8c38108152948876cd9e523ce9d3b7f85646c40c76d2af032ead848d6508189afaa27226100d72b0484ce3634d3434a8 WHIRLPOOL 79424e46ba2a4a3fafd01364230779c567b5a002e4bbe9056415d6cce6ac8492e88e0676d64cb9deb24eefb5be61221c32b4a432224ce835a884f93c55929fe5
 DIST NVIDIA-Linux-x86-352.79.run 42378162 SHA256 2929d6e509ed4502312c1b7384f6d12cb63bd4af03fc847a281d3ccdd4db4f69 SHA512 d2b50e55110f84412fd5c456849ceac0537ede643d12d1228cdda9dcca52f1f9d0a6e5a02eb4ee32cb68bbfa5adeacb8e4fc4e299848f70954d032daa989c122 WHIRLPOOL 19153e166b561dcc04730b6439999e625b5c4358f69d18127cf347cb86d39cb22f87b75d2623916021e9e774d234d6b41c3dc91f0524cebdf44f2a3007d4b8ee
+DIST NVIDIA-Linux-x86-355.00.27.run 43410730 SHA256 7ad0fcc9f088fe91ca412d6270a58c27c66aaa813b08613fc51e39d6fa6fff4f SHA512 cac01dcb1995d01d2bc1d0fe953d8751b72dc110b08f27d9dce069f7956f158abe3fb5a591e1ac16f2758329301d0ecb1a7d80ba79f91454c1fb1e62e2a0f22b WHIRLPOOL 301c4a3c0f16d5768ecd7b7bf37111e2035d8617f16c5099fbd1f32a609ab6f80f54216683afcb807e5c7151201269c1d70fa1bb5471abe034430bc295fb2dff
 DIST NVIDIA-Linux-x86-355.11.run 43569515 SHA256 94ce6b879581b931b84d83a9111040b9a5aa9306b012b4380cd93f6ffede3066 SHA512 450caea472c5e1b3d7098adba28d18c1221cf809c6bd0071466ff2a946dd0eca6555475f5f6bc044fb19a21c8939b1020357d4aeb0ce47d0edfcda071a66fd46 WHIRLPOOL 3a95e83ab3f46e64150caf1489aa3173aae69919bf432eabcdd0501de8bcdee5402cdb33e149a4d5d429ccb85e4b4af9b30bec5516ad7b7f091ae42f6093d26f
 DIST NVIDIA-Linux-x86-358.16.run 43972195 SHA256 d3a2842cbfb1163e20c658fbfaf5a235d5c9f035cd2d657f15df8a14b3fe80b1 SHA512 a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20 WHIRLPOOL 336e56827619ad53622c3fbf9fb3e9895a08b8500b81f3830514a34913180e3dc5c6f170f14675fa628e2c9658a084d7f9c45f47213d28335ecfee53c8110907
 DIST NVIDIA-Linux-x86-361.28.run 49758088 SHA256 1a129b5953d68d813e3b61e9cf26c58df42a390d078a2d5e99fe1d261d4c7404 SHA512 4a18d7df8dabea9da52a5996b6e820f618e6417449b4e329c886d05465b25adb39ae3bd77b2852c93a7338fab2d398f6705bddde315c7373e313f242dc1113ab WHIRLPOOL 6c428f95872fed5461c1c9dd4f4780e403f1331eb64d8f87b44e3cdb6022994f82080c28e398f2fbd2a914c11e3599452442c5684e38da077d157fd5ced14675
@@ -36,6 +37,7 @@ DIST NVIDIA-Linux-x86_64-340.96.run 69824601 SHA256 a7553a5749679994642ef0262906
 DIST NVIDIA-Linux-x86_64-346.96.run 73538317 SHA256 229b28a6b65965a248d07223d941de7d79b54cee7c6574f1037293e8a8026727 SHA512 188f8aac88085c3cac9637e87f4d9259d0c508075bbbf684775650a12f4760f47ba9e92f79e8bbe96d33ee014092edd38efce7dd730f67e0f11c2079eca938c5 WHIRLPOOL c9f4a5163018dc0b53aeff84b410cb34720d06ca7bdd17ce166ad3a2b057ffe94e6773594cd617fce79d9d0a02e5e1cd0525ca30dade7247ad5b7b20ff661a64
 DIST NVIDIA-Linux-x86_64-352.63.run 77647248 SHA256 3705a122fbd4fe04f4077dea7ba8b1127f1a9b40e92f3abc7afa91964e817e2a SHA512 37b38be1e9394aa8bdd33cfbdf3c16ed62b16f852f76e013fb5573803e057ac51f6728ff594f7d48008871d9503fe64bb6e2dfc00b4415a62894f7f26c6ad719 WHIRLPOOL df8debfe7655982a7ca2194cdd833e8dcdb69250077c18551a0b93c31eadeea793b21118ecdc7b9f59721ab0f8431a0442152d3d685a1afac87587dbed3ec816
 DIST NVIDIA-Linux-x86_64-352.79.run 77140528 SHA256 e05a825a5e0027f062b1a1344ff3484286f50df990d66d567348b80101a0c4e3 SHA512 b54257e9aa6f6353d4f149d4dfab5ea12bf1907260ad98fd9102da1b458c1cf32e28707c8c5136efdaeccd0f60e6e013736b349a59ea50044dceddf265afa38b WHIRLPOOL 25be659c5784558c42c4f2fb0b50d5d56c0419f175ad8c019e00bdc033707297668705e051e4f176fff67340ec68054848a8b3aa5a9922ee0c9f9a270787a6d6
+DIST NVIDIA-Linux-x86_64-355.00.27.run 76724911 SHA256 dd5a28669250fa8eee5eb8df1348e099b0c2f9e61fe756e357944347b3319edc SHA512 04297154a63613c681d0e03c47f0964efa78f3d395fa0385e1dd919fab3c6143b10c6f6998d73a92618c30391fcdb403a82a8ef883cc7cabfc5288358a218483 WHIRLPOOL bd88789622761b0bfe29fafa98327d83e98164f0f48321db7a1d2348d697b7cdb2bbd8670ab4033275eb5b5d99da755d37ea6dc527b553e077033ec8b34b0241
 DIST NVIDIA-Linux-x86_64-355.11.run 76490009 SHA256 a59b425381add9d9058dc2d987bf3087ab59c43224b5eb04c3f273f5886451ed SHA512 bfc7ab7741183408aa0226dc29176c8ffe08566fbea7cebf78f4aa30627dc27ddf90bb82951c99006b34bc481be15712b4f5867ef543a32bfe3fe81a8e6ddeae WHIRLPOOL bb5d3397a855a53c2cd7e48056564085b906550f856207932e4670fef995030a3a7bcc0a9b97fee2e60aaff9b41c4a954afc57585441f5dec92c795358da810a
 DIST NVIDIA-Linux-x86_64-358.16.run 77353969 SHA256 a942cdb29ed715ff1ce25beb06b6c2490126b98ef8bee5d9973967b557596bf2 SHA512 4ae43f5e8c311d6c97eb89b02504bf52e3a947c71662f30641988a78eb9fe083370124aeee3b89db74f8ee50f454338db98dc7abeb35a242ba5729fefccead77 WHIRLPOOL 3dd0dcd4b455fcac12d55f40cfb8db0536af82d90c32b8471528b44a9fa1b3f3706ac26558d7395f82649c37550fded17b48d75d5584b3a41390c94bb1135c48
 DIST NVIDIA-Linux-x86_64-361.28.run 87326250 SHA256 4c27a49251749402b0300c150536378239be04ce9f909934ab396daa8a591db3 SHA512 1078b6d0a55b9d7314b88466ac19b0cebc525d6e1374c211b0a06accc1dbe9a3dddd62cf477c2c81dbbead395c5db42ed24d514c47f22fbfc20ed680d38af2eb WHIRLPOOL b3a3168aab564681424e4604d2a56a0015f894240f90cff7df471a74890a2f004f99bcbe2d888048d54b7cc03ef32abfc54769e88cdd40603f953741a8154385
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.00.27.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-355.00.27.ebuild
new file mode 100644
index 000000000000..b9dbd474d0f0
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-355.00.27.ebuild
@@ -0,0 +1,505 @@
+# 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}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist fetch mirror"
+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
+	gtk3? ( x11-libs/cairo )
+	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.18.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_nofetch() {
+	einfo "Download from https://developer.nvidia.com/vulkan-driver :"
+	if use x86; then
+		echo "https://developer.nvidia.com/linux32bit -> NVIDIA-Linux-x86-355.00.27.run"
+	elif use amd64; then
+		echo "https://developer.nvidia.com/linux64bit -> NVIDIA-Linux-x86_64-355.00.27.run"
+	fi
+}
+
+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 many 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}-355.06-pax.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)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 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-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 0c8af44e7d9f..7eb3d5128485 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1 +1,2 @@
 DIST xf86-video-amdgpu-0.0.01_pre20150814.tar.xz 58024 SHA256 5654e22fcb051e04f5862576c84e8e7ab765f1097586874d3be75fefd49e159c SHA512 4885f92febd6ab1663c3b27b7db8af98eaa0d7f4c91c65e7ce8d9a8756ea0a051c65183d2d5fec3ed29b90d18de4bb81956bf585128f417a7e4471a12e2e9222 WHIRLPOOL 9b98505f0f9823661c084eaaad2e91bb2fb0956c07cf0cf22f6e4849ad9464134417f7caef9ab92c34e7881a24fabe8e6caa55300eebb3d887b04b150d42495d
+DIST xf86-video-amdgpu-1.0.1.tar.bz2 374443 SHA256 730fb959fc7a96643df10dc500bb645a94ac98fdfe021172a537a57c9cb3915e SHA512 ebc5822c615cb2ca9a058b222d3425a6d387b008ad9918454045a66b3985c596cba7df414972b99c1d30711b3c74739e6d74ab62ec25c469d880e0adcf833f80 WHIRLPOOL dc5a576bfea4a04152b7a745d913fdc317f0fd13df73a37a1909968eaea8edc0fff71cc71023e9fd74c60fed7976cfca58c221c55893026e858973970e9236a7
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-1.0.1.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-1.0.1.ebuild
new file mode 100644
index 000000000000..95627753c9c1
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_DRI="always"
+inherit xorg-2
+
+if [[ ${PV} == 9999* ]]; then
+	XORG_EAUTORECONF=yes
+	SRC_URI=""
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+
+IUSE="glamor"
+
+RDEPEND="x11-libs/libdrm[video_cards_amdgpu]
+	x11-base/xorg-server[glamor(-)?]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS="$(use_enable glamor)"
+	xorg-2_src_configure
+}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
index 7266714f6fe8..95627753c9c1 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 XORG_DRI="always"
-XORG_EAUTORECONF=yes
 inherit xorg-2
 
 if [[ ${PV} == 9999* ]]; then
+	XORG_EAUTORECONF=yes
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 0d367473eda5..b88cabaa8bc1 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc SHA512 ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491 WHIRLPOOL 352b114b1030d1fbe2d33f028e7c03be8b4a6a4b0e4cb4fd7c890dd4cc5594ebf1fd6477c9319c1e2ff5033fc3276fb9caa8d91d1d3ba6b0c2f1734b60d3efed
 DIST xf86-video-intel-2.9.1.tar.bz2 789001 SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 SHA512 62a7c1852b2d0b89be93536e7852caf398fc743e11a12c5071baed5e767b29c382ff5eb9d6c3ab453fc4d94aa16245b607ef33b94198bf7c7626746772fcc290 WHIRLPOOL 7e61c5d1396829aa354c9fdfbe5a21723171390d86b3307a2a331061e128a9866408993410090fe5d607609d245c55843633730bc4521e9cb0ec478c8d6ede1c
 DIST xf86-video-intel-2.99.917.tar.bz2 2259040 SHA256 00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9 SHA512 cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f WHIRLPOOL b26f1b303a27825120e1036f15493119e8869ebae74a2663204fe1ee63cf9fc217e593c469d6c33151a73c9ea6e9df88d0e3a0bb74ece5109b51593785fd4d7d
-DIST xf86-video-intel-2.99.917_p20160122.tar.xz 931472 SHA256 7e1b9b9a183078c5c11d9962ad8782a0f8ba6d64dd8267a457563a91bc90a990 SHA512 e109826b6a08cbd8d9ae7918e0c3fa1f47a56715691552d293e50dbcd92efd3e1a49f3a0db44209fec1e2cce885cc930d520f24bcd5ecb7fb83e5b71a87b1d17 WHIRLPOOL 5eee92198c63dad7883b746cfd01025391fab6176f02222e61e784fc4be70903533583312c71058660043a0b6ec2624cdeaf30d723c52acd369358451fc8e1a4
-DIST xf86-video-intel-2.99.917_p20160203.tar.xz 932800 SHA256 a40792f8bcb7d48593d60d4a97a957dd0a2b505e13f15638087abd20ba98df60 SHA512 e0bdbcbe297686c3d05573932ad929d7681de52bf9b02e37b51550da55ae0841f515b740dd67bf9053048acb8b6be05eb3b7d6121d7021abbae2b31dd2a30698 WHIRLPOOL 3ede81189f4040d26e6ab4b33d539a67ee0f11553a7db84eb6e15d6f6d6cb5345244e1515e072c48874689bc07ed159ee01f9544aabc7690320e017b245ad1dc
+DIST xf86-video-intel-2.99.917_p20160213.tar.xz 933036 SHA256 0c0b67ef52d02080f1361bde45b7bd4f901e6d64028e1a768223d63769f72616 SHA512 b762afdde5ef8eaf0e310985fbfd0c192f7463b3114507e3ed7edb16c99bbcf28e4c439d257d59d937c5b1e9f240d512a1025ebd23a0984160a8339df3a30995 WHIRLPOOL 723474bba515f222f2aa5392fc9dc8dc6d3cf548f6ffd1b0396f9c78b148588424da703fe9ade5730bd33f99ce10f4de77738e6a7d46212f1425ab2e82faa205
+DIST xf86-video-intel-2.99.917_p20160218.tar.xz 933036 SHA256 0c0b67ef52d02080f1361bde45b7bd4f901e6d64028e1a768223d63769f72616 SHA512 b762afdde5ef8eaf0e310985fbfd0c192f7463b3114507e3ed7edb16c99bbcf28e4c439d257d59d937c5b1e9f240d512a1025ebd23a0984160a8339df3a30995 WHIRLPOOL 723474bba515f222f2aa5392fc9dc8dc6d3cf548f6ffd1b0396f9c78b148588424da703fe9ade5730bd33f99ce10f4de77738e6a7d46212f1425ab2e82faa205
diff --git a/x11-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml
index e150cb4edafa..d18161323ae8 100644
--- a/x11-drivers/xf86-video-intel/metadata.xml
+++ b/x11-drivers/xf86-video-intel/metadata.xml
@@ -6,6 +6,7 @@
 		<name>X11</name>
 	</maintainer>
 	<use>
+		<flag name="dri3">Enable DRI3 support</flag>
 		<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 		<flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag>
 		<flag name="uxa">Enable UMA Acceleration Architecture</flag>
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160122.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160122.ebuild
deleted file mode 100644
index c56fa94dbe4b..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160122.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug +sna +udev uxa xvmc"
-COMMIT_ID="b48d4a7917ab793526be47559becc64aacd347ae"
-SRC_URI="http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
-
-S=${WORKDIR}/${COMMIT_ID}
-
-REQUIRED_USE="
-	|| ( sna uxa )
-"
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/dri3proto
-	x11-proto/presentproto
-	x11-proto/resourceproto"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-		$(use_enable dri)
-		$(use_enable sna)
-		$(use_enable uxa)
-		$(use_enable udev)
-		$(use_enable xvmc)
-		--disable-dri3
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160203.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160203.ebuild
deleted file mode 100644
index 921b93300dc2..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160203.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug +sna +udev uxa xvmc"
-COMMIT_ID="8b8c9a36828e90e46ad0755c6861df85f5307fb5"
-SRC_URI="http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
-
-S=${WORKDIR}/${COMMIT_ID}
-
-REQUIRED_USE="
-	|| ( sna uxa )
-"
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/dri3proto
-	x11-proto/presentproto
-	x11-proto/resourceproto"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-		$(use_enable dri)
-		$(use_enable sna)
-		$(use_enable uxa)
-		$(use_enable udev)
-		$(use_enable xvmc)
-		--disable-dri3
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild
new file mode 100644
index 000000000000..8ebdc86a8538
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+IUSE="debug dri3 +sna +udev uxa xvmc"
+COMMIT_ID="636b52913cac10e691834a699cff10fb94d395fa"
+SRC_URI="http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+
+S=${WORKDIR}/${COMMIT_ID}
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	dri3? (
+		>=x11-base/xorg-server-1.18
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	x11-misc/util-macros
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable dri3)
+		$(usex dri3 "--with-default-dri=3")
+		$(use_enable sna)
+		$(use_enable udev)
+		$(use_enable uxa)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160218.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160218.ebuild
new file mode 100644
index 000000000000..1bb8fd46c207
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160218.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=dri
+XORG_EAUTORECONF=yes
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+IUSE="debug dri3 +sna +udev uxa xvmc"
+COMMIT_ID="636b52913cac10e691834a699cff10fb94d395fa"
+SRC_URI="http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+
+S=${WORKDIR}/${COMMIT_ID}
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	dri3? (
+		>=x11-base/xorg-server-1.18
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable dri3)
+		$(usex dri3 "--with-default-dri=3")
+		$(use_enable sna)
+		$(use_enable udev)
+		$(use_enable uxa)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
index fdec7e69781e..27a8968bf53e 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 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/goffice/Manifest b/x11-libs/goffice/Manifest
index 635431739bf5..615331727c13 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,4 +1,4 @@
 DIST goffice-0.10.24.tar.xz 2358736 SHA256 cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a SHA512 67732854942769d221a677614edd51bfe9fcdaaf19f532a4182d5d0f0f31b4385ef6fbbf4be8a2f2b5f2d39d1cbb0218712c42cfcc0efaf754d0f4a9fd001b17 WHIRLPOOL 189e7f5ee790cd85d3f55ee6c441cfa829b692d1fc3d24dc9e036de4298653fd21db7e3853e6550fd2c2e76eaa54d0d15a233d98b2d2d47803e9ec72b833b84b
-DIST goffice-0.10.25.tar.xz 2358836 SHA256 cdeab902c7811a0b31c71872497f7ec21ebaeeb8a05b86bdd48d112b06c9ffa2 SHA512 eb62883833d4578309f0849c9643576cd83bb336d1e1c0a2f677b0d2849d65c005ca5e4d4ae6bf13b37a308798b204cd2a8eb9577165d6f4e0a161792115109b WHIRLPOOL 76f66e09ef3fcbe82ddc242e799cf41f540474ea952f9d7c7ac15b9422dec1989cd508cb16a2597ebf086300e45df972d1c4050a4edc1471c4efbeea5dc156e8
 DIST goffice-0.10.26.tar.xz 2358900 SHA256 2b8dd0a0f84ef4f6bd32bfdae2b68caa0e41631026a74d04c4d2266512a744bb SHA512 4f042a0ecd9c44b864cb761753c3e42704aa7cf5973816dc30bd45be14f984594f86ed67c8c1333ba71b68c41066021a9e582d245ff8fab8032e576c5ea9f603 WHIRLPOOL 95fbafa1ce8cf5a08b7c9bbcef521b9782ddce1e77235e5ac565e84fc186cce317be3ebbb01aaebb5a8c5a29f481bdb72e067f7df1283ae443949997233fe662
+DIST goffice-0.10.27.tar.xz 2363972 SHA256 3717b400fd190f18cf1dd7a16e1991b1f7c7cbdfeb1993656e7972347168d8c0 SHA512 31776e03928f7128319d3db7b6a049fbd2b9bbab56546666df7fd4b65c62ec96323a298e00d61d129bf4fbd7c148d0e94eee06014bef30f544225f1fc7ddf903 WHIRLPOOL 7bef90d215ccb11ac25419fef025a542ef7403091b29345d3a5565dfea6e4cc77783251db7a8286809a8e22e1008b966c0b279ed9fdf4acf5535de8a90d8a32d
 DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
diff --git a/x11-libs/goffice/goffice-0.10.25.ebuild b/x11-libs/goffice/goffice-0.10.25.ebuild
deleted file mode 100644
index 3b351e27f315..000000000000
--- a/x11-libs/goffice/goffice-0.10.25.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"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library of document-centric objects and utilities"
-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"
-IUSE="+introspection"
-
-# Build fails with -gtk
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.38.0:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24:=
-	>=x11-libs/cairo-1.10:=[svg]
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.8.7:3
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/perl-Compress-Raw-Zlib
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-# gnome-base/gnome-common
-
-src_configure() {
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.27.ebuild b/x11-libs/goffice/goffice-0.10.27.ebuild
new file mode 100644
index 000000000000..630e90fa6f8e
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.27.ebuild
@@ -0,0 +1,56 @@
+# 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="A library of document-centric objects and utilities"
+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"
+IUSE="+introspection"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.38.0:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24:=
+	>=x11-libs/cairo-1.10:=[svg]
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.8.7:3
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:= )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/perl-Compress-Raw-Zlib
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+# eautoreconf requires:
+# gnome-base/gnome-common
+
+src_configure() {
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
diff --git a/x11-libs/gtk+/gtk+-2.24.29.ebuild b/x11-libs/gtk+/gtk+-2.24.29.ebuild
index 99bd548e5f7d..495153e00101 100644
--- a/x11-libs/gtk+/gtk+-2.24.29.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.29.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-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"
 
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 COMMON_DEPEND="
diff --git a/x11-libs/gtk+/gtk+-3.18.7.ebuild b/x11-libs/gtk+/gtk+-3.18.7.ebuild
index 2e1373f1e0a3..f31d76f93288 100644
--- a/x11-libs/gtk+/gtk+-3.18.7.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.7.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	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"
+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)
diff --git a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
index e4630af2bd46..cd4df794e4e8 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
@@ -18,7 +18,7 @@ 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"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index d4c60d6dacbf..4f3db409d4b2 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,3 +1,4 @@
 DIST libdrm-2.4.59.tar.bz2 592722 SHA256 68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b SHA512 b9f61cfd47cf4a02c10e7fe79b0e9c5701383c76425cf4985a9b91d909f905334ca1ace7334aa0a4ab400694ad84a1a3bc1c3f29842d808026702b35fa9f87c3 WHIRLPOOL 6b0e1be70164db86152503e4b72373736f0462ff97ffac2c79a6c1fce83d658e6030d5435be5a61c1f6ca50728db4c7e3a5d8f5e48073fc74169696ff1b7c5be
 DIST libdrm-2.4.65.tar.bz2 645877 SHA256 71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4 SHA512 fabbb3ba163aa1307288472c11c6ce8f1e412cbd67ba3135a614f0e05bf4f881bf6ccc581e9cf05a7e2e965817bb71c0b5335263b5c0b0cb85829a0f29a6029d WHIRLPOOL b00d7aed0437ee0f64f60ed59becf41d165c101725cab700345203b2108a2adc9ed95d17acc0dff5706df86c87c13d058991417f42db40dfc523279cc5eb8547
 DIST libdrm-2.4.66.tar.bz2 694574 SHA256 79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76 SHA512 e0e3cea490389271690a79b5be8acd5e7c892a0646285617bd00d85f7c56ac163580c8c62d9fa79ed99e89468e35eaed6ac8be6ea870ce5ab09589f3e2d7f506 WHIRLPOOL 6f691c8f7444b70461896f2b91a5256c655124c12cb51b25163859db2f556692d182e43b79a851cbc8d565fde1cbe146133d177dbabe442289ab051170b6a695
+DIST libdrm-2.4.67.tar.bz2 689483 SHA256 ee5b71e1113be37544d0752681c12f040c01f782e2933df7d7bc21fd0d10cebe SHA512 3c48828b65b32a5e6a17b05b05d17ea02315b1c86c730d386d0680f2d8f312477cf5adc810a898a3734504c96ff376fc46b2d813b34cb8fe84a70b533c18ac2a WHIRLPOOL 134cdb80b035ba87027cbc074a05c1ed66eec4d462846f48b8c56e8eedd7b2b32dc9c6abeb01b0e9bf41f96364ab0bd59b881ef58651aded832b644faa2bd648
diff --git a/x11-libs/libdrm/libdrm-2.4.67.ebuild b/x11-libs/libdrm/libdrm-2.4.67.ebuild
new file mode 100644
index 000000000000..56690716affa
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.67.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libmatchbox/Manifest b/x11-libs/libmatchbox/Manifest
deleted file mode 100644
index 1257d031b3e1..000000000000
--- a/x11-libs/libmatchbox/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST check-0.9.12.tar.gz 730404 SHA256 c7d47e55e133a0ca19a52e08a99333ac55cb22618b53719b7f4117a1875b1ea3 SHA512 698e6cfdf24b07340fb4fa77f49811053f8307d3baca8bdcdde5e3dfe1f910bbadb6a393f03020d8b18c22e7e164d40f6bbbeb9659908b0df8459e5c4850fa50 WHIRLPOOL 4994c444532e1337bcda5e632d532ffd6aae59de866009b5bce3d1f25988dd203d04136dd451b6d24c6e32775159772d1c98097ff618a5cc559fca9725ad18ed
-DIST libmatchbox-1.9.tar.bz2 316575 SHA256 db01e218e8d09540459c8f7c5698c159cd84c3d5b8caa9763bf0e5a35f6edf00 SHA512 1834a096f1627fd51ef17a0a49a32b6a1b9e4f5022d9409b7dcb531f409aa67c16c3c4d52ed2ca881193879f624d8efb15d1bd950b653ce1cf5823b9200c9964 WHIRLPOOL f2692f76573dbe0860d3ba89b6e792f4add758687d074db7f2c70ce8757a6483802b71831d02dee8aae9e8268977b3ea23e3fbc9aeec19148bdc4662d59aea62
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch
deleted file mode 100644
index 6ba3c49243a0..000000000000
--- a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://projects.archlinux.org/svntogit/community.git/tree/libmatchbox/trunk/PKGBUILD?id=43f68b59fb790eb685d18a2f189c7e3055c77b30
-
---- libmb/mbpixbuf.c
-+++ libmb/mbpixbuf.c
-@@ -228,7 +228,7 @@
-   if ((fd = fopen( file, "rb" )) == NULL) return NULL;
- 
-   fread( header, 1, 8, fd );
--  if ( ! png_check_sig( header, 8 ) ) 
-+  if ( ! png_sig_cmp( header, 0, 8 ) == 0 ) 
-     {
-       fclose(fd);
-       return NULL;
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch
deleted file mode 100644
index 25f68575032c..000000000000
--- a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libmb/mbpixbuf.c
-+++ libmb/mbpixbuf.c
-@@ -247,7 +247,7 @@
-     return NULL;
-   }
- 
--  if ( setjmp( png_ptr->jmpbuf ) ) {
-+  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
-     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
-     fclose(fd);
-     return NULL;
-@@ -269,8 +269,8 @@
-       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
-     png_set_gray_to_rgb(png_ptr);
-  
--  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
--       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
-+  if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA 
-+       || color_type == PNG_COLOR_TYPE_GRAY_ALPHA
-        )
-     *has_alpha = 1;
-   else
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch
deleted file mode 100644
index f8b2feeea332..000000000000
--- a/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/367683
-
---- tests/Makefile.am
-+++ tests/Makefile.am
-@@ -19,6 +19,7 @@
- 
- noinst_PROGRAMS = dump-image
- dump_image_SOURCES=dump-image.c
-+dump_image_LDADD= @XLIBS_LIBS@
- 
- EXTRA_DIST = oh-overlayed.png oh.png oh-scaled.png overlay.png oh.jpg oh.xpm \
-              dot-desktop.c pixbuf.c oh.h
diff --git a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
deleted file mode 100644
index b8b5e0dacb39..000000000000
--- a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="The Matchbox Library"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2
-	mirror://sourceforge/check/check-0.9.12.tar.gz" # For check.m4
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86"
-IUSE="debug doc jpeg pango png static-libs test truetype X xsettings"
-
-RDEPEND="x11-libs/libXext:=
-	truetype? ( x11-libs/libXft:= )
-	pango? ( x11-libs/pango:= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	xsettings? ( x11-libs/libxsettings-client )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )"
-
-# Test suite broken, missing files and such.
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-pkg_setup() {
-	# Bug #138135
-	if use truetype && use pango; then
-		ewarn "You have both the truetype and pango USE flags set, pango"
-		ewarn "overrides and disables the XFT support truetype enables."
-		ewarn "If this isn't what you intended you should stop the build!"
-	fi
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/check-*/check.m4 "${WORKDIR}"/ || die
-
-	epatch \
-		"${FILESDIR}"/${P}-libpng1{4,5}.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	AT_M4DIR="${WORKDIR}" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable truetype xft) \
-		$(use_enable pango) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable xsettings) \
-		$(use_with X x) \
-		$(use_enable test unit-tests)
-}
-
-src_install() {
-	default
-	use doc && dohtml doc/html/*
-
-	prune_libtool_files --all
-}
diff --git a/x11-libs/libmatchbox/metadata.xml b/x11-libs/libmatchbox/metadata.xml
deleted file mode 100644
index 0efb326489f3..000000000000
--- a/x11-libs/libmatchbox/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="pango">Enable <pkg>x11-libs/pango</pkg> support</flag>
-		<flag name="xsettings">Enable the use of xsettings for settings
-		management</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">check</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/libsexy/Manifest b/x11-libs/libsexy/Manifest
deleted file mode 100644
index 48bfa7b71803..000000000000
--- a/x11-libs/libsexy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libsexy-0.1.11.tar.bz2 267376 SHA256 ba113ff5148e9ac137381a1da7045caa750a3b0c0113d4b97549bdbb6c1c8bb6 SHA512 60c7f1e8891ae36ab1f7a5b3421b1819bd940470d226b9e6dd752c4ec63ca79b5f8589c0cdd818f1c72e2bff605572554a537750be5774c6752df6bae99d094a WHIRLPOOL 069ecdaf69bff37810ee80e49b45d49ea0ef4cc2610976516ac71e54550876dfdc737599f763fe4ecd17f2b10a0a51e5a7574a697fc857ba26ff9a047e75c494
diff --git a/x11-libs/libsexy/files/libsexy-0.1.11-fix-null-list.patch b/x11-libs/libsexy/files/libsexy-0.1.11-fix-null-list.patch
deleted file mode 100644
index 5330e12e3a57..000000000000
--- a/x11-libs/libsexy/files/libsexy-0.1.11-fix-null-list.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nur libsexy-0.1.11/libsexy/sexy-spell-entry.c libsexy-0.1.11_patched/libsexy/sexy-spell-entry.c
---- libsexy-0.1.11/libsexy/sexy-spell-entry.c	2006-08-17 21:11:09.000000000 +0300
-+++ libsexy-0.1.11_patched/libsexy/sexy-spell-entry.c	2009-05-17 15:15:25.000000000 +0300
-@@ -56,7 +56,7 @@
- static void (*enchant_dict_add_to_session) (struct EnchantDict * dict, const char *const word, ssize_t len);
- static int (*enchant_dict_check) (struct EnchantDict * dict, const char *const word, ssize_t len);
- static void (*enchant_dict_describe) (struct EnchantDict * dict, EnchantDictDescribeFn fn, void * user_data);
--static void (*enchant_dict_free_suggestions) (struct EnchantDict * dict, char **suggestions);
-+static void (*enchant_dict_free_string_list) (struct EnchantDict * dict, char **suggestions);
- static void (*enchant_dict_store_replacement) (struct EnchantDict * dict, const char *const mis, ssize_t mis_len, const char *const cor, ssize_t cor_len);
- static char ** (*enchant_dict_suggest) (struct EnchantDict * dict, const char *const word, ssize_t len, size_t * out_n_suggs);
- static gboolean have_enchant = FALSE;
-@@ -156,8 +156,8 @@
- 	MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session)
- 	MODULE_SYMBOL("enchant_dict_check", enchant_dict_check)
- 	MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe)
--	MODULE_SYMBOL("enchant_dict_free_suggestions",
--				  enchant_dict_free_suggestions)
-+	MODULE_SYMBOL("enchant_dict_free_string_list",
-+				  enchant_dict_free_string_list)
- 	MODULE_SYMBOL("enchant_dict_store_replacement",
- 				  enchant_dict_store_replacement)
- 	MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest)
-@@ -435,9 +435,8 @@
- 			gtk_widget_show(mi);
- 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
- 		}
-+		enchant_dict_free_string_list(dict, suggestions);
- 	}
--
--	enchant_dict_free_suggestions(dict, suggestions);
- }
- 
- static GtkWidget *
diff --git a/x11-libs/libsexy/files/libsexy-0.1.11-pkgconfig-pollution.patch b/x11-libs/libsexy/files/libsexy-0.1.11-pkgconfig-pollution.patch
deleted file mode 100644
index faf16dea71ca..000000000000
--- a/x11-libs/libsexy/files/libsexy-0.1.11-pkgconfig-pollution.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libsexy.pc.in
-+++ libsexy.pc.in
-@@ -6,7 +6,8 @@
- Name: libsexy
- Description: Doing naughty things to good widgets
- Version: @VERSION@
--Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
-+Libs: -L${libdir} -lsexy
-+Libs.private: @PACKAGE_LIBS@
- Cflags: -I${includedir} @PACKAGE_CFLAGS@
- 
- 
diff --git a/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild b/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild
deleted file mode 100644
index 1b15dcc8394d..000000000000
--- a/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Sexy GTK+ Widgets"
-HOMEPAGE="http://www.chipx86.com/wiki/Libsexy"
-SRC_URI="http://releases.chipx86.com/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.20:2
-	dev-libs/libxml2
-	>=x11-libs/pango-1.4
-	>=app-text/iso-codes-0.49"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog NEWS"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fix-null-list.patch \
-		"${FILESDIR}"/${P}-pkgconfig-pollution.patch
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		tests/Makefile.am || die
-
-	rm -f acinclude.m4 #420913
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/libsexy/libsexy-0.1.11-r4.ebuild b/x11-libs/libsexy/libsexy-0.1.11-r4.ebuild
deleted file mode 100644
index ad786dcccffb..000000000000
--- a/x11-libs/libsexy/libsexy-0.1.11-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Sexy GTK+ Widgets"
-HOMEPAGE="http://www.chipx86.com/wiki/Libsexy"
-SRC_URI="http://releases.chipx86.com/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.20:2
-	dev-libs/libxml2
-	>=x11-libs/pango-1.4
-	>=app-text/iso-codes-0.49"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-null-list.patch
-	"${FILESDIR}"/${P}-pkgconfig-pollution.patch
-	)
-
-src_prepare() {
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		tests/Makefile.am || die
-
-	rm -f acinclude.m4 #420913
-
-	sed \
-		-e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \
-		-i configure.ac
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc gtk-doc)
-		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libsexy/metadata.xml b/x11-libs/libsexy/metadata.xml
deleted file mode 100644
index 0f6db5621bcb..000000000000
--- a/x11-libs/libsexy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-    <name>Gentoo Freedesktop Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index d7b0820ed65d..17a871189915 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,3 +1,3 @@
 DIST libwnck-2.31.0.tar.xz 630792 SHA256 83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9 WHIRLPOOL 369c0ce1f412a0874d2f3a09e387405632726259427fff013adc4d619f4f9f80b57e376252746bdc7fe54f27749e51127ccc0870a80629cb98afb45dc420f941
 DIST libwnck-3.14.0.tar.xz 675916 SHA256 f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c SHA512 bf5953d06697b6f623f82fe3ab3158ad3a794712bf08822fe901023e740afe4b47cc026854707b77c0c63d38614133fbef589d62385a39b99ce7e8c66c8940be WHIRLPOOL 945127110134e3b23f986fb3024b6a77577f42f9067e5760663849351687969398da0e69dca29f2e0950c8f5f364eb9e822c25d719c2f976fbf36f2e13c89d5c
-DIST libwnck-3.4.9.tar.xz 674396 SHA256 96e6353f2701a1ea565ece54d791a7bebef1832d96126f7377c54bb3516682c4 SHA512 58397ab9c3ea8517503cbc51c5e72ffadfba882146936855a65756ada28339303408df17517cd6711f26bca6236e66a8755177849af28292fcc4820ce64d28b2 WHIRLPOOL 93366bbcbc45a17aff607c7db9d7d057013671f34762248388b343975c932ca174b0d471fab23b93f1d05e5064f9945a9734dceb88f0cf90cfdeab916e0e0e1f
+DIST libwnck-3.14.1.tar.xz 683652 SHA256 bb643c9c423c8aa79c59973ce27ce91d3b180d1e9907902278fb79391f52befa SHA512 9ea05047b88e3bb47ab7d144089abbad8384a15b3d435ac250bd67ef45466f3bd264e6b4e36bb12d4acebb7da8c210ea7dae03ab5e020d7d6c1beb1658b97972 WHIRLPOOL 12a6c251f32814342f3ede40d28585c5d0afc79a51be136c0b3f30457104e3eb941ec1eafc0e53ec1acf9f4e73e633cb124ffc6d0b88edf3e8da6019ee095599
diff --git a/x11-libs/libwnck/libwnck-3.14.1.ebuild b/x11-libs/libwnck/libwnck-3.14.1.ebuild
new file mode 100644
index 000000000000..c7a8e6608ae1
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-3.14.1.ebuild
@@ -0,0 +1,56 @@
+# 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 flag-o-matic gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection startup-notification tools"
+
+RDEPEND="
+	x11-libs/cairo[X]
+	>=x11-libs/gtk+-3.10:3[introspection?]
+	>=dev-libs/glib-2.32:2
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXext
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )
+	x86-interix? ( sys-libs/itx-bind )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs
+#	gnome-base/gnome-common
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	if use x86-interix; then
+		# activate the itx-bind package...
+		append-flags "-I${EPREFIX}/usr/include/bind"
+		append-ldflags "-L${EPREFIX}/usr/lib/bind"
+	fi
+
+	# Don't collide with SLOT=1
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable startup-notification) \
+		$(use_enable tools) \
+		--program-suffix=-${SLOT}
+}
diff --git a/x11-libs/libwnck/libwnck-3.4.9.ebuild b/x11-libs/libwnck/libwnck-3.4.9.ebuild
deleted file mode 100644
index 06e8d95f60c0..000000000000
--- a/x11-libs/libwnck/libwnck-3.4.9.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"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection startup-notification tools"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.4:3[introspection?]
-	>=dev-libs/glib-2.32:2
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-	x86-interix? ( sys-libs/itx-bind )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs
-#	gnome-base/gnome-common
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	# Don't collide with SLOT=1
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable startup-notification) \
-		$(use_enable tools) \
-		--program-suffix=-${SLOT}
-}
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
index 65fdb58efac9..6838de46e0f3 100644
--- a/x11-libs/mx/metadata.xml
+++ b/x11-libs/mx/metadata.xml
@@ -5,12 +5,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-		<flag name="glade">Build the <pkg>dev-util/glade</pkg> catalog
-			files</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">clutter-project/mx</remote-id>
 	</upstream>
diff --git a/x11-libs/mx/mx-1.4.7-r1.ebuild b/x11-libs/mx/mx-1.4.7-r1.ebuild
deleted file mode 100644
index a845ad774823..000000000000
--- a/x11-libs/mx/mx-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit gnome2 eutils
-
-DESCRIPTION="A widget toolkit using Clutter"
-HOMEPAGE="http://clutter-project.org/"
-SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus debug glade +gtk +introspection startup-notification"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=media-libs/clutter-1.7.91:1.0
-	media-libs/cogl:=
-	>=x11-apps/xrandr-1.2.0
-
-	x11-libs/gdk-pixbuf:2[introspection?]
-
-	dbus? ( >=dev-libs/dbus-glib-0.82 )
-	glade? (
-		>=dev-util/glade-3.4.5:3
-		<dev-util/glade-3.9.1:3 )
-	gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	startup-notification? ( >=x11-libs/startup-notification-0.9 )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Tests are interactive, no use for us
-	sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
-		-i Makefile.am -i Makefile.in || die
-	# In 1.4.8
-	epatch "${FILESDIR}/${P}-gl-types.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-winsys=x11 \
-		$(use_enable gtk gtk-widgets) \
-		$(use_enable introspection) \
-		$(use_enable debug) \
-		$(use_with dbus) \
-		$(use_with glade) \
-		$(use_with startup-notification)
-}
diff --git a/x11-libs/pango/pango-1.38.1.ebuild b/x11-libs/pango/pango-1.38.1.ebuild
index 8217eb374ab1..392a21fca6a0 100644
--- a/x11-libs/pango/pango-1.38.1.ebuild
+++ b/x11-libs/pango/pango-1.38.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 556295b72598..86d6c7596bb5 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,5 +1,5 @@
 DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
 DIST vte-0.36.5.tar.xz 1017504 SHA256 c2c2ce9640f08b07667f1037862fe991081495446b735c0afb98f45e35b64edf SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6 WHIRLPOOL 22be408deecedfb7c674fbc49bac2852e5e1c28f25cd7998d20042f15a905158b2698f3e2a0a8fd4a78b89929e773779787dff9af9c6c5e006ee30ed6efdc59d
 DIST vte-0.40.2.tar.xz 923852 SHA256 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 WHIRLPOOL 2499e01c2b0d38645b61d4c0a1814d7a3196df6d300577380f1e622c06a974a4cd0d9799fff35f1b0680603aa3a0be38730991ace83df90bfb265009873c5858
-DIST vte-0.42.1.tar.xz 924740 SHA256 9e00e2e9e94f4202b979c871f407a8815890bc0f4a8448a08534f76ab0fc9d34 SHA512 4cf917d3f343973dcb816a341276bfab7784a9f4dc6f8fb402193e9a9062503ac192ccc274fe92bb20a17ac182d21fd2268bf9c1ddea817f730db5612e3b21c0 WHIRLPOOL 65839ff61d227a62de51d31bc58fc0baa5b4126d3d1ff482c18b9086a59e91a46f0943512c056182aae1d9801656395989f0b2c8b0470b123d9cd2c6a611c061
 DIST vte-0.42.3.tar.xz 927988 SHA256 96e98a40eae82d04c08f2ca1d2672659596e5b75626ba7d78df2412878ae62a0 SHA512 8eefe20a69cc66457bf5e55b2f141d2ba355fa8315e175dc2a2fa3ef7319f9dd91a7047cb49c105a771a9d7e060e9b0fc145bec123c508663cd0935486a7ec8e WHIRLPOOL ec557651c694869b7e8725da65e56c1f719818be61b4e304f9ae501cc88cee9fa4f01345f9a84f9bab44a55e730664cb000453606986d0c5863ab929bdef6494
+DIST vte-0.42.4.tar.xz 928048 SHA256 08c88bf5c0aa1dfa3711e2e83b784fb5ea82025661f30b54e93eebd5f4bce113 SHA512 871b47d976ae8faafabd2b9dd092b40b2b452fcfd7f60182db7c12ade0c265a1810e811a9a54b6a2c2061ff05f06743b90057babf300b98f391481bb02265fb5 WHIRLPOOL e3e9fbf5303770244b10259f1a07e41a7c0168debda2e81673f8fa1e19f591a4d2c643f614636e691ecaf22fc00eb8fce79d9d4a8d20c899f5a7e4ac187259db
diff --git a/x11-libs/vte/vte-0.42.1.ebuild b/x11-libs/vte/vte-0.42.1.ebuild
deleted file mode 100644
index 909abbd253eb..000000000000
--- a/x11-libs/vte/vte-0.42.1.ebuild
+++ /dev/null
@@ -1,77 +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 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-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"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.8:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXft
-
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	crypt?  ( >=net-libs/gnutls-3.2.7 )
-"
-RDEPEND="${RDEPEND}
-	!x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Python bindings are via gobject-introspection
-	# Ex: from gi.repository import Vte
-	gnome2_src_configure \
-		--disable-test-application \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_with crypt gnutls) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_install
-	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-libs/vte/vte-0.42.4.ebuild b/x11-libs/vte/vte-0.42.4.ebuild
new file mode 100644
index 000000000000..0fda0df0b591
--- /dev/null
+++ b/x11-libs/vte/vte-0.42.4.ebuild
@@ -0,0 +1,77 @@
+# 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 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=x11-libs/gtk+-3.8:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXft
+
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	crypt?  ( >=net-libs/gnutls-3.2.7 )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	gnome2_src_configure \
+		--disable-test-application \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_install
+	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
index 4f983325ef0a..a4280b79eb6d 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -1 +1,2 @@
 DIST xpa-2.1.15.tar.gz 861859 SHA256 ac0e041f9115757fbcbfeb377cb5833544815a70f2b46f6edfbf6d1239ae690a SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8 WHIRLPOOL 7dea8b931a1734c216ccfb79604ef5d291e1ea9230bbf0859895ac132ed2ceb7bc8ca13957d2022c34b641e740febf344b44e897faabf5aec9faf5761cf5213f
+DIST xpa-2.1.17.tar.gz 900465 SHA256 c95ae1d6c5353226a90f29007822e98da42a036af2f7326a21d2f66189c49751 SHA512 c9742b8427a9d8512a429f5a3b2bc6a55803b975c1524ead64906a4387a589f229e8715c46814b7b1bfb30a05f2f5fe59e944e1dabc333fcceca71c569a05a50 WHIRLPOOL 7426629091bc73d82ea87ce3db64b6f18f98f47bf98a45cc89971dbd0a88b44ee9eabe3e34e645e62a046fdb5b84258668f04616c38a34482f061e59b85445fb
diff --git a/x11-libs/xpa/xpa-2.1.17.ebuild b/x11-libs/xpa/xpa-2.1.17.ebuild
new file mode 100644
index 000000000000..6c93fa4b06a7
--- /dev/null
+++ b/x11-libs/xpa/xpa-2.1.17.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Messaging system providing communication between programs"
+HOMEPAGE="https://github.com/ericmandel/xpa"
+SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	x11-libs/libXt:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
+	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-threaded-xpans \
+		--with-x \
+		--with-tcl \
+		--with-threads
+}
+
+src_compile() {
+	emake shlib tclxpa
+}
+
+src_install () {
+	dodir /usr/$(get_libdir)
+	emake INSTALL_ROOT="${D}" install
+	insinto /usr/$(get_libdir)/tclxpa
+	doins pkgIndex.tcl
+	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
+	dodoc README
+	use doc && dodoc doc/*.pdf && dohtml doc/*.html
+	# build system so crappy not worth patching to a non respondant upstream
+	# and builds static with PIC
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
diff --git a/x11-misc/alltray/Manifest b/x11-misc/alltray/Manifest
deleted file mode 100644
index 913b05b89cfc..000000000000
--- a/x11-misc/alltray/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST alltray-0.7.5.1dev.tar.gz 481458 SHA256 09dad447b85ecb57debcb423f34381db7f112a010fbc83e4f65b3b31cf416514 SHA512 4cdba8a1a6d6969205387d985fda0cc479006ad009e3e35614569a5214d302b3852504c4d8ed0cf6557e202b941cc004033b4396a7b11e734a93317d70bc3efe WHIRLPOOL 6e9b65540b322a5f6902a204386cd80467b50f593dcb8933e34157e21f4c4f9c3e312e260f32c0fd31c592f9437f10bb754195ab0868592e24fbd941310117ae
diff --git a/x11-misc/alltray/alltray-0.7.5.1.ebuild b/x11-misc/alltray/alltray-0.7.5.1.ebuild
deleted file mode 100644
index e743ae66da5a..000000000000
--- a/x11-misc/alltray/alltray-0.7.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-VALA_MIN_API_VERSION="0.14"
-
-inherit autotools vala
-
-MY_P=${P}dev
-
-DESCRIPTION="An application which allows any application to be docked into the system notification area"
-HOMEPAGE="http://alltray.trausch.us/"
-SRC_URI="https://code.launchpad.net/${PN}/trunk/${PV}dev/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/libgtop:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libwnck:1"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::' src/Makefile.{am,in} || die #391101
-
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/Categories/s:Application;::' \
-		-e '/Icon/s:.png::' \
-		data/alltray.desktop{,.in} || die
-
-	vala_src_prepare
-	sed -i -e '/AC_PATH_PROG/s:valac:${VALAC}:g' configure.ac || die
-
-	eautoreconf
-}
diff --git a/x11-misc/alltray/files/alltray-0.7.4-include-fixes.patch b/x11-misc/alltray/files/alltray-0.7.4-include-fixes.patch
deleted file mode 100644
index 55814f5e70e5..000000000000
--- a/x11-misc/alltray/files/alltray-0.7.4-include-fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- alltray/src/Application.c
-+++ alltray/src/Application.c
-@@ -16,6 +16,7 @@
- #include <gdk-pixbuf/gdk-pixdata.h>
- #include <config.h>
- 
-+#include "gtop_glue.h"
- 
- #define ALL_TRAY_TYPE_APPLICATION (all_tray_application_get_type ())
- #define ALL_TRAY_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ALL_TRAY_TYPE_APPLICATION, AllTrayApplication))
---- alltray/src/AttachHelper.c
-+++ alltray/src/AttachHelper.c
-@@ -16,6 +16,7 @@
- #include <string.h>
- #include <gtk/gtk.h>
- 
-+#include "x11_glue.h"
- 
- #define ALL_TRAY_TYPE_ATTACH_HELPER (all_tray_attach_helper_get_type ())
- #define ALL_TRAY_ATTACH_HELPER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ALL_TRAY_TYPE_ATTACH_HELPER, AllTrayAttachHelper))
---- alltray/src/Process.c
-+++ alltray/src/Process.c
-@@ -16,6 +16,7 @@
- #include <libwnck/libwnck.h>
- #include <stdio.h>
- 
-+#include "gtop_glue.h"
- 
- #define ALL_TRAY_TYPE_PROCESS (all_tray_process_get_type ())
- #define ALL_TRAY_PROCESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ALL_TRAY_TYPE_PROCESS, AllTrayProcess))
diff --git a/x11-misc/alltray/metadata.xml b/x11-misc/alltray/metadata.xml
deleted file mode 100644
index 3434e8eff53f..000000000000
--- a/x11-misc/alltray/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-With AllTray you can dock any application into the system tray/notification
-area. A high-light feature is that a click on the "close" button will minimize
-to system tray. It is written in C using GTK and Xlib. It works well with Gnome,
-KDE and XFCE 4.2.
-	</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/basqet/Manifest b/x11-misc/basqet/Manifest
index 57facae20529..c2fe43fa3aa0 100644
--- a/x11-misc/basqet/Manifest
+++ b/x11-misc/basqet/Manifest
@@ -1,2 +1 @@
-DIST basqet_0.1.4-src.tgz 153422 SHA256 ad8187510fcc8c211e049053c0c10eeb4a3719856c17b1ecd8d0501406e4c967 SHA512 7f8ec0af7e031a6b7381be0486d5a448449910d4b0e784230d726eeb50ee69cb33d1454340e292a6be97bd9068b4d10c127a5c8a030bf3f02892a67d2a89c357 WHIRLPOOL 1f617e80e8fcc96c6c2b9bd4574bbe82954074369957aeaddf3f5c668b3fbab8fd2d36d60f68651adfae9e3cb77f6800369cb5a486611930d07d90bff5f171d6
 DIST basqet_0.2.0-src.tgz 471700 SHA256 46a66a61af82b57c5fc6be40565837dab785f1dbb375656cf207ef08eb09f8a2 SHA512 4153105f73161d02df611d9adf87508b0b35a6be95bfc3b3854319b9e38fa89ea12bcfc68ea186b21d7fe91c7f0a4e82d949eddfebff415b55c5f7f687df83e8 WHIRLPOOL 4afcee5a6e7d70babf05543c2f0f1db002e6753a03daad37f4eb5da58d0cf7ff9107bcbd4f13eb26ea0817c824b6eaa3937519282d2015d5e20d09ee34d7a8b8
diff --git a/x11-misc/basqet/basqet-0.1.4.ebuild b/x11-misc/basqet/basqet-0.1.4.ebuild
deleted file mode 100644
index 6a1f94744923..000000000000
--- a/x11-misc/basqet/basqet-0.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Keep your notes, pictures, ideas, and information in Baskets"
-HOMEPAGE="https://bitbucket.org/ridderby/basqet"
-SRC_URI="https://basqet.googlecode.com/files/${PN}_${PV}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtxmlpatterns:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	sed -i 's:PREFIX = /usr/local:PREFIX = /usr:' ${PN}.pro || die
-}
diff --git a/x11-misc/bbsload/Manifest b/x11-misc/bbsload/Manifest
deleted file mode 100644
index c4cd54834e8a..000000000000
--- a/x11-misc/bbsload/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bbsload-0.2.9.tar.gz 127556 SHA256 9a7f626cd66fa6d04a6aee83b31652ebe2604b1b8848ff5737a3a753a98acd82 SHA512 73bdf9da03bea0253ebec6aaf2cbd1e287bf97c2e9669c05fe878b24e3d30bfb6ad9c7b0be358f89ead646f023b2f0fc0ea1cc1b153713b91c005fbfbf8f4591 WHIRLPOOL a44b672e22fbd373911570a3dc3a949512a7ee77f2e8f71b3859ccc8215116e368c5ec81453e248b750091165e0524cc14c76a556c639972784195f7eaa9d95d
diff --git a/x11-misc/bbsload/bbsload-0.2.9.ebuild b/x11-misc/bbsload/bbsload-0.2.9.ebuild
deleted file mode 100644
index 0caf4016715c..000000000000
--- a/x11-misc/bbsload/bbsload-0.2.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="blackbox load monitor"
-HOMEPAGE="http://sourceforge.net/projects/bbtools/"
-SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="media-fonts/font-adobe-100dpi"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.8-as-needed.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbsload
-}
diff --git a/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch b/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch
deleted file mode 100644
index fd3aa0a42de3..000000000000
--- a/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -NrU5 bbsload-0.2.8.orig/configure.in bbsload-0.2.8/configure.in
---- bbsload-0.2.8.orig/configure.in	2008-12-18 00:44:23.000000000 +0100
-+++ bbsload-0.2.8/configure.in	2008-12-18 00:46:33.000000000 +0100
-@@ -87,16 +87,16 @@
- AC_PATH_X
- AC_PATH_XTRA
- 
- CFLAGS="$CFLAGS $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS $X_CFLAGS"
--LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
-+LIBS="$X_LIBS $X_PRE_LIBS"
- dnl Checks for X libraries.
--AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
-+AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
-              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
- 
--LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
- 
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(malloc.h)
- 
diff --git a/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch b/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch
deleted file mode 100644
index e506ca26d808..000000000000
--- a/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur bbsload-0.2.8.old/resource.hh bbsload-0.2.8/resource.hh
---- bbsload-0.2.8.old/resource.hh	2008-11-25 18:09:55.000000000 +0100
-+++ bbsload-0.2.8/resource.hh	2008-11-25 18:12:49.000000000 +0100
-@@ -121,8 +121,8 @@
- {
- 
- public:
--    Resource::Resource(ToolWindow *);
--    Resource::~Resource(void);
-+    Resource(ToolWindow *);
-+    ~Resource(void);
- 
-     struct FRAME frame;
-     struct LABEL label;
diff --git a/x11-misc/bbsload/metadata.xml b/x11-misc/bbsload/metadata.xml
deleted file mode 100644
index da720617856f..000000000000
--- a/x11-misc/bbsload/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>Load monitor for Blackbox.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">bbtools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/bmpanel/Manifest b/x11-misc/bmpanel/Manifest
deleted file mode 100644
index ced7a35a98d9..000000000000
--- a/x11-misc/bmpanel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bmpanel-0.9.27.tar.gz 30638 SHA256 a6976d024800b878117161174cc6ca57b21b2462666e75111cdd32eea8464557 SHA512 fc36db740ead9700156b24d1fea8fda6ac99b77db54f1a8d832a1d22075dc0f1034ad948e7b1506cec79db06a185494c2b7937dd76e220153aad0c6862ccc70d WHIRLPOOL 3e956b49854eb622cce8b4ca782e8e5427422694d9817c47b8b5763e2a1261e28b3fe24d1957ab6ea647a3d4436e910dc609c58de6335b04b0d917c6e1819804
diff --git a/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild b/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild
deleted file mode 100644
index cce6a31cb75a..000000000000
--- a/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit base eutils
-
-DESCRIPTION="a lightweight, NETWM compliant panel for X11 Window System"
-HOMEPAGE="http://nsf.110mb.com/bmpanel"
-SRC_URI="http://nsf.110mb.com/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="debug libev libevent"
-
-RDEPEND=">=media-libs/imlib2-1.4.0[X]
-	media-libs/freetype:2
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	media-libs/fontconfig
-	libev? ( dev-libs/libev )
-	libevent? ( dev-libs/libevent )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/Makefile.patch"
-)
-
-DOCS=( AUTHORS README )
-
-src_configure() {
-	# the provided configure script is broken.
-	# it doesn't provide --disable-foo, --host etc. so we can't use econf here.
-	local myconf="--prefix=/usr --ugly"
-
-	use debug && myconf="${myconf} --debug"
-	use libev && myconf="${myconf} --with-ev"
-	use libevent && myconf="${myconf} --with-event"
-
-	einfo "./configure ${myconf}"
-	./configure ${myconf} || die "configure failed"
-}
diff --git a/x11-misc/bmpanel/files/Makefile.patch b/x11-misc/bmpanel/files/Makefile.patch
deleted file mode 100644
index d9cdc8308837..000000000000
--- a/x11-misc/bmpanel/files/Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Makefile.old	2009-02-15 16:12:16.750885874 +0100
-+++ src/Makefile	2009-02-15 16:16:24.560106442 +0100
-@@ -12,10 +12,7 @@ ifneq ($(UGLY),1)
- endif
- 
- $(APP): $(OBJS)
--	$(V_L)$(LD) $(LIBS) -o $@ $(OBJS)
--ifeq ($(DEBUG),0)
--	$(V_S)strip -s $(APP)
--endif
-+	$(V_L)$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- $(BUILDDIR)/src/%.o: src/%.c .mk/config.mk
- 	$(V_C)$(CC) -c -MMD $(CFLAGS) $< -o $@
diff --git a/x11-misc/bmpanel/metadata.xml b/x11-misc/bmpanel/metadata.xml
deleted file mode 100644
index 48c7b00e4be0..000000000000
--- a/x11-misc/bmpanel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="libev">Use the libev event loop interface</flag>
-		<flag name="libevent">Use the libevent event loop interface</flag>
-	</use>
-</pkgmetadata>
diff --git a/x11-misc/dragbox/Manifest b/x11-misc/dragbox/Manifest
deleted file mode 100644
index 3dac2dff1f8f..000000000000
--- a/x11-misc/dragbox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dragbox-0.4.0.tar.gz 88019 SHA256 ba5dc05818cc991b4581e2b3987148043df786a60da1cf88e119d0dd4e4cd77f SHA512 19279826ce476607008764630e4036d6a5a659bef27c660591b9b1c95b0e2eb86f98bb34d64dcacba4fd2a39c73e091cea8d9c69dc3aab9aa2f214f1af82b7a9 WHIRLPOOL 00c53583069c378890767515d6d67de08504e6b25cef424f40bd6f8a011f4faab804e6d801bf207972306a5568b05d662143e9b309c78921e3487e0309af3558
diff --git a/x11-misc/dragbox/dragbox-0.4.0.ebuild b/x11-misc/dragbox/dragbox-0.4.0.ebuild
deleted file mode 100644
index b46f9a054ad1..000000000000
--- a/x11-misc/dragbox/dragbox-0.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="2"
-inherit python
-
-DESCRIPTION="GTK tool for connecting the commandline with the desktop environment"
-HOMEPAGE="http://kaizer.se/wiki/dragbox/"
-SRC_URI="http://kaizer.se/publicfiles/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk:2
-	gnome-base/libglade:2.0
-	dev-python/gnome-vfs-python:2
-	dev-python/libgnome-python:2
-	dev-python/gconf-python:2
-	sys-apps/dbus
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_clean_py-compile_files
-	python_convert_shebangs 2 dragbox
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	python_mod_optimize Dragbox
-}
-
-pkg_postrm() {
-	python_mod_cleanup Dragbox
-}
diff --git a/x11-misc/dragbox/metadata.xml b/x11-misc/dragbox/metadata.xml
deleted file mode 100644
index f3b74e3d80ae..000000000000
--- a/x11-misc/dragbox/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription lang="en">
-</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/gromit/files/gromit-20041213-build.patch b/x11-misc/gromit/files/gromit-20041213-build.patch
new file mode 100644
index 000000000000..f61a13bcccd6
--- /dev/null
+++ b/x11-misc/gromit/files/gromit-20041213-build.patch
@@ -0,0 +1,19 @@
+Respect CC, CFLAGS, & LDFLAGS.
+Drop DEPRECATED flags for bug #387833.
+Fix underlinking for bug #369453.
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,10 @@
+ all: gromit
+ 
+ proptest: proptest.c
+-	gcc -o proptest proptest.c `gtk-config --libs --cflags`
++	$(CC) -o proptest proptest.c `gtk-config --libs --cflags`
+ 
+ propertywatch: propertywatch.c
+-	gcc -o propertywatch propertywatch.c `gtk-config --libs --cflags`
++	$(CC) -o propertywatch propertywatch.c `gtk-config --libs --cflags`
+ 
+ gromit: gromit.c Makefile
+-	gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0`
++	$(CC) -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall $(CFLAGS) $(LDFLAGS) `pkg-config --libs --cflags gtk+-2.0` -lX11 -lm
diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r1.ebuild
index aa995ee80f94..40abca160b60 100644
--- a/x11-misc/gromit/gromit-20041213-r1.ebuild
+++ b/x11-misc/gromit/gromit-20041213-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
-
+EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="GRaphics Over MIscellaneous Things, a presentation helper"
@@ -17,25 +16,17 @@ IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's:-Wall:-Wall $(CFLAGS) $(LDFLAGS):' \
-		-e 's:gcc:$(CC):g' \
-		|| die "sed Makefile failed"
+	virtual/pkgconfig
+"
 
-	# Drop DEPRECATED flags, bug #387833
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED ::g' \
-		Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
 src_compile() {
-	emake CC=$(tc-getCC) || die
+	emake CC=$(tc-getCC)
 }
 
 src_install() {
 	dobin ${PN}
 	newdoc ${PN}rc ${PN}rc.example
-	dodoc AUTHORS ChangeLog README
+	einstalldocs
 }
diff --git a/x11-misc/growl-for-linux/Manifest b/x11-misc/growl-for-linux/Manifest
deleted file mode 100644
index e8b373cda78e..000000000000
--- a/x11-misc/growl-for-linux/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST growl-for-linux-0.6.7.tar.gz 945307 SHA256 ade0ecfc31ac6e713ac9a50bf91c45da0abf1ed45e98d124c60bb9d336704c2a SHA512 00bf229349c534014112dab0615c82201c5e629fec554ce29494b3d27403552018b20829655fe927c8469ae9cb878a8be54c920f27c5c04aaa8012749b0bbf5e WHIRLPOOL 0ddfc66d2554b025187a455a105f4e3a1cfca7a99691f3a08bef66ff0f5a94cb792436097eacb3511cdafc8ff830cec50907d2b65ff98ef606acf050121a3588
diff --git a/x11-misc/growl-for-linux/growl-for-linux-0.6.7-r1.ebuild b/x11-misc/growl-for-linux/growl-for-linux-0.6.7-r1.ebuild
deleted file mode 100644
index 69103e2a6772..000000000000
--- a/x11-misc/growl-for-linux/growl-for-linux-0.6.7-r1.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
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="Growl Implementation For Linux"
-HOMEPAGE="https://mattn.github.com/growl-for-linux/"
-SRC_URI="mirror://github/mattn/growl-for-linux/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	net-misc/curl
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	local myeconfargs=(
-		LIBS=-lgthread-2.0
-		--disable-static
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-}
diff --git a/x11-misc/growl-for-linux/growl-for-linux-0.6.7.ebuild b/x11-misc/growl-for-linux/growl-for-linux-0.6.7.ebuild
deleted file mode 100644
index 10f7e1ed8c66..000000000000
--- a/x11-misc/growl-for-linux/growl-for-linux-0.6.7.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_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="Growl Implementation For Linux"
-HOMEPAGE="https://mattn.github.com/growl-for-linux/"
-SRC_URI="mirror://github/mattn/growl-for-linux/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	net-misc/curl
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	local myeconfargs=(
-		LIBS=-lgthread-2.0
-		--disable-static
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-}
diff --git a/x11-misc/growl-for-linux/growl-for-linux-9999.ebuild b/x11-misc/growl-for-linux/growl-for-linux-9999.ebuild
deleted file mode 100644
index 4d7816906044..000000000000
--- a/x11-misc/growl-for-linux/growl-for-linux-9999.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
-
-EGIT_REPO_URI="git://github.com/mattn/growl-for-linux"
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils git-2
-
-DESCRIPTION="Growl Implementation For Linux"
-HOMEPAGE="https://mattn.github.com/growl-for-linux/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="libressl"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	net-misc/curl
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-}
diff --git a/x11-misc/growl-for-linux/metadata.xml b/x11-misc/growl-for-linux/metadata.xml
deleted file mode 100644
index ed3c10dca72b..000000000000
--- a/x11-misc/growl-for-linux/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <longdescription lang="en">
-    Growl For Linux is Linux-compatible of Growl. Growl is a notification system for Mac OS X.
-  </longdescription>
-</pkgmetadata>
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0.ebuild
deleted file mode 100644
index 5ef7ef08b616..000000000000
--- a/x11-misc/kaqaz/kaqaz-1.2.0.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
-inherit qmake-utils
-
-DESCRIPTION="Modern note manager"
-HOMEPAGE="http://labs.sialan.org/projects/kaqaz"
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-qt/qtdeclarative:5
-	dev-qt/qtquick1:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtsql:5
-	dev-qt/qtsensors:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml
index b10e735bbb38..fc62d74940fd 100644
--- a/x11-misc/kaqaz/metadata.xml
+++ b/x11-misc/kaqaz/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sialan-labs/kaqaz</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>yngwin@gentoo.org</email>
+		<name>Ben de Groot</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sialan-labs/kaqaz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/magneto-gtk/Manifest b/x11-misc/magneto-gtk/Manifest
deleted file mode 100644
index 520d012e476c..000000000000
--- a/x11-misc/magneto-gtk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/x11-misc/magneto-gtk/magneto-gtk-254.ebuild b/x11-misc/magneto-gtk/magneto-gtk-254.ebuild
deleted file mode 100644
index d367b5fbdfc5..000000000000
--- a/x11-misc/magneto-gtk/magneto-gtk-254.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Entropy Package Manager notification applet GTK2 frontend"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/magneto"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="~app-misc/magneto-loader-${PV}[${PYTHON_USEDEP}]
-	dev-python/notify-python
-	dev-python/pygtk:2
-	${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-gtk-install || die "make install failed"
-
-	python_optimize "${D}/usr/lib/entropy/magneto/magneto/gtk"
-}
diff --git a/x11-misc/magneto-gtk/metadata.xml b/x11-misc/magneto-gtk/metadata.xml
deleted file mode 100644
index 15f07e411445..000000000000
--- a/x11-misc/magneto-gtk/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
-	<use>
-	</use>
-</pkgmetadata>
diff --git a/x11-misc/magneto-gtk3/Manifest b/x11-misc/magneto-gtk3/Manifest
deleted file mode 100644
index 520d012e476c..000000000000
--- a/x11-misc/magneto-gtk3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/x11-misc/magneto-gtk3/magneto-gtk3-254.ebuild b/x11-misc/magneto-gtk3/magneto-gtk3-254.ebuild
deleted file mode 100644
index 7092a18e8201..000000000000
--- a/x11-misc/magneto-gtk3/magneto-gtk3-254.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Entropy Package Manager notification applet GTK3 frontend"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/magneto"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	~app-misc/magneto-loader-${PV}[${PYTHON_USEDEP}]
-	dev-libs/gobject-introspection
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-gtk3-install || die "make install failed"
-	python_optimize "${D}/usr/lib/entropy/magneto/magneto/gtk3"
-}
diff --git a/x11-misc/magneto-gtk3/metadata.xml b/x11-misc/magneto-gtk3/metadata.xml
deleted file mode 100644
index 15f07e411445..000000000000
--- a/x11-misc/magneto-gtk3/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
-	<use>
-	</use>
-</pkgmetadata>
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 8f4f2c467709..c9cf8dc28344 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -3,3 +3,4 @@ DIST notification-daemon-0.7.6.tar.xz 279488 SHA256 64d0ce6fb12c94c3b73b701502c8
 DIST notification-daemon-3.14.1.tar.xz 280344 SHA256 3cd9af77708fb1ab95ed6c8c66095c5c99a19e84eadc6ba607ef07973e262b80 SHA512 977d028206d6a2005d346f697af5790b404f56399c451774037db25e37724f0cfbd558ae413c9ada40d2d7f399c1911392b19194e8fd093de74f65a6783ccc05 WHIRLPOOL 6c4161a75cdf4db1c99ebc8ede36c4229de1a491a3d5aefab41279b934a95c73dca1799848bd62c63aea31c282d56afeced73f7c51ee36821b642d3490cf08cc
 DIST notification-daemon-3.16.1.tar.xz 280404 SHA256 256b322f5d18d438c3f1b0d1d10b6b1fbcff80f82f785e3fc69680e4e498fd81 SHA512 02971b68c5f16d5cf7760915040ac6336a540cda4fd85766e4597a9df3fc4971d7f12f8023a84e55c5cc90c79ea5c685b440411854d2113a719474347c8c4979 WHIRLPOOL 21f06857caf115cd4d53de14e9531a09ade102d378c1a80ba779f4c4cf7b392ae31c50cf7c148aa21800e882a3cd4bd10ba64ae197fd56e560ce050d2875d307
 DIST notification-daemon-3.18.1.tar.xz 327140 SHA256 5c3c86d677884b648bff58985fd3f5eb67d1fc92b78161f1e2e1dc5be91f5d05 SHA512 f21fe99e9c12debd05212e45c4887371ea985182bdf5d3559aef6a912ff87f717a3856976bf4bba0c49c4d188a7ef7503893389c7ca193f02ec7aa4bbcb38717 WHIRLPOOL 8489d91eeec979237c338f5ae82a191fe25b214506d7aca2245c32124ac044f0f2147549b59d29a1412d146e05bd6005b866e918660a472c59ea52c8b6122c5d
+DIST notification-daemon-3.18.2.tar.xz 329196 SHA256 0aac24764b62f34eca94f37a97e7473b6d557138440ae80b77099171ca6d67b4 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c WHIRLPOOL 6ee853a2f44cd7b3b194a8b4030c290620b2d9a2a09f309c119f7bb372ebc41bcf50ece2561055a7b96037457e73254bf8ead80bb1f3494cdde13000334ef2b7
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
new file mode 100644
index 000000000000..7dffc675e4c8
--- /dev/null
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome.org
+
+DESCRIPTION="Notification daemon"
+HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.15.2:3
+	sys-apps/dbus
+	x11-libs/libX11
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+	default
+
+	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
+	[D-BUS Service]
+	Name=org.freedesktop.Notifications
+	Exec=/usr/libexec/notification-daemon
+	EOF
+
+	insinto /usr/share/dbus-1/services
+	doins "${T}"/org.freedesktop.Notifications.service
+}
diff --git a/x11-misc/okindd/Manifest b/x11-misc/okindd/Manifest
index 227b4d39f07e..6ad23b456c8e 100644
--- a/x11-misc/okindd/Manifest
+++ b/x11-misc/okindd/Manifest
@@ -1,2 +1 @@
-DIST okindd-0.6.0-49-20110113.tar.bz2 11557 SHA256 a2a98c1bbe2e64b22542d7a0f131a4373dcd075fb569841e045aa6cfb827a236 SHA512 219a8cfe516966066fd4da08e553df0e8f9e038bdc801e4bf5feeb634964ac96949e7bc8b800caa5ee63a1fd9d0bb31b8a96a46b35804981d9fe6b03d27426f1 WHIRLPOOL 02de3f2a93cc913f3b7b7414b747d8accdb9f234ad4f5ebfd86b350a55692872f71dc6b3e5d796f1852baa2fb49760e8aaf093d29cb4a3677b0e0793e6be08d9
 DIST okindd-0.6.1-23-20120304.tar.bz2 14778 SHA256 f99e48b56f312d9aa7f0d612eb926ee3a11cec1bec50538e4c3efa5e7df6a985 SHA512 107d59b96363faac0a9394ad217b3ace0ac7d6eb003c34ea7b96760cba7d8e9abb7ef4e22222ab260dfc425099c8b6733ebd002dea79857b9080a30e1bc2d682 WHIRLPOOL 6c24fb40d11728969d81727d7398a062eb8a425a1370632de066746ce8fbae7d8cd5db1dbefee146f8f5ca8a7963522e090b249f8a4448033b4be45f1a0c4cff
diff --git a/x11-misc/okindd/okindd-0.6.0.ebuild b/x11-misc/okindd/okindd-0.6.0.ebuild
deleted file mode 100644
index 2dbefddf7d89..000000000000
--- a/x11-misc/okindd/okindd-0.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit qt4-r2
-
-MY_P="${P}-49-20110113"
-
-DESCRIPTION="On Screen Display (OSD) for KDE 4.x - works on any qt desktop"
-HOMEPAGE="http://sites.kochkin.org/okindd/Home"
-SRC_URI="http://sites.kochkin.org/okindd/Home/development/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtdbus:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	eqmake4 okindd.pro
-}
-
-DOCS=( changelog )
-src_install() {
-	qt4-r2_src_install
-	docinto examples
-	dodoc scripts/*
-	dodoc conf/okinddrc.example
-
-	elog "You can find an example configuration file at"
-	elog "	/usr/share/doc/okindd/examples/okinddrc.example"
-	elog "It should be placed in \${HOME}/.okindd/"
-}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index d5410c36a6a1..6c3d57059efa 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1 @@
-DIST sddm-0.12.0.tar.xz 3866620 SHA256 7d7504bf8a717a9131a2f32be852d7631365d21a468ca2649c8245f24ff29ae0 SHA512 d1d9f60634cb2a71096d92321a7a8b33efb8879a766979ca7c1d31ac5f1dbde8253384070338eef80f777db1cd78eef540e9111151f7f9e7d8e648d557e58047 WHIRLPOOL 58d21ead822b85bf3f0f6375cfadee6225dd9bf696e786fe68f283def43b4107d11e14b357d60b0278266270f9ddcb6a9b86285bc3b1a19644583f6ebebc4990
 DIST sddm-0.13.0.tar.xz 3869452 SHA256 dd868caaccf7783ead799f3b79e442d5adcb46251b78c8dbf3e9da0016dd347d SHA512 292a584945e74ea987088f975d5973b45a5b4fc07fa90b487fb9ece2de7ecca352344354474dfa8d103c8242367c19ad926e62a553e5b567d8d88a3f2c73c171 WHIRLPOOL e3961ecd5e22e8d565c16d86b6043ba7f3d6c1c296047d196577ab25af4e50216d67d53e9690b4df262c5ae4486bf36f88d345110a54bada9d75c4ff0dfc5ff3
diff --git a/x11-misc/sddm/sddm-0.12.0-r1.ebuild b/x11-misc/sddm/sddm-0.12.0-r1.ebuild
deleted file mode 100644
index c472cbc8756e..000000000000
--- a/x11-misc/sddm/sddm-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 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/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~arm ~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/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
-	dev-qt/linguist-tools:5
-	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
-
-	# fix for flags handling and bug 563108
-	epatch "${FILESDIR}/${P}-respect-user-flags.patch" "${FILESDIR}/${P}-CVE-2015-0856.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
-
-	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
-		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
-		if [[ -z ${line} ]]; then
-			ewarn
-			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
-			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
-			ewarn
-			ewarn "session      optional      pam_ck_connector.so nox11"
-			ewarn
-			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
-			ewarn
-		fi
-	fi
-}
diff --git a/x11-misc/set_opacity/metadata.xml b/x11-misc/set_opacity/metadata.xml
index 7140693cdb28..c88f3b905115 100644
--- a/x11-misc/set_opacity/metadata.xml
+++ b/x11-misc/set_opacity/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>pinkbyte@gentoo.org</email>
-    <name>Sergey Popov</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<maintainer type="person">
+			<email>anton.kochkov@gmail.com</email>
+			<name>Anton Kochkov</name>
+		</maintainer>
+		<remote-id type="github">XVilka/set_opacity</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/set_opacity/set_opacity-1.0.ebuild b/x11-misc/set_opacity/set_opacity-1.0.ebuild
index 37a6cba55d5c..5cf114b548b2 100644
--- a/x11-misc/set_opacity/set_opacity-1.0.ebuild
+++ b/x11-misc/set_opacity/set_opacity-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,8 +7,8 @@ EAPI="4"
 inherit toolchain-funcs
 
 DESCRIPTION="Tool for set real compositing for windows through window's id, process' pid etc."
-HOMEPAGE="https://gitorious.org/x11-tools/set_opacity"
-SRC_URI="https://gitorious.org/x11-tools/set_opacity/archive-tarball/${PV} -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/XVilka/set_opacity"
+SRC_URI="https://github.com/XVilka/set_opacity/archive-tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/set_opacity/set_opacity-9999.ebuild b/x11-misc/set_opacity/set_opacity-9999.ebuild
index 6633e1570170..3626e687308c 100644
--- a/x11-misc/set_opacity/set_opacity-9999.ebuild
+++ b/x11-misc/set_opacity/set_opacity-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="6"
 
-EGIT_REPO_URI="git://gitorious.org/x11-tools/set_opacity.git"
+EGIT_REPO_URI="https://github.com/XVilka/set_opacity.git"
 
-inherit git-2 toolchain-funcs
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Tool for set real compositing for windows through window's id, process' pid etc."
-HOMEPAGE="https://gitorious.org/x11-tools/set_opacity"
+HOMEPAGE="https://github.com/XVilka/set_opacity"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/x11-misc/slock/files/slock-1.3-dontdieonme.patch b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
index dd08ba710b57..bda110a2d5e6 100644
--- a/x11-misc/slock/files/slock-1.3-dontdieonme.patch
+++ b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
@@ -1,10 +1,11 @@
 --- a/slock.c
 +++ b/slock.c
-@@ -55,7 +55,6 @@
- 	va_start(ap, errstr);
- 	vfprintf(stderr, errstr, ap);
- 	va_end(ap);
--	exit(1);
+@@ -81,7 +81,7 @@
+ 		die("buffer too small\n");
+ 
+ 	if (fd < 0 || write(fd, value, length) != length || close(fd) != 0)
+-		die("cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)\n");
++		fprintf(stderr, "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)\n");
  }
+ #endif
  
- #ifdef __linux__
diff --git a/x11-misc/slock/slock-1.3.ebuild b/x11-misc/slock/slock-1.3-r1.ebuild
index 0cfb4d877271..0cfb4d877271 100644
--- a/x11-misc/slock/slock-1.3.ebuild
+++ b/x11-misc/slock/slock-1.3-r1.ebuild
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index dad1a2a7eb56..68051b797b37 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1 +1,2 @@
 DIST xdiskusage-1.48_p20111016.tar.xz 17812 SHA256 e612d2652a4127a9c4a296b186dd2cf9eb2cc43c217c85ae534ba55545af0250 SHA512 2c73bf3756c47c45e340fbb11769d420854371d01400ff1c54a89b4a14465b8f35d61372ff37a4d46a75a3e5f7891584972e4fd2d09dc9d7105cc34ebc10d226 WHIRLPOOL 5a55eef74e6a1ac93fbf4de78caddc18912a1b2642d29310491e7473baf4fc76dd578ead4005aa9da143255aecc190a08c1eb79da0ecdf2145e72d7bd2793cb5
+DIST xdiskusage-1.51.tgz 54248 SHA256 6fb2447f311299f9cb949f6954b333371209f7d53dd6a58700a679a1001089c6 SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a WHIRLPOOL fbabff47fbf0e711e21d9f88590f153cfbfe2a4674b976337ea64a0ffde96fae83882f1e1f8dc63edab186c14ab917b8824978ddcfde1c360c108ebf6503c5c2
diff --git a/x11-misc/xdiskusage/metadata.xml b/x11-misc/xdiskusage/metadata.xml
index 934d9a1c1304..8e4097862009 100644
--- a/x11-misc/xdiskusage/metadata.xml
+++ b/x11-misc/xdiskusage/metadata.xml
@@ -5,9 +5,6 @@
     <email>desktop-misc@gentoo.org</email>
     <name>Gentoo Desktop Miscellaneous Project</name>
   </maintainer>
-  <longdescription>
-	xdiskusage is a user-friendly program to show you what is using up all your disk space.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">xdiskusage</remote-id>
   </upstream>
diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
new file mode 100644
index 000000000000..840f16eaaaa1
--- /dev/null
+++ b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="user-friendly program to show you what is using up all your disk space"
+HOMEPAGE="http://xdiskusage.sourceforge.net/"
+SRC_URI="${HOMEPAGE}${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3:1
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags)" \
+		LDLIBS="$(fltk-config --ldflags)"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}
diff --git a/x11-misc/xoo/Manifest b/x11-misc/xoo/Manifest
deleted file mode 100644
index 5a0aada47eaa..000000000000
--- a/x11-misc/xoo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xoo-0.7.tar.gz 301563 SHA256 69796891a93887496d99c867bb70208830ceb6c3671fca0ecc70a564a14ae20a SHA512 1b24aee621645d8db661a7dac8ece7a76d5f0ef1a0800c4710aee98691cf953b69d2e3515a16cbc87fae32335dfddae248495f1f525bb1b265c6c6683f81c55d WHIRLPOOL f77709aeafeef7fbae321df19462c779d160e25ba287524ee7dc3da4cf0c66eee09a604c9ca3d15fccc683ce4cef0e14829419c2589d74644d6e447b9edbef2a
diff --git a/x11-misc/xoo/metadata.xml b/x11-misc/xoo/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-misc/xoo/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-misc/xoo/xoo-0.7.ebuild b/x11-misc/xoo/xoo-0.7.ebuild
deleted file mode 100644
index 1b0ef725816b..000000000000
--- a/x11-misc/xoo/xoo-0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2006-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="A graphical wrapper around xnest"
-HOMEPAGE="http://projects.o-hand.com/xoo"
-SRC_URI="http://projects.o-hand.com/sources/xoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gnome"
-
-DEPEND="gnome? ( gnome-base/gconf )
-	gnome-base/libglade
-	x11-libs/libXtst
-	x11-base/xorg-server"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Fix default Xnest binary path.
-	sed -e "s:/usr/X11R6/bin/Xnest:$(type -P Xnest):" -i src/main.c || die
-}
-
-src_compile() {
-	econf \
-		$(use_enable gnome gconf)
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS Changelog NEWS README TODO
-}
diff --git a/x11-plugins/desklet-Genesis/Manifest b/x11-plugins/desklet-Genesis/Manifest
deleted file mode 100644
index a8e7aa66f58c..000000000000
--- a/x11-plugins/desklet-Genesis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Genesis-0.2.tar.gz 23645 SHA256 0038de96fc6b2b5e6117afd0ce9785e0a81ea0af135f57b08364407990585b58 SHA512 fb6562412fa81ce77479a321d71112bba1ec39c4075127ce43bd770f6c0e07c85c9bcfbba0df1ac46413ec06ff426a620101ce54008d15333807b35768c9b1d1 WHIRLPOOL a0c46a6617d7193b49d7296806016a333a81fdc74da43c8d08d47382f16d574c26dbc57988121bad86b0cc2792b1cca9280e4fb2ff42a19ebae085e2362106e7
diff --git a/x11-plugins/desklet-Genesis/desklet-Genesis-0.2.ebuild b/x11-plugins/desklet-Genesis/desklet-Genesis-0.2.ebuild
deleted file mode 100644
index ba9b42a71a77..000000000000
--- a/x11-plugins/desklet-Genesis/desklet-Genesis-0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gdesklets
-
-DESCRIPTION="An application launcher for gDesklets"
-HOMEPAGE="http://gdesklets.de/?q=desklet/view/101"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=x11-plugins/desklet-Mouse-0.1"
diff --git a/x11-plugins/desklet-Genesis/metadata.xml b/x11-plugins/desklet-Genesis/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/desklet-Genesis/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/desklet-ImageSlideShow/Manifest b/x11-plugins/desklet-ImageSlideShow/Manifest
deleted file mode 100644
index 19705745d902..000000000000
--- a/x11-plugins/desklet-ImageSlideShow/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ImageSlideShow-0.8.tar.gz 25187 SHA256 60762ee089174494e97ca3cc97e03d2287971ddb877ad0143d82133661fad32b SHA512 0920ceca7555776a54b6f456b6af8be38da22fde345766b8e48b0771330635025ae3c0a19748ff0be1db9bc5ffa887fbd9cd7d9f79dc1fa51ad62842408986cb WHIRLPOOL a362c5039aa26b0499d892f6ffea82f1075adda162eb1bf97f325a8f70f50a4c3bb7884434076fb4b874428189cb7eed88b33387a94cbee071ff641d0fe16f1f
diff --git a/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild b/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
deleted file mode 100644
index a5acaab1a1ad..000000000000
--- a/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-CONTROL_NAME="${PN#desklet-}"
-
-inherit gdesklets
-
-DESCRIPTION="ImageSlideShow Control for gDesklets"
-HOMEPAGE="http://gdesklets.de/index.php?q=control/view/211"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-python/pillow"
-DOCS="MANIFEST README"
-
-src_prepare() {
-	epatch "${FILESDIR}/${CONTROL_NAME}-${PV}-cache-dir.patch"
-}
diff --git a/x11-plugins/desklet-ImageSlideShow/files/ImageSlideShow-0.8-cache-dir.patch b/x11-plugins/desklet-ImageSlideShow/files/ImageSlideShow-0.8-cache-dir.patch
deleted file mode 100644
index 64bcd08422b9..000000000000
--- a/x11-plugins/desklet-ImageSlideShow/files/ImageSlideShow-0.8-cache-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ImageSlideShow/__init__.py.orig	2008-01-15 16:36:23.000000000 +0100
-+++ ImageSlideShow/__init__.py	2009-05-10 16:57:27.000000000 +0200
-@@ -45,11 +45,10 @@
- 		self.__previous_width = 300
- 		
- 		#Cache folder
--		#folder = os.path.expanduser("~") + "/" + ".cache2/imageslideshow"
--		folder = "/tmp/imageslideshow"
-+		folder = os.path.expanduser("~") + "/" + ".thumbnails/imageslideshow"
- 		debugger("cache folder is:" + folder)
- 		if not os.path.isdir(folder):
--			os.mkdir(folder)
-+			os.makedirs(folder)
- 			
- 		self.__thumbnail_folder=folder
- 		
---- ImageSlideShow/directorywalk.py.orig	2009-05-02 20:42:41.000000000 +0200
-+++ ImageSlideShow/directorywalk.py	2009-05-28 18:57:51.000000000 +0200
-@@ -10,7 +10,7 @@
- 			st = os.lstat(os.path.join(top, name))
- 		except os.error:
- 			continue
--		if stat.S_ISDIR(st.st_mode):
-+		if stat.S_ISDIR(st.st_mode) or stat.S_ISLNK(st.st_mode):
- 			for (newtop, children) in walktree (os.path.join(top, name), depthfirst):
- 				yield newtop, children
- 	if depthfirst:
diff --git a/x11-plugins/desklet-ImageSlideShow/metadata.xml b/x11-plugins/desklet-ImageSlideShow/metadata.xml
deleted file mode 100644
index 8c9d3e79335e..000000000000
--- a/x11-plugins/desklet-ImageSlideShow/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription lang="en">
-		A Control for gDesklets (gnome-extra/gdesklets-core).  Provides
-		functions to control an image slideshow and read select image
-		meta-data.  Requires the Python Imaging Library.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>shizeon-at-gmail-dot-com</email>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-plugins/desklet-Mouse/Manifest b/x11-plugins/desklet-Mouse/Manifest
deleted file mode 100644
index cf0a0c14ca22..000000000000
--- a/x11-plugins/desklet-Mouse/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Mouse-0.1.tar.gz 528 SHA256 729f1f387b942fef3439171ee8b50685b20cd954e03bcaead06fc550a0b3a641 SHA512 853755ec30354bd7aec0b773eba0cc2dbc4f784dd269d860425b3f7330660be9af6a75b48a68cd178920fe3713c10e47cac06355c44eb7404d29f0e5818d7311 WHIRLPOOL 3fcab45160b5654502027419396c2d4d3347332bc0e12c731956cd0ae2f553ebe260d77b99d8160670d2468893e22cec9af2cdb24111d94624f40b1a47e5474f
diff --git a/x11-plugins/desklet-Mouse/desklet-Mouse-0.1.ebuild b/x11-plugins/desklet-Mouse/desklet-Mouse-0.1.ebuild
deleted file mode 100644
index 528e0bb4568b..000000000000
--- a/x11-plugins/desklet-Mouse/desklet-Mouse-0.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-CONTROL_NAME="${PN#desklet-}"
-
-inherit gdesklets
-
-DESCRIPTION="Control for gDesklets that reports information about the cursor"
-HOMEPAGE="http://gdesklets.de/?q=control/view/101"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/x11-plugins/desklet-Mouse/metadata.xml b/x11-plugins/desklet-Mouse/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/desklet-Mouse/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/desklet-SlideShow/Manifest b/x11-plugins/desklet-SlideShow/Manifest
deleted file mode 100644
index fbfbab255ca8..000000000000
--- a/x11-plugins/desklet-SlideShow/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SlideShow-0.9.tar.gz 118435 SHA256 bba44b67fc2c032b3f05347a46edaa516cd343542fef7b295abf70dfa3fbe78d SHA512 1f8dd754e7d52d6f0c05e46f0a5eef6d761ed2125d5659851aae34b40297c5e911d465ff8b507fc083beaa69a7ae13b1bab09a7432c8f42b197db861ca25c7af WHIRLPOOL c1c8a31bc28003a9fceb53de2a6b1ddf5b94000747f171ec9463f8ec92e844982449e3886b7e50843f0c46a1bd7055ef637914ca08be7e91ff50ba197b58fdd1
diff --git a/x11-plugins/desklet-SlideShow/desklet-SlideShow-0.9.ebuild b/x11-plugins/desklet-SlideShow/desklet-SlideShow-0.9.ebuild
deleted file mode 100644
index 864f0cf2c133..000000000000
--- a/x11-plugins/desklet-SlideShow/desklet-SlideShow-0.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gdesklets
-
-DESCRIPTION="Slideshow desklet for gDesklets that cycles through a collection of pictures"
-HOMEPAGE="http://gdesklets.de/index.php?q=desklet/view/221"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND} >=x11-plugins/desklet-ImageSlideShow-0.8"
-DOCS="todo"
diff --git a/x11-plugins/desklet-SlideShow/metadata.xml b/x11-plugins/desklet-SlideShow/metadata.xml
deleted file mode 100644
index 58ff1abb8082..000000000000
--- a/x11-plugins/desklet-SlideShow/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription lang="en">
-		A desklet for gDesklets (gnome-extra/gdesklets-core) that
-		cycles through a collection of pictures.  Will display image
-		captions (IPTC,JPEG Comment, EXIF) if available.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>shizeon-at-gmail-dot-com</email>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-plugins/desklet-WeeklyCalendar/Manifest b/x11-plugins/desklet-WeeklyCalendar/Manifest
deleted file mode 100644
index 6e4dc10e1395..000000000000
--- a/x11-plugins/desklet-WeeklyCalendar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST WeeklyCalendar-0.60.tar.gz 47610 SHA256 22beb6b78d1fd6898751d2b60504ccfd0437e734473fb61921f7b8b51dac1473 SHA512 0fd77e2620fe0e02e6b0cfe447d7e57c48f880934fdc6cce9c40cf5c47dbfd845ddb8b50bcdbf85e698298ddcb915e33acf243cf7bdbbe3ad616f81f4a351e62 WHIRLPOOL 938768c5192aa70d8b9fbbd16477df554d61c187c2da5489ef8a1bc6cc99219d937f2f20fbcf53469f048ae306ea1b9f8d2e3b54aff67fae274e254aa6267581
diff --git a/x11-plugins/desklet-WeeklyCalendar/desklet-WeeklyCalendar-0.60.ebuild b/x11-plugins/desklet-WeeklyCalendar/desklet-WeeklyCalendar-0.60.ebuild
deleted file mode 100644
index d6ff23a2abf8..000000000000
--- a/x11-plugins/desklet-WeeklyCalendar/desklet-WeeklyCalendar-0.60.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gdesklets
-
-DESCRIPTION="A weekly calendar with task management capability"
-HOMEPAGE="http://gdesklets.de/?q=desklet/view/111"
-LICENSE="GPL-3"
-
-SLOT="0"
-IUSE=""
-# KEYWORDS are limited by dev-python/icalendar
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=x11-plugins/desklet-iCalendarEvent-0.4"
-
-DOCS="README"
diff --git a/x11-plugins/desklet-WeeklyCalendar/metadata.xml b/x11-plugins/desklet-WeeklyCalendar/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/desklet-WeeklyCalendar/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/desklet-ftb/Manifest b/x11-plugins/desklet-ftb/Manifest
deleted file mode 100644
index c693fb8f5b57..000000000000
--- a/x11-plugins/desklet-ftb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FTB-0.3.2.tar.gz 183231 SHA256 62b821d677cb4111449e49d35ae30b206ba6621661d44479ce34ecd3f9a6150c SHA512 812ddd4afacb04f7f2a784cff329ef8d652c601532be6765618abdfd50fb6ea14f1b6e0227260a2d0497e1dd332bb43afd25eafb11852c2593b93a80c6a0cba5 WHIRLPOOL 15a416f83f892b86fa69808d7743e6ed3dbc99290ccad0ce8eb3b1293c642d8f3753c2e4558a0193d904297e2f19969eadfef5d209cf0075067179ace1e51a09
diff --git a/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild b/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild
deleted file mode 100644
index 0e2bbd449b87..000000000000
--- a/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESKLET_NAME="FTB"
-
-inherit gdesklets
-
-S="${WORKDIR}/Displays/${DESKLET_NAME}"
-
-DESCRIPTION="Configurable, stackable system monitors"
-HOMEPAGE="http://archive.gdesklets.info/"
-SRC_URI="http://archive.gdesklets.info/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 ~sparc ~x86"
diff --git a/x11-plugins/desklet-ftb/metadata.xml b/x11-plugins/desklet-ftb/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/desklet-ftb/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/desklet-iCalendarEvent/Manifest b/x11-plugins/desklet-iCalendarEvent/Manifest
deleted file mode 100644
index 19b48b5e97ca..000000000000
--- a/x11-plugins/desklet-iCalendarEvent/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iCalendarEvent-0.5.tar.gz 21571 SHA256 a77480401c4a1dbd009d28d138c257f1901d449f9bab65156c5918c572d176ae SHA512 559314919ef4a83de3f8ebd59c7cac50a928c8fe444c20ba426cbb117d70bfd7e8f3ff1cf332d9daf733f61489aaca27b59fb3656f8a38f9dc278372774fb720 WHIRLPOOL def989e848a1706d584a2bffdee21ec3296ba04e6a76f7c69e9ae1112a30a4f8ebc4182fbdbfd6509cc4542a724e2c6b62868399d7f98a7883cc491263207635
diff --git a/x11-plugins/desklet-iCalendarEvent/desklet-iCalendarEvent-0.5.ebuild b/x11-plugins/desklet-iCalendarEvent/desklet-iCalendarEvent-0.5.ebuild
deleted file mode 100644
index bf3c7e171a22..000000000000
--- a/x11-plugins/desklet-iCalendarEvent/desklet-iCalendarEvent-0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-CONTROL_NAME="${PN#desklet-}"
-
-inherit gdesklets
-
-DESCRIPTION="iCalendarEvent Control for gDesklets"
-HOMEPAGE="http://gdesklets.de/index.php?q=control/view/231"
-LICENSE="GPL-2"
-# KEYWORDS limited by dev-python/icalendar
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-python/icalendar-2.0.1
-	>=dev-python/python-dateutil-1.2
-	dev-libs/libgamin[python]
-	dev-libs/libxml2[python]"
-DOCS="Manifest"
diff --git a/x11-plugins/desklet-iCalendarEvent/metadata.xml b/x11-plugins/desklet-iCalendarEvent/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/desklet-iCalendarEvent/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/desklet-justanicon/Manifest b/x11-plugins/desklet-justanicon/Manifest
deleted file mode 100644
index 9393e637949e..000000000000
--- a/x11-plugins/desklet-justanicon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JustAnIcon-0.2.tar.gz 33000 SHA256 671141f1a4fe1325e538a8e481d0d758023ad7eca933313504c015e07180d13c SHA512 52e1fc18fc1dc998730db1da877fa30b68e2054cf53b22b88e93f64b021058b427df6dac0704e9ea9974820e71d480fc4b4d2c0ac8011373b8d48e75f23f1055 WHIRLPOOL 80c26c10a8fe230250aa408519d026840bc272bc2ec64541e6b4c1dcd708aa35cee6efb42d218633572bac6cf5ffa70648c9ae0be5dfe6242e27c9a38ad48de9
diff --git a/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild b/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild
deleted file mode 100644
index 1af035a889b9..000000000000
--- a/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESKLET_NAME="JustAnIcon"
-
-inherit gdesklets
-
-S="${WORKDIR}/Displays/${DESKLET_NAME}"
-
-DESCRIPTION="A configurable desktop icon"
-HOMEPAGE="http://archive.gdesklets.info/"
-SRC_URI="http://archive.gdesklets.info/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64"
diff --git a/x11-plugins/desklet-justanicon/metadata.xml b/x11-plugins/desklet-justanicon/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/desklet-justanicon/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.11.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.11.ebuild
deleted file mode 100644
index 3cc1df82e0ec..000000000000
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit gkrellm-plugin
-
-DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/gkrelltop"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="X"
-
-PLUGIN_SERVER_SO=gkrelltopd.so
-PLUGIN_SO=gkrelltop.so
-
-S="${WORKDIR}/${P}.orig"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	use X || TARGET="server"
-	emake ${TARGET}
-}
-
-pkg_postinst() {
-	einfo "To enable the gkrelltopd server plugin, you must add the following"
-	einfo "line to /etc/gkrellmd.conf:"
-	einfo "\tplugin-enable gkrelltopd"
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild
new file mode 100644
index 000000000000..cedc475347a1
--- /dev/null
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/gkrelltop"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+PLUGIN_SERVER_SO=gkrelltopd.so
+PLUGIN_SO=gkrelltop.so
+
+S="${WORKDIR}/${P}.orig"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr/bin/gcc:$(tc-getCC) \$(CFLAGS):" \
+		-e 's/-shared/$(LDFLAGS) &/' \
+		Makefile || die
+	default
+}
+
+src_compile() {
+	use X || TARGET="server"
+	emake ${TARGET}
+}
+
+pkg_postinst() {
+	einfo "To enable the gkrelltopd server plugin, you must add the following"
+	einfo "line to /etc/gkrellmd.conf:"
+	einfo "\tplugin-enable gkrelltopd"
+}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13.ebuild
deleted file mode 100644
index b8cbde44476e..000000000000
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/gkrelltop"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X"
-
-PLUGIN_SERVER_SO=gkrelltopd.so
-PLUGIN_SO=gkrelltop.so
-
-S="${WORKDIR}/${P}.orig"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr/bin/gcc:$(tc-getCC) \$(CFLAGS):" \
-		-e 's/-shared/$(LDFLAGS) &/' \
-		Makefile || die
-}
-
-src_compile() {
-	use X || TARGET="server"
-	emake ${TARGET}
-}
-
-pkg_postinst() {
-	einfo "To enable the gkrelltopd server plugin, you must add the following"
-	einfo "line to /etc/gkrellmd.conf:"
-	einfo "\tplugin-enable gkrelltopd"
-}
diff --git a/x11-plugins/matchbox-applet-input-manager/Manifest b/x11-plugins/matchbox-applet-input-manager/Manifest
deleted file mode 100644
index 503c6100eca9..000000000000
--- a/x11-plugins/matchbox-applet-input-manager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mb-applet-input-manager-0.6.tar.bz2 198357 SHA256 552f7547f59cce5451d93258b1f0dfb6fa86a47d9eee72ae3e72cbfb0de50069 SHA512 bf3fc0e17031f6eec2f3d6b4879e2034f56dc3bc997bfdf83112bb74f1be19884d97a7058d2be3052599f9ea6645a50303e55bfd023d399030a2f1dfe93adde6 WHIRLPOOL e15d140b7099f2591b46d17dc0c582eb8d003eab1ad570706e198d40cc0c7f7f43a84eda23cf14a1fc86271eb749bc4a665ed941d1a4827b51e415524f9b48e7
diff --git a/x11-plugins/matchbox-applet-input-manager/files/matchbox-applet-input-manager-0.6-sssh_debug.patch b/x11-plugins/matchbox-applet-input-manager/files/matchbox-applet-input-manager-0.6-sssh_debug.patch
deleted file mode 100644
index cd3f231bf0be..000000000000
--- a/x11-plugins/matchbox-applet-input-manager/files/matchbox-applet-input-manager-0.6-sssh_debug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mb-applet-input-manager-0.6/mbinputmgr-tray.c
-===================================================================
---- mb-applet-input-manager-0.6/mbinputmgr-tray.c	{cset 0f2cc092-505c-44d3-bcdf-2b07f6f6942d}
-+++ mb-applet-input-manager-0.6/mbinputmgr-tray.c	{local clone}
-@@ -257,13 +257,17 @@ xevent_callback (MBTrayApp *app, XEvent 
- {
-   if (ev->type == ClientMessage)
-     {
-+#ifdef DEBUG
-       printf("beep\n");
-+#endif
- 
-       XClientMessageEvent *cmev = (XClientMessageEvent *)&ev->xconfigure;
- 
-       if (cmev->message_type == AtomIMActivate)
- 	{
-+#ifdef DEBUG
- 	  printf("beep\n");
-+#endif
- 
- 	  /* De Activate */
- 	  if (cmev->data.l[0] == 0 && mbinputmgr_method_active(Inpmgr_state))
diff --git a/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild b/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild
deleted file mode 100644
index 1686b0487b76..000000000000
--- a/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit versionator eutils
-
-MY_PN=${PN/matchbox/mb}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Matchbox panel tray app for managing software input methods"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE="debug"
-
-DEPEND=">=x11-libs/libmatchbox-1.5"
-
-RDEPEND="${DEPEND}
-	x11-wm/matchbox-panel"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-sssh_debug.patch
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/x11-plugins/matchbox-applet-input-manager/metadata.xml b/x11-plugins/matchbox-applet-input-manager/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/matchbox-applet-input-manager/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/matchbox-applet-startup-monitor/Manifest b/x11-plugins/matchbox-applet-startup-monitor/Manifest
deleted file mode 100644
index 2dfe69825a65..000000000000
--- a/x11-plugins/matchbox-applet-startup-monitor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mb-applet-startup-monitor-0.1.tar.bz2 206232 SHA256 d0f1ba8275f688e7619c8a570e2a99f889e54efff8cb79d348827e2cb753d864 SHA512 2366133dd677e4fe94e5d78b59d51984a5aa359ed1b61b461d717bc4b54a1ca6aa9463fa9c94500459b9120a457ab51a396e3210e76ce76484e6a3e17460d20c WHIRLPOOL fca90d5b6af3697b7223b28a844f2421a80fdd0e6fd66785957bcb7743c44dbdc0886eac3c0d26c5e49ad6fc4f7e3f7be64a8cdbe667580f6f9841585fbe87ea
diff --git a/x11-plugins/matchbox-applet-startup-monitor/files/matchbox-applet-startup-monitor-0.1-false-true-fix.patch b/x11-plugins/matchbox-applet-startup-monitor/files/matchbox-applet-startup-monitor-0.1-false-true-fix.patch
deleted file mode 100644
index 1c8530497313..000000000000
--- a/x11-plugins/matchbox-applet-startup-monitor/files/matchbox-applet-startup-monitor-0.1-false-true-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naurp mb-applet-startup-monitor-0.1.orig/mbmonitor.c mb-applet-startup-monitor-0.1/mbmonitor.c
---- mb-applet-startup-monitor-0.1.orig/mbmonitor.c	2004-12-21 11:00:24.000000000 -0500
-+++ mb-applet-startup-monitor-0.1/mbmonitor.c	2006-06-23 12:33:38.000000000 -0400
-@@ -39,6 +39,14 @@
- 
- #include <libmb/mb.h>
- 
-+/* libmb inherits FALSE/TRUE definitions only if compiled with jpeg support. */
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
- #define TIMEOUT		   20
- #define POLLTIME	   10
- #define HOURGLASS_N_FRAMES 8 
diff --git a/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild b/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild
deleted file mode 100644
index ad484951c933..000000000000
--- a/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator
-
-MY_PN=${PN/matchbox/mb}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Startup notification matchbox panel tray app"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE=""
-
-DEPEND=">=x11-libs/libmatchbox-1.5
-	x11-libs/startup-notification"
-
-RDEPEND="${DEPEND}
-	x11-wm/matchbox-panel"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-false-true-fix.patch
-}
-
-src_compile() {
-	econf || die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/x11-plugins/matchbox-applet-startup-monitor/metadata.xml b/x11-plugins/matchbox-applet-startup-monitor/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/matchbox-applet-startup-monitor/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/matchbox-applet-volume/Manifest b/x11-plugins/matchbox-applet-volume/Manifest
deleted file mode 100644
index 38faef9d022c..000000000000
--- a/x11-plugins/matchbox-applet-volume/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mb-applet-volume-0.1.tar.bz2 119358 SHA256 9858fda4f190dd689afbe6c2e3812c357858ad28c07bd76058655071988c277f SHA512 211d865b368d63156592a7a5cc13ab6d6098f2cc79c66c215891d833a15d235b0bd52cae64109e867a932dbb4752e77a3ba2155e82543cf28c2d9c420f7b08c8 WHIRLPOOL fbbb82c670782d280a0553083d7883a79515af91b9a6246153500b925225536006ee7ca7d1e6aa72b56ea294b03ebd5e50fdb4071b9558378a987154b2ff221a
diff --git a/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild b/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild
deleted file mode 100644
index 80be475f9d69..000000000000
--- a/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit versionator
-
-MY_PN=${PN/matchbox/mb}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Matchbox panel tray app for controlling volume levels"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE=""
-
-COMMON_DEPEND=">=x11-libs/libmatchbox-1.5
-	x11-libs/gtk+:2"
-RDEPEND="${COMMON_DEPEND}
-	x11-wm/matchbox-panel"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-plugins/matchbox-applet-volume/metadata.xml b/x11-plugins/matchbox-applet-volume/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/matchbox-applet-volume/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/matchbox-desktop-image-browser/Manifest b/x11-plugins/matchbox-desktop-image-browser/Manifest
deleted file mode 100644
index 091b065ba51e..000000000000
--- a/x11-plugins/matchbox-desktop-image-browser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mb-desktop-image-browser-0.2.tar.bz2 209777 SHA256 48c2721048d3fa0bde425df1b40b1baa4ae67f6e42be78761ae81deb39ec746e SHA512 fe6259ce38998c9baf2dfa56f8c9284079eeab5aee19e608fa70f2bfc4bb35fca05b1fdd48f40291b11dd20a339cd48afa0e2ec5eb76e7d6f277e00fb81e5386 WHIRLPOOL 2df010997ac8c20b62f3d6adc61493449884c1d0dda890d5f7fd92b6706a354500513b85f3fc481fb665861616073051549fec348bbc87bac2ac1fb11a739a23
diff --git a/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-include_fix.patch b/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-include_fix.patch
deleted file mode 100644
index 654ff32947bc..000000000000
--- a/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-include_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mb-desktop-image-browser-0.2.orig/imgbrowser.c mb-desktop-image-browser-0.2/imgbrowser.c
---- mb-desktop-image-browser-0.2.orig/imgbrowser.c	2004-01-28 16:05:09 +0000
-+++ mb-desktop-image-browser-0.2/imgbrowser.c	2006-04-16 19:44:34 +0000
-@@ -4,7 +4,7 @@
- #include <regex.h>
- 
- #include <libmb/mb.h>
--#include <mbdesktop_module.h>
-+#include <matchbox-desktop/mbdesktop_module.h>
- 
- /* 
-    XXX Todo . 
diff --git a/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-noexec-matchbox-desktop.patch b/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-noexec-matchbox-desktop.patch
deleted file mode 100644
index b8dd76484cb7..000000000000
--- a/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-noexec-matchbox-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp mb-desktop-image-browser-0.2.orig/configure.ac mb-desktop-image-browser-0.2/configure.ac
---- mb-desktop-image-browser-0.2.orig/configure.ac	2004-02-06 18:10:21.000000000 +0000
-+++ mb-desktop-image-browser-0.2/configure.ac	2010-01-06 00:09:09.000000000 +0000
-@@ -24,7 +24,7 @@ AC_FUNC_MALLOC
- AC_TYPE_SIGNAL
- AC_CHECK_FUNCS([strchr strdup])
- 
--PKG_CHECK_MODULES(MB, libmb >= 1.1, matchbox-desktop,
-+PKG_CHECK_MODULES(MB, libmb >= 1.1, ,
- 	         AC_MSG_ERROR([*** Matchbox depencies not found***]))
- 
- dnl check for debug build
diff --git a/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch b/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
deleted file mode 100644
index 9026e3c95142..000000000000
--- a/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naurp mb-desktop-image-browser-0.2.orig/configure.ac mb-desktop-image-browser-0.2/configure.ac
---- mb-desktop-image-browser-0.2.orig/configure.ac	2010-01-06 01:05:40.000000000 +0000
-+++ mb-desktop-image-browser-0.2/configure.ac	2010-01-06 01:07:24.000000000 +0000
-@@ -34,6 +34,20 @@ AC_ARG_ENABLE(debug,
-       MB_CFLAGS="$MB_CFLAGS -DDEBUG"
-   fi])
- 
-+
-+dnl ------ Substitute in found libs, clags to Makefiles etc -----------------
-+
-+if test "x$prefix" = xNONE; then
-+   prefix="${ac_default_prefix}"
-+fi
-+if test "x$exec_prefix" = xNONE; then
-+   exec_prefix='${prefix}'
-+fi
-+
-+MBDESKTOP_PLUGIN_DIR=$libdir/matchbox/desktop
-+eval MBDESKTOP_PLUGIN_DIR=`eval echo "$MBDESKTOP_PLUGIN_DIR"`
-+
-+AC_SUBST(MBDESKTOP_PLUGIN_DIR)
- AC_SUBST(MB_LIBS)
- AC_SUBST(MB_CFLAGS)
- 
-diff -Naurp mb-desktop-image-browser-0.2.orig/Makefile.am mb-desktop-image-browser-0.2/Makefile.am
---- mb-desktop-image-browser-0.2.orig/Makefile.am	2010-01-06 01:05:40.000000000 +0000
-+++ mb-desktop-image-browser-0.2/Makefile.am	2010-01-06 01:07:01.000000000 +0000
-@@ -4,7 +4,7 @@ LDADD = $(MB_LIBS) 
- AM_CFLAGS = $(MB_CFLAGS)  -g -DDATADIR=\"$(datadir)\"
- 
- lib_LTLIBRARIES = imgbrowser.la
--libdir = $(datadir)/matchbox/desktop/modules
-+libdir = $(MBDESKTOP_PLUGIN_DIR)
- 
- imgbrowser_la_SOURCES = imgbrowser.c
- imgbrowser_la_LIBADD  = $(LDADD)
diff --git a/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2-r1.ebuild b/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2-r1.ebuild
deleted file mode 100644
index 7a48c03f3f12..000000000000
--- a/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit versionator eutils autotools
-
-MY_PN=${PN/matchbox/mb}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An alpha-ish image browser plug in for matchbox-desktop"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/libmatchbox-1.1"
-DEPEND="${RDEPEND} x11-wm/matchbox-desktop"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/$P-include_fix.patch
-	epatch "${FILESDIR}"/$P-noexec-matchbox-desktop.patch
-	epatch "${FILESDIR}"/$P-plugin-location-fix.patch
-
-	eautoreconf
-}
-
-src_compile () {
-	econf $(use_enable debug) || die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
-
-pkg_postinst() {
-	einfo "To use this matchbox-desktop module:"
-	einfo
-	einfo "Add an entry to you mbdesktop_modules file specifying the module and"
-	einfo "where your browsed images live."
-	einfo
-	einfo 'Ej: $ echo "/usr/lib/matchbox/desktop/imgbrowser.so ${HOME}/Pictures" >> \\'
-	einfo '		~/.matchbox/mbdesktop_modules'
-}
diff --git a/x11-plugins/matchbox-desktop-image-browser/metadata.xml b/x11-plugins/matchbox-desktop-image-browser/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/matchbox-desktop-image-browser/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/matchbox-desktop-xine/Manifest b/x11-plugins/matchbox-desktop-xine/Manifest
deleted file mode 100644
index 8d089c03a721..000000000000
--- a/x11-plugins/matchbox-desktop-xine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mb-desktop-xine-0.4.tar.bz2 263390 SHA256 a550138cac9fcbb620a154fdf251d97e3420a5b9ac2017225b35d9df745e49f3 SHA512 afb74ae7e552234c993ef659fde9fcd8fbbb8b1a8ebfe5be6aa92b9c14bd7d258cc13085cb5bc23763f6c4e591946fc145a979fe9c3f69c951d236c97cbe9fb2 WHIRLPOOL 79f7a32544532fe03fbb42fd8cc6d7f8c2cd6b4a795b4c937fbc62c37eef2acf83292fbfad0daaf2046551c0ce1876475be13a4f538d94b15a8bb9c3e1fed321
diff --git a/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild b/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild
deleted file mode 100644
index c65d1542b900..000000000000
--- a/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit versionator eutils autotools
-
-MY_PN=${PN/matchbox/mb}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A matchbox-desktop plugin that allows you to browse and play media"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-DEPEND=">=x11-libs/libmatchbox-1.1
-	x11-wm/matchbox-desktop
-	>=media-libs/xine-lib-1.0.0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile () {
-	econf $(use_enable debug) || die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/x11-plugins/matchbox-desktop-xine/metadata.xml b/x11-plugins/matchbox-desktop-xine/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-plugins/matchbox-desktop-xine/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index 4d7ddb283ee6..a57b459c9810 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,3 +1 @@
-DIST vicious-2.0.3.tar.gz 38707 SHA256 3c775a75dcb8d985da27d941a76092ae66d5a831f11a50e77654c7d1cf9e8dd4 SHA512 6586e0bc1b5156636d7f3294449d7a4dd6819ef46fcf686711d2e339d594bd13e3378403089fd7c106a424eb024e4d0e3157067b329e654fdee1429e607c5274 WHIRLPOOL 1c3d73fdba06a30aa9447d1040652772b410805a3015ad8e46c9d860a8495be1e127dabda97462b6abab8867732bbe965f3797a514dce3d31da50311087cff73
-DIST vicious-2.1.0.tar.xz 35376 SHA256 1d6b6a07db1f22893133fb557964fd93eacc34921012c9731c99aa82891c3a4e SHA512 307590d5448d586330202a8ef627a477ec4c52de59aca55009245ad43ea179fecd2633fdc0bca574121a0ff1e906591f570705ea3ba4afd682f6b930de643355 WHIRLPOOL 4970d2b1f179fe4f55cedc81258a035492c4e57b6a2118788caa864628eaa6e5b448c7623ef0a426d8a623411895c1f2a2f7a502b8f18f342ee9dbc23cc4d39f
 DIST vicious-2.1.3.tar.xz 39336 SHA256 97ffb824af89f2d205b0f0909601a32d761c0c02353b59b4314fd2cc47b2a387 SHA512 8b03fe4b770f0fcd52fad77a46145032a112cecbe27daa725054cb4c6307fb36727debb48243cd2d1becf2ad0fe3a2aaaa7495e0f041424ee9e45c2b107e7f7f WHIRLPOOL 98d810bc8b839d5ac4eff726a3129bdcc16794901ee0ba66b9264b48d453b645bfe2ae7bcb9fa1a2aec41c08926a0e80b92892fa13a2390d9f7be75300279e59
diff --git a/x11-plugins/vicious/vicious-2.0.3.ebuild b/x11-plugins/vicious/vicious-2.0.3.ebuild
deleted file mode 100644
index dfa288094bd2..000000000000
--- a/x11-plugins/vicious/vicious-2.0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-DESCRIPTION="Modular widget library for x11-wm/awesome"
-HOMEPAGE="http://awesome.naquadah.org/wiki/Vicious"
-SRC_URI="https://dev.gentoo.org/~wired/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="=x11-wm/awesome-3.4*"
-
-src_install() {
-	insinto /usr/share/awesome/lib/vicious
-	doins -r widgets helpers.lua init.lua || die "Install failed"
-	dodoc CHANGES README TODO || die "dodoc failed"
-}
diff --git a/x11-plugins/vicious/vicious-2.1.0-r1.ebuild b/x11-plugins/vicious/vicious-2.1.0-r1.ebuild
deleted file mode 100644
index f227dc652abb..000000000000
--- a/x11-plugins/vicious/vicious-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Modular widget library for x11-wm/awesome"
-HOMEPAGE="http://awesome.naquadah.org/wiki/Vicious"
-SRC_URI="http://git.sysphere.org/${PN}/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib"
-
-DEPEND=""
-RDEPEND="x11-wm/awesome"
-
-src_install() {
-	insinto /usr/share/awesome/lib/vicious
-	doins -r widgets helpers.lua init.lua
-	dodoc CHANGES README TODO
-
-	if use contrib; then
-		insinto /usr/share/awesome/lib/vicious/contrib
-		doins contrib/*.lua
-		newdoc contrib/README README.contrib
-	fi
-}
diff --git a/x11-plugins/vicious/vicious-2.1.0.ebuild b/x11-plugins/vicious/vicious-2.1.0.ebuild
deleted file mode 100644
index 9074c08862d0..000000000000
--- a/x11-plugins/vicious/vicious-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Modular widget library for x11-wm/awesome"
-HOMEPAGE="http://awesome.naquadah.org/wiki/Vicious"
-SRC_URI="http://git.sysphere.org/${PN}/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib"
-
-DEPEND=""
-RDEPEND="x11-wm/awesome"
-
-src_install() {
-	insinto /usr/share/awesome/lib/vicious
-	doins -r widgets helpers.lua init.lua
-	dodoc CHANGES README TODO
-
-	if use contrib; then
-		insinto /usr/share/awesome/lib/vicious/widgets
-		doins contrib/*.lua
-		newdoc contrib/README README.contrib
-	fi
-}
diff --git a/x11-plugins/vicious/vicious-2.1.3.ebuild b/x11-plugins/vicious/vicious-2.1.3.ebuild
index 7b70ac70dc69..095824d398f3 100644
--- a/x11-plugins/vicious/vicious-2.1.3.ebuild
+++ b/x11-plugins/vicious/vicious-2.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://git.sysphere.org/${PN}/snapshot/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="contrib"
 
 DEPEND=""
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
index c96f62462c73..7b5a902ebd69 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.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/Manifest b/x11-terms/guake/Manifest
index 9d0908879f53..321d1a60be5f 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,9 +1,3 @@
 DIST guake-0.5.0.tar.gz 307488 SHA256 08206d0a003f42194a3779094e78d46b116829c258f5261d31d862010dcce0ca SHA512 8de0ad2ae13ca1306fb32cc3d889091fea4c190fcaa8e4068077277e7c851c15f7c52521272e94d663332bf400648a1c94263bdc27b903b1b0524559cdceb5d0 WHIRLPOOL 27f75440f175cd03038b17e86914cf4e5aaa7be2a31df297dd2d2e8446c718d7701b57c26e88297c71b2645331131548b89b069ce6af328777a1d789135fdb2e
-DIST guake-0.5.1.tar.gz 311818 SHA256 ba4cb2b890c7141de28569152566b59590e162bc17a1b1a426d871c4cee69d27 SHA512 172cee2135b591dcfb61c87d1b1e7b01802f1da3fdd51e14a135917fa3f1201cf9cbad01802fa785f689420585bb3cc1af04d465661f79c2fd7466d6bb8360b2 WHIRLPOOL 698ba3f7798989deeddab040ca677ee1bfa346167938ae32fb113ce9d9d9c64a8bf51f1ffeb70d69771abc8585fcf32d26003e22f422285b5724ce1b5159bbb7
-DIST guake-0.5.2.tar.gz 315481 SHA256 a46802999721a9dd8b91f0977711641e561736dc0694506d2c3b6d636bc2c94e SHA512 34c28cae0561bac6109716555169d7133583987fae23de51ba14314190375190e877f9c7c03cf17b227ba3793779cc1fa35cc83ea6a7b461406cab9a20b1342b WHIRLPOOL ebb66c03cc7208987ee67da37e3bc5c1e7be8fc56ea3e56490750180d89a13570009e3d480feac3d10980de8c54f9ecfd6efc6eb1f88714288053a8fbe1653b2
-DIST guake-0.6.1.tar.gz 325041 SHA256 5d5f907b410829a7698e7d9ad9de8ef6900e12f4fa85598c9805a839beee0a32 SHA512 268cb16c1e0efd26ba4178921556a26360b504dd3a82c2eb9f59ad5656e7be632fe406b4d017249c291fa0ee228c980bf03578ec02a464624450feb3ab7ee2ca WHIRLPOOL ac5442bad8a5abd023e3a61d11719e34ddd83ea038f34f026440df6dc73d7c71dfc8ba4e2d1eb0ab3e50d9dfdc441257cda80462b51aaf74dc306e1a8a86facb
-DIST guake-0.7.0.tar.gz 341020 SHA256 ce771ac377d3ef74c793b50936617b0dda5682dd687c2599db568f77de24de5b SHA512 1c3481334301261950f7e542172da215e9b1820eba17d750134986f3a58c4616e8e97bc9da8fe083c7534e83410e213351957a6f6f02d747518a1d57f1f02b58 WHIRLPOOL 0dbf8d94895281ba9ae592eef8651d7966b06b1109d1990f2869bdf6be4970f88cc2f2fa8d2401d9f149b4259d4eb6f9fc37b243178457630d782c8186cb8945
-DIST guake-0.7.2.tar.gz 351702 SHA256 761bb608d7ec907cab3281c7c67317ac6413fdf52293bd5e9c8e4dc1024a5993 SHA512 1fd27b35fcc25743be7a49cc560fbc1a269f78d7e4c07afbd0fe489c1b8e0edbe31e73fb9735a6405668a3e5748cbc4757defd2996a51815d245283f4fca2c16 WHIRLPOOL 08579c7493cc74f9a0b97396e08d7223e9c614d86697ba9d7dfd262240e7c8123a3d4b117a3457a0af27fcc483a0a5a28571f181f49baf9bffa21a2e10d09742
-DIST guake-0.8.0.tar.gz 343381 SHA256 a34e80f2cbf1b57076ce2ecc67c04b21167a5439d1345877bc758256c57ac15a SHA512 42cb93a111d2f8c6e40b4555033a98efb42a6efd89b7efda8cbfe7417821846a20afaf3545008b644e39110b1bd92f83b732cdc36437fa00755be910275dd2b5 WHIRLPOOL cae222c1288bd5528c8e0aebd77d5ad047ce601ce4e541935221a5db4a4157d324d8c770c8633394bad1c397c38e302bf6c503b0da37006b01c347f6647ae1aa
-DIST guake-0.8.1.tar.gz 357086 SHA256 2d67ffb22e89b136b9c3e1d9b4befd6c9687b1b69d7c12559c9ce9048c57b386 SHA512 26c8cc37a10d65d440a7f58a7305019860357d539b1c50777d28ef79516dfc23c93b724b6ef2371fd1f26fff252a580668d016fe97a09795ca0d709ddd65933e WHIRLPOOL 68a7d3c19646b6939f0b023ec46743168077606a70b4e19b5c891bf46e179e214d58fd647e46bd332bc2178f71a1f91c12aa59e2a2a2c94ccf98dba4e16abb8f
 DIST guake-0.8.3.tar.gz 380656 SHA256 3e4c254209f4afceac9a46c3e161b5673408ccd0690804014127a914c76f75d1 SHA512 cf2fa505c774e608b0e1faf677c0725ea4b72d1ef5273e3504d75b57867d524bffdc5fa76ee88b76096305c7f897a746c477daf5543d765baea3a349099b8651 WHIRLPOOL 9eaa09a1c36fa69d586e1e38955bca477461bd19fd63dc3e25f72358bb8345f2a6f181b9d8d67728b2ce0c94861c90940d34eaa18b07b6c0b46303199f2d1a99
+DIST guake-0.8.4.tar.gz 384271 SHA256 85e4fd5be4952f8100a81706b8a0efc42be47528c3f15d3397fb6a71169ae75d SHA512 0f10a577c3c8f666513c6815b3fe46c68d86750bf300ecde3faf478050c6d7bf59f86ca6f52f437e2ec6c87b2ed7ebe3fc4f6036bc517ccd010f837ebacd23bf WHIRLPOOL 807cfa3ac2d2bdad6a20a9b369e34281dcca896d18cbb7c6fae0cc43dea6cb24bde064e442b1b57fc2737a8cd0a1a5cf3aa16735f8b4ab3ee59ed903cee09c2d
diff --git a/x11-terms/guake/files/guake-0.7.0-desktop.patch b/x11-terms/guake/files/guake-0.7.0-desktop.patch
deleted file mode 100644
index 8838b83913e3..000000000000
--- a/x11-terms/guake/files/guake-0.7.0-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/guake-prefs.desktop.in
-+++ b/data/guake-prefs.desktop.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Guake Preferences
--_Comment=Configure your Guake sessions
-+Name=Guake Preferences
-+Comment=Configure your Guake sessions
- TryExec=guake-prefs
- Exec=guake-prefs
- Icon=guake-prefs
-@@ -10,4 +10,4 @@
- StartupNotify=true
- Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
- X-Desktop-File-Install-Version=0.15
--_Keywords=Terminal;Utility;
-+Keywords=Terminal;Utility;
diff --git a/x11-terms/guake/guake-0.5.1.ebuild b/x11-terms/guake/guake-0.5.1.ebuild
deleted file mode 100644
index 4311c9bf9c2a..000000000000
--- a/x11-terms/guake/guake-0.5.1.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
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	dev-python/dbus-python
-	dev-python/gconf-python
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/pyxdg
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	eautoreconf
-
-	gnome2_src_prepare
-
-	G2CONF="--disable-static"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-0.5.2.ebuild b/x11-terms/guake/guake-0.5.2.ebuild
deleted file mode 100644
index b7de99a60ea2..000000000000
--- a/x11-terms/guake/guake-0.5.2.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
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	dev-python/dbus-python
-	dev-python/gconf-python
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/pyxdg
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	eautoreconf
-
-	gnome2_src_prepare
-
-	G2CONF="--disable-static"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-0.6.1.ebuild b/x11-terms/guake/guake-0.6.1.ebuild
deleted file mode 100644
index 4311c9bf9c2a..000000000000
--- a/x11-terms/guake/guake-0.6.1.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
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	dev-python/dbus-python
-	dev-python/gconf-python
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/pyxdg
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	eautoreconf
-
-	gnome2_src_prepare
-
-	G2CONF="--disable-static"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-0.7.0.ebuild b/x11-terms/guake/guake-0.7.0.ebuild
deleted file mode 100644
index 791869257bca..000000000000
--- a/x11-terms/guake/guake-0.7.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
-
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	dev-python/dbus-python
-	dev-python/gconf-python
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/pyxdg
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.0-desktop.patch
-
-	eautoreconf
-
-	gnome2_src_prepare
-
-	G2CONF="--disable-static"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-0.7.2.ebuild b/x11-terms/guake/guake-0.7.2.ebuild
deleted file mode 100644
index f6523dd92c71..000000000000
--- a/x11-terms/guake/guake-0.7.2.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
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	dev-python/dbus-python
-	dev-python/gconf-python
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/pyxdg
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	eautoreconf
-
-	gnome2_src_prepare
-
-	G2CONF="--disable-static"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-0.8.1.ebuild b/x11-terms/guake/guake-0.8.1.ebuild
deleted file mode 100644
index 27e64cc2bf47..000000000000
--- a/x11-terms/guake/guake-0.8.1.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
-PYTHON_COMPAT=( python2_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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	dev-libs/keybinder:0[python]
-	dev-python/dbus-python
-	dev-python/gconf-python
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/pyxdg
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	eautoreconf
-
-	gnome2_src_prepare
-
-	G2CONF="--disable-static"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-0.8.0.ebuild b/x11-terms/guake/guake-0.8.4.ebuild
index 0cdc6ed49b4a..0cdc6ed49b4a 100644
--- a/x11-terms/guake/guake-0.8.0.ebuild
+++ b/x11-terms/guake/guake-0.8.4.ebuild
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
index f8132d69aed8..2db33448c18d 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="
 "
 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/gartoon-redux/files/gartoon-redux-1.10-rsvg-convert.patch b/x11-themes/gartoon-redux/files/gartoon-redux-1.10-rsvg-convert.patch
new file mode 100644
index 000000000000..411b4537df49
--- /dev/null
+++ b/x11-themes/gartoon-redux/files/gartoon-redux-1.10-rsvg-convert.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -150,7 +150,7 @@
+ 	my $size = shift;
+ 	my $zoom_factor = $size / 90;
+ 	return "$target: $source\n" .
+-	       "\trsvg -x $zoom_factor -y $zoom_factor $source $target";
++	       "\trsvg-convert -x $zoom_factor -y $zoom_factor $source -o $target";
+ }
+ 
+ sub usage {
diff --git a/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
new file mode 100644
index 000000000000..ea8a1092bae5
--- /dev/null
+++ b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils
+
+DESCRIPTION="A massively improved variant of the well-known Gartoon theme"
+HOMEPAGE="http://gnome-look.org/content/show.php/?content=74841"
+SRC_URI="http://tweenk.artfx.pl/gartoon/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-lang/perl
+	dev-perl/Switch
+	gnome-base/librsvg
+"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.10-rsvg-convert.patch
+}
+
+src_configure() {
+	# perl script, not autotools based
+	./configure --prefix=/usr || die
+}
+
+src_compile() {
+	emake prepare
+	emake
+}
+
+src_install() {
+	emake icondir="${D}"/usr/share/icons/GartoonRedux install
+	dodoc AUTHORS changelog README TODO
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/gartoon-redux/gartoon-redux-1.10.ebuild b/x11-themes/gartoon-redux/gartoon-redux-1.10.ebuild
deleted file mode 100644
index 8dc94729e255..000000000000
--- a/x11-themes/gartoon-redux/gartoon-redux-1.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit gnome2-utils
-
-DESCRIPTION="A massively improved variant of the well-known Gartoon theme"
-HOMEPAGE="http://gnome-look.org/content/show.php/?content=74841"
-SRC_URI="http://tweenk.artfx.pl/gartoon/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-lang/perl
-	gnome-base/librsvg"
-
-RESTRICT="binchecks strip"
-
-src_configure() {
-	./configure --prefix=/usr || die
-}
-
-src_install() {
-	emake icondir="${D}/usr/share/icons/GartoonRedux" install || die
-	dodoc AUTHORS changelog README TODO || die
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/gartoon/gartoon-0.5-r2.ebuild b/x11-themes/gartoon/gartoon-0.5-r2.ebuild
index 568459a3fba2..c5c1f860132a 100644
--- a/x11-themes/gartoon/gartoon-0.5-r2.ebuild
+++ b/x11-themes/gartoon/gartoon-0.5-r2.ebuild
@@ -2,14 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=5
 
 DESCRIPTION="Gartoon SVG icon theme"
 HOMEPAGE="https://www.gentoo.org"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
-IUSE=""
 KEYWORDS="amd64 ~ppc sparc ~x86"
 SLOT="0"
 
@@ -22,8 +21,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -e "s:\(^pixmap_path\) \(\".*\"$\):\1 \"${mydest}/scalable/stock\":" \
-		-i scalable/stock/iconrc || die "sed failed"
+	sed -i \
+		-e "s:\(^pixmap_path\) \(\".*\"$\):\1 \"${mydest}/scalable/stock\":" \
+		scalable/stock/iconrc || die
 }
 
 src_install() {
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
index d3c4b3a68a36..fa041739be25 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.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.18.0.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
index 246bba32bf8e..d4cc9eab9ba4 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.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/matchbox-themes-extra/Manifest b/x11-themes/matchbox-themes-extra/Manifest
deleted file mode 100644
index d9f79d5cc7be..000000000000
--- a/x11-themes/matchbox-themes-extra/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST matchbox-themes-extra-0.3.tar.bz2 639435 SHA256 98a1c8695842b0cd7f32e67b0ef9118fd0f32db5297f3f08706c706dee8fc6be SHA512 2c3e5d5b25219afe8fceb23b6c50f9e2f07a1ec37315adcd6ff9dc26ef28a6530816f7a03b699102b054e374ecc70dd779c687205d268c840b3ed1412076c17d WHIRLPOOL b03ed4817cc91de048c154dd005873cca091124107e85ee4d7f8fca7aed6a16a51f0c16c225811def337a30c713a531a21832a01a4a9f990a41139b47316ca9c
diff --git a/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild b/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild
deleted file mode 100644
index 616fe63b3f87..000000000000
--- a/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit versionator
-
-DESCRIPTION="Extra themes for the matchbox window manager"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE=""
-
-DEPEND=""
-
-DEPEND="x11-wm/matchbox-window-manager"
-
-src_compile() {
-	econf || die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/x11-themes/matchbox-themes-extra/metadata.xml b/x11-themes/matchbox-themes-extra/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-themes/matchbox-themes-extra/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild b/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
new file mode 100644
index 000000000000..1b9eb480bb21
--- /dev/null
+++ b/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| (
+		(
+			=x11-libs/gtk+-3.16*:3
+			=x11-themes/mate-themes-1.10*:0/3.16
+		)
+		(
+			=x11-libs/gtk+-3.18*:3
+			=x11-themes/mate-themes-1.10*:0/3.18
+		)
+		=x11-themes/mate-themes-1.10*:0
+	)"
diff --git a/x11-themes/mate-themes-meta/metadata.xml b/x11-themes/mate-themes-meta/metadata.xml
new file mode 100644
index 000000000000..b189665aa7a1
--- /dev/null
+++ b/x11-themes/mate-themes-meta/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r160.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r160.ebuild
deleted file mode 100644
index c073a417988a..000000000000
--- a/x11-themes/mate-themes/mate-themes-1.10.5-r160.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-MATE_GTK_V="$(get_version_component_range 4- ${PVR})"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V:1:2} + 1 ))" #variable to allow negation of =$P-1*
-MATE_GTK_V="3.${MATE_GTK_V:1:2}"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${PN}-gtk${MATE_GTK_V}-${PV}.tar.xz ->
-	${P}-gtk${MATE_GTK_V}.tar.xz"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild
new file mode 100644
index 000000000000..deb706cb5472
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+MATE_GTK_V="$(get_version_component_range 4- ${PVR})"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V:1:2} + 1 ))" #variable to allow negation of =$P-1*
+MATE_GTK_V="3.${MATE_GTK_V:1:2}"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${PN}-gtk${MATE_GTK_V}-${PV}.tar.xz ->
+	${P}-gtk${MATE_GTK_V}.tar.xz"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r180.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r180.ebuild
deleted file mode 100644
index c073a417988a..000000000000
--- a/x11-themes/mate-themes/mate-themes-1.10.5-r180.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-MATE_GTK_V="$(get_version_component_range 4- ${PVR})"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V:1:2} + 1 ))" #variable to allow negation of =$P-1*
-MATE_GTK_V="3.${MATE_GTK_V:1:2}"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${PN}-gtk${MATE_GTK_V}-${PV}.tar.xz ->
-	${P}-gtk${MATE_GTK_V}.tar.xz"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild
new file mode 100644
index 000000000000..deb706cb5472
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+MATE_GTK_V="$(get_version_component_range 4- ${PVR})"
+MATE_GTK_NV="3.$(( ${MATE_GTK_V:1:2} + 1 ))" #variable to allow negation of =$P-1*
+MATE_GTK_V="3.${MATE_GTK_V:1:2}"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${PN}-gtk${MATE_GTK_V}-${PV}.tar.xz ->
+	${P}-gtk${MATE_GTK_V}.tar.xz"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${MATE_GTK_V}"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-2:2
+	!<x11-libs/gtk+-${MATE_GTK_V}:3
+	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
+	>=x11-themes/gtk-engines-2.15.3:2
+	x11-themes/gtk-engines-murrine"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35:*
+	sys-devel/gettext:*
+	>=sys-devel/autoconf-2.53:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
index 33ba8a6de296..6c1caaed5a11 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="https://github.com/QtCurve/qtcurve"
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git"
-	KEYWORDS="alpha"
+	KEYWORDS="alpha x86"
 else
 	SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz  -> ${P}.tar.gz
 		https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> ${PN}-1.8.18-dont_use_c++11.patch"
-	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="LGPL-2+"
diff --git a/x11-themes/smplayer-themes/Manifest b/x11-themes/smplayer-themes/Manifest
index 0d39aec6dda5..149e784eb75d 100644
--- a/x11-themes/smplayer-themes/Manifest
+++ b/x11-themes/smplayer-themes/Manifest
@@ -1,3 +1,4 @@
 DIST smplayer-themes-14.12.0.tar.bz2 2660621 SHA256 2c520a678bfcfa8c9a6881d4612ce8fb5216abdf072d27fb3da362af316ae333 SHA512 b97c097c7bbbcc60878e9cf4306c08fb87b83da67763a965e9e21517fb02568e902cbc1c8739be3f54b7a5b398c49dc8ab81964b97140a64f34bcf8af9c39765 WHIRLPOOL bab1009ab6dfe693177a905a583454fd5614830c90c09f1a93832129342583efd8f6c4bce6c355e340e43062b06119fde1c5532136dd38cdadc72fe280603312
 DIST smplayer-themes-14.9.0.tar.bz2 2094596 SHA256 66164c0edc8698e174844ebbb7047a2444f249c569029cdc3c04833bbfb73238 SHA512 2c6b96c2fc5029ee3d4d6cd1204788c89c712d69ca230ba335f7a988fab181df9b700d8ceee446a7ccb852bdfdc82106fdcbf38ca199fb881088f9efc1ae1d7c WHIRLPOOL f68a511793a4f6fd270ce2708e4bfe5a25ef26493f18e9b18f49d5c19cb80fcab2a37c8494c9e9eac263a978ebce64e4bdfc4c0af32c6551a9f5dc7b4b2584d5
+DIST smplayer-themes-15.12.0.tar.bz2 3229694 SHA256 bd30b4cee576c4b1e4e8b59c986f93f2c2d150554d3eedb6e1dd37aa2e0fd110 SHA512 27fa91ed878c5b69d6d80ea90be15360a1224ff14e3828d71a9dccb8fbea10158377b1149c80e3260033a7d99a02586881ba2a57dc0e2b07cdacf26ae9c03ba5 WHIRLPOOL 2e13c3f1f244cdac3e58edfe3e9bb228927b3e7b28ed64360b1cd66fd36a6444be922054c4d2e9f208c83a0c79899a94e2a64d9ab3b2972fa2b82a7aea417e2f
 DIST smplayer-themes-15.6.0.tar.bz2 2903294 SHA256 3d64f4db3d5465230b995ef5140ca6716206b4479f15d7a4b52c5fd939b60138 SHA512 2381254851894386722e832c56b0b65d94465413c5ca49690d59f499e95a64cfb5067d705c1b27e0c27eefcab01863c945c3c619804a298a9e96fc3e23b2855e WHIRLPOOL a17a43bcede39441e47feedb66df417daa3db1c18b380dab9f941fbb15cfe2cc0754ce26eec0b469f15d6f49e5ab75372b55202fdefd4746f8429eb69cba983c
diff --git a/x11-themes/smplayer-themes/smplayer-themes-15.12.0.ebuild b/x11-themes/smplayer-themes/smplayer-themes-15.12.0.ebuild
new file mode 100644
index 000000000000..19849b879b78
--- /dev/null
+++ b/x11-themes/smplayer-themes/smplayer-themes-15.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Icon themes for smplayer"
+HOMEPAGE="http://smplayer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+
+LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4"
+RDEPEND="media-video/smplayer"
+
+src_prepare() {
+	default
+
+	# bug 544108
+	sed -i -e "s|	rcc|	\"$(qt4_get_bindir)\"/rcc|" themes/Makefile || die
+
+	# bug 544160
+	sed -i -e 's/make/$(MAKE)/' Makefile || die
+}
+
+src_install() {
+	rm themes/Makefile themes/H2O/Makefile || die
+	insinto /usr/share/smplayer
+	doins -r themes
+	dodoc Changelog README.txt
+}
diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
index bd63b7740358..eb30fbcae09e 100644
--- a/x11-wm/awesome/awesome-3.5.6-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome"
 
 COMMON_DEPEND="
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index d8c572a58036..c4256568fe7a 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -5,3 +5,4 @@ DIST enlightenment-0.19.10.tar.xz 24594372 SHA256 8bdc2b764765e807df263962cb3c47
 DIST enlightenment-0.19.12.tar.xz 24569084 SHA256 55f23c337e3092e735ae37ada8f6701adab5ddd13f37ef38c63eec8a536f0b25 SHA512 30332fa0108a4361dd7cc961325b607fccef99caa1db6eaf068fc97de9978ad21dde5724a7e8f6612441fb0529a56461c8df63de25579f67d452fa9bf382d859 WHIRLPOOL e19f84c4a6311ef583d8f2bd53bc85a13e37bc65bdccc1823953685e0946f18cfaf0a75ee97f1a97e5d7fb9c9b0711b92f00f6949e5ca44718b6bf2347cb3a4c
 DIST enlightenment-0.20.1.tar.xz 25038128 SHA256 820b14ab3decd585a011973d97efc0679a90f803b9d72f0726166a3262c1f4ee SHA512 6afffebfe5d223c288f80589b105badcfbd34c9277078fa7704937ae5173d2b866c57c2aee46d7cae9a6c9ac8d59f0b62bb0081e819b69a37d48571cbfc492cb WHIRLPOOL b4428665554086e6d97b42687a683d0facc25ec3013a2c91cbccce4943edb0541667db243268692a5e9f9a86231a1a0104548e887986baa64c480074eb0360fb
 DIST enlightenment-0.20.2.tar.xz 25037464 SHA256 441009a5cbe19861bc1f1404ce4361184ace27208ce429a51c23344c8f9f5d39 SHA512 7d6c5a0a435bbbe999848272ad017d5e914566aa3b833a423bfe21ffeabad17d8a6e91fc597c6ecfd94638c907aa24960a0d017bb4f3f0555875a4ca202415a8 WHIRLPOOL 333b36297ca01b243063e9470eb814b0aafebe25d1a3d58892a7a559455ee08671bb29878eb920df34e06b0fccafeafdbb45bde03fc587a0eea9f054046c5102
+DIST enlightenment-0.20.5.tar.xz 25039672 SHA256 22749584d2fdf62d5a63c64dd9e57a1e318837a48f10fb9cdd2097769aa802d0 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911 WHIRLPOOL 5bfa8e6cc2d5d17fc61a08fc9edbc8970f60cb9e44fcfaf7035b764d21525b375ce9f4060ac33a45627cc3a1f2eb21335e322f88f8a79709fce9284aa668d983
diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
index 3b6c43a8c67c..05e09ca4fd90 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_URI_APPEND="${PN}"
 else
 	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
-	EKEY_STATE="live"
+	EKEY_STATE="snap"
 fi
 
 inherit enlightenment
@@ -54,8 +54,8 @@ RDEPEND="
 		>=x11-libs/pixman-0.31.1
 		>=x11-libs/libxkbcommon-0.3.1
 	)
-	>=dev-libs/efl-1.16[X]
-	>=media-libs/elementary-1.16
+	>=dev-libs/efl-1.17[X]
+	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
new file mode 100644
index 000000000000..05e09ca4fd90
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+
+__CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus
+	paths performance randr shelves theme
+	window-manipulation window-remembers
+)
+__NORM_MODS=(
+	appmenu backlight bluez4 battery
+	clock conf connman cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker
+	mixer msgbus music-control notification
+	pager packagekit pager-plain policy-mobile quickaccess
+	shot start syscon systray tasks teamwork temperature tiling
+	winlist wizard wl-desktop-shell wl-drm wl-text-input
+	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
+)
+IUSE_E_MODULES=(
+	${__CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${__NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.2.0
+		>=x11-libs/pixman-0.31.1
+		>=x11-libs/libxkbcommon-0.3.1
+	)
+	>=dev-libs/efl-1.17[X]
+	>=media-libs/elementary-1.17
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/quickstart.diff
+	enlightenment_src_prepare
+}
+
+# Sanity check to make sure module lists are kept up-to-date.
+check_modules() {
+	local detected=$(
+		awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
+		configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
+	)
+	local sorted=$(
+		printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
+		LC_COLLATE=C sort
+	)
+	if [[ ${detected} != "${sorted}" ]] ; then
+		local out new old
+		eerror "The ebuild needs to be kept in sync."
+		echo "${sorted}" > ebuild-iuse
+		echo "${detected}" > configure-detected
+		out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
+		new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
+		old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
+		eerror "Add these modules: $(echo ${new})"
+		eerror "Drop these modules: $(echo ${old})"
+		die "please update the ebuild"
+	fi
+}
+
+src_configure() {
+	check_modules
+
+	E_ECONF=(
+		--disable-install-sysactions
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable systemd)
+		--enable-device-udev
+		$(use_enable udev mount-eeze)
+		$(use_enable ukit mount-udisks)
+		$(use_enable wayland)
+	)
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+		# Disable modules by hand since we default to enabling them all.
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				E_ECONF+=( --disable-${c} )
+				continue
+			fi
+			;;
+		esac
+		E_ECONF+=( $(use_enable ${u} ${c}) )
+	done
+	enlightenment_src_configure
+}
+
+src_install() {
+	enlightenment_src_install
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
index e2ceeafe1422..7f083236192f 100644
--- a/x11-wm/jwm/jwm-2.3.2.ebuild
+++ b/x11-wm/jwm/jwm-2.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
 IUSE="bidi debug jpeg png truetype xinerama xpm"
 
 RDEPEND="xpm? ( x11-libs/libXpm )
diff --git a/x11-wm/matchbox-common/Manifest b/x11-wm/matchbox-common/Manifest
deleted file mode 100644
index c497fa56d5f8..000000000000
--- a/x11-wm/matchbox-common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST matchbox-common-0.9.1.tar.bz2 86365 SHA256 524995b9899cc10d04c7964fb88ff8a2199865ca97e8d4988abd8d6c2a286199 SHA512 192870faad4f30db79f8c8ca21f0a03f1a790328767a928d911bc7dd51d6f78928953460450e0dfdf55c3985f33626239599895ff11af28617c356b789bb358c WHIRLPOOL 2045d84a975053e1db9b1410fd1190d519c6a0bd6da912e43fdae15b615952b483763991c89cbdc1004a08c6194270e5f0a5ad86cc11236777378732a218501c
diff --git a/x11-wm/matchbox-common/files/MatchBox.desktop b/x11-wm/matchbox-common/files/MatchBox.desktop
deleted file mode 100644
index 8428a245f780..000000000000
--- a/x11-wm/matchbox-common/files/MatchBox.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MatchBox
-Comment=This session logs you into MatchBox 
-Exec=matchbox-session
-TryExec=/usr/bin/matchbox-session
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/x11-wm/matchbox-common/files/add-media-category.patch b/x11-wm/matchbox-common/files/add-media-category.patch
deleted file mode 100644
index 5c502b379728..000000000000
--- a/x11-wm/matchbox-common/files/add-media-category.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am matchbox-common-0.9.1/data/vfolders-pda/Makefile.am
---- matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am	2004-12-01 12:22:30.000000000 +0100
-+++ matchbox-common-0.9.1/data/vfolders-pda/Makefile.am	2006-02-16 21:32:57.000000000 +0100
-@@ -1,5 +1,6 @@
- desktop_files = Applications.directory \
-                 Games.directory        \
-+                Media.directory        \
-                 Other.directory        \
-                 Root.directory         \
-                 Settings.directory     \
-@@ -11,4 +12,4 @@
- vfolders_DATA = $(desktop_files)
- endif
- 
--EXTRA_DIST = $(desktop_files)
-\ No newline at end of file
-+EXTRA_DIST = $(desktop_files)
-diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory matchbox-common-0.9.1/data/vfolders-pda/Media.directory
---- matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory	1970-01-01 01:00:00.000000000 +0100
-+++ matchbox-common-0.9.1/data/vfolders-pda/Media.directory	2006-02-16 21:16:29.000000000 +0100
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+Name=Media
-+Name[de]=Medien
-+Comment=View media files
-+Comment[de]=Programme zur Wiedergabe von audiovisuellen Medien
-+Icon=mbfolder.png
-+Type=Directory
-+Match=AudioVideo;Graphics;Media;Viewer;
-diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order matchbox-common-0.9.1/data/vfolders-pda/Root.order
---- matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order	2006-02-16 20:51:36.000000000 +0100
-+++ matchbox-common-0.9.1/data/vfolders-pda/Root.order	2006-02-16 20:53:23.000000000 +0100
-@@ -1,3 +1,4 @@
-+Media
- Games
- Settings
- Other
diff --git a/x11-wm/matchbox-common/files/no-utilities-category.patch b/x11-wm/matchbox-common/files/no-utilities-category.patch
deleted file mode 100644
index 6801533ac3a0..000000000000
--- a/x11-wm/matchbox-common/files/no-utilities-category.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- matchbox-common-0.9.1.orig/data/vfolders-pda/Root.order	2006-02-03 22:26:55.000000000 +0100
-+++ matchbox-common-0.9.1/data/vfolders-pda/Root.order	2006-02-03 22:32:08.000000000 +0100
-@@ -1,4 +1,3 @@
--Utilities
- Games
- Settings
- Other
diff --git a/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild b/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild
deleted file mode 100644
index 234eca3a0234..000000000000
--- a/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator
-
-DESCRIPTION="Common files used by matchbox-panel and matchbox-desktop packages"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE="pda"
-
-RDEPEND=">=x11-libs/libmatchbox-1.1"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf $(use_enable pda pda-folders)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Insert our Xsession
-	echo -e "#!/bin/sh\n\nmatchbox-session" > "${T}"/matchbox
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/matchbox
-
-	# Insert GDM/KDM xsession file
-	wm=matchbox make_session_desktop MatchBox matchbox-session
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/no-utilities-category.patch
-	epatch "${FILESDIR}"/add-media-category.patch
-}
diff --git a/x11-wm/matchbox-common/metadata.xml b/x11-wm/matchbox-common/metadata.xml
deleted file mode 100644
index 59ca8723f9d0..000000000000
--- a/x11-wm/matchbox-common/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<use>
-	<flag name="pda">Support for pda folders</flag>
-</use>
-</pkgmetadata>
diff --git a/x11-wm/matchbox-desktop/Manifest b/x11-wm/matchbox-desktop/Manifest
deleted file mode 100644
index 399962591d09..000000000000
--- a/x11-wm/matchbox-desktop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST matchbox-desktop-0.9.1.tar.bz2 231962 SHA256 ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793 SHA512 469d7c088405f627b571d0475e283e1dab2d74e10a58ab9d597cb8941a633f1993859234f9444d160257dade005ce3b325c5375fab2e5f4e30aa0048578853eb WHIRLPOOL 3ec33f322c06856d655e99a940384d5e666e1d87beab71ef8ab0a8a8aabe873de5508bb090be24a169396eaced08f9c342000997a1eb799fbbebce2b2ddfa47f
diff --git a/x11-wm/matchbox-desktop/files/matchbox-desktop-0.9.1-dlopen.patch b/x11-wm/matchbox-desktop/files/matchbox-desktop-0.9.1-dlopen.patch
deleted file mode 100644
index 3c7c7037eedf..000000000000
--- a/x11-wm/matchbox-desktop/files/matchbox-desktop-0.9.1-dlopen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uarN matchbox-desktop-0.9.1.orig/configure.ac matchbox-desktop-0.9.1/configure.ac
---- matchbox-desktop-0.9.1.orig/configure.ac	2005-01-24 09:11:02.000000000 -0500
-+++ matchbox-desktop-0.9.1/configure.ac	2014-10-29 14:08:54.882668438 -0400
-@@ -12,6 +12,7 @@
- AC_PROG_CC
- AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
-+LT_LIB_DLLOAD
- 
- AC_HEADER_DIRENT
- AC_HEADER_STDC
diff --git a/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild b/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild
deleted file mode 100644
index 1651b6a9e6b6..000000000000
--- a/x11-wm/matchbox-desktop/matchbox-desktop-0.9.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$
-
-inherit versionator autotools eutils
-
-DESCRIPTION="The Matchbox Desktop"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE="debug dnotify startup-notification"
-
-DEPEND=">=x11-libs/libmatchbox-1.5
-	startup-notification? ( x11-libs/startup-notification )"
-
-RDEPEND="${DEPEND}
-	x11-wm/matchbox-common"
-
-src_unpack() {
-	unpack ${A} || die "Failed to unpack"
-	cd "${S}" || die
-	epatch "${FILESDIR}/${P}-dlopen.patch" || die "Patch failed"
-	eautoreconf || die
-}
-
-src_compile() {
-	econf	$(use_enable debug) \
-		$(use_enable startup-notification) \
-		$(use_enable dnotify) \
-		|| die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/x11-wm/matchbox-desktop/metadata.xml b/x11-wm/matchbox-desktop/metadata.xml
deleted file mode 100644
index 91130aa74dfc..000000000000
--- a/x11-wm/matchbox-desktop/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="dnotify">Use the linux kernel directory notification feature.</flag>
-  </use>
-</pkgmetadata>
diff --git a/x11-wm/matchbox-panel/Manifest b/x11-wm/matchbox-panel/Manifest
deleted file mode 100644
index 781a6087c6ef..000000000000
--- a/x11-wm/matchbox-panel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST matchbox-panel-0.9.3.tar.bz2 162477 SHA256 319b656e2f1f25339d65802a3136f31169141fd54d1ca9131ff4aada62b25ce6 SHA512 370fbbef2434ae55cd6772b0b205c3ae3cfce1ef59fc72d2794847ec8bf67a74a471aec0d179a5177392a566abdfb4dc2c7647a89b76b56cad210067eac49e8d WHIRLPOOL 60e3c02540d66d4f566651414f33dcaebec5ed26d1d448e97b54f5cceb5e5e9602464b728d6d2c1813d1d87f4779ceec9bfd7387d8a53d318e7e1274531b03cb
diff --git a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch
deleted file mode 100644
index 8dcafbd7d93b..000000000000
--- a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Naurp matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c matchbox-panel-0.9.3/applets/mb-applet-battery.c
---- matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c	2006-02-07 22:27:24.000000000 +0000
-+++ matchbox-panel-0.9.3/applets/mb-applet-battery.c	2006-06-20 18:12:00.000000000 +0000
-@@ -157,50 +157,50 @@ struct avg_consumption {
- 
- static struct avg_consumption a;
- 
-+enum ac_state { AC_UNKNOWN = -1, AC_OFFLINE = 0, AC_ONLINE = 1 };
-+enum bat_state { BAT_UNKNOWN = -1, BAT_CHARGING = 1, BAT_DISCHARGING = 2 };
-+
-+struct entry {
-+	char *key;
-+	char *value;
-+	char *unit;
-+};
-+
-+struct acpi_status {
-+	enum ac_state	ac_state;
-+	enum bat_state	bat_state;
-+	unsigned long	design_capacity;
-+	unsigned long	remaining_capacity;
-+	unsigned long	present_rate;
-+};
-+
- static int
--read_apm(int *values)
-+line_parse(char *line, struct entry *e)
- {
--	enum ac_state { AC_UNKNOWN = -1, AC_OFFLINE = 0, AC_ONLINE = 1 };
--	enum bat_state { BAT_UNKNOWN = -1, BAT_CHARGING = 1, BAT_DISCHARGING = 2 };
--
--	struct entry {
--		char *key;
--		char *value;
--		char *unit;
--	};
--
--	struct acpi_status {
--		enum ac_state	ac_state;
--		enum bat_state	bat_state;
--		unsigned long	design_capacity;
--		unsigned long	remaining_capacity;
--		unsigned long	present_rate;
--	};
-+	char *ptr;
- 
--	static int
--	line_parse(char *line, struct entry *e)
--	{
--		char *ptr;
--		
--		ptr = strchr(line, ':');
--		if (!ptr)
--			return -1;
--		e->key = line;
--		*ptr = 0;
--		while (*++ptr && *ptr == ' ');
--		e->value = ptr;
--		while (*++ptr && *ptr != '\n' && *ptr != ' ');
-+	ptr = strchr(line, ':');
-+	if (!ptr)
-+		return -1;
-+	e->key = line;
-+	*ptr = 0;
-+	while (*++ptr && *ptr == ' ');
-+	e->value = ptr;
-+	while (*++ptr && *ptr != '\n' && *ptr != ' ');
-+	*ptr = 0;
-+	if (*++ptr) {
-+		e->unit = ptr;
-+		while (*++ptr && *ptr != '\n');
- 		*ptr = 0;
--		if (*++ptr) {
--			e->unit = ptr;
--			while (*++ptr && *ptr != '\n');
--			*ptr = 0;
--		} else
--			e->unit = 0;
--	
--		return 0;
--	}
-+	} else
-+		e->unit = 0;
-+
-+	return 0;
-+}
- 
-+static int
-+read_apm(int *values)
-+{
- 	FILE *f;
- 	char line[1024];
- 	struct entry e;
diff --git a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch
deleted file mode 100644
index d36a2eb8df0a..000000000000
--- a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naurp matchbox-panel-0.9.3.orig/configure.ac matchbox-panel-0.9.3/configure.ac
---- matchbox-panel-0.9.3.orig/configure.ac	2006-03-07 18:46:39.000000000 +0000
-+++ matchbox-panel-0.9.3/configure.ac	2010-05-18 13:10:59.000000000 +0000
-@@ -56,6 +56,10 @@ AC_ARG_ENABLE(acpi-linux,
-   [  --enable-acpi-linux   Use Linux ACPI rather than APM for battery info],
-      enable_acpi_linux=$enableval, enable_acpi_linux=no )
- 
-+AC_ARG_ENABLE(wireless-tools,
-+  [  --enable-wireless-tools   enable building of wifi applet],
-+     enable_wireless_tools=$enableval, enable_wireless_tools=no )
-+
- PKG_CHECK_MODULES(LIBMB, libmb >= 1.6,,
- 	         AC_MSG_ERROR([*** Required Matchbox Library (libmb) 1.6 not installed ***]))
- 
-@@ -209,17 +213,20 @@ AM_CONDITIONAL(WANT_ACPI, test x$enable_
- 
- dnl ------ wireless checks --------------------------------------------------
- 
--wifi_enabled=no
--
--AC_CHECK_HEADERS(iwlib.h, have_iwlib_h=yes, have_iwlib_h=no)
--AC_CHECK_LIB(iw, iw_sockets_open, have_libiw=yes, have_libiw=yes)
-+if test x$enable_wireless_tools = xyes; then
-+  AC_CHECK_HEADERS(iwlib.h, have_iwlib_h=yes, 
-+    AC_MSG_ERROR([Unable to find the wireless-tools headers]))
-+  AC_CHECK_LIB(iw, iw_sockets_open, have_libiw=yes,
-+    AC_MSG_ERROR([Unable to find the wireless-tools library]))
- 
--if test x$have_iwlib_h = x"yes" && test x$have_libiw = x"yes"; then
--	WIRELESS_LIBS="-liw"
--	wifi_enabled=yes
-+  WIRELESS_LIBS="-liw"
-+  wifi_enabled=yes
-+else
-+  WIRELESS_LIBS=""
-+  wifi_enabled=no
- fi
--AC_SUBST(WIRELESS_LIBS)
- 
-+AC_SUBST(WIRELESS_LIBS)
- AM_CONDITIONAL(WANT_WIFI, test x$wifi_enabled = x"yes")
- 
- 
diff --git a/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild b/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild
deleted file mode 100644
index 624cc40a52cc..000000000000
--- a/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools versionator
-
-DESCRIPTION="The Matchbox Panel"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE="acpi debug dnotify lowres nls startup-notification wifi"
-
-DEPEND=">=x11-libs/libmatchbox-1.5
-	startup-notification? ( x11-libs/startup-notification )
-	nls? ( sys-devel/gettext )
-	wifi? ( net-wireless/wireless-tools )"
-
-RDEPEND="${DEPEND}
-	x11-wm/matchbox-common"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/"${P}-gcc4-no-nested-functions.patch
-	epatch "${FILESDIR}/"${P}-wifi.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_compile() {
-	econf	$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable startup-notification) \
-		$(use_enable dnotify) \
-		$(use_enable acpi acpi-linux) \
-		$(use_enable lowres small-icons) \
-		$(use_enable wifi wireless-tools) \
-		|| die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/x11-wm/matchbox-panel/metadata.xml b/x11-wm/matchbox-panel/metadata.xml
deleted file mode 100644
index 9e349018ff53..000000000000
--- a/x11-wm/matchbox-panel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="dnotify">Use the linux kernel directory notification feature.</flag>
-    <flag name="lowres">Optimize for low resolution screens.</flag>
-  </use>
-</pkgmetadata>
diff --git a/x11-wm/matchbox-window-manager/Manifest b/x11-wm/matchbox-window-manager/Manifest
deleted file mode 100644
index 9af88302aa3b..000000000000
--- a/x11-wm/matchbox-window-manager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST matchbox-window-manager-1.2.tar.bz2 208813 SHA256 81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff SHA512 a603ef2da6fef4caa87980765b64d0f84f19fdb29a181e2a0c442846a09e42984c97b5a11c9ceb37a5e9db9915acc2733fbb6b2af9c0afb11917edbdb50c3b24 WHIRLPOOL a46ec32450aeedf33a927ceebde0c9e481b444a3e50c733ea6eabc6d193669ab7eec2799d0adf0160e613aeb50b96719b3be35675245cc2a6b60f50737ca54eb
diff --git a/x11-wm/matchbox-window-manager/files/matchbox-window-manager-1.0-use-nopng.patch b/x11-wm/matchbox-window-manager/files/matchbox-window-manager-1.0-use-nopng.patch
deleted file mode 100644
index 881567d9b96d..000000000000
--- a/x11-wm/matchbox-window-manager/files/matchbox-window-manager-1.0-use-nopng.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naurp matchbox-window-manager-1.0.orig/src/structs.h matchbox-window-manager-1.0/src/structs.h
---- matchbox-window-manager-1.0.orig/src/structs.h	2006-02-19 16:00:52.000000000 -0500
-+++ matchbox-window-manager-1.0/src/structs.h	2006-06-12 18:52:53.000000000 -0400
-@@ -81,23 +81,12 @@
- 
- #define GENERIC_ICON        PKGDATADIR "/mbnoapp.xpm"
- 
--#ifdef MB_HAVE_PNG
--
- #define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
--
- #define DEFAULTTHEME       DATADIR "/themes/Default/matchbox/theme.xml"
- 
- #define DEFAULT_THEMENAME  "Default"
--
- #define DEFAULTTHEMENAME  "Default"
- 
--#else
--
--#define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
--#define DEFAULT_THEME_NAME  "Default"
--
--#endif
--
- #define CONFDEFAULTS       PKGDATADIR "/defaults"
- 
- /* Simple Macros  */
diff --git a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2-r1.ebuild b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2-r1.ebuild
deleted file mode 100644
index 71be316d1daf..000000000000
--- a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2-r1.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"
-GCONF_DEBUG="no"
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Light weight WM designed for use on PDA computers"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE="debug expat gnome session startup-notification xcomposite"
-
-RDEPEND="
-	>=x11-libs/libmatchbox-1.5
-	expat? ( dev-libs/expat )
-	gnome? ( gnome-base/gconf )
-	startup-notification? ( x11-libs/startup-notification )
-	session? ( x11-libs/libSM )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Allows to build with USE=-png
-	epatch "${FILESDIR}"/${PN}-1.0-use-nopng.patch
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-	 	--enable-keyboard \
-		--enable-ping-protocol \
-		--enable-xrm \
-		$(use_enable debug) \
-		$(use_enable session) \
-		$(use_enable expat) \
-		$(use_enable gnome gconf) \
-		$(use_enable startup-notification) \
-		$(use_enable xcomposite composite)
-}
diff --git a/x11-wm/matchbox-window-manager/metadata.xml b/x11-wm/matchbox-window-manager/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-wm/matchbox-window-manager/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-wm/matchbox/matchbox-1.0.ebuild b/x11-wm/matchbox/matchbox-1.0.ebuild
deleted file mode 100644
index 53cb9af2bbd6..000000000000
--- a/x11-wm/matchbox/matchbox-1.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$
-
-DESCRIPTION="Light weight WM designed for use on PDA computers"
-HOMEPAGE="http://matchbox-project.org/"
-LICENSE="metapackage"
-SLOT="0"
-IUSE="minimal"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-
-RDEPEND="x11-wm/matchbox-common
-	x11-wm/matchbox-desktop
-	x11-wm/matchbox-panel
-	x11-wm/matchbox-window-manager
-	!minimal? ( x11-misc/matchbox-keyboard
-		x11-themes/matchbox-themes-extra
-		x11-plugins/matchbox-applet-input-manager
-		x11-plugins/matchbox-applet-startup-monitor
-		x11-plugins/matchbox-applet-volume )"
-
-# Alpha quality plug-ins:
-#IUSE="$IUSE xine"
-#		x11-plugins/matchbox-desktop-image-browser
-#		xine? ( x11-plugins/matchbox-desktop-xine ) )"
-
-S="${WORKDIR}"
diff --git a/x11-wm/matchbox/metadata.xml b/x11-wm/matchbox/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-wm/matchbox/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-wm/muffin/muffin-2.8.4.ebuild b/x11-wm/muffin/muffin-2.8.4.ebuild
index 01f70916ca1a..905c927d8d85 100644
--- a/x11-wm/muffin/muffin-2.8.4.ebuild
+++ b/x11-wm/muffin/muffin-2.8.4.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.18.2-r1.ebuild b/x11-wm/mutter/mutter-3.18.2-r1.ebuild
index c279529275eb..ac1d7156a505 100644
--- a/x11-wm/mutter/mutter-3.18.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.18.2-r1.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/xpra/Manifest b/x11-wm/xpra/Manifest
index c63a5002f7f3..7f898910cd13 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,6 +1,4 @@
 DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
+DIST xpra-0.14.34.tar.xz 1127536 SHA256 1f59e3d308bdff6e3b19df0c671a97d2a4bc8e1ec1c3dd49c2bbc8f9feefd8aa SHA512 e19cc701fce797ca96bbf1cc1e4140b8a1d35ca5c1a8bd3cf4a16623908c28c0dd119f654e103352a3a2ec09735bf8562f4669aefe39b746933202621e905230 WHIRLPOOL 32a175b04ab8b6bdf3e5a53bea91a6e01925a3f40358e3edf2a786d58d52e05d917a04f3ffdcf8bbee07fb5ce8c8d032e5cbc52542d9b16a13ba072ff4aa71af
 DIST xpra-0.15.10.tar.xz 1200040 SHA256 1403aaf571c486bb4a67bc9e9d431e5f863c9b7912bd65e6aec62fcea2d9d4e0 SHA512 add1e63da75b7e29163a7e0957e3f841019c557ba42b15f437ed385de99905cb28a3760386570b72c5d2ba305c5b7779a85ca39d4452ccd6133c26f0a7983d9a WHIRLPOOL a5c50b68b39786aad6c50332340bf421ac17f38948880acb49d55769e8a9b4fb48b068a0fea0e5e660e9621b460eb60d19131600173b826b54a4f7d2e623fb5f
-DIST xpra-0.15.6.tar.xz 1196700 SHA256 cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32 SHA512 750b24d06b6af93757e54651c0e5e55192280715c4439e56881824da90dcea25460631c993bf239c6f9023e74dce5063e32688e31c616d036da16fa3da8c304a WHIRLPOOL 66cdc20662ba4251506e03a969332996870e37fe6f60becd3f2feed7b24e1410bc793f5f4679a0dc58940bda52d26563f9db10f8ae3fd83fb60cb89988be38a0
-DIST xpra-0.15.7.tar.xz 1197012 SHA256 b07ed8708023583788de6b5fec579505c2d13fbe96243e9bd0fd696b66ead8e2 SHA512 a75c3299b1f3074556440cc2822557564cf48e6a9c2ea061073ccca0ea204578713ece1e43389d0b808bd02cba9646bd161399661b1d52161e497e4406d029fa WHIRLPOOL e187d25bb6f947b36934f02682ce0d4e091df874f9e3ef25fd261435fd79d3ad5167417ae8e75f167470ac57285d07aa11b6d7d8b51573321569a3a86e2db150
-DIST xpra-0.15.8.tar.xz 1198496 SHA256 e6ca124c89cfa81c8ee69dd2d746cdb0b4d896af6b369e60abc50d2fd2d2a0d2 SHA512 0c23bda2ad2ac2355da1e867f3909e13c2146a5f1b0c4903628e1177edb143fb10a57e8cfaada901bf1df0ec71f87356444856405f0f32f99abc1b655d2de636 WHIRLPOOL abc1e6691f459eea0454df870c0c96bf06b628816e2c283090eac467b6c1fbaf0df6e4f7b229c9eb719acdb8630cb441119ce95b6be2b95ac7385c8a0f5bd2e8
-DIST xpra-0.15.9.tar.xz 1199224 SHA256 bdf51ae3d4114050ff23f7a88fc10af0eb55dd6f74412a6b2c10efeaf6499116 SHA512 83b3452b45a3fa3ea095cef5d2ed901d754903b9aed20cb5a42e0172e9f7058abd88f8635b36adbf314114a4c396a6478e64611273ac61c369332d8590bcef76 WHIRLPOOL 900f5325ebe4ae78b3da214a153961a2c1925ce52f7645ecfcd5254a38f6f942accb263cccfa41eb3b305bef28692ade610e78e17d0c87c1c15b8354656e192b
+DIST xpra-0.16.2.tar.xz 1341856 SHA256 ce99b941f63aeae465c9d095bcdef857227f8102759df3d013fbfb65c8cea540 SHA512 a5431367918551c630a7f80bd59c51b3bd360472ee268b7865862f4de03b0962b534ab65c4926faa386098c48cdab49f8d7e91b60b998017df52ab077d270a33 WHIRLPOOL bb3c89eb6f32349f26b076abea5535b9e37a3ea2789be9aa35723a383603cce090044d8b8631817b5eda0b158ddcf2c278240e977a3daed0c8fe510e576f4135
diff --git a/x11-wm/xpra/files/xpra-0.16.2-prefix.patch b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
new file mode 100644
index 000000000000..4559578d63ce
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
@@ -0,0 +1,27 @@
+--- xpra-0.16.2/setup.py
++++ xpra-0.16.2/setup.py
+@@ -1723,8 +1723,8 @@
+         #prepare default [/usr/local]/etc configuration files:
+         if '--user' in sys.argv:
+             etc_prefix = 'etc/xpra'
+-        elif sys.prefix == '/usr':
+-            etc_prefix = '/etc/xpra'
++        elif sys.prefix[-4:] == '/usr':
++            etc_prefix = sys.prefix[:-4] + '/etc/xpra'
+         else:
+             etc_prefix = sys.prefix + '/etc/xpra'
+ 
+--- xpra-0.16.2/xpra/platform/paths.py
++++ xpra-0.16.2/xpra/platform/paths.py
+@@ -40,9 +40,9 @@
+ def do_get_system_conf_dirs():
+     prefix = get_install_prefix()
+     #the system wide configuration directory
+-    if prefix == '/usr':
++    if prefix[-4:] == '/usr':
+         #default posix config location:
+-        return ['/etc/xpra']
++        return [sys.prefix[:-4] + '/etc/xpra']
+     #hope the prefix is something like "/usr/local" or "$HOME/.local":
+     return [prefix + '/etc/xpra/']
+ 
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index bc86193d0e88..60f9071b5617 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -10,14 +10,15 @@
 </upstream>
 <use>
 	<flag name="client">Build client-side code</flag>
-	<flag name="server">Build server-side code</flag>
 	<flag name="clipboard">Enable clipboard support</flag>
-	<flag name="rencode">Enable rencode support</flag>
-	<flag name="vpx">Enable vpx image format support</flag>
-	<flag name="webp">Enable webp image format support</flag>
 	<flag name="csc">Enable csc softscaler support</flag>
 	<flag name="dec_av">Enable dec_avcodec support</flag>
 	<flag name="dec_av2">Enable dec_avcodec2 support</flag>
+	<flag name="lz4">Enable support for lz4 compression</flag>
+	<flag name="rencode">Enable rencode support</flag>
+	<flag name="server">Build server-side code</flag>
+	<flag name="vpx">Enable vpx image format support</flag>
+	<flag name="webp">Enable webp image format support</flag>
 	<flag name="x265">Enable x265 support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-0.14.34.ebuild b/x11-wm/xpra/xpra-0.14.34.ebuild
new file mode 100644
index 000000000000..d917a674f275
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.14.34.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
+SRC_URI="http://xpra.org/src/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc dec_av dec_av2 libav lz4 lzo opengl pulseaudio +rencode server sound vpx webp x264 x265"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	opengl? ( client )
+	|| ( client server )"
+
+# x264/old-libav.path situation see bug 459218
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_av? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_av2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+		dev-python/gst-python:0.10 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
+		libav? ( media-video/libav:0= )
+	)
+	x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.14.0-prefix.patch
+
+	if use libav ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(use_with dec_av dec_avcodec)
+		$(use_with dec_av2 dec_avcodec2)
+		$(use_with opengl)
+		$(use_with rencode)
+		$(use_with server cymaths)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264 enc_x264)
+		$(use_with x265 enc_x265)
+		--with-Xdummy
+		--with-argb
+		--with-cyxor
+		--with-gtk2
+		--without-gtk3
+		--without-qt4
+		--with-strict
+		--with-warn
+		--with-x11
+		--without-PIC
+		--without-debug )
+}
diff --git a/x11-wm/xpra/xpra-0.15.10-r1.ebuild b/x11-wm/xpra/xpra-0.15.10-r1.ebuild
new file mode 100644
index 000000000000..6a19d6ef45a4
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.15.10-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
+SRC_URI="http://xpra.org/src/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	opengl? ( client )
+	|| ( client server )"
+
+# x264/old-libav.path situation see bug 459218
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_av2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+		dev-python/gst-python:0.10 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
+		libav? ( media-video/libav:0= )
+	)
+	x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	rm -rf rencode || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
+
+	if use libav ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(use_with cups printing)
+		$(use_with dec_av2 dec_avcodec2)
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264 enc_x264)
+		$(use_with x265 enc_x265)
+		--with-Xdummy
+		--with-gtk2
+		--without-gtk3
+		--with-strict
+		--with-warn
+		--with-x11
+		--without-PIC
+		--without-debug )
+}
diff --git a/x11-wm/xpra/xpra-0.15.10.ebuild b/x11-wm/xpra/xpra-0.15.10.ebuild
deleted file mode 100644
index c5ca308f940b..000000000000
--- a/x11-wm/xpra/xpra-0.15.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.15.6.ebuild b/x11-wm/xpra/xpra-0.15.6.ebuild
deleted file mode 100644
index 60c3a614a9f7..000000000000
--- a/x11-wm/xpra/xpra-0.15.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.15.7.ebuild b/x11-wm/xpra/xpra-0.15.7.ebuild
deleted file mode 100644
index c5ca308f940b..000000000000
--- a/x11-wm/xpra/xpra-0.15.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.15.8.ebuild b/x11-wm/xpra/xpra-0.15.8.ebuild
deleted file mode 100644
index c5ca308f940b..000000000000
--- a/x11-wm/xpra/xpra-0.15.8.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.15.9.ebuild b/x11-wm/xpra/xpra-0.15.9.ebuild
deleted file mode 100644
index c5ca308f940b..000000000000
--- a/x11-wm/xpra/xpra-0.15.9.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.16.2.ebuild b/x11-wm/xpra/xpra-0.16.2.ebuild
new file mode 100644
index 000000000000..3838b86e8826
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.16.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils flag-o-matic
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
+SRC_URI="http://xpra.org/src/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	opengl? ( client )
+	|| ( client server )"
+
+# x264/old-libav.path situation see bug 459218
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_av2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		dev-python/gst-python:1.0 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
+		libav? ( media-video/libav:0= )
+	)
+	x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	rm -rf rencode || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.16.2-prefix.patch
+
+	if use libav ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(use_with cups printing)
+		$(use_with dec_av2 dec_avcodec2)
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264 enc_x264)
+		$(use_with x265 enc_x265)
+		--with-Xdummy
+		--with-gtk2
+		--without-gtk3
+		--with-strict
+		--with-warn
+		--with-x11
+		--without-PIC
+		--without-debug )
+
+	# see https://www.xpra.org/trac/ticket/1080 
+	# and http://trac.cython.org/ticket/395
+	append-cflags -fno-strict-aliasing
+}
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
index 9de7153c7365..b0e6a0a6f854 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
@@ -12,14 +12,13 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
-IUSE="glade startup-notification"
+IUSE="startup-notification"
 
 RDEPEND="gnome-base/libglade
 	x11-libs/libSM
 	x11-libs/libX11
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-4.10
-	glade? ( dev-util/glade:3 )
 	startup-notification? ( x11-libs/startup-notification )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -32,7 +31,8 @@ pkg_setup() {
 	XFCONF=(
 		--disable-static
 		$(use_enable startup-notification)
-		$(use_enable glade gladeui)
+		# glade:3 no longer supported on Gentoo, #575166
+		--disable-gladeui
 		--with-html-dir="${EPREFIX}"/deprecated
 		)
 }
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild
deleted file mode 100644
index 930f129c9ea9..000000000000
--- a/xfce-base/libxfcegui4/libxfcegui4-4.10.0.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 xfconf
-
-DESCRIPTION="A compability library for unported Xfce 4.6 plugins (DEPRECATED)"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage http://git.xfce.org/archive/libxfcegui4/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
-IUSE="glade startup-notification"
-
-RDEPEND="gnome-base/libglade
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.10
-	<xfce-base/libxfce4util-4.11
-	glade? ( dev-util/glade:3 )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--disable-static
-		$(use_enable startup-notification)
-		$(use_enable glade gladeui)
-		--with-html-dir="${EPREFIX}"/deprecated
-		)
-}
-
-src_install() {
-	xfconf_src_install
-	rm -rf "${ED}"/deprecated
-}
diff --git a/xfce-base/libxfcegui4/metadata.xml b/xfce-base/libxfcegui4/metadata.xml
index e61e8e097342..359901b31db4 100644
--- a/xfce-base/libxfcegui4/metadata.xml
+++ b/xfce-base/libxfcegui4/metadata.xml
@@ -5,7 +5,4 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
-  <use>
-    <flag name="glade">Build glade bindings</flag>
-  </use>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild
index 1aff29ff14b5..82a508b4641d 100644
--- a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild
+++ b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND="app-shells/bash
+RDEPEND="app-shells/bash:*
 	>=x11-misc/gtkdialog-0.8"
 DEPEND="${RDEPEND}"
 
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index a334c001a8c2..c62801f99d41 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,2 +1 @@
-DIST xfce4-dict-0.6.0.tar.bz2 373420 SHA256 a8188ca4c980ca2003be6bf2391589f5122830680c41d51105b10813850da0d3 SHA512 3964abe66280413f7db4617c33379144414bfc751070a24167cd3285619fce18fdf81c4fce1b3f58e6866611a79400e9ea0a56063a4fb147e3fbc7a2f6db7c4c WHIRLPOOL eb04bd1521fdbfba5d01452948f9b6cedaa4620d48b155dd5a90af77e2d62e3817bb1bdf8804feb11d9d1286a537b341eb59fc9c76395a0677fa43649ab6e3de
 DIST xfce4-dict-0.7.1.tar.bz2 493952 SHA256 d15611e75a5e9c51167f2101cb760505ff72c446ef15542183b5e0fbf9c540fc SHA512 820d77e84583ace3b809b45ecbbf16da7fbdd5d4d69762e18e940f20ea9f54a5f88332e24fe85865fe50a5ab0c31f7b9b20ce28c1179b5538d4612c2d9fe1d50 WHIRLPOOL b17ca270ac568667467bfd79ec40e40257efdeaabee06fcc3a3044832e1f3e6c03876f11583382a95939bcd7a16c0e91b40e8a35557b1b37b45c47946db52158
diff --git a/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch b/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch
deleted file mode 100644
index 9366f0b059b7..000000000000
--- a/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=8229
-
-Fix underlinking. See below. Function "floor" and math.h is used in common.c which is part of libdict.
-
-/path/to/ld: ../lib/.libs/libdict.a(libdict_la-common.o): undefined reference to symbol 'floor@@GLIBC_2.2.5'
-/path/to/ld: note: 'floor@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
-/lib/libm.so.6: could not read symbols: Invalid operation
-collect2: ld returned 1 exit status
-
---- lib/Makefile.am
-+++ lib/Makefile.am
-@@ -34,7 +34,8 @@
- libdict_la_LIBADD =								\
- 	$(LIBXFCE4PANEL_LIBS)						\
- 	$(LIBXFCEGUI4_LIBS)							\
--	@GTHREAD_LIBS@
-+	@GTHREAD_LIBS@								\
-+	-lm
- 
- 
- noinst_DATA = 									\
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
deleted file mode 100644
index 0ac66d54504b..000000000000
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-EAUTORECONF=yes
-inherit multilib xfconf
-
-DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-dict"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
-
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	DOCS=( AUTHORS ChangeLog README )
-}
-
-src_prepare() {
-	# xfce4-dict.desktop: (will be fatal in the future): value "Dictionary" in key
-	# "Categories" in group "Desktop Entry" requires another category to be present
-	# among the following categories: Office;TextTools
-	sed -i -e '/Categories/s:Office:&;Utility;TextTools:' src/xfce4-dict.desktop.in || die
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index caac4fc44b38..effdc63ad7eb 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,3 +1 @@
-DIST xfce4-notes-plugin-1.7.7.tar.bz2 472082 SHA256 a7baa105b37ad05dea4d6b55d98fd3214c77ad5c7a0e91471d4906c81e5f5217 SHA512 27172da495ee800c181e22839eb2761f3951c1ab18030680af28d132b6014fd5705ca7bbdcea77520afa55d242dc1351f1fcee0936d47ef6847528d5001fc52c WHIRLPOOL b3e41e1ab115bbede6fc52607d76f2f448fafbd5c4c7ba3041f6ca964376de61664b3ff31e63ab1fee4b2e13f5051d17bc6470ca5642c32c5d804fa5c40762e0
-DIST xfce4-notes-plugin-1.8.0.tar.bz2 469959 SHA256 3627b7da0533ca3fb10310f287dc0d569470960ffdaea7678fd878a20d409678 SHA512 ef1817fc0b8202f789cf0b6c0db3c0fea8cbdcaee33501db4e3f551bbe7609eb984dfd4f6be87e0c883e7d18d303dd46922676d3cb7f0249d03e60eb50ccb11f WHIRLPOOL c10f56256788db885f701dc754d3dad7756843cc2d25b10fe82c86da6f164326fd74f8ef07760e8dc06b7402c0165e8f3474381eec6d9ead2bee7bc7d5cc9a50
 DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 SHA256 07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2 SHA512 3e3f2513aaa5d26880d21ba31458aa8b79c1e01cac47141513d61002df9535e52ca2c14a8da6cddd54fcab3bcda6199c636cce045cea9bd4548f5fc763e069f3 WHIRLPOOL cacb0549bccc06266671b414ac65cb1937e2ec64498792abfa255f37418aeebf0632fcc13234d96b860b952fa0f2c93597cf52e386e46ede4ef85006b0763324
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.ebuild
deleted file mode 100644
index ec2fe7746476..000000000000
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.7.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=5
-inherit xfconf
-
-DESCRIPTION="Xfce4 panel sticky notes plugin"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.7/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.18:2
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8
-	>=xfce-base/xfconf-4.8
-	dev-libs/libunique:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	XFCONF=( --disable-static )
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.0.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.0.ebuild
deleted file mode 100644
index b8623dc58be8..000000000000
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.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
-inherit versionator xfconf
-
-DESCRIPTION="Xfce4 panel sticky notes plugin"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2=
-	>=x11-libs/gtk+-2.20:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	>=xfce-base/xfconf-4.10:=
-	dev-libs/libunique:1="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}